refs #3

rmpestano · Jul 31, 2015 · fda9ea4 · fda9ea4
1 parent e6953ab
commit fda9ea4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/core/src/test/java/com/github/dbunit/rules/EntityManagerProvider.java b/core/src/test/java/com/github/dbunit/rules/EntityManagerProvider.java
@@ -71,6 +71,7 @@ private void init(String unitName) {
             }
 
         }
+        em.clear();
         emf.getCache().evictAll();
     }
 

diff --git a/core/src/test/java/com/github/dbunit/rules/MultipleExecutorsIt.java b/core/src/test/java/com/github/dbunit/rules/MultipleExecutorsIt.java
@@ -50,7 +50,7 @@ public static void tearDown() throws SQLException {
 
     }
 
-   /* @Test
+    @Test
     public void shouldSeedDataSetDisablingContraints() {
         for (DataSetExecutor executor : executors) {
             DataSetModel dataSetModel = new DataSetModel("datasets/yml/users.yml").disableConstraints(true);
@@ -130,7 +130,7 @@ public void shouldLoadUserFollowers() {
             assertThat(user.getFollowers()).contains(expectedFollower);
         }
 
-    }*/
+    }
 
     @Test
     public void shouldLoadUsersFromJsonDataset() {

diff --git a/jpa/src/main/java/com/github/dbunit/rules/jpa/EntityManagerProvider.java b/jpa/src/main/java/com/github/dbunit/rules/jpa/EntityManagerProvider.java
@@ -32,16 +32,14 @@ public class EntityManagerProvider implements TestRule {
 
     private Connection          conn;
 
-    private Map<String, Object> emfProps;
-
     private static Logger log = LoggerFactory.getLogger(EntityManagerProvider.class);
 
     private static EntityManagerProvider instance;
 
     private EntityManagerProvider() {
     }
 
-    public static EntityManagerProvider instance(String unitName) {
+    public static synchronized EntityManagerProvider instance(String unitName) {
         if (instance == null) {
             instance = new EntityManagerProvider();
         }