test: Testdatenbank mit XML-Testdaten füllen

Thomas Ziemer
1 parent d0c0b80b
Showing 10 changed files with 52 additions and 20 deletions
.gitignore
src/main/java/net/ziemers/swxercise/lg/user/service/UserService.java
src/test/java/net/ziemers/swxercise/db/utils/JpaTestUtils.java
src/test/java/net/ziemers/swxercise/lg/testdata/testdatabuilder/AbstractTestDataBuilder.java → src/test/java/net/ziemers/swxercise/lg/testdatabuilder/AbstractTestDataBuilder.java
src/test/java/net/ziemers/swxercise/lg/testdata/testdatabuilder/user/ProfileTestDataBuilder.java → src/test/java/net/ziemers/swxercise/lg/testdatabuilder/user/ProfileTestDataBuilder.java
src/test/java/net/ziemers/swxercise/lg/testdata/testdatabuilder/user/UserDtoTestDataBuilder.java → src/test/java/net/ziemers/swxercise/lg/testdatabuilder/user/UserDtoTestDataBuilder.java
src/test/java/net/ziemers/swxercise/lg/testdata/testdatabuilder/user/UserTestDataBuilder.java → src/test/java/net/ziemers/swxercise/lg/testdatabuilder/user/UserTestDataBuilder.java
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
@@ -2,5 +2,6 @@
 .project
 .settings/
 .idea/
+.DS_Store
 target/
 *.iml
