From 486c17511f2a81f7e12de5f30beaf9ea21096d36 Mon Sep 17 00:00:00 2001
From: rmpestano <bigboss666>
Date: Thu, 15 Sep 2016 20:57:54 -0300
Subject: [PATCH] cosmetics

---
 .../dbunit/rules/junit5/DBUnitExtension.java  |  4 ++--
 .../rules/junit5/CleanBeforeAfterIt.java      | 23 ++++++++++++-------
 ...nitJUnit5WithMethodConnectionHolderIt.java |  4 +++-
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/junit5/src/main/java/com/github/dbunit/rules/junit5/DBUnitExtension.java b/junit5/src/main/java/com/github/dbunit/rules/junit5/DBUnitExtension.java
index de74ed4..7417125 100644
--- a/junit5/src/main/java/com/github/dbunit/rules/junit5/DBUnitExtension.java
+++ b/junit5/src/main/java/com/github/dbunit/rules/junit5/DBUnitExtension.java
@@ -150,7 +150,7 @@ public void exportDataSet(DataSetExecutor dataSetExecutor, Method method) {
             try {
                 DataSetExporter.getInstance().export(dataSetExecutor.getDBUnitConnection(),exportConfig);
             } catch (Exception e) {
-            	log.warn("Could not export dataset after method "+method.getName(),e);
+            	log.warn("Could not export dataset after method " + method.getName(), e);
             }
         }
     }
@@ -326,7 +326,7 @@ private ConnectionHolder createConnection(DBUnitConfig dbUnitConfig, String curr
 	private DBUnitTestContext getTestContext(ExtensionContext context) {
 		Class<?> testClass = context.getTestClass().get();
 		Store store = context.getStore(namespace);
-		DBUnitTestContext testContext = store.get(testClass,DBUnitTestContext.class);
+		DBUnitTestContext testContext = store.get(testClass, DBUnitTestContext.class);
 		if(testContext == null){
 			testContext = new DBUnitTestContext();
 			store.put(testClass, testContext);
diff --git a/junit5/src/test/java/com/github/dbunit/rules/junit5/CleanBeforeAfterIt.java b/junit5/src/test/java/com/github/dbunit/rules/junit5/CleanBeforeAfterIt.java
index 7f2532b..e6f481b 100644
--- a/junit5/src/test/java/com/github/dbunit/rules/junit5/CleanBeforeAfterIt.java
+++ b/junit5/src/test/java/com/github/dbunit/rules/junit5/CleanBeforeAfterIt.java
@@ -1,8 +1,11 @@
 package com.github.dbunit.rules.junit5;
 
-import com.github.dbunit.rules.junit5.model.User;
 import com.github.dbunit.rules.api.connection.ConnectionHolder;
 import com.github.dbunit.rules.api.dataset.DataSet;
+import com.github.dbunit.rules.configuration.DataSetConfig;
+import com.github.dbunit.rules.connection.ConnectionHolderImpl;
+import com.github.dbunit.rules.dataset.DataSetExecutorImpl;
+import com.github.dbunit.rules.junit5.model.User;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -10,10 +13,11 @@
 import org.junit.platform.runner.JUnitPlatform;
 import org.junit.runner.RunWith;
 
+import java.sql.SQLException;
+import java.util.Arrays;
 import java.util.List;
 
-import static com.github.dbunit.rules.util.EntityManagerProvider.em;
-import static com.github.dbunit.rules.util.EntityManagerProvider.instance;
+import static com.github.dbunit.rules.util.EntityManagerProvider.*;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 
@@ -29,12 +33,15 @@ public class CleanBeforeAfterIt {
 
 
     @BeforeAll
-    public static void before(){
-        em("junit5-pu").getTransaction().begin();
-        em().createNativeQuery("DELETE FROM USER").executeUpdate();
+    public static void before() throws SQLException {
+        DataSetExecutorImpl.
+                instance(new ConnectionHolderImpl(instance("junit5-pu").connection())).
+                clearDatabase(new DataSetConfig().tableOrdering(Arrays.asList("TWEET","USER").toArray(new String[2])));
+        tx().begin();
+        //em().createNativeQuery("DELETE FROM TWEET").executeUpdate();
+        //em().createNativeQuery("DELETE FROM USER").executeUpdate();
         em().createNativeQuery("INSERT INTO USER VALUES (6,'user6')").executeUpdate();
-        em().flush();
-        em().getTransaction().commit();
+        tx().commit();
         List<User> users = em().createQuery("select u from User u").getResultList();
         assertThat(users).isNotNull().hasSize(1);
 
diff --git a/junit5/src/test/java/com/github/dbunit/rules/junit5/DBUnitJUnit5WithMethodConnectionHolderIt.java b/junit5/src/test/java/com/github/dbunit/rules/junit5/DBUnitJUnit5WithMethodConnectionHolderIt.java
index 0ce8437..2fabff1 100644
--- a/junit5/src/test/java/com/github/dbunit/rules/junit5/DBUnitJUnit5WithMethodConnectionHolderIt.java
+++ b/junit5/src/test/java/com/github/dbunit/rules/junit5/DBUnitJUnit5WithMethodConnectionHolderIt.java
@@ -39,7 +39,9 @@ public void shouldInsertUser() {
         User user = new User();
         user.setName("user");
         user.setName("@rmpestano");
-        tx().begin();
+        if(!tx().isActive()){
+            tx().begin();
+        }
         em().persist(user);
         tx().commit();
         User insertedUser = (User)em().createQuery("select u from User u where u.name = '@rmpestano'").getSingleResult();