test: Tests (außer Delete-Tests) fertig gemacht

Thomas Ziemer
1 parent 35cdab48
Showing 4 changed files with 119 additions and 68 deletions
README.md
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
@@ -222,4 +222,14 @@ Quelle: https://tools.jboss.org/downloads/jbosstools/neon/4.4.3.Final.html
 ## Projekt verwenden
-Beim Deployen des Projekts auf den Application Server wird automatisch der Benutzer "admin" mit dem Kennwort "admin" erstellt und diesem die Rolle "Adminrolle" zugewiesen. Mit ihm kann man sich anmelden und erste Übungen vornehmen.
 \ No newline at end of file
+In der Entwicklungsumgebung:
+
+Beim Deployen des Projekts auf den Application Server wird durch einen Data Bootstrapping-Mechanismus automatisch der Benutzer "admin" mit dem Kennwort "admin" erstellt und diesem die Rolle "Adminrolle" zugewiesen. Mit ihm kann man sich anmelden und erste Übungen vornehmen. Hierzu verwendet man den REST-Client "Advanced Rest Client Application" für den Chrome Browser.
+
+Nach der Implementierung von JUnit-Tests auf der Kommandozeile:
+
+> mvn clean install
+
+Das Projekt wird gebaut und die Tests werden ausgeführt. Möchte man die Tests gelegentlich mal nicht ausführen, macht man:
+
+> mvn clean install -DskipTests
 \ No newline at end of file
 package net.ziemers.swxercise.lg.user.service;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 import javax.inject.Inject;
@@ -27,6 +28,8 @@ import org.junit.runner.RunWith;
  * To test classes in isolation we shouldn't be using their dependencies.
  * Instead we should be using a mock. There are many mocking libraries out
  * there, however CDI-Unit has extra support for Mockito @Mock annotations.
