Author: glandais Date: 2007-12-05 17:23:14 +0000 (Wed, 05 Dec 2007) New Revision: 47 Added: trunk/simexplorer-si-storage/src/test/org/cemagref/simexplorer/si/storage/test/ElementGenerator.java Modified: trunk/simexplorer-si-storage/src/java/org/cemagref/simexplorer/si/storage/database/lucene/LuceneDatabase.java trunk/simexplorer-si-storage/src/java/org/cemagref/simexplorer/si/storage/entities/Component.java trunk/simexplorer-si-storage/src/java/org/cemagref/simexplorer/si/storage/entities/ExplorationApplication.java trunk/simexplorer-si-storage/src/java/org/cemagref/simexplorer/si/storage/entities/ExplorationData.java trunk/simexplorer-si-storage/src/java/org/cemagref/simexplorer/si/storage/entities/Library.java trunk/simexplorer-si-storage/src/java/org/cemagref/simexplorer/si/storage/entities/LoggableElement.java trunk/simexplorer-si-storage/src/java/org/cemagref/simexplorer/si/storage/factories/ConstantFactory.java trunk/simexplorer-si-storage/src/java/org/cemagref/simexplorer/si/storage/factories/ConstantValueFactory.java trunk/simexplorer-si-storage/src/java/org/cemagref/simexplorer/si/storage/factories/EntityFactory.java trunk/simexplorer-si-storage/src/java/org/cemagref/simexplorer/si/storage/factories/ExplorationApplicationFactory.java trunk/simexplorer-si-storage/src/java/org/cemagref/simexplorer/si/storage/factories/LoggableElementFactory.java trunk/simexplorer-si-storage/src/test/org/cemagref/simexplorer/si/storage/test/LuceneDatabaseTestCase.java Log: Passages tests et g?\195?\169n?\195?\169ration al?\195?\169atoire d'EA Modified: trunk/simexplorer-si-storage/src/java/org/cemagref/simexplorer/si/storage/database/lucene/LuceneDatabase.java =================================================================== --- trunk/simexplorer-si-storage/src/java/org/cemagref/simexplorer/si/storage/database/lucene/LuceneDatabase.java 2007-12-05 15:34:55 UTC (rev 46) +++ trunk/simexplorer-si-storage/src/java/org/cemagref/simexplorer/si/storage/database/lucene/LuceneDatabase.java 2007-12-05 17:23:14 UTC (rev 47) @@ -71,6 +71,11 @@ @Override public void pushElement(LoggableElement element) throws Exception { + Set<LoggableElement> children = element.getChildren(); + for (LoggableElement loggableElement : children) { + pushElement(loggableElement); + } + LoggableElementFactory elementFactory = (LoggableElementFactory) LoggableElementFactory .getFactory(element.getClass()); Document document = saveLuceneElement(elementFactory, element); @@ -238,23 +243,7 @@ document.add(new Field(KEY_MAJORVERSION, element.getMajorVersion() .toString(), Field.Store.YES, Field.Index.UN_TOKENIZED)); - org.w3c.dom.Document xmlDocument = factory.getBuilder().newDocument(); - // Propriétés du DOM - xmlDocument.setXmlVersion("1.0"); - xmlDocument.setXmlStandalone(true); - // Création de l'arborescence du DOM - Element racine = xmlDocument.createElement(element.getClass() - .getSimpleName()); - factory.saveXMLElement(xmlDocument, racine, element); - xmlDocument.appendChild(racine); - DOMSource domSource = new DOMSource(xmlDocument); - StringWriter writer = new StringWriter(); - StreamResult result = new StreamResult(writer); - TransformerFactory tf = TransformerFactory.newInstance(); - Transformer transformer = tf.newTransformer(); - transformer.transform(domSource, result); - String stringResult = writer.toString(); - document.add(new Field(KEY_XML, stringResult, + document.add(new Field(KEY_XML, factory.getElementXML(element), Field.Store.COMPRESS, Field.Index.NO)); return document; Modified: trunk/simexplorer-si-storage/src/java/org/cemagref/simexplorer/si/storage/entities/Component.java =================================================================== --- trunk/simexplorer-si-storage/src/java/org/cemagref/simexplorer/si/storage/entities/Component.java 2007-12-05 15:34:55 UTC (rev 46) +++ trunk/simexplorer-si-storage/src/java/org/cemagref/simexplorer/si/storage/entities/Component.java 2007-12-05 17:23:14 UTC (rev 47) @@ -1,5 +1,6 @@ package org.cemagref.simexplorer.si.storage.entities; +import java.util.HashSet; import java.util.Set; public class Component extends LoggableElement { @@ -41,4 +42,11 @@ this.libraries = libraries; } + @Override + public Set<LoggableElement> getChildren() { + Set<LoggableElement> elements = new HashSet<LoggableElement>(); + elements.addAll(libraries); + return elements; + } + } Modified: trunk/simexplorer-si-storage/src/java/org/cemagref/simexplorer/si/storage/entities/ExplorationApplication.java =================================================================== --- trunk/simexplorer-si-storage/src/java/org/cemagref/simexplorer/si/storage/entities/ExplorationApplication.java 2007-12-05 15:34:55 UTC (rev 46) +++ trunk/simexplorer-si-storage/src/java/org/cemagref/simexplorer/si/storage/entities/ExplorationApplication.java 2007-12-05 17:23:14 UTC (rev 47) @@ -21,5 +21,12 @@ public void setComponents(Set<Component> components) { this.components = components; } + @Override + public Set<LoggableElement> getChildren() { + Set<LoggableElement> elements = new HashSet<LoggableElement>(); + elements.addAll(explorations); + elements.addAll(components); + return elements; + } } Modified: trunk/simexplorer-si-storage/src/java/org/cemagref/simexplorer/si/storage/entities/ExplorationData.java =================================================================== --- trunk/simexplorer-si-storage/src/java/org/cemagref/simexplorer/si/storage/entities/ExplorationData.java 2007-12-05 15:34:55 UTC (rev 46) +++ trunk/simexplorer-si-storage/src/java/org/cemagref/simexplorer/si/storage/entities/ExplorationData.java 2007-12-05 17:23:14 UTC (rev 47) @@ -1,5 +1,6 @@ package org.cemagref.simexplorer.si.storage.entities; +import java.util.HashSet; import java.util.Set; public class ExplorationData extends LoggableElement { @@ -50,5 +51,10 @@ public void setValuesMap(Set<ConstantValue> valuesMap) { this.valuesMap = valuesMap; } + @Override + public Set<LoggableElement> getChildren() { + Set<LoggableElement> elements = new HashSet<LoggableElement>(); + return elements; + } } Modified: trunk/simexplorer-si-storage/src/java/org/cemagref/simexplorer/si/storage/entities/Library.java =================================================================== --- trunk/simexplorer-si-storage/src/java/org/cemagref/simexplorer/si/storage/entities/Library.java 2007-12-05 15:34:55 UTC (rev 46) +++ trunk/simexplorer-si-storage/src/java/org/cemagref/simexplorer/si/storage/entities/Library.java 2007-12-05 17:23:14 UTC (rev 47) @@ -1,6 +1,15 @@ package org.cemagref.simexplorer.si.storage.entities; +import java.util.HashSet; +import java.util.Set; + public class Library extends LoggableElement { + @Override + public Set<LoggableElement> getChildren() { + Set<LoggableElement> elements = new HashSet<LoggableElement>(); + return elements; + } + } Modified: trunk/simexplorer-si-storage/src/java/org/cemagref/simexplorer/si/storage/entities/LoggableElement.java =================================================================== --- trunk/simexplorer-si-storage/src/java/org/cemagref/simexplorer/si/storage/entities/LoggableElement.java 2007-12-05 15:34:55 UTC (rev 46) +++ trunk/simexplorer-si-storage/src/java/org/cemagref/simexplorer/si/storage/entities/LoggableElement.java 2007-12-05 17:23:14 UTC (rev 47) @@ -91,6 +91,8 @@ this.descriptors = descriptors; } + public abstract Set<LoggableElement> getChildren(); + /* public LoggableElement getParent() { return parent; Modified: trunk/simexplorer-si-storage/src/java/org/cemagref/simexplorer/si/storage/factories/ConstantFactory.java =================================================================== --- trunk/simexplorer-si-storage/src/java/org/cemagref/simexplorer/si/storage/factories/ConstantFactory.java 2007-12-05 15:34:55 UTC (rev 46) +++ trunk/simexplorer-si-storage/src/java/org/cemagref/simexplorer/si/storage/factories/ConstantFactory.java 2007-12-05 17:23:14 UTC (rev 47) @@ -18,7 +18,8 @@ public Constant loadXMLElement(Element xmlElement) throws Exception { Constant constant = super.loadXMLElement(xmlElement); constant.setName(getProperty(xmlElement, KEY_NAME)); - constant.setType(Class.forName(getProperty(xmlElement, KEY_TYPE))); + String className = getProperty(xmlElement, KEY_TYPE); + constant.setType(Class.forName(className)); return constant; } @@ -26,7 +27,8 @@ public void saveXMLElement(Document document, Element xmlElement, Constant element) throws Exception { setProperty(document, xmlElement, KEY_NAME, element.getName()); - setProperty(document, xmlElement, KEY_TYPE, element.getClass().getName()); + String className = element.getType().getName(); + setProperty(document, xmlElement, KEY_TYPE, className); } } Modified: trunk/simexplorer-si-storage/src/java/org/cemagref/simexplorer/si/storage/factories/ConstantValueFactory.java =================================================================== --- trunk/simexplorer-si-storage/src/java/org/cemagref/simexplorer/si/storage/factories/ConstantValueFactory.java 2007-12-05 15:34:55 UTC (rev 46) +++ trunk/simexplorer-si-storage/src/java/org/cemagref/simexplorer/si/storage/factories/ConstantValueFactory.java 2007-12-05 17:23:14 UTC (rev 47) @@ -29,7 +29,7 @@ ConstantValue element) throws Exception { Element xmlConstant = document.createElement(KEY_CONSTANT); - getFactory(Constant.class).saveXMLElement(document, xmlElement, element.getConstant()); + getFactory(Constant.class).saveXMLElement(document, xmlConstant, element.getConstant()); xmlElement.appendChild(xmlConstant); setProperty(document, xmlElement, KEY_VALUE, element.getValue()); Modified: trunk/simexplorer-si-storage/src/java/org/cemagref/simexplorer/si/storage/factories/EntityFactory.java =================================================================== --- trunk/simexplorer-si-storage/src/java/org/cemagref/simexplorer/si/storage/factories/EntityFactory.java 2007-12-05 15:34:55 UTC (rev 46) +++ trunk/simexplorer-si-storage/src/java/org/cemagref/simexplorer/si/storage/factories/EntityFactory.java 2007-12-05 17:23:14 UTC (rev 47) @@ -1,5 +1,6 @@ package org.cemagref.simexplorer.si.storage.factories; +import java.io.StringWriter; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -7,6 +8,13 @@ import java.util.Set; import java.util.StringTokenizer; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; + import org.cemagref.simexplorer.si.storage.entities.Entity; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -20,6 +28,18 @@ private static Map<String, EntityFactory> factories = new HashMap<String, EntityFactory>(); + private static DocumentBuilder documentBuilder = null; + + public static synchronized DocumentBuilder getBuilder() throws Exception { + if (documentBuilder == null) { + DocumentBuilderFactory factory = DocumentBuilderFactory + .newInstance(); + documentBuilder = factory.newDocumentBuilder(); + return documentBuilder; + } + return documentBuilder; + } + public static EntityFactory getFactory(String entityClassName) throws Exception { EntityFactory entityFactory = factories.get(entityClassName); @@ -104,6 +124,26 @@ public abstract void saveXMLElement(Document document, Element xmlElement, E element) throws Exception; + + public String getElementXML(E element) throws Exception { + org.w3c.dom.Document xmlDocument = getBuilder().newDocument(); + // Propriétés du DOM + xmlDocument.setXmlVersion("1.0"); + xmlDocument.setXmlStandalone(true); + // Création de l'arborescence du DOM + Element racine = xmlDocument.createElement(element.getClass() + .getSimpleName()); + saveXMLElement(xmlDocument, racine, element); + xmlDocument.appendChild(racine); + DOMSource domSource = new DOMSource(xmlDocument); + StringWriter writer = new StringWriter(); + StreamResult result = new StreamResult(writer); + TransformerFactory tf = TransformerFactory.newInstance(); + Transformer transformer = tf.newTransformer(); + transformer.transform(domSource, result); + + return writer.toString(); + } public Set loadCollection(String tagSetName, String tagName, Class clazz, Element xmlElement) throws Exception { Modified: trunk/simexplorer-si-storage/src/java/org/cemagref/simexplorer/si/storage/factories/ExplorationApplicationFactory.java =================================================================== --- trunk/simexplorer-si-storage/src/java/org/cemagref/simexplorer/si/storage/factories/ExplorationApplicationFactory.java 2007-12-05 15:34:55 UTC (rev 46) +++ trunk/simexplorer-si-storage/src/java/org/cemagref/simexplorer/si/storage/factories/ExplorationApplicationFactory.java 2007-12-05 17:23:14 UTC (rev 47) @@ -19,9 +19,9 @@ ExplorationApplication element) throws Exception { super.saveXMLElement(document, xmlElement, element); saveCollection(element.getExplorations(), KEY_DATA, KEY_DATA_NODE, - ExplorationData.class.getClass(), document, xmlElement); + ExplorationData.class, document, xmlElement); saveCollection(element.getComponents(), KEY_COMPONENTS, - KEY_COMPONENT_NODE, Component.class.getClass(), document, + KEY_COMPONENT_NODE, Component.class, document, xmlElement); } @@ -31,9 +31,9 @@ ExplorationApplication explorationApplication = super .loadXMLElement(xmlElement); explorationApplication.setExplorations(loadCollection(KEY_DATA, - KEY_DATA_NODE, ExplorationData.class.getClass(), xmlElement)); + KEY_DATA_NODE, ExplorationData.class, xmlElement)); explorationApplication.setComponents(loadCollection(KEY_COMPONENTS, - KEY_COMPONENT_NODE, Component.class.getClass(), xmlElement)); + KEY_COMPONENT_NODE, Component.class, xmlElement)); return explorationApplication; } Modified: trunk/simexplorer-si-storage/src/java/org/cemagref/simexplorer/si/storage/factories/LoggableElementFactory.java =================================================================== --- trunk/simexplorer-si-storage/src/java/org/cemagref/simexplorer/si/storage/factories/LoggableElementFactory.java 2007-12-05 15:34:55 UTC (rev 46) +++ trunk/simexplorer-si-storage/src/java/org/cemagref/simexplorer/si/storage/factories/LoggableElementFactory.java 2007-12-05 17:23:14 UTC (rev 47) @@ -14,18 +14,6 @@ private static final String KEY_DESCRIPTION = "description"; - private static DocumentBuilder documentBuilder = null; - - public static synchronized DocumentBuilder getBuilder() throws Exception { - if (documentBuilder == null) { - DocumentBuilderFactory factory = DocumentBuilderFactory - .newInstance(); - documentBuilder = factory.newDocumentBuilder(); - return documentBuilder; - } - return documentBuilder; - } - @Override public E loadXMLElement(Element xmlElement) throws Exception { E element = super.loadXMLElement(xmlElement); Added: trunk/simexplorer-si-storage/src/test/org/cemagref/simexplorer/si/storage/test/ElementGenerator.java =================================================================== --- trunk/simexplorer-si-storage/src/test/org/cemagref/simexplorer/si/storage/test/ElementGenerator.java (rev 0) +++ trunk/simexplorer-si-storage/src/test/org/cemagref/simexplorer/si/storage/test/ElementGenerator.java 2007-12-05 17:23:14 UTC (rev 47) @@ -0,0 +1,135 @@ +package org.cemagref.simexplorer.si.storage.test; + +import java.util.Date; +import java.util.HashSet; +import java.util.Random; +import java.util.Set; +import java.util.UUID; + +import org.cemagref.simexplorer.si.storage.entities.Code; +import org.cemagref.simexplorer.si.storage.entities.Component; +import org.cemagref.simexplorer.si.storage.entities.Constant; +import org.cemagref.simexplorer.si.storage.entities.ConstantValue; +import org.cemagref.simexplorer.si.storage.entities.Descriptor; +import org.cemagref.simexplorer.si.storage.entities.Entity; +import org.cemagref.simexplorer.si.storage.entities.ExplorationApplication; +import org.cemagref.simexplorer.si.storage.entities.ExplorationData; +import org.cemagref.simexplorer.si.storage.entities.Library; +import org.cemagref.simexplorer.si.storage.entities.LoggableElement; +import org.cemagref.simexplorer.si.storage.entities.Result; +import org.cemagref.simexplorer.si.storage.entities.Structure; +import org.cemagref.simexplorer.si.storage.factories.EntityFactory; + +public class ElementGenerator { + + private Random r = new Random(); + + private void update(LoggableElement element) throws Exception { + element.setUuid(UUID.randomUUID().toString()); + element.setName(UUID.randomUUID().toString()); + element.setType(element.getClass().getSimpleName()); + element.setDescription("test"); + element.setMajorVersion(r.nextInt(100)); + element.setMinorVersion(r.nextInt(100)); + element.setCreationDate(new Date(r.nextLong())); + element.setHash(UUID.randomUUID().toString()); + + Set descriptors = generateArray(Descriptor.class); + for (Object object : descriptors) { + processDescriptor((Descriptor) object); + } + element.setDescriptors(descriptors); + } + + private void processDescriptor(Descriptor object) { + object.setName(UUID.randomUUID().toString()); + object.setValue(UUID.randomUUID().toString()); + } + + private Set<Entity> generateArray(Class clazz) throws Exception { + Set<Entity> elements = new HashSet<Entity>(); + int i = 1 + r.nextInt(2); + for (int j = 0; j < i; j++) { + Entity element = EntityFactory.getFactory(clazz).createInstance(); + if (element instanceof LoggableElement) { + update((LoggableElement) element); + } + elements.add(element); + } + return elements; + } + + public ExplorationApplication generateRandomEA() throws Exception { + ExplorationApplication ea = new ExplorationApplication(); + update(ea); + Set datas = generateArray(ExplorationData.class); + for (Object object : datas) { + processExplorationData((ExplorationData) object); + } + ea.setExplorations(datas); + Set components = generateArray(Component.class); + for (Object object : components) { + processComponent((Component) object); + } + ea.setComponents(components); + return ea; + } + + private void processComponent(Component component) throws Exception { + Set constants = generateArray(Constant.class); + for (Object constant : constants) { + processConstant((Constant) constant); + } + component.setConstants(constants); + + component.setStructures(new HashSet<Structure>()); + + Set codes = generateArray(Code.class); + for (Object code : codes) { + processCode((Code) code); + } + component.setCodes(codes); + + Set libraries = generateArray(Library.class); + for (Object library : libraries) { + processLibrary((Library) library); + } + component.setLibraries(libraries); + + } + + private void processLibrary(Library library) { + } + + private void processCode(Code code) { + code.setCode(UUID.randomUUID().toString()); + code.setLanguage(UUID.randomUUID().toString()); + } + + private void processConstant(Constant constant) { + constant.setName(UUID.randomUUID().toString()); + constant.setType(String.class); + } + + private void processExplorationData(ExplorationData explorationData) throws Exception { + Result result = new Result(); + explorationData.setResult(result); + + Set constantValues = generateArray(ConstantValue.class); + for (Object constantValue : constantValues) { + processConstantValue((ConstantValue) constantValue); + } + explorationData.setValuesMap(constantValues); + + } + + private void processConstantValue(ConstantValue constantValue) { + Constant constant = new Constant(); + constant.setName(UUID.randomUUID().toString()); + constant.setType(Integer.class); + + constantValue.setConstant(constant); + constantValue.setValue(Integer.toString(r.nextInt())); + } + +} Modified: trunk/simexplorer-si-storage/src/test/org/cemagref/simexplorer/si/storage/test/LuceneDatabaseTestCase.java =================================================================== --- trunk/simexplorer-si-storage/src/test/org/cemagref/simexplorer/si/storage/test/LuceneDatabaseTestCase.java 2007-12-05 15:34:55 UTC (rev 46) +++ trunk/simexplorer-si-storage/src/test/org/cemagref/simexplorer/si/storage/test/LuceneDatabaseTestCase.java 2007-12-05 17:23:14 UTC (rev 47) @@ -11,14 +11,17 @@ import org.cemagref.simexplorer.si.storage.database.lucene.LuceneDatabase; import org.cemagref.simexplorer.si.storage.entities.ExplorationData; import org.cemagref.simexplorer.si.storage.entities.LoggableElement; +import org.cemagref.simexplorer.si.storage.factories.EntityFactory; public class LuceneDatabaseTestCase extends TestCase { private LuceneDatabase database; + private ElementGenerator elementGenerator; protected void setUp() throws Exception { super.setUp(); database = new LuceneDatabase(); + elementGenerator = new ElementGenerator(); } protected void tearDown() throws Exception { @@ -27,6 +30,19 @@ } public final void testPushFindElement() throws Exception { + /* + database.pushElement(elementGenerator.generateRandomEA()); + + Map<String, String> properties = new HashMap<String, String>(); + properties.put(DatabaseConstants.KEY_DESCRIPTION, "test"); + Set<LoggableElement> elements = database + .findElementsByProperties(properties); + for (LoggableElement loggableElement : elements) { + System.out.println(EntityFactory.getFactory( + loggableElement.getClass()).getElementXML(loggableElement)); + } + */ + String description1 = UUID.randomUUID().toString(); String uuid1 = UUID.randomUUID().toString(); Integer majorVersion1 = 5; @@ -88,9 +104,10 @@ explorationData2.setMinorVersion(minorVersion2); explorationData2.setDescription(description2); database.pushElement(explorationData2); - - assertEquals(description2, database.getElementLatestVersion(uuid1).getDescription()); + assertEquals(description2, database.getElementLatestVersion(uuid1) + .getDescription()); + String description3 = UUID.randomUUID().toString(); Integer majorVersion3 = majorVersion1 + 1; Integer minorVersion3 = 0; @@ -101,7 +118,8 @@ explorationData3.setDescription(description3); database.pushElement(explorationData3); - assertEquals(description3, database.getElementLatestVersion(uuid1).getDescription()); + assertEquals(description3, database.getElementLatestVersion(uuid1) + .getDescription()); } public final void testFindElementsById() throws Exception { @@ -125,7 +143,7 @@ explorationData2.setMinorVersion(minorVersion2); explorationData2.setDescription(description2); database.pushElement(explorationData2); - + String description3 = UUID.randomUUID().toString(); Integer majorVersion3 = majorVersion1 + 1; Integer minorVersion3 = 0; @@ -138,11 +156,12 @@ Set<LoggableElement> elements = database.findElementsById(uuid1); assertEquals(3, elements.size()); - + } - public final void testFindElementsByPropertiesMapOfStringString() throws Exception { - + public final void testFindElementsByPropertiesMapOfStringString() + throws Exception { + String description1 = UUID.randomUUID().toString(); String uuid1 = UUID.randomUUID().toString(); Integer majorVersion1 = 5; @@ -163,7 +182,7 @@ explorationData2.setMinorVersion(minorVersion2); explorationData2.setDescription(description2); database.pushElement(explorationData2); - + String description3 = UUID.randomUUID().toString(); Integer majorVersion3 = majorVersion1 + 1; Integer minorVersion3 = 0; @@ -175,18 +194,20 @@ database.pushElement(explorationData3); // TODO add some other classes in db - + Map<String, String> properties = new HashMap<String, String>(); properties.put(DatabaseConstants.KEY_UUID, uuid1); properties.put(DatabaseConstants.KEY_MAJORVERSION, "5"); - - Set<LoggableElement> elements = database.findElementsByProperties(properties); - assertEquals(2, elements.size()); - + + Set<LoggableElement> elements = database + .findElementsByProperties(properties); + assertEquals(2, elements.size()); + } - public final void testFindElementsByPropertiesMapOfStringStringClass() throws Exception { - + public final void testFindElementsByPropertiesMapOfStringStringClass() + throws Exception { + String description1 = UUID.randomUUID().toString(); String uuid1 = UUID.randomUUID().toString(); Integer majorVersion1 = 5; @@ -207,7 +228,7 @@ explorationData2.setMinorVersion(minorVersion2); explorationData2.setDescription(description2); database.pushElement(explorationData2); - + String description3 = UUID.randomUUID().toString(); Integer majorVersion3 = majorVersion1 + 1; Integer minorVersion3 = 0; @@ -221,14 +242,15 @@ Map<String, String> properties = new HashMap<String, String>(); properties.put(DatabaseConstants.KEY_UUID, uuid1); properties.put(DatabaseConstants.KEY_MAJORVERSION, "5"); - - Set<LoggableElement> elements = database.findElementsByProperties(properties, ExplorationData.class); + + Set<LoggableElement> elements = database.findElementsByProperties( + properties, ExplorationData.class); assertEquals(2, elements.size()); - + } public final void testDeleteElement() throws Exception { - + String description1 = UUID.randomUUID().toString(); String uuid1 = UUID.randomUUID().toString(); Integer majorVersion1 = 5; @@ -239,14 +261,14 @@ explorationData1.setMinorVersion(minorVersion1); explorationData1.setDescription(description1); database.pushElement(explorationData1); - + database.deleteElement(explorationData1); assertNull(database.findElement(uuid1, majorVersion1, minorVersion1)); - + } public final void testDeleteElements() throws Exception { - + String description1 = UUID.randomUUID().toString(); String uuid1 = UUID.randomUUID().toString(); Integer majorVersion1 = 5; @@ -257,7 +279,7 @@ explorationData1.setMinorVersion(minorVersion1); explorationData1.setDescription(description1); database.pushElement(explorationData1); - + String description2 = UUID.randomUUID().toString(); Integer majorVersion2 = 5; Integer minorVersion2 = minorVersion1 + 1; @@ -267,7 +289,7 @@ explorationData2.setMinorVersion(minorVersion2); explorationData2.setDescription(description2); database.pushElement(explorationData2); - + String description3 = UUID.randomUUID().toString(); Integer majorVersion3 = majorVersion1 + 1; Integer minorVersion3 = 0; @@ -277,11 +299,11 @@ explorationData3.setMinorVersion(minorVersion3); explorationData3.setDescription(description3); database.pushElement(explorationData3); - + database.deleteElements(uuid1); - + assertEquals(0, database.findElementsById(uuid1).size()); - + } }