r64 - trunk/simexplorer-si-storage/src/test/fr/cemagref/simexplorer/is/storage/test - Simexplorer-si-commits

11 Dec 2007

Author: glandais
Date: 2007-12-11 17:07:52 +0000 (Tue, 11 Dec 2007)
New Revision: 64

Modified:
   trunk/simexplorer-si-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseTestCase.java
Log:
Maintenance

Modified: trunk/simexplorer-si-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseTestCase.java
===================================================================

--- trunk/simexplorer-si-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseTestCase.java	2007-12-11 17:07:26 UTC (rev 63)
+++ trunk/simexplorer-si-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseTestCase.java	2007-12-11 17:07:52 UTC (rev 64)
@@ -13,18 +13,20 @@
 import java.util.UUID;
 
 import junit.framework.TestCase;
+import fr.cemagref.simexplorer.is.storage.database.Database;
 import fr.cemagref.simexplorer.is.storage.database.lucene.LuceneDatabase;
 import fr.cemagref.simexplorer.is.storage.entities.metadata.MetaDataEntity;
 import fr.cemagref.simexplorer.is.storage.entities.metadata.Version;
 
 public class LuceneDatabaseTestCase extends TestCase {
 
-    private LuceneDatabase database;
+    private Database database;
     // private ElementGenerator elementGenerator;
     private Random r = new Random();
 
     protected void setUp() throws Exception {
         super.setUp();
+
         database = new LuceneDatabase();
         database.open();
         // elementGenerator = new ElementGenerator();
@@ -68,6 +70,7 @@
                     .toString());
         }
         me.setDescriptors(descriptors);
+        me.setAttachments(new HashMap<String, String>());
         me.setParentData(null);
         me.setParentVersion(null);
 
@@ -93,14 +96,48 @@
 
     public void testInsertElementGetElement() throws Exception {
         MetaDataEntity me = generateMetaDataEntity();
-        database.insertElement(me);
+        database.insertElement(me, new ArrayList<Reader>());
         MetaDataEntity me2 = database.getElement(me.getUuid(), me.getVersion());
         assertEquals(me.getDescription(), me2.getDescription());
+        database.insertElement(me, new ArrayList<Reader>());
     }
 
+    public void testInsertElementGetElementExtra() throws Exception {
+        int c = 10;
+        Date begin = new Date();
+        List<String> ids = new ArrayList<String>();
+        for (int i = 0; i < c; i++) {
+            MetaDataEntity[] mes = generateVersionnedMetaDataEntity();
+            for (int j = 0; j < mes.length; j++) {
+                database.insertElement(mes[j], new ArrayList<Reader>(), false);
+            }
+            ids.add(mes[0].getUuid());
+        }
+        database.commit();
+
+        Date end = new Date();
+        long time = end.getTime() - begin.getTime();
+        System.out.println("Insert : Time taken : " + time + "ms");
+        double timePerElement = time / (4 * c);
+        System.out.println("Insert : Time taken per element : "
+                + timePerElement + "ms");
+        begin = new Date();
+
+        for (String uuid : ids) {
+            MetaDataEntity me = database.getElementLatestVersion(uuid);
+            assertEquals(uuid, me.getUuid());
+        }
+
+        end = new Date();
+        time = end.getTime() - begin.getTime();
+        System.out.println("Search : Time taken : " + time + "ms");
+        timePerElement = time / (4 * c);
+        System.out.println("Search : Time taken per element : "
+                + timePerElement + "ms");
+    }
+
     public void testIndexAddFindElementsByContentSearch() throws Exception {
         MetaDataEntity me = generateMetaDataEntity();
-        database.insertElement(me);
 
         String keyphrase = Long.toHexString(r.nextLong());
 
@@ -109,7 +146,8 @@
 
         List<Reader> readers = new ArrayList<Reader>();
         readers.add(reader);
-        database.indexAdd(me, readers);
+        
+        database.insertElement(me, readers);
 
         Set<MetaDataEntity> mes = database
                 .findElementsByContentSearch(keyphrase);
@@ -120,7 +158,7 @@
     public void testGetVersions() throws Exception {
         MetaDataEntity[] mes = generateVersionnedMetaDataEntity();
         for (int i = 0; i < mes.length; i++) {
-            database.insertElement(mes[i]);
+            database.insertElement(mes[i], new ArrayList<Reader>());
         }
         List<Version> versions = database.getVersions(mes[0].getUuid());
         assertEquals(mes.length, versions.size());
@@ -134,15 +172,17 @@
     public void testFindElementsById() throws Exception {
         MetaDataEntity[] mes = generateVersionnedMetaDataEntity();
         for (int i = 0; i < mes.length; i++) {
-            database.insertElement(mes[i]);
+            database.insertElement(mes[i], new ArrayList<Reader>());
         }
         Set<MetaDataEntity> elements = database.findElementsById(mes[0]
                 .getUuid());
         assertEquals(elements.size(), mes.length);
     }
 
-    public void testFindElementsByProperties() {
-        fail("Not yet implemented");
+    public void testFindElementsByProperties() throws Exception {
+        MetaDataEntity me = generateMetaDataEntity();
+
+        database.insertElement(me, new ArrayList<Reader>());
     }
 
     public void testDeleteElements() {

    

r64 - trunk/simexplorer-si-storage/src/test/fr/cemagref/simexplorer/is/storage/test

glandais＠users.labs.libre-entreprise.org

tags

participants (1)