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

[Minor] renamed test classes

This commit is contained in:
Robert von Burg 2014-08-17 14:02:00 +02:00
parent d236d8589b
commit b38c57e424
14 changed files with 107 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/test/java/ch/eitchnet/xmlpers/test/AbstractPersistenceTest.java
View File

@ -27,10 +27,10 @@ import ch.eitchnet.xmlpers.api.PersistenceConstants;
import ch.eitchnet.xmlpers.api.PersistenceManager;
import ch.eitchnet.xmlpers.api.PersistenceManagerLoader;
import ch.eitchnet.xmlpers.test.impl.BookContextFactory;
import ch.eitchnet.xmlpers.test.impl.ResourceContextFactory;
import ch.eitchnet.xmlpers.test.impl.MyModelContextFactory;
import ch.eitchnet.xmlpers.test.impl.TestConstants;
import ch.eitchnet.xmlpers.test.model.Book;
import ch.eitchnet.xmlpers.test.model.Resource;
import ch.eitchnet.xmlpers.test.model.MyModel;
public abstract class AbstractPersistenceTest {
@ -67,8 +67,8 @@ public abstract class AbstractPersistenceTest {
protected void setup(Properties properties) {
properties.setProperty(PersistenceConstants.PROP_VERBOSE, "true"); //$NON-NLS-1$
this.persistenceManager = PersistenceManagerLoader.load(properties);
this.persistenceManager.getCtxFactory().registerPersistenceContextFactory(Resource.class,
TestConstants.TYPE_RES, new ResourceContextFactory());
this.persistenceManager.getCtxFactory().registerPersistenceContextFactory(MyModel.class,
TestConstants.TYPE_RES, new MyModelContextFactory());
this.persistenceManager.getCtxFactory().registerPersistenceContextFactory(Book.class, TestConstants.TYPE_BOOK,
new BookContextFactory());
}

10
src/test/java/ch/eitchnet/xmlpers/test/FileDaoTest.java
View File

@ -38,7 +38,7 @@ import ch.eitchnet.xmlpers.impl.DefaultPersistenceRealm;
import ch.eitchnet.xmlpers.impl.DefaultPersistenceTransaction;
import ch.eitchnet.xmlpers.impl.PathBuilder;
import ch.eitchnet.xmlpers.objref.ObjectReferenceCache;
import ch.eitchnet.xmlpers.test.model.Resource;
import ch.eitchnet.xmlpers.test.model.MyModel;
/**
* @author Robert von Burg <eitch@eitchnet.ch>
@ -90,12 +90,12 @@ public class FileDaoTest extends AbstractPersistenceTest {
private void testCrud(PersistenceContextFactoryDelegator ctxFactoryDelegator, FileDao fileDao) {
Resource resource = createResource();
MyModel resource = createResource();
assertResource(resource);
Class<? extends Resource> classType = resource.getClass();
PersistenceContextFactory<Resource> ctxFactory = ctxFactoryDelegator.getCtxFactory(classType);
Class<? extends MyModel> classType = resource.getClass();
PersistenceContextFactory<MyModel> ctxFactory = ctxFactoryDelegator.getCtxFactory(classType);
ObjectReferenceCache objectRefCache = this.realm.getObjectRefCache();
PersistenceContext<Resource> context = ctxFactory.createCtx(objectRefCache, resource);
PersistenceContext<MyModel> context = ctxFactory.createCtx(objectRefCache, resource);
context.setObject(resource);
fileDao.performCreate(context);

8
src/test/java/ch/eitchnet/xmlpers/test/LockingTest.java
View File

@ -35,7 +35,7 @@ import ch.eitchnet.xmlpers.api.PersistenceConstants;
import ch.eitchnet.xmlpers.api.PersistenceTransaction;
import ch.eitchnet.xmlpers.objref.IdOfSubTypeRef;
import ch.eitchnet.xmlpers.objref.LockableObject;
import ch.eitchnet.xmlpers.test.model.Resource;
import ch.eitchnet.xmlpers.test.model.MyModel;
/**
* @author Robert von Burg <eitch@eitchnet.ch>
@ -117,7 +117,7 @@ public class LockingTest extends AbstractPersistenceTest {
// create resource which is to be updated
try (PersistenceTransaction tx = this.persistenceManager.openTx()) {
Resource resource = createResource(resourceId);
MyModel resource = createResource(resourceId);
tx.getObjectDao().add(resource);
}
@ -208,7 +208,7 @@ public class LockingTest extends AbstractPersistenceTest {
@Override
protected void doWork(PersistenceTransaction tx) {
Resource resource = createResource(this.resourceId);
MyModel resource = createResource(this.resourceId);
tx.getObjectDao().add(resource);
}
}
@ -223,7 +223,7 @@ public class LockingTest extends AbstractPersistenceTest {
protected void doWork(PersistenceTransaction tx) {
IdOfSubTypeRef objectRef = tx.getObjectRefCache().getIdOfSubTypeRef(TYPE_RES, RES_TYPE, this.resourceId);
Resource resource = tx.getObjectDao().queryById(objectRef);
MyModel resource = tx.getObjectDao().queryById(objectRef);
assertNotNull(resource);
updateResource(resource);

28
src/test/java/ch/eitchnet/xmlpers/test/ObjectDaoResourceTest.java
View File

@ -46,7 +46,7 @@ import ch.eitchnet.xmlpers.objref.ObjectRef;
import ch.eitchnet.xmlpers.objref.SubTypeRef;
import ch.eitchnet.xmlpers.test.impl.TestConstants;
import ch.eitchnet.xmlpers.test.model.ModelBuilder;
import ch.eitchnet.xmlpers.test.model.Resource;
import ch.eitchnet.xmlpers.test.model.MyModel;
/**
* @author Robert von Burg <eitch@eitchnet.ch>
@ -93,7 +93,7 @@ public class ObjectDaoResourceTest extends AbstractPersistenceTest {
ObjectDao objectDao;
// create new resource
Resource resource = createResource();
MyModel resource = createResource();
try (PersistenceTransaction tx = freshTx(ioMode);) {
objectDao = tx.getObjectDao();
objectDao.add(resource);
@ -157,12 +157,12 @@ public class ObjectDaoResourceTest extends AbstractPersistenceTest {
String type = "testBulk" + ioMode.name(); //$NON-NLS-1$
// create a list of resources
List<Resource> resources = new ArrayList<>(10);
List<MyModel> resources = new ArrayList<>(10);
for (int i = 0; i < 10; i++) {
String id = RES_ID + "_" + i; //$NON-NLS-1$
String name = "Bulk Test Object. " + i; //$NON-NLS-1$
Resource resource = createResource(id, name, type);
MyModel resource = createResource(id, name, type);
resources.add(resource);
}
@ -204,14 +204,14 @@ public class ObjectDaoResourceTest extends AbstractPersistenceTest {
// create a resource
try (PersistenceTransaction tx = this.persistenceManager.openTx()) {
Resource resource = createResource(id, name, subType);
MyModel resource = createResource(id, name, subType);
tx.getObjectDao().add(resource);
}
// read by id
try (PersistenceTransaction tx = this.persistenceManager.openTx()) {
ObjectRef objectRef = tx.getObjectRefCache().getIdOfSubTypeRef(classType, subType, id);
Resource resource = tx.getObjectDao().queryById(objectRef);
MyModel resource = tx.getObjectDao().queryById(objectRef);
assertNotNull("Expected to read resource by ID", resource); //$NON-NLS-1$
}
@ -224,7 +224,7 @@ public class ObjectDaoResourceTest extends AbstractPersistenceTest {
// fail to read by id
try (PersistenceTransaction tx = this.persistenceManager.openTx()) {
ObjectRef objectRef = tx.getObjectRefCache().getIdOfSubTypeRef(classType, subType, id);
Resource resource = tx.getObjectDao().queryById(objectRef);
MyModel resource = tx.getObjectDao().queryById(objectRef);
assertNull("Expected that resource was deleted by ID, thus can not be read anymore", resource); //$NON-NLS-1$
}
}
@ -239,7 +239,7 @@ public class ObjectDaoResourceTest extends AbstractPersistenceTest {
// update
try (PersistenceTransaction tx = this.persistenceManager.openTx()) {
Resource resource = createResource();
MyModel resource = createResource();
tx.getObjectDao().update(resource);
}
}
@ -254,7 +254,7 @@ public class ObjectDaoResourceTest extends AbstractPersistenceTest {
// delete
try (PersistenceTransaction tx = this.persistenceManager.openTx()) {
Resource resource = createResource();
MyModel resource = createResource();
tx.getObjectDao().remove(resource);
}
}
@ -270,7 +270,7 @@ public class ObjectDaoResourceTest extends AbstractPersistenceTest {
try (PersistenceTransaction tx = this.persistenceManager.openTx()) {
String id = "shouldAllowAllOperationsInSameTx_create"; //$NON-NLS-1$
Resource resource = createResource(id, name, subType);
MyModel resource = createResource(id, name, subType);
tx.getObjectDao().add(resource);
}
@ -279,7 +279,7 @@ public class ObjectDaoResourceTest extends AbstractPersistenceTest {
try (PersistenceTransaction tx = this.persistenceManager.openTx()) {
String id = "shouldAllowAllOperationsInSameTx_create_modify"; //$NON-NLS-1$
Resource resource = createResource(id, name, subType);
MyModel resource = createResource(id, name, subType);
tx.getObjectDao().add(resource);
tx.getObjectDao().update(resource);
@ -289,7 +289,7 @@ public class ObjectDaoResourceTest extends AbstractPersistenceTest {
try (PersistenceTransaction tx = this.persistenceManager.openTx()) {
String id = "shouldAllowAllOperationsInSameTx_create_delete"; //$NON-NLS-1$
Resource resource = createResource(id, name, subType);
MyModel resource = createResource(id, name, subType);
tx.getObjectDao().add(resource);
tx.getObjectDao().remove(resource);
@ -299,7 +299,7 @@ public class ObjectDaoResourceTest extends AbstractPersistenceTest {
try (PersistenceTransaction tx = this.persistenceManager.openTx()) {
String id = "shouldAllowAllOperationsInSameTx_create_modify_delete"; //$NON-NLS-1$
Resource resource = createResource(id, name, subType);
MyModel resource = createResource(id, name, subType);
tx.getObjectDao().add(resource);
tx.getObjectDao().update(resource);
@ -310,7 +310,7 @@ public class ObjectDaoResourceTest extends AbstractPersistenceTest {
// prepare for read/modify
try (PersistenceTransaction tx = this.persistenceManager.openTx()) {
Resource resource = createResource(id, name, subType);
MyModel resource = createResource(id, name, subType);
tx.getObjectDao().add(resource);
}

16
src/test/java/ch/eitchnet/xmlpers/test/RealmTest.java
View File

@ -30,7 +30,7 @@ import ch.eitchnet.xmlpers.api.PersistenceTransaction;
import ch.eitchnet.xmlpers.objref.ObjectRef;
import ch.eitchnet.xmlpers.test.impl.TestConstants;
import ch.eitchnet.xmlpers.test.model.ModelBuilder;
import ch.eitchnet.xmlpers.test.model.Resource;
import ch.eitchnet.xmlpers.test.model.MyModel;
@SuppressWarnings("nls")
public class RealmTest extends AbstractPersistenceTest {
@ -62,21 +62,21 @@ public class RealmTest extends AbstractPersistenceTest {
// create in first realm
try (PersistenceTransaction txRealm1 = this.persistenceManager.openTx(REALM_1);) {
Resource resource1 = ModelBuilder.createResource(id, name, type);
MyModel resource1 = ModelBuilder.createResource(id, name, type);
txRealm1.getObjectDao().add(resource1);
}
// find in first realm
try (PersistenceTransaction txRealm1 = this.persistenceManager.openTx(REALM_1);) {
ObjectRef objectRef = txRealm1.getObjectRefCache().getIdOfSubTypeRef(objType, type, id);
Resource resource = txRealm1.getObjectDao().queryById(objectRef);
MyModel resource = txRealm1.getObjectDao().queryById(objectRef);
assertNotNull("Resource was not found in first realm!", resource);
}
// fail to find in second realm
try (PersistenceTransaction txRealm2 = this.persistenceManager.openTx(REALM_2);) {
ObjectRef objectRef = txRealm2.getObjectRefCache().getIdOfSubTypeRef(objType, type, id);
Resource resource = txRealm2.getObjectDao().queryById(objectRef);
MyModel resource = txRealm2.getObjectDao().queryById(objectRef);
assertNull("Resource was not created in second realm, thus not expected to be found there!", resource);
}
}
@ -92,13 +92,13 @@ public class RealmTest extends AbstractPersistenceTest {
// create in first realm
try (PersistenceTransaction txRealm1 = this.persistenceManager.openTx(REALM_1);) {
Resource resource1 = ModelBuilder.createResource(id, name, subType);
MyModel resource1 = ModelBuilder.createResource(id, name, subType);
txRealm1.getObjectDao().add(resource1);
}
// create in second realm
try (PersistenceTransaction txRealm2 = this.persistenceManager.openTx(REALM_2);) {
Resource resource1 = ModelBuilder.createResource(id, name, subType);
MyModel resource1 = ModelBuilder.createResource(id, name, subType);
txRealm2.getObjectDao().add(resource1);
}
@ -111,14 +111,14 @@ public class RealmTest extends AbstractPersistenceTest {
// fail to find in second realm
try (PersistenceTransaction txRealm2 = this.persistenceManager.openTx(REALM_2);) {
ObjectRef objectRef = txRealm2.getObjectRefCache().getIdOfSubTypeRef(objType, subType, id);
Resource resource = txRealm2.getObjectDao().queryById(objectRef);
MyModel resource = txRealm2.getObjectDao().queryById(objectRef);
assertNull("Resource was not deleted from second realm, thus not expected to be found there!", resource);
}
// find in first realm
try (PersistenceTransaction txRealm1 = this.persistenceManager.openTx(REALM_1);) {
ObjectRef objectRef = txRealm1.getObjectRefCache().getIdOfSubTypeRef(objType, subType, id);
Resource resource = txRealm1.getObjectDao().queryById(objectRef);
MyModel resource = txRealm1.getObjectDao().queryById(objectRef);
assertNotNull("Resource was not found in first realm!", resource);
}
}

8
src/test/java/ch/eitchnet/xmlpers/test/TransactionResultTest.java
View File

@ -38,7 +38,7 @@ import ch.eitchnet.xmlpers.api.PersistenceConstants;
import ch.eitchnet.xmlpers.api.PersistenceTransaction;
import ch.eitchnet.xmlpers.api.TransactionResult;
import ch.eitchnet.xmlpers.test.model.Book;
import ch.eitchnet.xmlpers.test.model.Resource;
import ch.eitchnet.xmlpers.test.model.MyModel;
/**
* @author Robert von Burg <eitch@eitchnet.ch>
@ -95,14 +95,14 @@ public class TransactionResultTest extends AbstractPersistenceTest {
private void performChanges(TransactionResult txResult) {
// create a list of resources
List<Resource> resources = new ArrayList<>(10);
List<MyModel> resources = new ArrayList<>(10);
int i = 0;
for (; i < 10; i++) {
String id = RES_ID + "_" + i; //$NON-NLS-1$
String name = "Tx Result Test 1 Object. " + i; //$NON-NLS-1$
String type = "testTxResult1"; //$NON-NLS-1$
Resource resource = createResource(id, name, type);
MyModel resource = createResource(id, name, type);
resources.add(resource);
}
for (; i < 20; i++) {
@ -110,7 +110,7 @@ public class TransactionResultTest extends AbstractPersistenceTest {
String name = "Tx Result Test 2 Object. " + i; //$NON-NLS-1$
String type = "testTxResult2"; //$NON-NLS-1$
Resource resource = createResource(id, name, type);
MyModel resource = createResource(id, name, type);
resources.add(resource);
}

36
src/test/java/ch/eitchnet/xmlpers/test/XmlTestMain.java
View File

@ -47,8 +47,8 @@ import org.xml.sax.helpers.DefaultHandler;
import ch.eitchnet.utils.exceptions.XmlException;
import ch.eitchnet.utils.helper.XmlHelper;
import ch.eitchnet.xmlpers.test.model.ModelBuilder;
import ch.eitchnet.xmlpers.test.model.Parameter;
import ch.eitchnet.xmlpers.test.model.Resource;
import ch.eitchnet.xmlpers.test.model.MyParameter;
import ch.eitchnet.xmlpers.test.model.MyModel;
/**
* @author Robert von Burg <eitch@eitchnet.ch>
@ -59,7 +59,7 @@ public class XmlTestMain {
private static final Logger logger = LoggerFactory.getLogger(XmlTestMain.class);
private static Resource res;
private static MyModel res;
public static void main(String[] args) throws Exception {
@ -70,7 +70,7 @@ public class XmlTestMain {
writeSax(res);
writeDom(res);
List<Resource> resoures;
List<MyModel> resoures;
resoures = readDom();
logger.info("Parsed Resources:\n" + resoures);
resoures = readSax();
@ -81,7 +81,7 @@ public class XmlTestMain {
* @return
*
*/
private static List<Resource> readDom() throws Exception {
private static List<MyModel> readDom() throws Exception {
File file = new File("target/res_dom.xml");
DocumentBuilderFactory dbfac = DocumentBuilderFactory.newInstance();
@ -89,7 +89,7 @@ public class XmlTestMain {
Document document = docBuilder.parse(file);
Element rootElement = document.getDocumentElement();
List<Resource> resources = new ArrayList<Resource>();
List<MyModel> resources = new ArrayList<MyModel>();
NodeList resElements = rootElement.getElementsByTagName("Resource");
for (int i = 0; i < resElements.getLength(); i++) {
@ -98,7 +98,7 @@ public class XmlTestMain {
String name = resElement.getAttribute("name");
String type = resElement.getAttribute("type");
Resource res = new Resource();
MyModel res = new MyModel();
res.setId(id);
res.setName(name);
res.setType(type);
@ -114,7 +114,7 @@ public class XmlTestMain {
return resources;
}
private static void parseParameters(Resource res, NodeList paramElements) {
private static void parseParameters(MyModel res, NodeList paramElements) {
for (int i = 0; i < paramElements.getLength(); i++) {
Element paramElement = (Element) paramElements.item(i);
String id = paramElement.getAttribute("id");
@ -122,7 +122,7 @@ public class XmlTestMain {
String type = paramElement.getAttribute("type");
String value = paramElement.getAttribute("value");
Parameter param = new Parameter();
MyParameter param = new MyParameter();
param.setId(id);
param.setName(name);
param.setType(type);
@ -136,10 +136,10 @@ public class XmlTestMain {
* @return
*
*/
private static List<Resource> readSax() throws Exception {
private static List<MyModel> readSax() throws Exception {
final List<Resource> resources = new ArrayList<>();
final Resource[] currentRes = new Resource[1];
final List<MyModel> resources = new ArrayList<>();
final MyModel[] currentRes = new MyModel[1];
DefaultHandler xmlHandler = new DefaultHandler() {
@ -149,7 +149,7 @@ public class XmlTestMain {
switch (qName) {
case "Resource":
Resource res = new Resource();
MyModel res = new MyModel();
res.setId(attributes.getValue("id"));
res.setName(attributes.getValue("name"));
res.setType(attributes.getValue("type"));
@ -157,7 +157,7 @@ public class XmlTestMain {
resources.add(res);
break;
case "Parameter":
Parameter param = new Parameter();
MyParameter param = new MyParameter();
param.setId(attributes.getValue("id"));
param.setName(attributes.getValue("name"));
param.setType(attributes.getValue("type"));
@ -182,7 +182,7 @@ public class XmlTestMain {
return resources;
}
private static void writeDom(Resource res) throws Exception {
private static void writeDom(MyModel res) throws Exception {
DocumentBuilderFactory dbfac = DocumentBuilderFactory.newInstance();
DocumentBuilder docBuilder = dbfac.newDocumentBuilder();
@ -194,7 +194,7 @@ public class XmlTestMain {
resElement.setAttribute("type", res.getType());
for (String paramId : res.getParameterKeySet()) {
Parameter param = res.getParameterBy(paramId);
MyParameter param = res.getParameterBy(paramId);
Element paramElement = doc.createElement("Parameter");
paramElement.setAttribute("id", param.getId());
paramElement.setAttribute("name", param.getName());
@ -250,7 +250,7 @@ public class XmlTestMain {
}
}
private static void writeSax(Resource res) throws Exception {
private static void writeSax(MyModel res) throws Exception {
XMLOutputFactory factory = XMLOutputFactory.newInstance();
File file = new File("target/res_sax.xml");
@ -268,7 +268,7 @@ public class XmlTestMain {
writer.writeAttribute("type", res.getType());
for (String paramId : res.getParameterKeySet()) {
Parameter param = res.getParameterBy(paramId);
MyParameter param = res.getParameterBy(paramId);
writer.writeEmptyElement("Parameter");
writer.writeAttribute("id", param.getId());
writer.writeAttribute("name", param.getName());

12
src/test/java/ch/eitchnet/xmlpers/test/impl/ResourceContextFactory.java → src/test/java/ch/eitchnet/xmlpers/test/impl/MyModelContextFactory.java
View File

@ -20,20 +20,20 @@ import ch.eitchnet.xmlpers.api.PersistenceContextFactory;
import ch.eitchnet.xmlpers.objref.IdOfSubTypeRef;
import ch.eitchnet.xmlpers.objref.ObjectRef;
import ch.eitchnet.xmlpers.objref.ObjectReferenceCache;
import ch.eitchnet.xmlpers.test.model.Resource;
import ch.eitchnet.xmlpers.test.model.MyModel;
public class ResourceContextFactory implements PersistenceContextFactory<Resource> {
public class MyModelContextFactory implements PersistenceContextFactory<MyModel> {
@Override
public PersistenceContext<Resource> createCtx(ObjectReferenceCache objectRefCache, Resource t) {
public PersistenceContext<MyModel> createCtx(ObjectReferenceCache objectRefCache, MyModel t) {
IdOfSubTypeRef objectRef = objectRefCache.getIdOfSubTypeRef(TestConstants.TYPE_RES, t.getType(), t.getId());
return createCtx(objectRef);
}
@Override
public PersistenceContext<Resource> createCtx(ObjectRef objectRef) {
PersistenceContext<Resource> ctx = new PersistenceContext<>(objectRef);
ctx.setParserFactory(new ResourceParserFactory());
public PersistenceContext<MyModel> createCtx(ObjectRef objectRef) {
PersistenceContext<MyModel> ctx = new PersistenceContext<>(objectRef);
ctx.setParserFactory(new MyModelParserFactory());
return ctx;
}

18
src/test/java/ch/eitchnet/xmlpers/test/impl/ResourceDomParser.java → src/test/java/ch/eitchnet/xmlpers/test/impl/MyModelDomParser.java
View File

@ -23,21 +23,21 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import ch.eitchnet.xmlpers.api.DomParser;
import ch.eitchnet.xmlpers.test.model.Parameter;
import ch.eitchnet.xmlpers.test.model.Resource;
import ch.eitchnet.xmlpers.test.model.MyParameter;
import ch.eitchnet.xmlpers.test.model.MyModel;
import ch.eitchnet.xmlpers.util.DomUtil;
public class ResourceDomParser implements DomParser<Resource> {
public class MyModelDomParser implements DomParser<MyModel> {
private Resource resource;
private MyModel resource;
@Override
public Resource getObject() {
public MyModel getObject() {
return this.resource;
}
@Override
public void setObject(Resource resource) {
public void setObject(MyModel resource) {
this.resource = resource;
}
@ -56,7 +56,7 @@ public class ResourceDomParser implements DomParser<Resource> {
element.setAttribute("type", this.resource.getType());
for (String paramId : this.resource.getParameterKeySet()) {
Parameter param = this.resource.getParameterBy(paramId);
MyParameter param = this.resource.getParameterBy(paramId);
Element paramElement = document.createElement("Parameter");
element.appendChild(paramElement);
@ -79,7 +79,7 @@ public class ResourceDomParser implements DomParser<Resource> {
String name = rootElement.getAttribute("name");
String type = rootElement.getAttribute("type");
Resource resource = new Resource(id, name, type);
MyModel resource = new MyModel(id, name, type);
NodeList children = rootElement.getChildNodes();
for (int i = 0; i < children.getLength(); i++) {
@ -93,7 +93,7 @@ public class ResourceDomParser implements DomParser<Resource> {
String paramType = paramElement.getAttribute("type");
String paramValue = paramElement.getAttribute("value");
Parameter param = new Parameter(paramId, paramName, paramType, paramValue);
MyParameter param = new MyParameter(paramId, paramName, paramType, paramValue);
resource.addParameter(param);
}

12
src/test/java/ch/eitchnet/xmlpers/test/impl/ResourceParserFactory.java → src/test/java/ch/eitchnet/xmlpers/test/impl/MyModelParserFactory.java
View File

@ -18,17 +18,17 @@ package ch.eitchnet.xmlpers.test.impl;
import ch.eitchnet.xmlpers.api.DomParser;
import ch.eitchnet.xmlpers.api.ParserFactory;
import ch.eitchnet.xmlpers.api.SaxParser;
import ch.eitchnet.xmlpers.test.model.Resource;
import ch.eitchnet.xmlpers.test.model.MyModel;
public class ResourceParserFactory implements ParserFactory<Resource> {
public class MyModelParserFactory implements ParserFactory<MyModel> {
@Override
public DomParser<Resource> getDomParser() {
return new ResourceDomParser();
public DomParser<MyModel> getDomParser() {
return new MyModelDomParser();
}
@Override
public SaxParser<Resource> getSaxParser() {
return new ResourceSaxParser();
public SaxParser<MyModel> getSaxParser() {
return new MyModelSaxParser();
}
}

18
src/test/java/ch/eitchnet/xmlpers/test/impl/ResourceSaxParser.java → src/test/java/ch/eitchnet/xmlpers/test/impl/MyModelSaxParser.java
View File

@ -23,20 +23,20 @@ import org.xml.sax.helpers.DefaultHandler;
import ch.eitchnet.xmlpers.api.SaxParser;
import ch.eitchnet.xmlpers.api.XmlPersistenceStreamWriter;
import ch.eitchnet.xmlpers.test.model.Parameter;
import ch.eitchnet.xmlpers.test.model.Resource;
import ch.eitchnet.xmlpers.test.model.MyParameter;
import ch.eitchnet.xmlpers.test.model.MyModel;
class ResourceSaxParser extends DefaultHandler implements SaxParser<Resource> {
class MyModelSaxParser extends DefaultHandler implements SaxParser<MyModel> {
private Resource resource;
private MyModel resource;
@Override
public Resource getObject() {
public MyModel getObject() {
return this.resource;
}
@Override
public void setObject(Resource object) {
public void setObject(MyModel object) {
this.resource = object;
}
@ -54,7 +54,7 @@ class ResourceSaxParser extends DefaultHandler implements SaxParser<Resource> {
writer.writeAttribute("name", this.resource.getName());
writer.writeAttribute("type", this.resource.getType());
for (String paramId : this.resource.getParameterKeySet()) {
Parameter param = this.resource.getParameterBy(paramId);
MyParameter param = this.resource.getParameterBy(paramId);
writer.writeEmptyElement("Parameter");
writer.writeAttribute("id", param.getId());
writer.writeAttribute("name", param.getName());
@ -72,7 +72,7 @@ class ResourceSaxParser extends DefaultHandler implements SaxParser<Resource> {
String id = attributes.getValue("id");
String name = attributes.getValue("name");
String type = attributes.getValue("type");
Resource resource = new Resource(id, name, type);
MyModel resource = new MyModel(id, name, type);
this.resource = resource;
break;
case "Parameter":
@ -80,7 +80,7 @@ class ResourceSaxParser extends DefaultHandler implements SaxParser<Resource> {
name = attributes.getValue("name");
type = attributes.getValue("type");
String value = attributes.getValue("value");
Parameter param = new Parameter(id, name, type, value);
MyParameter param = new MyParameter(id, name, type, value);
this.resource.addParameter(param);
break;
default:

20
src/test/java/ch/eitchnet/xmlpers/test/model/ModelBuilder.java
View File

@ -43,22 +43,22 @@ public class ModelBuilder {
public static final String BOOK_PRESS_2 = "Another press";
public static final double BOOK_PRICE = 45.55D;
public static Resource createResource() {
public static MyModel createResource() {
return createResource(RES_ID, RES_NAME, RES_TYPE);
}
public static Resource createResource(String id) {
public static MyModel createResource(String id) {
return createResource(id, RES_NAME, RES_TYPE);
}
public static Resource createResource(String id, String name, String type) {
Resource resource = new Resource(id, name, type);
Parameter param = new Parameter(PARAM_ID, PARAM_NAME, PARAM_TYPE, PARAM_VALUE_1);
public static MyModel createResource(String id, String name, String type) {
MyModel resource = new MyModel(id, name, type);
MyParameter param = new MyParameter(PARAM_ID, PARAM_NAME, PARAM_TYPE, PARAM_VALUE_1);
resource.addParameter(param);
return resource;
}
public static void updateResource(Resource resource) {
public static void updateResource(MyModel resource) {
resource.setName(RES_NAME_MODIFIED);
resource.getParameterBy(PARAM_ID).setValue(PARAM_VALUE_2);
}
@ -95,12 +95,12 @@ public class ModelBuilder {
Assert.assertEquals(BOOK_PRICE, book.getPrice(), 0.0);
}
public static void assertResource(Resource resource) {
public static void assertResource(MyModel resource) {
Assert.assertNotNull(resource);
Assert.assertEquals(RES_ID, resource.getId());
Assert.assertEquals(RES_NAME, resource.getName());
Assert.assertEquals(RES_TYPE, resource.getType());
Parameter param = resource.getParameterBy(PARAM_ID);
MyParameter param = resource.getParameterBy(PARAM_ID);
Assert.assertNotNull(param);
Assert.assertEquals(PARAM_ID, param.getId());
Assert.assertEquals(PARAM_NAME, param.getName());
@ -108,12 +108,12 @@ public class ModelBuilder {
Assert.assertEquals(PARAM_VALUE_1, param.getValue());
}
public static void assertResourceUpdated(Resource resource) {
public static void assertResourceUpdated(MyModel resource) {
Assert.assertNotNull(resource);
Assert.assertEquals(RES_ID, resource.getId());
Assert.assertEquals(RES_NAME_MODIFIED, resource.getName());
Assert.assertEquals(RES_TYPE, resource.getType());
Parameter param = resource.getParameterBy(PARAM_ID);
MyParameter param = resource.getParameterBy(PARAM_ID);
Assert.assertNotNull(param);
Assert.assertEquals(PARAM_ID, param.getId());
Assert.assertEquals(PARAM_NAME, param.getName());

14
src/test/java/ch/eitchnet/xmlpers/test/model/Resource.java → src/test/java/ch/eitchnet/xmlpers/test/model/MyModel.java
View File

@ -20,17 +20,17 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
public class Resource {
public class MyModel {
private String id;
private String name;
private String type;
private Map<String, Parameter> parameters = new HashMap<String, Parameter>();
private Map<String, MyParameter> parameters = new HashMap<String, MyParameter>();
/**
*
*/
public Resource() {
public MyModel() {
// empty constructor
}
@ -39,7 +39,7 @@ public class Resource {
* @param name
* @param type
*/
public Resource(String id, String name, String type) {
public MyModel(String id, String name, String type) {
super();
this.id = id;
this.name = name;
@ -57,7 +57,7 @@ public class Resource {
builder.append(", type=");
builder.append(this.type);
builder.append(", parameters=");
for (Entry<String, Parameter> param : this.parameters.entrySet()) {
for (Entry<String, MyParameter> param : this.parameters.entrySet()) {
builder.append("\n");
builder.append(" " + param.getKey() + " = " + param.getValue());
}
@ -107,7 +107,7 @@ public class Resource {
this.type = type;
}
public void addParameter(Parameter parameter) {
public void addParameter(MyParameter parameter) {
this.parameters.put(parameter.getId(), parameter);
}
@ -115,7 +115,7 @@ public class Resource {
return this.parameters.keySet();
}
public Parameter getParameterBy(String id) {
public MyParameter getParameterBy(String id) {
return this.parameters.get(id);
}
}

6
src/test/java/ch/eitchnet/xmlpers/test/model/Parameter.java → src/test/java/ch/eitchnet/xmlpers/test/model/MyParameter.java
View File

@ -15,7 +15,7 @@
*/
package ch.eitchnet.xmlpers.test.model;
public class Parameter {
public class MyParameter {
private String id;
private String name;
@ -25,7 +25,7 @@ public class Parameter {
/**
*
*/
public Parameter() {
public MyParameter() {
// empty constructor
}
@ -35,7 +35,7 @@ public class Parameter {
* @param type
* @param value
*/
public Parameter(String id, String name, String type, String value) {
public MyParameter(String id, String name, String type, String value) {
super();
this.id = id;
this.name = name;