You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2015/06/11 17:24:22 UTC

[02/11] incubator-taverna-language git commit: Test RoEvoSerializer

Test RoEvoSerializer


Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/fe8ad277
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/fe8ad277
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/fe8ad277

Branch: refs/heads/wfdesc-jena
Commit: fe8ad277ddc5a3a2a6f878d66da04882cfceccf6
Parents: e116209
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Feb 26 22:00:43 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Jun 5 22:52:22 2015 +0100

----------------------------------------------------------------------
 .../scufl2/wfdesc/TestRoEvoSerializer.java      | 26 +++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/fe8ad277/taverna-scufl2-wfdesc/src/test/java/org/apache/taverna/scufl2/wfdesc/TestRoEvoSerializer.java
----------------------------------------------------------------------
diff --git a/taverna-scufl2-wfdesc/src/test/java/org/apache/taverna/scufl2/wfdesc/TestRoEvoSerializer.java b/taverna-scufl2-wfdesc/src/test/java/org/apache/taverna/scufl2/wfdesc/TestRoEvoSerializer.java
index 1e757ad..afe8cd5 100644
--- a/taverna-scufl2-wfdesc/src/test/java/org/apache/taverna/scufl2/wfdesc/TestRoEvoSerializer.java
+++ b/taverna-scufl2-wfdesc/src/test/java/org/apache/taverna/scufl2/wfdesc/TestRoEvoSerializer.java
@@ -21,9 +21,12 @@ package org.apache.taverna.scufl2.wfdesc;
 */
 
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
+import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -31,10 +34,14 @@ import java.io.InputStream;
 import org.apache.taverna.scufl2.api.container.WorkflowBundle;
 import org.apache.taverna.scufl2.api.io.ReaderException;
 import org.apache.taverna.scufl2.api.io.WorkflowBundleIO;
-import org.apache.taverna.scufl2.wfdesc.ROEvoSerializer;
+import org.apache.taverna.scufl2.wfdesc.ontologies.Prov_o;
 import org.junit.Before;
 import org.junit.Test;
 
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.rdf.model.Resource;
+
 
 public class TestRoEvoSerializer {
 	private static final String HELLOWORLD_T2FLOW = "helloanyone.t2flow";
@@ -50,15 +57,28 @@ public class TestRoEvoSerializer {
 		assertNotNull(helloStream);
 		helloWorld = io.readBundle(helloStream, "application/vnd.taverna.t2flow+xml");
 		assertNotNull(helloWorld);
+		assertEquals("/2010/workflow/01348671-5aaa-4cc2-84cc-477329b70b0d/",
+				helloWorld.getMainWorkflow().getIdentifier().getPath());
 	}
 	
-	
 	@Test
 	public void workflowUUIDs() throws Exception {
 		ByteArrayOutputStream os = new ByteArrayOutputStream();
 		roEvo.workflowHistory(helloWorld.getMainWorkflow(), os);
+		System.out.write(os.toByteArray());
 		assertTrue(500 < os.size());
-		assertTrue(os.toString("UTF-8").indexOf(" a roevo:VersionableResource , prov:Entity ;") > 0);
+		String ttl = os.toString("UTF-8");
+		assertTrue(ttl.contains("01348671-5aaa-4cc2-84cc-477329b70b0d"));
+		assertTrue(ttl.contains("VersionableResource"));
+		assertTrue(ttl.contains("Entity"));
+		
+		OntModel m = ModelFactory.createOntologyModel();
+		m.read(new ByteArrayInputStream(os.toByteArray()), "http://example.com/", "Turtle");
+		Resource mainWf = m.getResource(helloWorld.getMainWorkflow().getIdentifier().toASCIIString());		
+		Resource older = mainWf.getProperty(Prov_o.wasRevisionOf).getResource();
+		Resource oldest = older.getProperty(Prov_o.wasRevisionOf).getResource();
+		assertNull(oldest.getProperty(Prov_o.wasRevisionOf));
+		
 	}
 	
 }