diff --git a/README.adoc b/README.adoc index 045c06a..4879af5 100644 --- a/README.adoc +++ b/README.adoc @@ -163,7 +163,7 @@ This module is the basis for subsequent modules. It contains a JUnit rule (shown com.github.dbunit-rules core - 0.13.1 + 0.13.2 test ---- @@ -637,7 +637,7 @@ If you use CDI in your tests then you should give a try in DBUnit rules https:// com.github.dbunit-rules cdi - 0.13.1 + 0.13.2 test ---- @@ -704,7 +704,7 @@ NOTE: If you don't use CDI you need to < com.github.dbunit-rules cucumber - 0.13.1 + 0.13.2 test ---- @@ -906,7 +906,7 @@ http://junit.org/junit5/[JUnit 5] is the new version of JUnit and comes with a n com.github.dbunit-rules junit5 - 0.13.1 + 0.13.2 test ---- diff --git a/cdi/README.adoc b/cdi/README.adoc index 9859982..2eba717 100644 --- a/cdi/README.adoc +++ b/cdi/README.adoc @@ -12,7 +12,7 @@ A CDI interceptor to configure DBUnit datasets in your tests. com.github.dbunit-rules cdi - 0.13.1 + 0.13.2 test ---- @@ -50,6 +50,7 @@ property in test/resources/META-INF/apache-deltaspike.properties: [source,java] ---- @RunWith(CdiTestRunner.class) +@DBUnitInterceptor <1> public class ContactServiceIt { @Inject @@ -64,6 +65,7 @@ public class ContactServiceIt { } } ---- +<1> Activates the CDI interceptor which will seed database based on @DataSet annotation. .contacts.yml ---- diff --git a/cdi/pom.xml b/cdi/pom.xml index 335a8cd..e401a66 100644 --- a/cdi/pom.xml +++ b/cdi/pom.xml @@ -93,50 +93,4 @@ - - - docs - - - - com.github.cukedoctor - cukedoctor-maven-plugin - 1.0.4 - - documentation - docs - - all - center - true - ${project.version} - - - - - execute - - verify - - - - - org.apache.maven.plugins - maven-scm-publish-plugin - 1.1 - - ${project.build.outputDirectory} - Publishing DBUnit Rules CDI ${project.parent.version} living documentation. - - target/docs - true - scm:git:https://${USER}:${PASS}@github.com/rmpestano/dbunit-rules.git - - gh-pages - - - - - - diff --git a/core/pom.xml b/core/pom.xml index a1da437..fdd6623 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -87,4 +87,51 @@ + + + docs + + + + com.github.cukedoctor + cukedoctor-maven-plugin + 1.0.4 + + documentation + docs + + all + center + true + ${project.version} + + + + + execute + + verify + + + + + org.apache.maven.plugins + maven-scm-publish-plugin + 1.1 + + ${project.build.outputDirectory} + Publishing DBUnit Rules CDI ${project.parent.version} living documentation. + + target/docs + true + scm:git:https://${USER}:${PASS}@github.com/rmpestano/dbunit-rules.git + + gh-pages + + + + + + + diff --git a/core/src/main/java/com/github/dbunit/rules/exporter/DataSetExporterImpl.java b/core/src/main/java/com/github/dbunit/rules/exporter/DataSetExporterImpl.java index 7968b53..6cea1a0 100644 --- a/core/src/main/java/com/github/dbunit/rules/exporter/DataSetExporterImpl.java +++ b/core/src/main/java/com/github/dbunit/rules/exporter/DataSetExporterImpl.java @@ -62,6 +62,8 @@ public OutputStream export(Connection connection, DataSetExportConfig dataSetExp }else { filter = new DatabaseSequenceFilter(dbunitConnection); } + + /* JSONDataSet j; j. FlatXmlWriter diff --git a/junit5/src/test/java/com/github/dbunit/rules/junit5/DBUnitJUnit5It.java b/junit5/src/test/java/com/github/dbunit/rules/junit5/DBUnitJUnit5It.java index 7016815..2c7abee 100644 --- a/junit5/src/test/java/com/github/dbunit/rules/junit5/DBUnitJUnit5It.java +++ b/junit5/src/test/java/com/github/dbunit/rules/junit5/DBUnitJUnit5It.java @@ -11,6 +11,7 @@ import java.util.List; +import static com.github.dbunit.rules.util.EntityManagerProvider.*; import static org.assertj.core.api.Assertions.assertThat; /** 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 4a659c6..96a6931 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 @@ -12,6 +12,7 @@ import java.util.List; import static org.assertj.core.api.Assertions.assertThat; +import static com.github.dbunit.rules.util.EntityManagerProvider.*; /** * Created by pestano on 28/08/16. diff --git a/junit5/src/test/java/com/github/dbunit/rules/junit5/ScriptsIt.java b/junit5/src/test/java/com/github/dbunit/rules/junit5/ScriptsIt.java index 8be9ec3..1163bae 100644 --- a/junit5/src/test/java/com/github/dbunit/rules/junit5/ScriptsIt.java +++ b/junit5/src/test/java/com/github/dbunit/rules/junit5/ScriptsIt.java @@ -14,6 +14,7 @@ import java.util.List; +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,7 +30,7 @@ public class ScriptsIt { @BeforeAll public static void before() { - EntityManagerProvider provider = EntityManagerProvider.instance("junit5-pu"); + EntityManagerProvider provider = instance("junit5-pu"); tx().begin(); em().createNativeQuery("DELETE FROM USER").executeUpdate(); em().createNativeQuery("INSERT INTO USER VALUES (6,'user6')").executeUpdate(); @@ -52,7 +53,7 @@ public void shouldExecuteScriptsBefore() { } private List listUsers(String sql) { - return EntityManagerProvider.instance("junit5-pu").em().createQuery(sql).getResultList(); + return instance("junit5-pu").em().createQuery(sql).getResultList(); } @AfterAll diff --git a/junit5/src/test/java/com/github/dbunit/rules/junit5/TransactionIt.java b/junit5/src/test/java/com/github/dbunit/rules/junit5/TransactionIt.java index 25dd767..e215aff 100644 --- a/junit5/src/test/java/com/github/dbunit/rules/junit5/TransactionIt.java +++ b/junit5/src/test/java/com/github/dbunit/rules/junit5/TransactionIt.java @@ -8,6 +8,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.junit.platform.runner.JUnitPlatform; import org.junit.runner.RunWith; +import static com.github.dbunit.rules.util.EntityManagerProvider.*; /** * Created by rmpestano on 6/21/16.