refs #3

rmpestano · Jul 30, 2015 · 8e50be9 · 8e50be9
1 parent 62ea672
commit 8e50be9
Show file tree

Hide file tree

Showing 9 changed files with 86 additions and 22 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -39,8 +39,29 @@
             <scope>provided</scope>
         </dependency>
 
-
-
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.18.1</version>
+                <configuration>
+                    <parallel>classes</parallel>
+                    <useUnlimitedThreads>true</useUnlimitedThreads>
+                    <reuseForks>true</reuseForks>
+                    <includes>
+                        <include>**/*It.java</include>
+                        <include>**/*Test.java</include>
+                    </includes>
+                    <systemPropertyVariables>
+                        <java.util.logging.config.file>
+                            src/test/resources/logging.properties
+                        </java.util.logging.config.file>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
diff --git a/core/src/test/java/com/github/dbunit/rules/ConnectionHolderIt.java b/core/src/test/java/com/github/dbunit/rules/ConnectionHolderIt.java
@@ -52,7 +52,7 @@ public void shouldLoadUserFollowers() {
         assertThat(user.getFollowers()).contains(expectedFollower);
     }
 
-    /*@Test
+    @Test
     @DataSet(value = "datasets/json/users.json")
     public void shouldLoadUsersFromJsonDataset() {
         User user = (User) emProvider.em().createQuery("select u from User u left join fetch u.followers where u.id = 1").getSingleResult();
@@ -76,6 +76,6 @@ public void shouldLoadUsersFromXmlDataset() {
         assertThat(user.getFollowers()).isNotNull().hasSize(1);
         Follower expectedFollower = new Follower(2,1);
         assertThat(user.getFollowers()).contains(expectedFollower);
-    } */
+    }
 
 }
diff --git a/examples/pom.xml b/examples/pom.xml
@@ -73,6 +73,14 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <!-- see DeltaspikeUsingInterceptorIt -->
+            <groupId>com.github.dbunit-rules</groupId>
+            <artifactId>jpa</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.deltaspike.modules</groupId>
             <artifactId>deltaspike-test-control-module-api</artifactId>
@@ -147,13 +155,28 @@
             <scope>test</scope>
         </dependency>
 
-
-
-
     </dependencies>
 
     <build>
         <plugins>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.18.1</version>
+                <configuration>
+                    <forkCount>0</forkCount>
+                    <threadCount>0</threadCount>
+                    <reuseForks>false</reuseForks>
+                    <includes>
+                        <include>**/*It.java</include>
+                        <include>**/*Test.java</include>
+                    </includes>
+                    <systemPropertyVariables>
+                        <java.util.logging.config.file>
+                            src/test/resources/logging.properties
+                        </java.util.logging.config.file>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>com.mysema.maven</groupId>
                 <artifactId>apt-maven-plugin</artifactId>

diff --git a/examples/src/main/java/org/example/CdiConfig.java b/examples/src/main/java/org/example/CdiConfig.java
@@ -14,6 +14,6 @@ public class CdiConfig {
 
     @Produces
     @Dependent
-    @PersistenceContext(unitName = "customerdb")
+    @PersistenceContext(unitName = "customerDB")
     private EntityManager entityManager;
 }
diff --git a/examples/src/test/java/com/github/dbunit/rules/examples/CdiTestConfig.java b/examples/src/test/java/com/github/dbunit/rules/examples/CdiTestConfig.java
@@ -1,5 +1,6 @@
 package com.github.dbunit.rules.examples;
 
+import com.github.dbunit.rules.jpa.EntityManagerProvider;
 import org.example.CdiConfig;
 import org.hibernate.Session;
 import org.hibernate.internal.SessionImpl;
@@ -9,6 +10,7 @@
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.inject.Produces;
 import javax.enterprise.inject.Specializes;
+import javax.enterprise.inject.spi.InjectionPoint;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.Persistence;
@@ -26,19 +28,14 @@
 @ApplicationScoped
 public class CdiTestConfig extends CdiConfig {
 
-   private EntityManagerFactory emf;
    private EntityManager em;
 
 
     @Produces
     public EntityManager produce(){
-        if(emf == null){
-            emf = Persistence.createEntityManagerFactory("customerTestDb");
-        }
-        if(em == null || !em.isOpen()){
-            em = emf.createEntityManager();
-        }
-        return em;
+      synchronized (this){
+        return EntityManagerProvider.instance(System.getProperty("db")).em();
+      }
     }
 
 }
diff --git a/examples/src/test/java/com/github/dbunit/rules/examples/DeltaspikeIt.java b/examples/src/test/java/com/github/dbunit/rules/examples/DeltaspikeIt.java
@@ -14,6 +14,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import javax.annotation.concurrent.NotThreadSafe;
 import javax.inject.Inject;
 import javax.persistence.EntityManager;
 import java.sql.Connection;
@@ -29,6 +30,10 @@
 @RunWith(CdiTestRunner.class)
 public class DeltaspikeIt {
 
+    static {
+        System.setProperty("db","customerDB");
+    }
+
     @Inject
     EntityManager entityManager;
 

diff --git a/examples/src/test/java/com/github/dbunit/rules/examples/DeltaspikeUsingInterceptorIt.java b/examples/src/test/java/com/github/dbunit/rules/examples/DeltaspikeUsingInterceptorIt.java
@@ -25,6 +25,10 @@
 @DataSetInterceptor
 public class DeltaspikeUsingInterceptorIt {
 
+    static {
+        System.setProperty("db","interceptorDB");
+    }
+
     @Inject
     EntityManager entityManager;
 

diff --git a/examples/src/test/resources/META-INF/persistence.xml b/examples/src/test/resources/META-INF/persistence.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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="customerTestDb" transaction-type="RESOURCE_LOCAL">
+    <persistence-unit name="customerDB" transaction-type="RESOURCE_LOCAL">
     <provider>org.hibernate.ejb.HibernatePersistence</provider>
 
     <class>org.example.jpadomain.Company</class>
@@ -19,4 +19,23 @@
 
     </persistence-unit>
 
+    <persistence-unit name="interceptorDB" transaction-type="RESOURCE_LOCAL">
+        <provider>org.hibernate.ejb.HibernatePersistence</provider>
+
+        <class>org.example.jpadomain.Company</class>
+        <class>org.example.jpadomain.Contact</class>
+
+        <properties>
+            <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect" />
+            <property name="javax.persistence.jdbc.driver" value="org.hsqldb.jdbcDriver" />
+            <property name="javax.persistence.jdbc.url" value="jdbc:hsqldb:mem:interceptor;DB_CLOSE_DELAY=-1" />
+            <property name="javax.persistence.jdbc.user" value="sa" />
+            <property name="javax.persistence.jdbc.password" value="" />
+            <property name="hibernate.hbm2ddl.auto" value="create-drop" />
+            <property name="hibernate.show_sql" value="true" />
+
+        </properties>
+
+    </persistence-unit>
+
 </persistence>
diff --git a/pom.xml b/pom.xml
@@ -146,11 +146,6 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.18.1</version>
                 <configuration>
-                    <parallel>classes</parallel>
-                    <forkCount>2</forkCount>
-                    <threadCount>4</threadCount>
-                    <perCoreThreadCount>true</perCoreThreadCount>
-                    <reuseForks>false</reuseForks>
                     <includes>
                         <include>**/*It.java</include>
                         <include>**/*Test.java</include>