Debugging in progress. FindByName returns null again.

This commit is contained in:
Merel Steenbergen
2019-03-22 20:20:39 +01:00
parent e69e08ad15
commit 12c2ebab4e
5 changed files with 14 additions and 31 deletions

View File

@@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="src" path="Client/src/main/java"/>
<classpathentry kind="src" path="Server/src/main/java"/>
<classpathentry kind="output" path="Client/build/classes/java/main"/>
</classpath>

View File

@@ -1,17 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>OOPP</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>

View File

@@ -114,9 +114,11 @@ public class User {
public String friendsToString(){
String result = "";
for(User u : friends){
result += u.getId() + ", ";
result += u.getName() + ", ";
}
if(result.endsWith(", ")){
result = result.substring(0, result.lastIndexOf(","));
}
result = result.substring(0, result.lastIndexOf(","));
return result;
}

View File

@@ -33,7 +33,7 @@ public class UserTest {
@Test
public void toStringTest() {
User user = new User(1L, "greenify", "password", 3);
assertEquals("User(id=1, name=greenify, password=password, veganMeal=3)", user.toString());
assertEquals("User(id=1, name=greenify, password=password, veganMeal=3, friends=[])", user.toString());
}
@Test

View File

@@ -82,10 +82,15 @@ public class UserServiceTest {
userService.registerUser("Merel", "password");
userService.registerUser("Ellis", "pass");
assertEquals(user.getFriends(), new ArrayList<User>());
userService.addFriend(1l,"Merel", "Ëllis");
List<User> ellis = new ArrayList<User>();
((ArrayList) ellis).add(friend);
assertEquals(user.getFriends(), ellis);
//STILL TELLS ME NULL
System.out.println(userRepository.findByName("Merel"));
// userService.addFriend(1l,"Merel", "Ellis");
// List<User> ellis = new ArrayList<User>();
// ((ArrayList) ellis).add(friend);
// assertEquals(user.getFriends(), ellis);
}
}