Author: glandais Date: 2008-03-20 16:43:31 +0000 (Thu, 20 Mar 2008) New Revision: 1432 Modified: trunk/simexplorer-is/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabaseTestCase.java Log: Updating tests Modified: trunk/simexplorer-is/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabaseTestCase.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabaseTestCase.java 2008-03-20 16:43:11 UTC (rev 1431) +++ trunk/simexplorer-is/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabaseTestCase.java 2008-03-20 16:43:31 UTC (rev 1432) @@ -36,7 +36,8 @@ import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.storage.MetaDataGenerator; import fr.cemagref.simexplorer.is.storage.SearchColumn; -import fr.cemagref.simexplorer.is.storage.database.Database; +import fr.cemagref.simexplorer.is.storage.SortColumn; +import fr.cemagref.simexplorer.is.storage.SortOrder; import fr.cemagref.simexplorer.is.storage.util.Config; /** @@ -48,8 +49,8 @@ private static final Log log = LogFactory.getLog(LuceneDatabaseTestCase.class); /** The database. */ - private Database database; - // private ElementGenerator elementGenerator; + private LuceneDatabase database; + /** The mdg. */ private MetaDataGenerator mdg = new MetaDataGenerator(); @@ -65,7 +66,6 @@ Config.setPropertiesLocation("/properties/testConfig.properties"); database = new LuceneDatabase(); database.open(true); - // elementGenerator = new ElementGenerator(); } /* (non-Javadoc) @@ -86,10 +86,15 @@ MetaData me = mdg.generateMetaDataEntity(); database.insertElement(me, new ArrayList<Reader>(), new ArrayList<Attachment>(), new ArrayList<Descriptor>()); database.commit(); + MetaData me2 = database.getElement(me.getUuid(), me.getVersion()); - assertEquals(me.getDescription(), me2.getDescription()); + assertEquals(me, me2); + database.insertElement(me, new ArrayList<Reader>(), new ArrayList<Attachment>(), new ArrayList<Descriptor>()); database.commit(); + + me2 = database.getElement(me.getUuid(), me.getVersion()); + assertEquals(me, me2); } /** @@ -110,9 +115,12 @@ database.insertElement(me, readers, new ArrayList<Attachment>(), new ArrayList<Descriptor>()); database.commit(); - int mesCount = database.findElementsByContentSearchCount(keyphrase, SearchColumn.AllFields, true); + + List<MetaData> findElementsByContentSearch = database.findElementsByContentSearch(keyphrase, SearchColumn.AllFields, true, 0, 1, SortColumn.None, SortOrder.Ascending); - assertEquals(1, mesCount); + assertEquals(1, findElementsByContentSearch.size()); + assertEquals(me, findElementsByContentSearch.get(0)); + } /**