From a7e17d22d1d7dc80ea02be36bef5e70fb969c9f0 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Wed, 11 Dec 2013 23:51:45 +0100 Subject: [PATCH] [Minor] moved the ModelBuilder to li.strolch.model ModelGenerator now generating objects is available everywhere --- .../impl/dao/test/ObserverUpdateTest.java | 4 ++-- .../persistence/impl/dao/test/XmlOrderDaoTest.java | 14 +++++--------- .../impl/dao/test/XmlResourceDaoTest.java | 8 ++++---- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/src/test/java/li/strolch/persistence/impl/dao/test/ObserverUpdateTest.java b/src/test/java/li/strolch/persistence/impl/dao/test/ObserverUpdateTest.java index 9c372ba2a..0a7fabf7e 100644 --- a/src/test/java/li/strolch/persistence/impl/dao/test/ObserverUpdateTest.java +++ b/src/test/java/li/strolch/persistence/impl/dao/test/ObserverUpdateTest.java @@ -21,8 +21,8 @@ */ package li.strolch.persistence.impl.dao.test; -import static li.strolch.testbase.model.ModelBuilder.createOrder; -import static li.strolch.testbase.model.ModelBuilder.createResource; +import static li.strolch.model.ModelGenerator.createOrder; +import static li.strolch.model.ModelGenerator.createResource; import static org.junit.Assert.assertEquals; import java.util.Date; diff --git a/src/test/java/li/strolch/persistence/impl/dao/test/XmlOrderDaoTest.java b/src/test/java/li/strolch/persistence/impl/dao/test/XmlOrderDaoTest.java index 29608adf5..7f593e0a6 100644 --- a/src/test/java/li/strolch/persistence/impl/dao/test/XmlOrderDaoTest.java +++ b/src/test/java/li/strolch/persistence/impl/dao/test/XmlOrderDaoTest.java @@ -1,17 +1,13 @@ package li.strolch.persistence.impl.dao.test; -import static li.strolch.testbase.model.ModelBuilder.BAG_ID; -import static li.strolch.testbase.model.ModelBuilder.PARAM_STRING_ID; -import static li.strolch.testbase.model.ModelBuilder.createOrder; +import static li.strolch.model.ModelGenerator.BAG_ID; +import static li.strolch.model.ModelGenerator.PARAM_STRING_ID; +import static li.strolch.model.ModelGenerator.createOrder; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; - -import java.util.Date; - import li.strolch.model.Order; -import li.strolch.model.State; import li.strolch.model.parameter.Parameter; import li.strolch.persistence.api.StrolchTransaction; @@ -27,7 +23,7 @@ public class XmlOrderDaoTest extends AbstractDaoImplTest { public void shouldCreateOrder() { // create - Order newOrder = createOrder("MyTestOrder", "Test Name", "TestType", new Date(), State.CREATED); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ + Order newOrder = createOrder("MyTestOrder", "Test Name", "TestType"); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ try (StrolchTransaction tx = persistenceHandler.openTx();) { persistenceHandler.getOrderDao(tx).save(newOrder); } @@ -37,7 +33,7 @@ public class XmlOrderDaoTest extends AbstractDaoImplTest { public void shouldCrud() { // create - Order newOrder = createOrder(ID, NAME, TYPE, new Date(), State.CREATED); + Order newOrder = createOrder(ID, NAME, TYPE); try (StrolchTransaction tx = persistenceHandler.openTx();) { persistenceHandler.getOrderDao(tx).save(newOrder); } diff --git a/src/test/java/li/strolch/persistence/impl/dao/test/XmlResourceDaoTest.java b/src/test/java/li/strolch/persistence/impl/dao/test/XmlResourceDaoTest.java index bb2117d0f..6b9ed3ca9 100644 --- a/src/test/java/li/strolch/persistence/impl/dao/test/XmlResourceDaoTest.java +++ b/src/test/java/li/strolch/persistence/impl/dao/test/XmlResourceDaoTest.java @@ -1,8 +1,8 @@ package li.strolch.persistence.impl.dao.test; -import static li.strolch.testbase.model.ModelBuilder.BAG_ID; -import static li.strolch.testbase.model.ModelBuilder.PARAM_STRING_ID; -import static li.strolch.testbase.model.ModelBuilder.createResource; +import static li.strolch.model.ModelGenerator.BAG_ID; +import static li.strolch.model.ModelGenerator.PARAM_STRING_ID; +import static li.strolch.model.ModelGenerator.createResource; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -20,7 +20,7 @@ public class XmlResourceDaoTest extends AbstractDaoImplTest { private static final String TYPE = "Box"; //$NON-NLS-1$ @Test - public void shouldCreateOrder() { + public void shouldCreateResource() { // create Resource newResource = createResource("MyTestResource", "Test Name", "TestType"); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$