Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Minor] moved the ModelBuilder to li.strolch.model ModelGenerator 

now generating objects is available everywhere
This commit is contained in:
Robert von Burg 2013-12-11 23:51:45 +01:00
parent daba472769
commit a7e17d22d1
3 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/test/java/li/strolch/persistence/impl/dao/test/ObserverUpdateTest.java
View File

@ -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;

14
src/test/java/li/strolch/persistence/impl/dao/test/XmlOrderDaoTest.java
View File

@ -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);
}

8
src/test/java/li/strolch/persistence/impl/dao/test/XmlResourceDaoTest.java
View File

@ -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$