test: eigene persistence.xml für die Tests

Thomas Ziemer
1 parent d9338bfc
Showing 6 changed files with 60 additions and 35 deletions
pom.xml
src/main/java/net/ziemers/swxercise/db/utils/JpaTestUtils.java
src/main/resources/META-INF/persistence.xml
src/test/java/net/ziemers/swxercise/lg/user/service/UserServiceTest.java
src/test/resources/META-INF/persistence.xml
src/test/resources/log4j.properties
@@ -20,13 +20,7 @@
 		<slf4j-version>1.7.25</slf4j-version>
 		<jackson-version>2.8.8.1</jackson-version>
-		<swxercise.schema>swxercise</swxercise.schema>
-		<swxercise.host>localhost</swxercise.host>
-		<swxercise.user>root</swxercise.user>
-		<swxercise.password>root</swxercise.password>
-		<swxercise.port>3306</swxercise.port>
-
-		<!-- Legacy compatiblity -->
+		<!-- Substituiert die Platzhalter in der testenden "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>
@@ -51,11 +45,16 @@
 			<version>${junit-version}</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
+		<!--dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
 			<version>${slf4j-version}</version>
-		</dependency>
+		</dependency-->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>${slf4j-version}</version>
+        </dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>
@@ -67,11 +66,11 @@
 			<artifactId>dbunit</artifactId>
 			<version>${dbunit-version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-core</artifactId>
-			<version>${hibernate-version}</version>
-		</dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <version>${hibernate-version}</version>
+        </dependency>
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
@@ -86,6 +85,14 @@
 	<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>
+
 		<plugins>
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
@@ -97,7 +97,8 @@ public class JpaTestUtils {
             overrideProperties.load(fis);
             emf = Persistence.createEntityManagerFactory(PERSISTENCE_UNIT_TEST, overrideProperties);
         } catch (Exception e) {
-            logger.info("Persistence properties will not be overriden because of following error:", e);
+            // logger.info("Persistence properties will not be overriden because of following error:", e);
+            logger.info("Persistence properties will not be overriden");
         } finally {
             if (fis != null) {
                 try {
@@ -10,24 +10,4 @@
 			<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}" />
-            <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 org.junit.Test;
 public class UserServiceTest extends JpaTestUtils {
+
+    @Test
+    public void testService() {
+        txBegin();
+        txCommit();
+    }
+
 }
+<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>
+log4j.rootLogger=INFO, stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{2}: %m%n