From 6385beec0673f0a8f917aa3473f0a6a2af53d01d Mon Sep 17 00:00:00 2001
From: Merel Steenbergen <m.a.steenbergen@student.tudelft.nl>
Date: Fri, 22 Mar 2019 21:51:09 +0100
Subject: [PATCH] FIX: Tests now work

---
 .../greenify/server/service/UserService.java  |  2 +-
 .../server/service/UserServiceTest.java       | 34 +++++++------------
 2 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/src/Server/src/main/java/greenify/server/service/UserService.java b/src/Server/src/main/java/greenify/server/service/UserService.java
index 62e212b..b305a0f 100644
--- a/src/Server/src/main/java/greenify/server/service/UserService.java
+++ b/src/Server/src/main/java/greenify/server/service/UserService.java
@@ -87,7 +87,7 @@ public class UserService {
     public void addFriend(Long id, String name, String friend) {
         User user = userRepository.findByName(name);
         User add = userRepository.findByName(friend);
-        user.addFriend(user);
+        user.addFriend(add);
         userRepository.save(user);
         logger.info("Added friend to user(id=" + user.getId()
                 + ", name=" + user.getName() + ")");
diff --git a/src/Server/src/test/java/greenify/server/service/UserServiceTest.java b/src/Server/src/test/java/greenify/server/service/UserServiceTest.java
index 9c74476..3dbcfb9 100644
--- a/src/Server/src/test/java/greenify/server/service/UserServiceTest.java
+++ b/src/Server/src/test/java/greenify/server/service/UserServiceTest.java
@@ -42,14 +42,17 @@ public class UserServiceTest {
      */
     @Before
     public void setUp() {
-        User alex = new User(1L, "alex", "password", 0);
-        when(userRepository.findByName(alex.getName()))
-                .thenReturn(alex);
+        User user = new User(1L, "user", "password", 0);
+        when(userRepository.findByName(user.getName()))
+                .thenReturn(user);
+        User friend = new User(2L, "friend", "password", 0);
+        when(userRepository.findByName(friend.getName()))
+                .thenReturn(friend);
     }
 
     @Test
     public void validLoginTest() {
-        String name = "alex";
+        String name = "user";
         String password = "password";
         UserDto found = userService.loginUser(name, password);
         assertEquals(found.getName(), name);
@@ -57,8 +60,8 @@ public class UserServiceTest {
 
     @Test
     public void userRegisterTest() {
-        User user = new User(1L, "name", "password", 0);
-        UserDto registered = userService.registerUser(user.getName(), user.getPassword());
+        User test = new User(1L, "name", "password", 0);
+        UserDto registered = userService.registerUser(test.getName(), test.getPassword());
         assertEquals(registered.getName(), "name");
     }
 
@@ -69,7 +72,6 @@ public class UserServiceTest {
 
     @Test
     public void invalidLoginTest() {
-        User user = null;
         assertThrows(ApplicationException.class, () -> {
             userService.loginUser(null, null);
         });
@@ -77,20 +79,10 @@ public class UserServiceTest {
 
     @Test
     public void addFriendTest() {
-        User user = new User(1l,"Merel", "password", 0);
-        User friend = new User(2l, "Ellis", "pass", 0);
-        userService.registerUser("Merel", "password");
-        userService.registerUser("Ellis", "pass");
-        assertEquals(user.getFriends(), new ArrayList<User>());
-
-        //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);
+        userService.addFriend(1L,"user", "friend");
+        List<User> test = new ArrayList<User>();
+        test.add(userRepository.findByName("friend"));
+        assertEquals(userRepository.findByName("user").getFriends(), test);
     }
 
 }