You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by re...@apache.org on 2011/06/22 15:43:08 UTC

svn commit: r1138462 - in /incubator/clerezza/trunk/parent/rdf.web/rdf.web.core: pom.xml src/test/java/org/apache/clerezza/rdf/web/core/BackupAndRestoreTest.java src/test/java/org/apache/clerezza/rdf/web/core/BackupTest.java

Author: reto
Date: Wed Jun 22 13:43:07 2011
New Revision: 1138462

URL: http://svn.apache.org/viewvc?rev=1138462&view=rev
Log:
CLEREZZA-576: Added utility class to restore from backup (with test, not yet a service)

Added:
    incubator/clerezza/trunk/parent/rdf.web/rdf.web.core/src/test/java/org/apache/clerezza/rdf/web/core/BackupAndRestoreTest.java
      - copied, changed from r1138406, incubator/clerezza/trunk/parent/rdf.web/rdf.web.core/src/test/java/org/apache/clerezza/rdf/web/core/BackupTest.java
Removed:
    incubator/clerezza/trunk/parent/rdf.web/rdf.web.core/src/test/java/org/apache/clerezza/rdf/web/core/BackupTest.java
Modified:
    incubator/clerezza/trunk/parent/rdf.web/rdf.web.core/pom.xml

Modified: incubator/clerezza/trunk/parent/rdf.web/rdf.web.core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/rdf.web/rdf.web.core/pom.xml?rev=1138462&r1=1138461&r2=1138462&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/rdf.web/rdf.web.core/pom.xml (original)
+++ incubator/clerezza/trunk/parent/rdf.web/rdf.web.core/pom.xml Wed Jun 22 13:43:07 2011
@@ -40,6 +40,11 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
+			<groupId>org.easymock</groupId>
+			<artifactId>easymock</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
 			<groupId>javax.ws.rs</groupId>
 			<artifactId>jsr311-api</artifactId>
 		</dependency>

Copied: incubator/clerezza/trunk/parent/rdf.web/rdf.web.core/src/test/java/org/apache/clerezza/rdf/web/core/BackupAndRestoreTest.java (from r1138406, incubator/clerezza/trunk/parent/rdf.web/rdf.web.core/src/test/java/org/apache/clerezza/rdf/web/core/BackupTest.java)
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/rdf.web/rdf.web.core/src/test/java/org/apache/clerezza/rdf/web/core/BackupAndRestoreTest.java?p2=incubator/clerezza/trunk/parent/rdf.web/rdf.web.core/src/test/java/org/apache/clerezza/rdf/web/core/BackupAndRestoreTest.java&p1=incubator/clerezza/trunk/parent/rdf.web/rdf.web.core/src/test/java/org/apache/clerezza/rdf/web/core/BackupTest.java&r1=1138406&r2=1138462&rev=1138462&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/rdf.web/rdf.web.core/src/test/java/org/apache/clerezza/rdf/web/core/BackupTest.java (original)
+++ incubator/clerezza/trunk/parent/rdf.web/rdf.web.core/src/test/java/org/apache/clerezza/rdf/web/core/BackupAndRestoreTest.java Wed Jun 22 13:43:07 2011
@@ -37,6 +37,7 @@ import org.apache.clerezza.rdf.core.Type
 import org.apache.clerezza.rdf.core.UriRef;
 import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
 import org.apache.clerezza.rdf.core.access.TcManager;
+import org.apache.clerezza.rdf.core.access.TcProvider;
 import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
 import org.apache.clerezza.rdf.core.impl.TripleImpl;
 import org.apache.clerezza.rdf.core.serializedform.Parser;
@@ -47,6 +48,7 @@ import org.apache.clerezza.rdf.jena.pars
 import org.apache.clerezza.rdf.jena.serializer.JenaSerializerProvider;
 import org.apache.clerezza.rdf.ontologies.RDF;
 import org.apache.clerezza.rdf.web.ontologies.BACKUP;
+import org.easymock.EasyMock;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -56,7 +58,7 @@ import org.junit.Test;
  *
  * @author hasan
  */
-public class BackupTest {
+public class BackupAndRestoreTest {
 
 	private static String testGraphFileName = "test.graph";
 
@@ -151,6 +153,24 @@ public class BackupTest {
 				downloadedBackupContentsGraph, folder);
 	}
 
+	@Test
+	public void restoreFromBackup() throws IOException {
+		byte[] backupData = backup.createBackup();
+		TcProvider tcProvider = EasyMock.createMock(TcProvider.class);
+		tcProvider.deleteTripleCollection(testMGraphUri0);
+		EasyMock.expect(tcProvider.createMGraph(testMGraphUri0)).andReturn(new SimpleMGraph());
+		tcProvider.deleteTripleCollection(testMGraphUri1);
+		EasyMock.expect(tcProvider.createMGraph(testMGraphUri1)).andReturn(new SimpleMGraph());
+		tcProvider.deleteTripleCollection(testGraphUriA);
+		EasyMock.expect(tcProvider.createGraph(EasyMock.eq(testGraphUriA),
+				EasyMock.notNull(TripleCollection.class))).andReturn(new SimpleMGraph().getGraph());
+		EasyMock.replay(tcProvider);
+		Restorer restore = new Restorer();
+		restore.parser = Parser.getInstance();
+		restore.restore(new ByteArrayInputStream(backupData), tcProvider);
+		EasyMock.verify(tcProvider);
+	}
+
 	private void checkDownloadedGraphs(Map<String, TripleCollection> extractedTc,
 			Graph downloadedBackupContentsGraph, String folder) {
 		Assert.assertFalse(extractedTc.isEmpty());