test: Testumgebung fertiggestellt

Thomas Ziemer
1 parent cc3c6640
Showing 5 changed files with 36 additions and 34 deletions
pom.xml
src/main/resources/META-INF/persistence.xml
src/test/java/net/ziemers/swxercise/lg/user/service/UserServiceTest.java
src/test/java/net/ziemers/swxercise/ui/UserViewControllerTest.java
src/test/resources/META-INF/persistence.xml
@@ -7,6 +7,7 @@
 	<version>0.0.1-SNAPSHOT</version>
 	<name>swXercise Maven Webapp</name>
 	<url>http://maven.apache.org</url>
+
 	<properties>
 		<mvn-compiler-plugin-version>3.3</mvn-compiler-plugin-version>
 		<jee-version>7.0</jee-version>
@@ -20,7 +21,7 @@
 		<slf4j-version>1.7.25</slf4j-version>
 		<jackson-version>2.8.8.1</jackson-version>
-		<!-- Substituiert die Platzhalter in der testenden "persistence.xml" -->
+		<!-- Substituiert die Platzhalter in der "persistence.xml" -->
 		<TEST_SCHEMA_NAME>swxercise_test</TEST_SCHEMA_NAME>
 		<swxercise.test.schema>${TEST_SCHEMA_NAME}</swxercise.test.schema>
 		<swxercise.test.host>localhost</swxercise.test.host>
@@ -28,6 +29,7 @@
 		<swxercise.test.password>root</swxercise.test.password>
 		<swxercise.test.port>3306</swxercise.test.port>
 	</properties>
+
 	<dependencies>
 		<dependency>
 			<groupId>javax</groupId>
@@ -65,6 +67,8 @@
 			<groupId>org.dbunit</groupId>
 			<artifactId>dbunit</artifactId>
 			<version>${dbunit-version}</version>
+			<!--scope>test</scope-->
+			<!-- TODO Wie koennen wir es erreichen, dass dies nur noch im Testkontext abhängig ist? -->
 		</dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
@@ -85,13 +89,13 @@
 	<build>
 		<finalName>swXercise</finalName>
-        <testResources>
-            <!-- Sorgt dafür, dass Properties-Filtering von hier in die testende "persistence.xml" funktioniert -->
-            <testResource>
-                <directory>src/test/resources</directory>
-                <filtering>true</filtering>
-            </testResource>
-        </testResources>
+		<resources>
+			<!-- Sorgt dafür, dass Properties-Filtering von hier in die "persistence.xml" funktioniert -->
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>true</filtering>
+			</resource>
+		</resources>
 		<plugins>
 			<plugin>
@@ -5,9 +5,29 @@
 	<persistence-unit name="swXercisePU" transaction-type="JTA">
 		<jta-data-source>java:jboss/datasources/swXerciseDS</jta-data-source>
 		<properties>
-            <property name="wildfly.jpa.default-unit" value="true"/>
+      <property name="wildfly.jpa.default-unit" value="true"/>
 			<!-- property name="hibernate.hbm2ddl.auto" value="create-drop" / -->
 			<property name="hibernate.hbm2ddl.auto" value="update" />
 		</properties>
 	</persistence-unit>
+
+	<persistence-unit name="swXerciseTestPU" transaction-type="RESOURCE_LOCAL">
+		<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+		<exclude-unlisted-classes>false</exclude-unlisted-classes>
+		<properties>
+			<!-- Property for WildFly to ignore this -->
+			<property name="jboss.as.jpa.managed" value="false" />
+			<!-- Properties for Hibernate -->
+			<property name="javax.persistence.jdbc.url" value="jdbc:mysql://${swxercise.test.host}:${swxercise.test.port}/${swxercise.test.schema}?useSSL=false" />
+			<property name="javax.persistence.jdbc.user" value="${swxercise.test.user}" />
+			<property name="javax.persistence.jdbc.password" value="${swxercise.test.password}" />
+			<property name="javax.persistence.jdbc.driver" value="com.mysql.jdbc.Driver" />
+			<property name="hibernate.show_sql" value="false" />
+			<property name="hibernate.format_sql" value="false" />
+			<property name="hibernate.hbm2ddl.auto" value="create-drop" />
+			<property name="hibernate.connection.useUnicode" value="true" />
+			<property name="hibernate.connection.characterEncoding" value="UTF-8" />
+			<property name="hibernate.ejb.entitymanager_factory_name" value="swXerciseTestPU" />
+		</properties>
+	</persistence-unit>
 </persistence>
 package net.ziemers.swxercise.lg.user.service;
 import net.ziemers.swxercise.db.utils.JpaTestUtils;
+import net.ziemers.swxercise.lg.model.user.User;
 import org.junit.Test;
 public class UserServiceTest extends JpaTestUtils {
@@ -8,6 +9,7 @@ public class UserServiceTest extends JpaTestUtils {
     @Test
     public void testService() {
         txBegin();
+        getEm().persist(new User("Hein", "Blöd"));
         txCommit();
     }
@@ -115,7 +115,7 @@ public class UserViewControllerTest {
         // wir simulieren den Erfolg des userService (der hier nicht getestet werden soll),
         // sofern das korrekte userDto an ihn übergeben wurde
         when(userService.loginUser(userDto)).thenReturn(true);
-        when(userService.getSessionUser()).thenReturn(user);
+        //when(userService.getSessionUser()).thenReturn(user);
         actual = underTest.loginUser(userDto);
     }
-<persistence version="2.0"
-	xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
-
-    <persistence-unit name="swXerciseTestPU" transaction-type="RESOURCE_LOCAL">
-        <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
-        <exclude-unlisted-classes>false</exclude-unlisted-classes>
-        <properties>
-            <!-- Property for WildFly to ignore this -->
-            <property name="jboss.as.jpa.managed" value="false" />
-            <!-- Properties for Hibernate -->
-            <property name="javax.persistence.jdbc.url" value="jdbc:mysql://${swxercise.test.host}:${swxercise.test.port}/${swxercise.test.schema}?useSSL=false" />
-            <property name="javax.persistence.jdbc.user" value="${swxercise.test.user}" />
-            <property name="javax.persistence.jdbc.password" value="${swxercise.test.password}" />
-            <property name="javax.persistence.jdbc.driver" value="com.mysql.jdbc.Driver" />
-            <property name="hibernate.show_sql" value="false" />
-            <property name="hibernate.format_sql" value="false" />
-            <!--<property name="hibernate.hbm2ddl.auto" value="create-drop" / -->
-            <property name="hibernate.connection.useUnicode" value="true" />
-            <property name="hibernate.connection.characterEncoding" value="UTF-8" />
-            <property name="hibernate.ejb.entitymanager_factory_name" value="swXerciseTestPU" />
-        </properties>
-    </persistence-unit>
-</persistence>