Author: glandais Date: 2007-12-06 18:37:21 +0000 (Thu, 06 Dec 2007) New Revision: 52 Modified: 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/LuceneDatabaseTestCase.java Log: Mise ?\195?\160 jour des tests Modified: 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 2007-12-06 18:37:03 UTC (rev 51) +++ trunk/simexplorer-si-storage/src/test/org/cemagref/simexplorer/si/storage/test/ElementGenerator.java 2007-12-06 18:37:21 UTC (rev 52) @@ -29,8 +29,7 @@ element.setName(UUID.randomUUID().toString()); element.setType(element.getClass().getSimpleName()); element.setDescription("test"); - element.setMajorVersion(r.nextInt(100)); - element.setMinorVersion(r.nextInt(100)); + element.setVersion(Integer.toString(r.nextInt(100))); element.setCreationDate(new Date(r.nextLong())); element.setHash(UUID.randomUUID().toString()); 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-06 18:37:03 UTC (rev 51) +++ trunk/simexplorer-si-storage/src/test/org/cemagref/simexplorer/si/storage/test/LuceneDatabaseTestCase.java 2007-12-06 18:37:21 UTC (rev 52) @@ -11,7 +11,7 @@ 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; +import org.cemagref.simexplorer.si.storage.entities.Version; public class LuceneDatabaseTestCase extends TestCase { @@ -21,87 +21,75 @@ protected void setUp() throws Exception { super.setUp(); database = new LuceneDatabase(); + database.open(); elementGenerator = new ElementGenerator(); } protected void tearDown() throws Exception { super.tearDown(); - database.shutDown(); + database.close(); } public final void testPushFindElement() throws Exception { + /* - database.pushElement(elementGenerator.generateRandomEA()); + * 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)); } + */ - 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; - Integer minorVersion1 = 12; ExplorationData explorationData1 = new ExplorationData(); explorationData1.setUuid(uuid1); - explorationData1.setMajorVersion(majorVersion1); - explorationData1.setMinorVersion(minorVersion1); + explorationData1.setVersion("5.12"); explorationData1.setDescription(description1); database.pushElement(explorationData1); - LoggableElement element = database.findElement(uuid1, majorVersion1, - minorVersion1); + LoggableElement element = database.findElement(uuid1, new Version( + "5.12")); assertNotNull(element); assertEquals(description1, element.getDescription()); String description2 = UUID.randomUUID().toString(); ExplorationData explorationData2 = new ExplorationData(); explorationData2.setUuid(uuid1); - explorationData2.setMajorVersion(majorVersion1); - explorationData2.setMinorVersion(minorVersion1); + explorationData2.setVersion("5.12"); explorationData2.setDescription(description2); database.pushElement(explorationData2); - assertEquals(description2, database.findElement(uuid1, majorVersion1, - minorVersion1).getDescription()); + assertEquals(description2, database.findElement(uuid1, + new Version("5.12")).getDescription()); String description3 = UUID.randomUUID().toString(); - Integer minorVersion3 = minorVersion1 + 1; ExplorationData explorationData3 = new ExplorationData(); explorationData3.setUuid(uuid1); - explorationData3.setMajorVersion(majorVersion1); - explorationData3.setMinorVersion(minorVersion3); + explorationData3.setVersion("5.13"); explorationData3.setDescription(description3); database.pushElement(explorationData3); - assertEquals(description3, database.findElement(uuid1, majorVersion1, - minorVersion3).getDescription()); + assertEquals(description3, database.findElement(uuid1, + new Version("5.13")).getDescription()); } public final void testGetElementLatestVersion() throws Exception { String description1 = UUID.randomUUID().toString(); String uuid1 = UUID.randomUUID().toString(); - Integer majorVersion1 = 5; - Integer minorVersion1 = 12; ExplorationData explorationData1 = new ExplorationData(); explorationData1.setUuid(uuid1); - explorationData1.setMajorVersion(majorVersion1); - explorationData1.setMinorVersion(minorVersion1); + explorationData1.setVersion("5.12"); explorationData1.setDescription(description1); database.pushElement(explorationData1); String description2 = UUID.randomUUID().toString(); - Integer majorVersion2 = 5; - Integer minorVersion2 = minorVersion1 + 1; ExplorationData explorationData2 = new ExplorationData(); explorationData2.setUuid(uuid1); - explorationData2.setMajorVersion(majorVersion2); - explorationData2.setMinorVersion(minorVersion2); + explorationData2.setVersion("5.13"); explorationData2.setDescription(description2); database.pushElement(explorationData2); @@ -109,12 +97,9 @@ .getDescription()); String description3 = UUID.randomUUID().toString(); - Integer majorVersion3 = majorVersion1 + 1; - Integer minorVersion3 = 0; ExplorationData explorationData3 = new ExplorationData(); explorationData3.setUuid(uuid1); - explorationData3.setMajorVersion(majorVersion3); - explorationData3.setMinorVersion(minorVersion3); + explorationData3.setVersion("6.0"); explorationData3.setDescription(description3); database.pushElement(explorationData3); @@ -129,28 +114,21 @@ Integer minorVersion1 = 12; ExplorationData explorationData1 = new ExplorationData(); explorationData1.setUuid(uuid1); - explorationData1.setMajorVersion(majorVersion1); - explorationData1.setMinorVersion(minorVersion1); + explorationData1.setVersion("5.12"); explorationData1.setDescription(description1); database.pushElement(explorationData1); String description2 = UUID.randomUUID().toString(); - Integer majorVersion2 = 5; - Integer minorVersion2 = minorVersion1 + 1; ExplorationData explorationData2 = new ExplorationData(); explorationData2.setUuid(uuid1); - explorationData2.setMajorVersion(majorVersion2); - explorationData2.setMinorVersion(minorVersion2); + explorationData2.setVersion("5.13"); explorationData2.setDescription(description2); database.pushElement(explorationData2); String description3 = UUID.randomUUID().toString(); - Integer majorVersion3 = majorVersion1 + 1; - Integer minorVersion3 = 0; ExplorationData explorationData3 = new ExplorationData(); explorationData3.setUuid(uuid1); - explorationData3.setMajorVersion(majorVersion3); - explorationData3.setMinorVersion(minorVersion3); + explorationData3.setVersion("6.0"); explorationData3.setDescription(description3); database.pushElement(explorationData3); @@ -164,32 +142,22 @@ String description1 = UUID.randomUUID().toString(); String uuid1 = UUID.randomUUID().toString(); - Integer majorVersion1 = 5; - Integer minorVersion1 = 12; ExplorationData explorationData1 = new ExplorationData(); explorationData1.setUuid(uuid1); - explorationData1.setMajorVersion(majorVersion1); - explorationData1.setMinorVersion(minorVersion1); + explorationData1.setVersion("5.12"); explorationData1.setDescription(description1); database.pushElement(explorationData1); - String description2 = UUID.randomUUID().toString(); - Integer majorVersion2 = 5; - Integer minorVersion2 = minorVersion1 + 1; ExplorationData explorationData2 = new ExplorationData(); explorationData2.setUuid(uuid1); - explorationData2.setMajorVersion(majorVersion2); - explorationData2.setMinorVersion(minorVersion2); - explorationData2.setDescription(description2); + explorationData2.setVersion("5.13"); + explorationData2.setDescription(description1); database.pushElement(explorationData2); String description3 = UUID.randomUUID().toString(); - Integer majorVersion3 = majorVersion1 + 1; - Integer minorVersion3 = 0; ExplorationData explorationData3 = new ExplorationData(); explorationData3.setUuid(uuid1); - explorationData3.setMajorVersion(majorVersion3); - explorationData3.setMinorVersion(minorVersion3); + explorationData3.setVersion("6.0"); explorationData3.setDescription(description3); database.pushElement(explorationData3); @@ -197,7 +165,7 @@ Map<String, String> properties = new HashMap<String, String>(); properties.put(DatabaseConstants.KEY_UUID, uuid1); - properties.put(DatabaseConstants.KEY_MAJORVERSION, "5"); + properties.put(DatabaseConstants.KEY_DESCRIPTION, description1); Set<LoggableElement> elements = database .findElementsByProperties(properties); @@ -210,38 +178,28 @@ String description1 = UUID.randomUUID().toString(); String uuid1 = UUID.randomUUID().toString(); - Integer majorVersion1 = 5; - Integer minorVersion1 = 12; ExplorationData explorationData1 = new ExplorationData(); explorationData1.setUuid(uuid1); - explorationData1.setMajorVersion(majorVersion1); - explorationData1.setMinorVersion(minorVersion1); + explorationData1.setVersion("5.12"); explorationData1.setDescription(description1); database.pushElement(explorationData1); - String description2 = UUID.randomUUID().toString(); - Integer majorVersion2 = 5; - Integer minorVersion2 = minorVersion1 + 1; ExplorationData explorationData2 = new ExplorationData(); explorationData2.setUuid(uuid1); - explorationData2.setMajorVersion(majorVersion2); - explorationData2.setMinorVersion(minorVersion2); - explorationData2.setDescription(description2); + explorationData2.setVersion("5.13"); + explorationData2.setDescription(description1); database.pushElement(explorationData2); String description3 = UUID.randomUUID().toString(); - Integer majorVersion3 = majorVersion1 + 1; - Integer minorVersion3 = 0; ExplorationData explorationData3 = new ExplorationData(); explorationData3.setUuid(uuid1); - explorationData3.setMajorVersion(majorVersion3); - explorationData3.setMinorVersion(minorVersion3); + explorationData3.setVersion("6.0"); explorationData3.setDescription(description3); database.pushElement(explorationData3); Map<String, String> properties = new HashMap<String, String>(); properties.put(DatabaseConstants.KEY_UUID, uuid1); - properties.put(DatabaseConstants.KEY_MAJORVERSION, "5"); + properties.put(DatabaseConstants.KEY_DESCRIPTION, description1); Set<LoggableElement> elements = database.findElementsByProperties( properties, ExplorationData.class); @@ -253,17 +211,14 @@ String description1 = UUID.randomUUID().toString(); String uuid1 = UUID.randomUUID().toString(); - Integer majorVersion1 = 5; - Integer minorVersion1 = 12; ExplorationData explorationData1 = new ExplorationData(); explorationData1.setUuid(uuid1); - explorationData1.setMajorVersion(majorVersion1); - explorationData1.setMinorVersion(minorVersion1); + explorationData1.setVersion("5.12"); explorationData1.setDescription(description1); database.pushElement(explorationData1); database.deleteElement(explorationData1); - assertNull(database.findElement(uuid1, majorVersion1, minorVersion1)); + assertNull(database.findElement(uuid1, new Version("5.12"))); } @@ -271,32 +226,23 @@ String description1 = UUID.randomUUID().toString(); String uuid1 = UUID.randomUUID().toString(); - Integer majorVersion1 = 5; - Integer minorVersion1 = 12; ExplorationData explorationData1 = new ExplorationData(); explorationData1.setUuid(uuid1); - explorationData1.setMajorVersion(majorVersion1); - explorationData1.setMinorVersion(minorVersion1); + explorationData1.setVersion("5.12"); explorationData1.setDescription(description1); database.pushElement(explorationData1); String description2 = UUID.randomUUID().toString(); - Integer majorVersion2 = 5; - Integer minorVersion2 = minorVersion1 + 1; ExplorationData explorationData2 = new ExplorationData(); explorationData2.setUuid(uuid1); - explorationData2.setMajorVersion(majorVersion2); - explorationData2.setMinorVersion(minorVersion2); + explorationData2.setVersion("5.13"); explorationData2.setDescription(description2); database.pushElement(explorationData2); String description3 = UUID.randomUUID().toString(); - Integer majorVersion3 = majorVersion1 + 1; - Integer minorVersion3 = 0; ExplorationData explorationData3 = new ExplorationData(); explorationData3.setUuid(uuid1); - explorationData3.setMajorVersion(majorVersion3); - explorationData3.setMinorVersion(minorVersion3); + explorationData3.setVersion("6.0"); explorationData3.setDescription(description3); database.pushElement(explorationData3);