diff --git a/src/Server/src/main/java/greenify/server/data/model/User.java b/src/Server/src/main/java/greenify/server/data/model/User.java index 088f533..1edcc28 100644 --- a/src/Server/src/main/java/greenify/server/data/model/User.java +++ b/src/Server/src/main/java/greenify/server/data/model/User.java @@ -143,6 +143,17 @@ public class User { + this.password + ")"; } + public String friendsToString(){ + String result = "friends=["; + for(User u : friends){ + result += "{name=" + u.getName() + ", footprint=" + u.getFootPrint() + "}, "; + } + if(result.endsWith(", ")){ + return result.substring(0, result.lastIndexOf(",")) + "]"; + } + return result + "]"; + } + @Override public boolean equals(Object other) { if (other instanceof User) { diff --git a/src/Server/src/test/java/greenify/server/data/model/UserTest.java b/src/Server/src/test/java/greenify/server/data/model/UserTest.java index 54cb850..92b8d2c 100644 --- a/src/Server/src/test/java/greenify/server/data/model/UserTest.java +++ b/src/Server/src/test/java/greenify/server/data/model/UserTest.java @@ -96,7 +96,6 @@ public class UserTest { User first = new User(1L, "greenify", "password"); User second = new User(1L, "merel", "password"); assertEquals(first.getFriends(), second.getFriends()); - System.out.print(second); first.addFriend(second); ArrayList test = new ArrayList(); test.add(second); @@ -109,6 +108,16 @@ public class UserTest { assertEquals(test.getFriends(), new ArrayList()); assertThrows(ApplicationException.class, () -> { test.addFriend(test); - }); } + }); + } + + + @Test + public void friendsToStringTest(){ + User first = new User(1L, "greenify", "password"); + User second = new User(1L, "merel", "password"); + first.addFriend(second); + assertEquals(first.friendsToString(), "friends=[{name=merel, footprint=0.0}]"); + } }