@@ -40,13 +40,17 @@ public class UserService {
     }
     public Long createUser(final UserDto userDto) {
-        final Profile profile = new Profile(userDto.getUsername(), userDto.getPassword());
+        User user = dao.findByUsername(userDto.getUsername());
+        if (user == null) {
+            final Profile profile = new Profile(userDto.getUsername(), userDto.getPassword());
-        // wir füllen das User-Objekt mit Method Chaining
-        final User user = new User(userDto.getFirstname(), userDto.getLastname())
-                .withProfile(profile);
+            // wir füllen das User-Objekt mit Method Chaining
+            user = new User(userDto.getFirstname(), userDto.getLastname())
+                    .withProfile(profile);
-        return dao.save(user);
+            return dao.save(user);
+        }
+        return null;
     }
     public void deleteUser(final Long id) {
@@ -40,7 +40,7 @@ public class JpaTestUtils {
     private static final String PERSISTENCE_UNIT_TEST = "swXerciseTestPU";
-    private static final String NET_ZIEMERS_SWXERCISE_PKG = "net/ziemers/swxercise/";
+    private static final String NET_ZIEMERS_SWXERCISE_PKG = "net/ziemers/swxercise/testdata/";
     private static EntityManagerFactory emf = null;
-package net.ziemers.swxercise.lg.testdata.testdatabuilder;
+package net.ziemers.swxercise.lg.testdatabuilder;
 import javax.persistence.EntityManager;
-package net.ziemers.swxercise.lg.testdata.testdatabuilder.user;
+package net.ziemers.swxercise.lg.testdatabuilder.user;
 import net.ziemers.swxercise.lg.model.user.Profile;
-import net.ziemers.swxercise.lg.testdata.testdatabuilder.AbstractTestDataBuilder;
+import net.ziemers.swxercise.lg.testdatabuilder.AbstractTestDataBuilder;
 import javax.persistence.EntityManager;
-package net.ziemers.swxercise.lg.testdata.testdatabuilder.user;
+package net.ziemers.swxercise.lg.testdatabuilder.user;
-import net.ziemers.swxercise.lg.testdata.testdatabuilder.AbstractTestDataBuilder;
+import net.ziemers.swxercise.lg.testdatabuilder.AbstractTestDataBuilder;
 import net.ziemers.swxercise.lg.user.dto.UserDto;
 import javax.persistence.EntityManager;
-package net.ziemers.swxercise.lg.testdata.testdatabuilder.user;
+package net.ziemers.swxercise.lg.testdatabuilder.user;
 import net.ziemers.swxercise.lg.model.user.Address;
 import net.ziemers.swxercise.lg.model.user.Profile;
 import net.ziemers.swxercise.lg.model.user.User;
-import net.ziemers.swxercise.lg.testdata.testdatabuilder.AbstractTestDataBuilder;
+import net.ziemers.swxercise.lg.testdatabuilder.AbstractTestDataBuilder;
 import javax.persistence.EntityManager;
@@ -5,7 +5,7 @@ import javax.inject.Inject;
 import net.ziemers.swxercise.db.dao.user.UserDao;
 import net.ziemers.swxercise.db.utils.JpaTestUtils;
 import net.ziemers.swxercise.lg.model.user.User;
-import net.ziemers.swxercise.lg.testdata.testdatabuilder.user.UserDtoTestDataBuilder;
+import net.ziemers.swxercise.lg.testdatabuilder.user.UserDtoTestDataBuilder;
 import net.ziemers.swxercise.lg.user.dto.UserDto;
 import static org.junit.Assert.*;
@@ -28,11 +28,14 @@ import org.junit.runner.RunWith;
 public class UserServiceTest extends JpaTestUtils {
     private static String USERNAME_TEST = "username_test";
+    private static String EXISTING_USERNAME_TEST = "username_profile";
     private static boolean dbInitialized;
     private UserDto userDto;
+    private Long userId;
+
     @Inject
     private UserDao userDao;
@@ -43,7 +46,7 @@ public class UserServiceTest extends JpaTestUtils {
     public void setUp() throws Exception {
         if (!dbInitialized) {
             cleanDb();
-            //initDbWith("UserService.xml");
+            initDbWith("UserServiceTestData.xml");
             dbInitialized = true;
         }
     }
@@ -52,7 +55,7 @@ public class UserServiceTest extends JpaTestUtils {
     public void testCreateUserReturnsSuccess() {
         given()
-                .userDto();
+                .userDto(USERNAME_TEST);
         when()
                 .createUser();
@@ -61,13 +64,26 @@ public class UserServiceTest extends JpaTestUtils {
                 .assertCreateSuccess();
     }
+    @Test
+    public void testCreateUserReturnsFail() {
+
+        given()
+                .userDto(EXISTING_USERNAME_TEST);
+
+        when()
+                .createUser();
+
+        then()
+                .assertCreateFail();
+    }
+
     // given
     private UserServiceTest given() {
         return this;
     }
-    private UserServiceTest userDto() {
+    private UserServiceTest userDto(final String username) {
         userDto = new UserDtoTestDataBuilder()
                 .withUsername(USERNAME_TEST)
                 .build();
@@ -82,7 +98,7 @@ public class UserServiceTest extends JpaTestUtils {
     private UserServiceTest createUser() {
         txBegin();
-        underTest.createUser(userDto);
+        userId = underTest.createUser(userDto);
         txCommit();
         return this;
@@ -95,8 +111,14 @@ public class UserServiceTest extends JpaTestUtils {
     }
     private void assertCreateSuccess() {
+        // wir suchen den soeben erstellten Benutzer; wenn er existiert, is 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);
+    }
+
 }
 package net.ziemers.swxercise.ui;
 import net.ziemers.swxercise.lg.model.user.User;
-import net.ziemers.swxercise.lg.testdata.testdatabuilder.user.UserDtoTestDataBuilder;
-import net.ziemers.swxercise.lg.testdata.testdatabuilder.user.UserTestDataBuilder;
+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 org.junit.Test;
+<?xml version="1.0" encoding="UTF-8"?>
+<dataset>
+    <profile id="1" username="username_profile" passwordHash="passwordHash_profile" hashAlgorithm="hashAlgorithm_profile" salt="salt_profile"/>
+    <user id="2" firstname="firstname_user" lastname="lastname_user" profile_id="1"/>
+</dataset>