Author: glandais Date: 2007-12-20 16:55:29 +0000 (Thu, 20 Dec 2007) New Revision: 79 Added: trunk/simexplorer-si-storage/src/ressources/ trunk/simexplorer-si-storage/src/ressources/testImport/ trunk/simexplorer-si-storage/src/ressources/testImport/data.xml trunk/simexplorer-si-storage/src/ressources/testImport/test.zip trunk/simexplorer-si-storage/src/test/fr/cemagref/simexplorer/is/storage/test/service/ trunk/simexplorer-si-storage/src/test/fr/cemagref/simexplorer/is/storage/test/service/StorageServiceTest.java Modified: trunk/simexplorer-si-storage/src/test/fr/cemagref/simexplorer/is/storage/test/ElementGenerator.java trunk/simexplorer-si-storage/src/test/fr/cemagref/simexplorer/is/storage/test/MetaDataGenerator.java Log: Tests update Service test case Added: trunk/simexplorer-si-storage/src/ressources/testImport/data.xml =================================================================== --- trunk/simexplorer-si-storage/src/ressources/testImport/data.xml (rev 0) +++ trunk/simexplorer-si-storage/src/ressources/testImport/data.xml 2007-12-20 16:55:29 UTC (rev 79) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<data> + <metadata> + <uuid>abcd</uuid> + <version>1.0</version> + </metadata> +</data> \ No newline at end of file Added: trunk/simexplorer-si-storage/src/ressources/testImport/test.zip =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-si-storage/src/ressources/testImport/test.zip ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/simexplorer-si-storage/src/test/fr/cemagref/simexplorer/is/storage/test/ElementGenerator.java =================================================================== --- trunk/simexplorer-si-storage/src/test/fr/cemagref/simexplorer/is/storage/test/ElementGenerator.java 2007-12-20 16:55:00 UTC (rev 78) +++ trunk/simexplorer-si-storage/src/test/fr/cemagref/simexplorer/is/storage/test/ElementGenerator.java 2007-12-20 16:55:29 UTC (rev 79) @@ -52,7 +52,7 @@ Set<T> elements = new HashSet<T>(); int i = 1 + r.nextInt(2); for (int j = 0; j < i; j++) { - T element = BaseEntityFactory.getFactory(clazz).createInstance(); + T element = (T) BaseEntityFactory.getFactory(clazz).createInstance(); if (element instanceof LoggableElement) { update((LoggableElement) element); } Modified: trunk/simexplorer-si-storage/src/test/fr/cemagref/simexplorer/is/storage/test/MetaDataGenerator.java =================================================================== --- trunk/simexplorer-si-storage/src/test/fr/cemagref/simexplorer/is/storage/test/MetaDataGenerator.java 2007-12-20 16:55:00 UTC (rev 78) +++ trunk/simexplorer-si-storage/src/test/fr/cemagref/simexplorer/is/storage/test/MetaDataGenerator.java 2007-12-20 16:55:29 UTC (rev 79) @@ -6,6 +6,7 @@ import java.util.Random; import java.util.UUID; +import fr.cemagref.simexplorer.is.storage.attachment.Content; import fr.cemagref.simexplorer.is.storage.entities.metadata.MetaDataEntity; import fr.cemagref.simexplorer.is.storage.entities.metadata.Version; @@ -62,7 +63,7 @@ descriptors.put("descriptor" + j, UUID.randomUUID().toString()); } me.setDescriptors(descriptors); - me.setAttachments(new HashMap<String, String>()); + me.setAttachments(new HashMap<String, Content>()); me.setParentDataUuid(null); me.setParentDataVersion(null); me.setParentVersionUuid(null); Added: trunk/simexplorer-si-storage/src/test/fr/cemagref/simexplorer/is/storage/test/service/StorageServiceTest.java =================================================================== --- trunk/simexplorer-si-storage/src/test/fr/cemagref/simexplorer/is/storage/test/service/StorageServiceTest.java (rev 0) +++ trunk/simexplorer-si-storage/src/test/fr/cemagref/simexplorer/is/storage/test/service/StorageServiceTest.java 2007-12-20 16:55:29 UTC (rev 79) @@ -0,0 +1,71 @@ +package fr.cemagref.simexplorer.is.storage.test.service; + +import java.io.ByteArrayInputStream; +import java.io.FileInputStream; +import java.io.InputStream; +import java.util.HashMap; +import java.util.Map; +import java.util.Random; +import java.util.UUID; + +import junit.framework.TestCase; + +import com.healthmarketscience.rmiio.RemoteInputStream; +import com.healthmarketscience.rmiio.RemoteInputStreamServer; +import com.healthmarketscience.rmiio.SimpleRemoteInputStream; + +import fr.cemagref.simexplorer.is.storage.service.StorageService; +import fr.cemagref.simexplorer.is.storage.service.StorageServiceImpl; + +public class StorageServiceTest extends TestCase { + + private StorageService storageService; + private Random r = new Random(); + + protected void setUp() throws Exception { + super.setUp(); + + storageService = new StorageServiceImpl(); + storageService.open(); + } + + protected void tearDown() throws Exception { + super.tearDown(); + storageService.close(); + } + + public void testInsertElementZip() throws Exception { + InputStream zipStream = new FileInputStream( + "./src/ressources/testImport/test.zip"); + RemoteInputStreamServer zipRemoteStream = new SimpleRemoteInputStream( + zipStream); + storageService.saveElement(zipRemoteStream); + storageService.commit(); + assertNotNull(storageService.getMetadata("abcd")); + } + + public void testInsertElementStreams() throws Exception { + String id = UUID.randomUUID().toString(); + + StringBuffer xmlString = new StringBuffer( + "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>"); + xmlString.append("<data>"); + xmlString.append("<metadata>"); + xmlString.append("<uuid>" + id + "</uuid>"); + xmlString.append("<version>1.0</version>"); + xmlString.append("</metadata>"); + xmlString.append("</data>"); + + InputStream xmlStream = new ByteArrayInputStream(xmlString.toString() + .getBytes()); + RemoteInputStreamServer xmlRemoteStream = new SimpleRemoteInputStream( + xmlStream); + + Map<String, RemoteInputStream> attachmentsRemoteStream = new HashMap<String, RemoteInputStream>(); + + storageService.saveElement(xmlRemoteStream, attachmentsRemoteStream); + storageService.commit(); + assertNotNull(storageService.getMetadata(id)); + } + +}