test: ViewController- und ServiceTests optimiert/ergänzt

Thomas Ziemer
1 parent 62d24433
Showing 3 changed files with 138 additions and 26 deletions
src/test/java/net/ziemers/swxercise/lg/user/service/UserServiceTest.java
src/test/java/net/ziemers/swxercise/ui/UserViewControllerTest.java
src/test/resources/net/ziemers/swxercise/testdata/UserServiceTestData.xml
@@ -29,12 +29,13 @@ public class UserServiceTest extends JpaTestUtils {
     private static String USERNAME_TEST = "username_test";
     private static String EXISTING_USERNAME_TEST = "username_profile";
+    private static Long EXISTING_USER_ID = 2L;
     private static boolean dbInitialized;
     private UserDto userDto;
-    private Long userId;
+    private boolean actual;
     @Inject
     private UserDao userDao;
@@ -74,7 +75,20 @@ public class UserServiceTest extends JpaTestUtils {
                 .createUser();
         then()
-                .assertCreateFail();
+                .assertCreateFailure();
+    }
+
+    @Test
+    public void testUpdateUserDoesntUpdateUsername() {
+
+        given()
+                .userDto(USERNAME_TEST);
+
+        when()
+                .updateUser(EXISTING_USER_ID);
+
+        then()
+                .assertUpdateSuccess();
     }
     // given
@@ -85,7 +99,7 @@ public class UserServiceTest extends JpaTestUtils {
     private UserServiceTest userDto(final String username) {
         userDto = new UserDtoTestDataBuilder()
-                .withUsername(USERNAME_TEST)
+                .withUsername(username)
                 .build();
         return this;
     }
@@ -98,7 +112,15 @@ public class UserServiceTest extends JpaTestUtils {
     private UserServiceTest createUser() {
         txBegin();
-        userId = underTest.createUser(userDto);
+        actual = underTest.createUser(userDto);
+        txCommit();
+
+        return this;
+    }
+
+    private UserServiceTest updateUser(final Long id) {
+        txBegin();
+        actual = underTest.updateUser(id, userDto);
         txCommit();
         return this;
@@ -111,14 +133,20 @@ public class UserServiceTest extends JpaTestUtils {
     }
     private void assertCreateSuccess() {
-        // wir suchen den soeben erstellten Benutzer; wenn er existiert, is alles gut
+        // wir suchen den soeben erstellten Benutzer; wenn er existiert, ist alles gut
         final User user = userDao.findByUsername(USERNAME_TEST);
         assertNotNull(user);
     }
-    private void assertCreateFail() {
-        // es darf kein neuer Benutzer mit identischem "username" erstellt worden sein
-        assertNull(userId);
+    private void assertCreateFailure() {
+        // es darf kein neuer Benutzer mit identischem Benutzernamen erstellt worden sein
+        assertFalse(actual);
+    }
+
+    private void assertUpdateSuccess() {
+        // wir suchen den soeben aktualisierten Benutzer; wenn sein Benutzername unverändert ist, ist alles gut
+        final User user = userDao.findById(EXISTING_USER_ID);
+        assertEquals(EXISTING_USERNAME_TEST, user.getProfile().getUsername());
     }
 }
 package net.ziemers.swxercise.ui;
-import net.ziemers.swxercise.lg.model.user.User;
 import net.ziemers.swxercise.lg.testdatabuilder.user.UserDtoTestDataBuilder;
-import net.ziemers.swxercise.lg.testdatabuilder.user.UserTestDataBuilder;
 import net.ziemers.swxercise.lg.user.dto.UserDto;
 import net.ziemers.swxercise.lg.user.service.UserService;
+import net.ziemers.swxercise.ui.enums.ResponseState;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
@@ -33,8 +32,6 @@ public class UserViewControllerTest {
     private UserDto userDto;
-    private User user;
-
     private RestResponse actual;
     @Test
@@ -59,12 +56,54 @@ public class UserViewControllerTest {
     @Test
     public void testCreateUserReturnsSuccess() {
-        // TODO Test ist noch zu implementieren
+
+        given()
+                .userDto();
+
+        doing()
+                .createUser(true);
+
+        then()
+                .assertCreateSuccess();
     }
     @Test
-    public void testUpdateUserReturnsSuccess() {
-        // TODO Test ist noch zu implementieren
+    public void testCreateUserReturnsFailure() {
+
+        given()
+                .userDto();
+
+        doing()
+                .createUser(false);
+
+        then()
+                .assertCreateFailure();
+    }
+
+    @Test
+    public void testUpdateLoggedInUserReturnsSuccess() {
+
+        given()
+                .userDto();
+
+        doing()
+                .updateUser();
+
+        then()
+                .assertUpdateSuccess();
+    }
+
+    @Test
+    public void testUpdateSpecificUserReturnsSuccess() {
+
+        given()
+                .userDto();
+
+        doing()
+                .updateUser(1L);
+
+        then()
+                .assertUpdateSuccess();
     }
     @Test
@@ -81,17 +120,29 @@ public class UserViewControllerTest {
     public void testLoginUserReturnsSuccess() {
         given()
-                .userDto()
-                .user();
+                .userDto();
         doing()
-                .loginUser();
+                .loginUser(true);
         then()
                 .assertLoginSuccess();
     }
     @Test
+    public void testLoginNonExistingUserReturnsFailure() {
+
+        given()
+                .userDto();
+
+        doing()
+                .loginUser(false);
+
+        then()
+                .assertLoginFailure();
+    }
+
+    @Test
     public void testLogoutUserReturnsSuccess() {
         doing()
@@ -112,23 +163,36 @@ public class UserViewControllerTest {
         return this;
     }
-    private UserViewControllerTest user() {
-        user = new UserTestDataBuilder().build();
-        return this;
-    }
-
     // doing
     private UserViewControllerTest doing() {
         return this;
     }
-    private void loginUser() {
+    private void createUser(final boolean result) {
         /*
          * The when().thenReturn() method chain is used to specify
          * a return value for a method call with pre-defined parameters.
          */
-        when(userService.loginUser(userDto)).thenReturn(true);
+        when(userService.createUser(userDto)).thenReturn(result);
+
+        actual = underTest.createUser(userDto);
+    }
+
+    private void updateUser() {
+        when(userService.updateUser(userDto)).thenReturn(true);
+
+        actual = underTest.updateUser(userDto);
+    }
+
+    private void updateUser(final Long id) {
+        when(userService.updateUser(id, userDto)).thenReturn(true);
+
+        actual = underTest.updateUser(id, userDto);
+    }
+
+    private void loginUser(final boolean result) {
+        when(userService.loginUser(userDto)).thenReturn(result);
         actual = underTest.loginUser(userDto);
     }
@@ -145,11 +209,31 @@ public class UserViewControllerTest {
         return this;
     }
+    private void assertCreateSuccess() {
+        final RestResponse expected = new RestResponse();
+        assertEquals(expected, actual);
+    }
+
+    private void assertCreateFailure() {
+        final RestResponse expected = new RestResponse(ResponseState.ALREADY_EXISTING);
+        assertEquals(expected, actual);
+    }
+
+    private void assertUpdateSuccess() {
+        final RestResponse expected = new RestResponse();
+        assertEquals(expected, actual);
+    }
+
     private void assertLoginSuccess() {
         final RestResponse expected = new RestResponse();
         assertEquals(expected, actual);
     }
+    private void assertLoginFailure() {
+        final RestResponse expected = new RestResponse(ResponseState.FAILED);
+        assertEquals(expected, actual);
+    }
+
     private void assertLogoutSuccess() {
         final RestResponse expected = new RestResponse();
         assertEquals(expected, actual);
 <?xml version="1.0" encoding="UTF-8"?>
 <dataset>
     <!-- die Grosz-/Kleinschreibung scheint unter bestimmten Bedingungen von Bedeutung zu sein! -->
-    <Profile id="1" username="username_profile" passwordHash="passwordHash_profile" hashAlgorithm="hashAlgorithm_profile" salt="salt_profile"/>
+    <Profile id="1" username="username_profile" passwordHash="passwordHash_profile" hashAlgorithm="SHA512" salt="salt_profile"/>
     <User id="2" firstname="firstname_user" lastname="lastname_user" profile_id="1"/>
 </dataset>