From d0e79313a259f5dbd2e4e5a7c2801f1344414e21 Mon Sep 17 00:00:00 2001 From: rmpestano Date: Thu, 20 Aug 2015 18:19:37 -0300 Subject: [PATCH] version.next --- cdi/pom.xml | 2 +- .../test/java/com/github/dbunit/rules/DataSetExecutorIt.java | 1 - .../test/java/com/github/dbunit/rules/MultipleDataSetsIt.java | 2 -- .../java/com/github/dbunit/rules/bdd/DBUnitRulesSteps.java | 4 ++-- examples/pom.xml | 2 +- jpa/pom.xml | 2 +- pom.xml | 2 +- 7 files changed, 6 insertions(+), 9 deletions(-) diff --git a/cdi/pom.xml b/cdi/pom.xml index f420cf7..c4d58fe 100644 --- a/cdi/pom.xml +++ b/cdi/pom.xml @@ -3,7 +3,7 @@ com.github.dbunit-rules parent - 0.2 + 0.3-SNAPSHOT 4.0.0 diff --git a/core/src/test/java/com/github/dbunit/rules/DataSetExecutorIt.java b/core/src/test/java/com/github/dbunit/rules/DataSetExecutorIt.java index 6e3dd8c..8272b71 100644 --- a/core/src/test/java/com/github/dbunit/rules/DataSetExecutorIt.java +++ b/core/src/test/java/com/github/dbunit/rules/DataSetExecutorIt.java @@ -40,7 +40,6 @@ public static void tearDown() throws SQLException { if (connection != null && !connection.isClosed()) { connection.close(); } - } @Test diff --git a/core/src/test/java/com/github/dbunit/rules/MultipleDataSetsIt.java b/core/src/test/java/com/github/dbunit/rules/MultipleDataSetsIt.java index 34dd7f7..885940f 100644 --- a/core/src/test/java/com/github/dbunit/rules/MultipleDataSetsIt.java +++ b/core/src/test/java/com/github/dbunit/rules/MultipleDataSetsIt.java @@ -40,8 +40,6 @@ public class MultipleDataSetsIt { public DBUnitRule defaultExecutorRule = DBUnitRule.instance(emProvider.getConnection()); - - @Test @DataSet(value = "datasets/yml/users.yml",disableConstraints = true, executorId = "exec1") public void shouldSeedDataSetDisablingContraints() { diff --git a/core/src/test/java/com/github/dbunit/rules/bdd/DBUnitRulesSteps.java b/core/src/test/java/com/github/dbunit/rules/bdd/DBUnitRulesSteps.java index bec8349..c7123d9 100644 --- a/core/src/test/java/com/github/dbunit/rules/bdd/DBUnitRulesSteps.java +++ b/core/src/test/java/com/github/dbunit/rules/bdd/DBUnitRulesSteps.java @@ -29,7 +29,7 @@ public class DBUnitRulesSteps { /*@Rule not supported https://github.com/cucumber/cucumber-jvm/issues/393 public DBUnitRule dbUnitRule = DBUnitRule.instance(emProvider.getConnection());*/ - DataSetExecutor executor = DataSetExecutorImpl.instance(new ConnectionHolderImpl(emProvider.getConnection())); + DataSetExecutor executor = DataSetExecutorImpl.instance("bdd-executor", new ConnectionHolderImpl(emProvider.getConnection())); private List users; @@ -37,7 +37,7 @@ public class DBUnitRulesSteps { @Given("^The database is seeded with users$") //@DataSet(value = "datasets/yml/users.yml") public void The_database_is_seeded_with_users() { - executor.createDataSet(new DataSetModel("datasets/yml/users.yml")); + executor.createDataSet(new DataSetModel("yml/users.yml")); } @When("^I list users$") diff --git a/examples/pom.xml b/examples/pom.xml index ef9f3e7..a544779 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -3,7 +3,7 @@ com.github.dbunit-rules parent - 0.2 + 0.3-SNAPSHOT 4.0.0 diff --git a/jpa/pom.xml b/jpa/pom.xml index 8d716f8..b36a7d6 100644 --- a/jpa/pom.xml +++ b/jpa/pom.xml @@ -3,7 +3,7 @@ com.github.dbunit-rules parent - 0.2 + 0.3-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 23128ca..220de32 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.github.dbunit-rules parent pom - 0.2 + 0.3-SNAPSHOT core