+ *
+ * Quelle: http://jglue.org/cdi-unit-user-guide/
  */
 @RunWith(CdiRunner.class)
 public class UserServiceTest extends JpaTestUtils {
@@ -42,6 +45,8 @@ public class UserServiceTest extends JpaTestUtils {
     private boolean actual;
+    private Collection<User> actualUsers;
+
     private User actualUser;
     @Inject
@@ -65,10 +70,11 @@ public class UserServiceTest extends JpaTestUtils {
     /*
      * In order to inject @SessionScoped beans, one has to annotate the function or class with @InRequestScope
      * as only this annotation guarantees to have the session scope active always.
+     * Quelle: https://github.com/BrynCooke/cdi-unit/issues/82
      */
     @Test
     @InRequestScope
-    public void testLoginUserReturnsSuccess() {
+    public void testLoginUserSucceeds() {
         given()
                 .userDto(EXISTING_USERNAME_TEST);
@@ -77,12 +83,12 @@ public class UserServiceTest extends JpaTestUtils {
                 .loginUser(EXISTING_PASSWORD_TEST);
         then()
-                .assertLoginSuccess();
+                .assertLoginUserSucceeded();
     }
     @Test
     @InRequestScope
-    public void testLogoutUserSuccess() {
+    public void testLogoutUserSucceeds() {
         given()
                 .userDto(EXISTING_USERNAME_TEST)
@@ -92,22 +98,22 @@ public class UserServiceTest extends JpaTestUtils {
                 .logoutUser();
         then()
-                .assertLogoutSuccess();
+                .assertLogoutUserSucceeded();
     }
     @Test
-    public void testFindUserById() {
+    public void testFindUserByIdSucceeds() {
         when()
                 .findUser(EXISTING_USER_ID);
         then()
-                .assertFindUserByIdSuccess(EXISTING_USER_ID);
+                .assertFindUserByIdSucceeded(EXISTING_USER_ID);
     }
     @Test
     @InRequestScope
-    public void testFindUser() {
+    public void testFindSessionUserSucceeds() {
         given()
                 .userDto(EXISTING_USERNAME_TEST)
@@ -117,16 +123,21 @@ public class UserServiceTest extends JpaTestUtils {
                 .findUser();
         then()
-                .assertFindUserByIdSuccess(EXISTING_USER_ID);
+                .assertFindUserByIdSucceeded(EXISTING_USER_ID);
     }
     @Test
-    public void testFindAllUsers() {
-        // TODO Test ist noch zu implementieren
+    public void testFindAllUsersSucceeds() {
+
+        when()
+                .findAllUsers();
+
+        then()
+                .assertFindAllUsersSucceeded();
     }
     @Test
-    public void testCreateUserReturnsSuccess() {
+    public void testCreateUserSucceeds() {
         given()
                 .userDto(USERNAME_TEST);
@@ -135,11 +146,11 @@ public class UserServiceTest extends JpaTestUtils {
                 .createUser();
         then()
-                .assertCreateSuccess();
+                .assertCreateUserSucceeded();
     }
     @Test
-    public void testCreateUserReturnsFailure() {
+    public void testCreateAlreadyExistingUserFails() {
         given()
                 .userDto(EXISTING_USERNAME_TEST);
@@ -148,7 +159,7 @@ public class UserServiceTest extends JpaTestUtils {
                 .createUser();
         then()
-                .assertCreateFailure();
+                .assertCreateUserFailed();
     }
     @Test
@@ -161,49 +172,49 @@ public class UserServiceTest extends JpaTestUtils {
                 .updateUser(EXISTING_USER_ID);
         then()
-                .assertUpdateSuccess();
+                .assertUpdateUserSucceeded();
     }
     @Test
-    public void testDeleteUserByIdReturnsSuccess() {
+    public void testDeleteUserByIdSucceeds() {
         // TODO Test ist noch zu implementieren
     }
     @Test
-    public void testDeleteUnknownUserByIdReturnsFailure() {
+    public void testDeleteUnknownUserByIdFails() {
         // TODO Test ist noch zu implementieren
     }
     @Test
-    public void testDeleteSessionUserReturnsSuccess() {
+    public void testDeleteSessionUserSucceeds() {
         // TODO Test ist noch zu implementieren
     }
     @Test
     @InRequestScope
-    public void testIsNotLoggedInUserAllowedReturnsSuccess() {
+    public void testIsNotLoggedInUserAllowedWithNotLoggedInRightSucceeds() {
         when()
                 .isUserAllowed(new HashSet<String>(Arrays.asList("NOT_LOGGED_IN")));
         then()
-                .assertIsUserAllowedSuccess();
+                .assertIsUserAllowedSucceeded();
     }
     @Test
     @InRequestScope
-    public void testIsNotLoggedInUserAllowedReturnsFailure() {
+    public void testIsNotLoggedInUserAllowedWithLoggedInRightFails() {
         when()
                 .isUserAllowed(new HashSet<String>(Arrays.asList("LOGGED_IN")));
         then()
-                .assertIsUserAllowedFailure();
+                .assertIsUserAllowedFailed();
     }
     @Test
     @InRequestScope
-    public void testIsSessionUserAllowedReturnsSuccess() {
+    public void testIsSessionUserAllowedWithLoggedInRightSucceeds() {
         given()
                 .userDto(EXISTING_USERNAME_TEST)
@@ -213,12 +224,27 @@ public class UserServiceTest extends JpaTestUtils {
                 .isUserAllowed(new HashSet<String>(Arrays.asList("LOGGED_IN")));
         then()
-                .assertIsUserAllowedSuccess();
+                .assertIsUserAllowedSucceeded();
     }
     @Test
     @InRequestScope
-    public void testIsAdminUserAllowedReturnsSuccess() {
+    public void testIsSessionUserAllowedWithNotLoggedInRightFails() {
+
+        given()
+                .userDto(EXISTING_USERNAME_TEST)
+                .loginUser(EXISTING_PASSWORD_TEST);
+
+        when()
+                .isUserAllowed(new HashSet<String>(Arrays.asList("NOT_LOGGED_IN")));
+
+        then()
+                .assertIsUserAllowedFailed();
+    }
+
+    @Test
+    @InRequestScope
+    public void testIsAdminUserAllowedWithAdminRightSucceeds() {
       given()
               .userDto(EXISTING_USERNAME_TEST)
@@ -228,12 +254,12 @@ public class UserServiceTest extends JpaTestUtils {
               .isUserAllowed(new HashSet<String>(Arrays.asList("ADMIN")));
       then()
-              .assertIsUserAllowedSuccess();
+              .assertIsUserAllowedSucceeded();
     }
     @Test
     @InRequestScope
-    public void testIsUserWithUnknownRoleAllowedReturnsFailure() {
+    public void testIsUserWithUnknownRoleAllowedFails() {
       given()
               .userDto(EXISTING_USERNAME_TEST)
@@ -243,7 +269,7 @@ public class UserServiceTest extends JpaTestUtils {
               .isUserAllowed(new HashSet<String>(Arrays.asList("UNKNOWN_ROLE")));
       then()
-              .assertIsUserAllowedFailure();
+              .assertIsUserAllowedFailed();
     }
     // given
@@ -302,6 +328,11 @@ public class UserServiceTest extends JpaTestUtils {
         return this;
     }
+    private UserServiceTest findAllUsers() {
+        actualUsers = underTest.findAllUsers();
+        return this;
+    }
+
     private UserServiceTest isUserAllowed(final Set<String> rightsSet) {
         actual = underTest.isUserAllowed(rightsSet);
         return this;
@@ -313,44 +344,50 @@ public class UserServiceTest extends JpaTestUtils {
         return this;
     }
-    private void assertLoginSuccess() {
+    private void assertLoginUserSucceeded() {
         // die Login-Methode lieferte Erfolg zurück, und es gibt einen angemeldeten Benutzer
         assertTrue(actual);
         assertNotNull(sessionContext.getUser());
     }
-    private void assertLogoutSuccess() {
+    private void assertLogoutUserSucceeded() {
       // die Logout-Methode lieferte Erfolg zurück, und es gibt keinen angemeldeten Benutzer
         assertTrue(actual);
         assertNull(sessionContext.getUser());
     }
-    private void assertFindUserByIdSuccess(final Long expectedId) {
+    private void assertFindUserByIdSucceeded(final Long expectedId) {
         assertEquals(expectedId, actualUser.getId());
     }
-    private void assertCreateSuccess() {
+    private void assertFindAllUsersSucceeded() {
+        // in unseren Testdaten befinden sich zwei Benutzer
+        final int EXISTING_USERS_COUNT = 2;
+        assertEquals(EXISTING_USERS_COUNT, actualUsers.size());
+    }
+
+    private void assertCreateUserSucceeded() {
         // wir suchen den soeben erstellten Benutzer; wenn er existiert, ist alles gut
         final User user = userDao.findByUsername(USERNAME_TEST);
         assertNotNull(user);
     }
-    private void assertCreateFailure() {
+    private void assertCreateUserFailed() {
         // es darf kein neuer Benutzer mit identischem Benutzernamen erstellt worden sein
         assertFalse(actual);
     }
-    private void assertUpdateSuccess() {
+    private void assertUpdateUserSucceeded() {
         // 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());
     }
-    private void assertIsUserAllowedSuccess() {
+    private void assertIsUserAllowedSucceeded() {
         assertTrue(actual);
     }
-    private void assertIsUserAllowedFailure() {
+    private void assertIsUserAllowedFailed() {
         assertFalse(actual);
     }
@@ -47,10 +47,13 @@ public class UserViewControllerTest {
     private User actualUser;
     @Test
-    public void testJUnitFrameworkReturnsTrue() {
+    public void testJUnitFrameworkSucceeds() {
         assertTrue(true);
     }
+    /**
+     * Hier sieht man eine erwartete Exception
+     */
     @Test(expected = AssertionError.class)
     public void testJUnitFrameworkThrowsException() {
         assertTrue(false);
@@ -63,7 +66,7 @@ public class UserViewControllerTest {
                 .getAllUsers();
         then()
-                .assertGetAllUsersSuccess();
+                .assertGetAllUsersSucceeded();
     }
     @Test
@@ -73,21 +76,21 @@ public class UserViewControllerTest {
                 .getUserById(EXISTING_USER_ID);
         then()
-                .assertGetUserByIdSuccess();
+                .assertGetUserByIdSucceeded();
     }
     @Test
-    public void testGetSessionUserReturnsUserJson() {
+    public void testGetSessionUserReturnsSessionUserJson() {
         doing()
                 .getUser();
         then()
-                .assertGetUserSuccess();
+                .assertGetUserSucceeded();
     }
     @Test
-    public void testCreateUserReturnsSuccess() {
+    public void testCreateUserSucceeds() {
         given()
                 .userDto();
@@ -96,11 +99,11 @@ public class UserViewControllerTest {
                 .createUser(true);
         then()
-                .assertCreateSuccess();
+                .assertCreateUserSucceeded();
     }
     @Test
-    public void testCreateUserReturnsFailure() {
+    public void testCreateUserFails() {
         given()
                 .userDto();
@@ -109,11 +112,11 @@ public class UserViewControllerTest {
                 .createUser(false);
         then()
-                .assertCreateFailure();
+                .assertCreateUserFailed();
     }
     @Test
-    public void testUpdateSessionUserReturnsSuccess() {
+    public void testUpdateSessionUserSucceeds() {
         given()
                 .userDto();
@@ -122,11 +125,11 @@ public class UserViewControllerTest {
                 .updateUser();
         then()
-                .assertUpdateSuccess();
+                .assertUpdateUserSucceeded();
     }
     @Test
-    public void testUpdateUserByIdReturnsSuccess() {
+    public void testUpdateUserByIdSucceeds() {
         given()
                 .userDto();
@@ -135,26 +138,26 @@ public class UserViewControllerTest {
                 .updateUser(EXISTING_USER_ID);
         then()
-                .assertUpdateSuccess();
+                .assertUpdateUserSucceeded();
     }
     @Test
-    public void testDeleteUserByIdReturnsSuccess() {
+    public void testDeleteUserByIdSucceeds() {
         // TODO Test ist noch zu implementieren
     }
     @Test
-    public void testDeleteUnknownUserByIdReturnsFailure() {
+    public void testDeleteUnknownUserByIdFails() {
         // TODO Test ist noch zu implementieren
     }
     @Test
-    public void testDeleteSessionUserReturnsSuccess() {
+    public void testDeleteSessionUserSucceeds() {
         // TODO Test ist noch zu implementieren
     }
     @Test
-    public void testLoginUserReturnsSuccess() {
+    public void testLoginUserSucceeds() {
         given()
                 .userDto();
@@ -163,11 +166,11 @@ public class UserViewControllerTest {
                 .loginUser(true);
         then()
-                .assertLoginSuccess();
+                .assertLoginUserSucceeded();
     }
     @Test
-    public void testLoginUserReturnsFailure() {
+    public void testLoginUserFails() {
         given()
                 .userDto();
@@ -176,17 +179,17 @@ public class UserViewControllerTest {
                 .loginUser(false);
         then()
-                .assertLoginFailure();
+                .assertLoginUserFailed();
     }
     @Test
-    public void testLogoutUserReturnsSuccess() {
+    public void testLogoutUserSucceeds() {
         doing()
                 .logoutUser();
         then()
-                .assertLogoutSuccess();
+                .assertLogoutUserSucceeded();
     }
     // given
@@ -264,45 +267,45 @@ public class UserViewControllerTest {
         return this;
     }
-    private void assertCreateSuccess() {
+    private void assertCreateUserSucceeded() {
         final RestResponse expected = new RestResponse();
         assertEquals(expected, actual);
     }
-    private void assertCreateFailure() {
+    private void assertCreateUserFailed() {
         final RestResponse expected = new RestResponse(ResponseState.ALREADY_EXISTING);
         assertEquals(expected, actual);
     }
-    private void assertGetAllUsersSuccess() {
+    private void assertGetAllUsersSucceeded() {
         final Collection<User> expectedCollection = new ArrayList<>();
         assertEquals(expectedCollection, actualCollection);
     }
-    private void assertGetUserByIdSuccess() {
+    private void assertGetUserByIdSucceeded() {
         assertEquals(USER_FIRSTNAME, actualUser.getFirstname());
     }
-    private void assertGetUserSuccess() {
+    private void assertGetUserSucceeded() {
         assertEquals(USER_FIRSTNAME, actualUser.getFirstname());
     }
-    private void assertUpdateSuccess() {
+    private void assertUpdateUserSucceeded() {
         final RestResponse expected = new RestResponse();
         assertEquals(expected, actual);
     }
-    private void assertLoginSuccess() {
+    private void assertLoginUserSucceeded() {
         final RestResponse expected = new RestResponse();
         assertEquals(expected, actual);
     }
-    private void assertLoginFailure() {
+    private void assertLoginUserFailed() {
         final RestResponse expected = new RestResponse(ResponseState.FAILED);
         assertEquals(expected, actual);
     }
-    private void assertLogoutSuccess() {
+    private void assertLogoutUserSucceeded() {
         final RestResponse expected = new RestResponse();
         assertEquals(expected, actual);
     }
@@ -7,4 +7,5 @@
     <!-- das Kennwort ist "secret" -->
     <Profile id="1" role_id="4" username="username_profile" passwordHash="9EOZEsheQcXixUO/XW/vPwRlZh9NMyHppli2qKe3U9+Y0EHhtJU1AA56pkduCGsSbp8VZ7so/62+3cftxBhJGg==" hashAlgorithm="SHA512" salt="FuQll2Av59se1r1Dc4WEPDmzZw4="/>
     <User id="2" firstname="firstname_user" lastname="lastname_user" profile_id="1"/>
+    <User id="5" firstname="firstname_user2" lastname="lastname_user2"/>
 </dataset>