r229 - in trunk/simexplorer-is-storage/src: java/fr/cemagref/simexplorer/is/storage test/fr/cemagref/simexplorer/is/storage/test - Simexplorer-si-commits

20 Jan 2008

Author: tchemit
Date: 2008-01-20 11:51:57 +0000 (Sun, 20 Jan 2008)
New Revision: 229

Added:
   trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/MetaDataGenerator.java
Removed:
   trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/MetaDataGenerator.java
Modified:
   trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseLoadTestCase.java
   trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseTestCase.java
   trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseThread.java
Log:
deplacement du g?\195?\169n?\195?\169rateur de meta donn?\195?\169es pour pouvoir l'utiliser dans le service bouchon?\195?\169

Copied: trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/MetaDataGenerator.java (from rev 227, trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/MetaDataGenerator.java)
===================================================================

--- trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/MetaDataGenerator.java	                        (rev 0)
+++ trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/MetaDataGenerator.java	2008-01-20 11:51:57 UTC (rev 229)
@@ -0,0 +1,95 @@
+package fr.cemagref.simexplorer.is.storage;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Random;
+import java.util.UUID;
+
+import fr.cemagref.simexplorer.is.contenttype.ContentType;
+import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity;
+import fr.cemagref.simexplorer.is.entities.metadata.Version;
+
+public class MetaDataGenerator {
+
+    Random r = new Random();
+
+    /*
+     * private static boolean descriptorFieldsInit = false; private static
+     * String[] descriptorFields;
+     * 
+     * private static void generateDescriptors() { descriptorFields = new
+     * String[10]; for (int i = 0; i < descriptorFields.length; i++) {
+     * descriptorFields[i] = "descriptor" + i; } }
+     */
+
+    public MetaDataEntity generateMetaDataEntity(String uuid, Version version,
+            MetaDataEntity parentVersion, MetaDataEntity parentData) {
+        MetaDataEntity me = generateMetaDataEntity(uuid, version, parentVersion);
+        if (parentData != null) {
+            me.setParentDataUuid(parentData.getUuid());
+            me.setParentDataVersion(parentData.getVersion().toString());
+        }
+        return me;
+    }
+
+    public MetaDataEntity generateMetaDataEntity(String uuid, Version version,
+            MetaDataEntity parentVersion) {
+        MetaDataEntity me = generateMetaDataEntity(uuid, version);
+
+        if (parentVersion != null) {
+            me.setParentVersionUuid(parentVersion.getUuid());
+            me.setParentVersionVersion(parentVersion.getVersion().toString());
+            parentVersion.setLatest(false);
+        }
+        me.setLatest(true);
+
+        return me;
+    }
+
+    public MetaDataEntity generateMetaDataEntity(String uuid, Version version) {
+        MetaDataEntity me = new MetaDataEntity();
+
+        me.setUuid(uuid);
+        me.setName(uuid);
+        me.setType("LuceneDatabaseTestCase");
+        me.setDescription(uuid + " " + version.toString());
+        me.setVersion(version.toString());
+        me.setLatest(true);
+        me.setCreationDate(new Date());
+        me.setHash(UUID.randomUUID().toString());
+
+        Map<String, String> descriptors = new HashMap<String, String>();
+        descriptors.put("overallId", uuid);
+        int i = 5 + r.nextInt(10);
+        for (int j = 0; j < i; j++) {
+            descriptors.put("descriptor" + j, UUID.randomUUID().toString());
+        }
+        me.setDescriptors(descriptors);
+        me.setAttachments(new HashMap<String, ContentType>());
+        me.setParentDataUuid(null);
+        me.setParentDataVersion(null);
+        me.setParentVersionUuid(null);
+        me.setParentVersionVersion(null);
+
+        return me;
+    }
+
+    public MetaDataEntity generateMetaDataEntity() {
+        return generateMetaDataEntity(UUID.randomUUID().toString(),
+                new Version("1.0"));
+    }
+
+    public MetaDataEntity[] generateVersionnedMetaDataEntity() {
+        String uuid = UUID.randomUUID().toString();
+
+        MetaDataEntity[] mes = new MetaDataEntity[4];
+        mes[0] = generateMetaDataEntity(uuid, new Version("1.0"));
+        mes[1] = generateMetaDataEntity(uuid, new Version("1.1"), mes[0]);
+        mes[2] = generateMetaDataEntity(uuid, new Version("1.2"), mes[1]);
+        mes[3] = generateMetaDataEntity(uuid, new Version("2.0"), mes[2]);
+
+        return mes;
+    }
+
+}

Modified: trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseLoadTestCase.java
===================================================================
--- trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseLoadTestCase.java	2008-01-20 11:51:03 UTC (rev 228)
+++ trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseLoadTestCase.java	2008-01-20 11:51:57 UTC (rev 229)
@@ -12,6 +12,7 @@
 import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity;
 import fr.cemagref.simexplorer.is.storage.database.Database;
 import fr.cemagref.simexplorer.is.storage.database.lucene.LuceneDatabase;
