diff --git a/src/test/java/org/tests/compositekeys/TestCKeyDelete.java b/src/test/java/org/tests/compositekeys/TestCKeyDelete.java index 22a032854..acd40ad4c 100644 --- a/src/test/java/org/tests/compositekeys/TestCKeyDelete.java +++ b/src/test/java/org/tests/compositekeys/TestCKeyDelete.java @@ -38,7 +38,6 @@ public class TestCKeyDelete extends BaseTestCase { @Test public void testDeleteWhere() { - DB.truncate(CKeyParent.class); CKeyParentId id = new CKeyParentId(101, "deleteMe2"); CKeyParentId searchId = new CKeyParentId(101, "deleteMe2"); diff --git a/src/test/java/org/tests/m2m/TestM2MDeleteCascadeFromParent.java b/src/test/java/org/tests/m2m/TestM2MDeleteCascadeFromParent.java index 4df6c7efb..55983234b 100644 --- a/src/test/java/org/tests/m2m/TestM2MDeleteCascadeFromParent.java +++ b/src/test/java/org/tests/m2m/TestM2MDeleteCascadeFromParent.java @@ -1,14 +1,13 @@ package org.tests.m2m; import io.ebean.BaseTestCase; -import io.ebean.DB; import io.ebean.Ebean; import io.ebean.SqlQuery; import io.ebean.SqlRow; +import org.junit.Test; import org.tests.model.m2m.MnyA; import org.tests.model.m2m.MnyB; import org.tests.model.m2m.MnyC; -import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -17,8 +16,6 @@ public class TestM2MDeleteCascadeFromParent extends BaseTestCase { @Test public void test() { - DB.truncate("mny_b_mny_c","mny_c","mny_b", "mny_a"); - MnyC c0 = new MnyC(); c0.setName("c0"); c0.save(); diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java index 2bf32672a..c4bd282d0 100644 --- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java +++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java @@ -1,7 +1,6 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; -import io.ebean.DB; import io.ebean.Ebean; import io.ebean.Transaction; import org.ebeantest.LoggedSqlCollector; @@ -19,7 +18,6 @@ public class TestElementCollectionBasic extends BaseTestCase { @Test public void test() { - DB.truncate(EcPerson.class); eventLog(); LoggedSqlCollector.start(); diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java index a91ce35d0..e36c86a53 100644 --- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java +++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java @@ -1,7 +1,6 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; -import io.ebean.DB; import io.ebean.Ebean; import io.ebean.annotation.PersistBatch; import io.ebeaninternal.api.SpiEbeanServer; @@ -16,7 +15,6 @@ public class TestElementCollectionBasicCache extends BaseTestCase { @Test public void test() { - DB.truncate(EcPerson.class); EcPerson person = new EcPerson("Cache1"); person.getPhoneNumbers().add("021 1234"); diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java index ed4f219a1..225a7316d 100644 --- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java +++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java @@ -1,7 +1,6 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; -import io.ebean.DB; import io.ebean.Ebean; import org.ebeantest.LoggedSqlCollector; import org.junit.Test; @@ -16,7 +15,6 @@ public class TestElementCollectionBasicMap extends BaseTestCase { @Test public void test() { - DB.truncate(EcmPerson.class); LoggedSqlCollector.start(); diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java index 830cb5b5b..3b65b22ba 100644 --- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java +++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java @@ -1,7 +1,6 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; -import io.ebean.DB; import io.ebean.Ebean; import org.ebeantest.LoggedSqlCollector; import org.junit.Test; @@ -14,7 +13,6 @@ public class TestElementCollectionBasicMapAsLob extends BaseTestCase { @Test public void test() { - DB.truncate(EcmcPerson.class); LoggedSqlCollector.start(); diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java index 7830a62af..3e33693c9 100644 --- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java +++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java @@ -1,7 +1,6 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; -import io.ebean.DB; import io.ebean.Ebean; import io.ebean.annotation.PersistBatch; import io.ebeaninternal.api.SpiEbeanServer; @@ -16,7 +15,6 @@ public class TestElementCollectionBasicMapCache extends BaseTestCase { @Test public void test() { - DB.truncate(EcmPerson.class); EcmPerson person = new EcmPerson("CacheMap"); person.getPhoneNumbers().put("home", "021 1234"); diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java index 57b7500be..ea0e3c213 100644 --- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java +++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java @@ -1,7 +1,6 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; -import io.ebean.DB; import io.ebean.Ebean; import org.ebeantest.LoggedSqlCollector; import org.junit.Test; @@ -15,7 +14,6 @@ public class TestElementCollectionBasicSet extends BaseTestCase { @Test public void test() { - DB.truncate(EcsPerson.class); LoggedSqlCollector.start(); diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java index 145081116..923054961 100644 --- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java +++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java @@ -1,7 +1,6 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; -import io.ebean.DB; import io.ebean.Ebean; import org.ebeantest.LoggedSqlCollector; import org.junit.Test; @@ -14,7 +13,6 @@ public class TestElementCollectionEmbeddedList extends BaseTestCase { @Test public void test() { - DB.truncate(EcblPerson.class); LoggedSqlCollector.start(); diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java index b6dc16487..a1153b074 100644 --- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java +++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java @@ -1,7 +1,6 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; -import io.ebean.DB; import io.ebean.Ebean; import org.ebeantest.LoggedSqlCollector; import org.junit.Test; @@ -14,7 +13,6 @@ public class TestElementCollectionEmbeddedListCache extends BaseTestCase { @Test public void test() { - DB.truncate(EcblPerson.class); EcblPerson person = new EcblPerson("CacheL"); person.getPhoneNumbers().add(new EcPhone("64", "021","1234")); diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java index bad87bc76..5d13fcf5e 100644 --- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java +++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java @@ -1,7 +1,6 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; -import io.ebean.DB; import io.ebean.Ebean; import org.ebeantest.LoggedSqlCollector; import org.junit.Test; @@ -15,7 +14,6 @@ public class TestElementCollectionEmbeddedMap extends BaseTestCase { @Test public void test() { - DB.truncate(EcbmPerson.class); LoggedSqlCollector.start(); diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java index e4f6af4c3..9fe0ecc21 100644 --- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java +++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java @@ -1,7 +1,6 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; -import io.ebean.DB; import io.ebean.Ebean; import org.ebeantest.LoggedSqlCollector; import org.junit.Test; @@ -14,7 +13,6 @@ public class TestElementCollectionEmbeddedMapCache extends BaseTestCase { @Test public void test() { - DB.truncate(EcbmPerson.class); EcbmPerson person = new EcbmPerson("Cache1"); person.getPhoneNumbers().put("home", new EcPhone("64", "021", "1234")); diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEnumSet.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEnumSet.java index ae03beeb6..988097da5 100644 --- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEnumSet.java +++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEnumSet.java @@ -1,7 +1,6 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; -import io.ebean.DB; import io.ebean.Ebean; import org.junit.Test; @@ -11,7 +10,6 @@ public class TestElementCollectionEnumSet extends BaseTestCase { @Test public void test() { - DB.truncate(EcEnumPerson.class); EcEnumPerson person = new EcEnumPerson("Enum Person"); person.getTags().add(EcEnumPerson.Tags.BLUE); diff --git a/src/test/java/org/tests/model/lazywithid/TestColumnIdName.java b/src/test/java/org/tests/model/lazywithid/TestColumnIdName.java index b36bb48cb..f422f8414 100644 --- a/src/test/java/org/tests/model/lazywithid/TestColumnIdName.java +++ b/src/test/java/org/tests/model/lazywithid/TestColumnIdName.java @@ -1,7 +1,6 @@ package org.tests.model.lazywithid; import io.ebean.BaseTestCase; -import io.ebean.DB; import io.ebean.Ebean; import org.junit.Test; @@ -12,7 +11,6 @@ import static org.junit.Assert.assertEquals; public class TestColumnIdName extends BaseTestCase { @Test public void test() { - DB.truncate(Tune.class); Tune tune = new Tune(); tune.getLoonies().add(new Looney("Taz")); diff --git a/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java b/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java index 605d9a3e6..e9557baeb 100644 --- a/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java +++ b/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java @@ -1,7 +1,6 @@ package org.tests.softdelete; import io.ebean.BaseTestCase; -import io.ebean.DB; import io.ebean.Ebean; import io.ebean.Query; import io.ebean.SqlQuery; @@ -114,7 +113,6 @@ public class TestSoftDeleteBasic extends BaseTestCase { @Test public void testFindSoftDeleted() { - DB.truncate(EBasicSoftDelete.class); EBasicSoftDelete bean = new EBasicSoftDelete(); bean.setName("softDelFetch"); diff --git a/src/test/resources/ebean.properties b/src/test/resources/ebean.properties index 66205aa64..ccca26091 100644 --- a/src/test/resources/ebean.properties +++ b/src/test/resources/ebean.properties @@ -21,7 +21,7 @@ ebean.ddl.generate=true ebean.ddl.run=true ebean.ddl.header=-- Generated by ebean ${version} at ${timestamp} ebean.packages=org.tests -datasource.default=nuodb +datasource.default=h2 ebean.dumpMetricsOnShutdown=true ebean.dumpMetricsOptions=sql,hash