refs #29

rmpestano · Aug 28, 2016 · 1319e2c · 1319e2c
1 parent 127eccc
commit 1319e2c
Show file tree

Hide file tree

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

diff --git a/...a-productivity-boosters/src/test/java/com/github/dbunit/rules/examples/CdiTestConfig.java b/...a-productivity-boosters/src/test/java/com/github/dbunit/rules/examples/CdiTestConfig.java
@@ -13,8 +13,6 @@
 @ApplicationScoped
 public class CdiTestConfig extends CdiConfig {
 
-    private EntityManager em;
-
 
     @Produces
     public EntityManager produce() {

diff --git a/junit5/src/main/java/com/github/dbunit/junit5/DBUnitExtension.java b/junit5/src/main/java/com/github/dbunit/junit5/DBUnitExtension.java
@@ -28,6 +28,9 @@ public void beforeTestExecution(TestExtensionContext testExtensionContext) throw
             return;
         }
 
+        if(isEntityManagerActive()){
+            em().clear();
+        }
 
         ConnectionHolder connectionHolder = findTestConnection(testExtensionContext);
 

diff --git a/junit5/src/test/java/com/github/dbunit/junit5/DBUnitJUnit5Test.java b/junit5/src/test/java/com/github/dbunit/junit5/DBUnitJUnit5Test.java
@@ -61,7 +61,7 @@ public void shouldUpdateUser() {
     }
 
     @Test
-    @DataSet(value = "users.yml", transactional = true)//disable constraints because User 1 has one tweet and a follower
+    @DataSet(value = "users.yml", transactional = true)
     @ExpectedDataSet("expectedUser.yml")
     public void shouldDeleteUser() {
         User user = (User) em().createQuery("select u from User u  where u.id = 1").getSingleResult();