+import fr.cemagref.simexplorer.is.storage.MetaDataGenerator;
 
 public class LuceneDatabaseLoadTestCase extends TestCase {
 

Modified: trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseTestCase.java
===================================================================
--- trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseTestCase.java	2008-01-20 11:51:03 UTC (rev 228)
+++ trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseTestCase.java	2008-01-20 11:51:57 UTC (rev 229)
@@ -13,6 +13,7 @@
 import fr.cemagref.simexplorer.is.entities.metadata.Version;
 import fr.cemagref.simexplorer.is.storage.database.Database;
 import fr.cemagref.simexplorer.is.storage.database.lucene.LuceneDatabase;
+import fr.cemagref.simexplorer.is.storage.MetaDataGenerator;
 
 public class LuceneDatabaseTestCase extends TestCase {
 

Modified: trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseThread.java
===================================================================
--- trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseThread.java	2008-01-20 11:51:03 UTC (rev 228)
+++ trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseThread.java	2008-01-20 11:51:57 UTC (rev 229)
@@ -7,6 +7,7 @@
 
 import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity;
 import fr.cemagref.simexplorer.is.storage.database.Database;
+import fr.cemagref.simexplorer.is.storage.MetaDataGenerator;
 
 public class LuceneDatabaseThread extends Thread {
 

Deleted: trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/MetaDataGenerator.java
===================================================================
--- trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/MetaDataGenerator.java	2008-01-20 11:51:03 UTC (rev 228)
+++ trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/MetaDataGenerator.java	2008-01-20 11:51:57 UTC (rev 229)
@@ -1,95 +0,0 @@
-package fr.cemagref.simexplorer.is.storage.test;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Random;
-import java.util.UUID;
-
-import fr.cemagref.simexplorer.is.contenttype.ContentType;
-import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity;
-import fr.cemagref.simexplorer.is.entities.metadata.Version;
-
-public class MetaDataGenerator {
-
-    Random r = new Random();
-
-    /*
-     * private static boolean descriptorFieldsInit = false; private static
-     * String[] descriptorFields;
-     * 
-     * private static void generateDescriptors() { descriptorFields = new
-     * String[10]; for (int i = 0; i < descriptorFields.length; i++) {
-     * descriptorFields[i] = "descriptor" + i; } }
-     */
-
-    public MetaDataEntity generateMetaDataEntity(String uuid, Version version,
-            MetaDataEntity parentVersion, MetaDataEntity parentData) {
-        MetaDataEntity me = generateMetaDataEntity(uuid, version, parentVersion);
-        if (parentData != null) {
-            me.setParentDataUuid(parentData.getUuid());
-            me.setParentDataVersion(parentData.getVersion().toString());
-        }
-        return me;
-    }
-
-    public MetaDataEntity generateMetaDataEntity(String uuid, Version version,
-            MetaDataEntity parentVersion) {
-        MetaDataEntity me = generateMetaDataEntity(uuid, version);
-
-        if (parentVersion != null) {
-            me.setParentVersionUuid(parentVersion.getUuid());
-            me.setParentVersionVersion(parentVersion.getVersion().toString());
-            parentVersion.setLatest(false);
-        }
-        me.setLatest(true);
-
-        return me;
-    }
-
-    public MetaDataEntity generateMetaDataEntity(String uuid, Version version) {
-        MetaDataEntity me = new MetaDataEntity();
-
-        me.setUuid(uuid);
-        me.setName(uuid);
-        me.setType("LuceneDatabaseTestCase");
-        me.setDescription(uuid + " " + version.toString());
-        me.setVersion(version.toString());
-        me.setLatest(true);
-        me.setCreationDate(new Date());
-        me.setHash(UUID.randomUUID().toString());
-
-        Map<String, String> descriptors = new HashMap<String, String>();
-        descriptors.put("overallId", uuid);
-        int i = 5 + r.nextInt(10);
-        for (int j = 0; j < i; j++) {
-            descriptors.put("descriptor" + j, UUID.randomUUID().toString());
-        }
-        me.setDescriptors(descriptors);
-        me.setAttachments(new HashMap<String, ContentType>());
-        me.setParentDataUuid(null);
-        me.setParentDataVersion(null);
-        me.setParentVersionUuid(null);
-        me.setParentVersionVersion(null);
-
-        return me;
-    }
-
-    public MetaDataEntity generateMetaDataEntity() {
-        return generateMetaDataEntity(UUID.randomUUID().toString(),
-                new Version("1.0"));
-    }
-
-    public MetaDataEntity[] generateVersionnedMetaDataEntity() {
-        String uuid = UUID.randomUUID().toString();
-
-        MetaDataEntity[] mes = new MetaDataEntity[4];
-        mes[0] = generateMetaDataEntity(uuid, new Version("1.0"));
-        mes[1] = generateMetaDataEntity(uuid, new Version("1.1"), mes[0]);
-        mes[2] = generateMetaDataEntity(uuid, new Version("1.2"), mes[1]);
-        mes[3] = generateMetaDataEntity(uuid, new Version("2.0"), mes[2]);
-
-        return mes;
-    }
-
-}

    

r229 - in trunk/simexplorer-is-storage/src: java/fr/cemagref/simexplorer/is/storage test/fr/cemagref/simexplorer/is/storage/test

tchemit＠users.labs.libre-entreprise.org

tags

participants (1)