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/02/17 12:17:54 UTC
[38/52] [abbrv] incubator-taverna-language git commit: Stop tests
from being quite so chatty on stdout.
Stop tests from being quite so chatty on stdout.
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/2602a85b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/2602a85b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/2602a85b
Branch: refs/heads/master
Commit: 2602a85bc728f5f15e40d9a4fd31c9afb536c31c
Parents: 414cd6a
Author: Donal Fellows <do...@manchester.ac.uk>
Authored: Thu Feb 12 13:45:00 2015 +0000
Committer: Donal Fellows <do...@manchester.ac.uk>
Committed: Thu Feb 12 13:45:00 2015 +0000
----------------------------------------------------------------------
.../taverna/scufl2/wfdesc/TestAllTypes.java | 29 ++++++++++++--------
.../scufl2/wfdesc/TestAnnotationQuoting.java | 4 +--
.../taverna/scufl2/wfdesc/TestNested.java | 23 ++++++++++------
.../scufl2/wfdesc/TestRoEvoSerializer.java | 10 +++++--
.../scufl2/wfdesc/TestSemanticAnnotations.java | 2 +-
5 files changed, 41 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/2602a85b/taverna-scufl2-wfdesc/src/test/java/org/apache/taverna/scufl2/wfdesc/TestAllTypes.java
----------------------------------------------------------------------
diff --git a/taverna-scufl2-wfdesc/src/test/java/org/apache/taverna/scufl2/wfdesc/TestAllTypes.java b/taverna-scufl2-wfdesc/src/test/java/org/apache/taverna/scufl2/wfdesc/TestAllTypes.java
index 186e088..8448965 100644
--- a/taverna-scufl2-wfdesc/src/test/java/org/apache/taverna/scufl2/wfdesc/TestAllTypes.java
+++ b/taverna-scufl2-wfdesc/src/test/java/org/apache/taverna/scufl2/wfdesc/TestAllTypes.java
@@ -65,7 +65,7 @@ public class TestAllTypes {
allTypesWfdesc = File.createTempFile("scufl2-wfdesc", ".ttl");
allTypesWfdesc.delete();
// allTypesWfdesc.deleteOnExit();
- System.out.println(allTypesWfdesc);
+ // System.out.println(allTypesWfdesc);
}
@Test
@@ -111,17 +111,18 @@ public class TestAllTypes {
oldWf = wf;
}
String proc = binding.path("proc").path("value").asText();
+ assertNotNull(proc);
String procType = binding.path("procType").path("value").asText();
String procTypeShort = null;
- if (procType != null) {
- procTypeShort = URI.create(procType).getFragment();
- } else {
- System.err.println("No type for " + proc);
- }
+ if (procType == null)
+ continue;
+ procTypeShort = URI.create(procType).getFragment();
+ assertNotNull(procTypeShort);
String procLabel = binding.path("procLabel").path("value").asText();
- System.out.println(" Processor " + procLabel + " (" + procTypeShort
- + ")");
- System.out.println(" " + proc + " " + procType);
+ assertNotNull(procLabel);
+ //System.out.println(" Processor " + procLabel + " (" + procTypeShort
+ // + ")");
+ //System.out.println(" " + proc + " " + procType);
}
out.reset();
@@ -152,13 +153,17 @@ public class TestAllTypes {
}
String fromProcLabel = binding.path("fromProcLabel").path("value")
.asText();
+ assertNotNull(fromProcLabel);
String toProcLabel = binding.path("toProcLabel").path("value")
.asText();
+ assertNotNull(toProcLabel);
String fromProc = binding.path("fromProc").path("value").asText();
+ assertNotNull(fromProc);
String toProc = binding.path("toProc").path("value").asText();
- System.out.print(" " + fromProcLabel);
- System.out.println(" -> " + toProcLabel);
- System.out.println(" " + fromProc + " -> " + toProc);
+ assertNotNull(toProc);
+ //System.out.print(" " + fromProcLabel);
+ //System.out.println(" -> " + toProcLabel);
+ //System.out.println(" " + fromProc + " -> " + toProc);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/2602a85b/taverna-scufl2-wfdesc/src/test/java/org/apache/taverna/scufl2/wfdesc/TestAnnotationQuoting.java
----------------------------------------------------------------------
diff --git a/taverna-scufl2-wfdesc/src/test/java/org/apache/taverna/scufl2/wfdesc/TestAnnotationQuoting.java b/taverna-scufl2-wfdesc/src/test/java/org/apache/taverna/scufl2/wfdesc/TestAnnotationQuoting.java
index 5b78751..a4021ee 100644
--- a/taverna-scufl2-wfdesc/src/test/java/org/apache/taverna/scufl2/wfdesc/TestAnnotationQuoting.java
+++ b/taverna-scufl2-wfdesc/src/test/java/org/apache/taverna/scufl2/wfdesc/TestAnnotationQuoting.java
@@ -35,10 +35,8 @@ import org.apache.taverna.scufl2.api.io.WriterException;
import org.apache.taverna.scufl2.wfdesc.ROEvoSerializer;
import org.junit.Before;
import org.junit.Test;
-import org.openrdf.query.Binding;
import org.openrdf.query.BindingSet;
import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.Query;
import org.openrdf.query.QueryEvaluationException;
import org.openrdf.query.QueryLanguage;
import org.openrdf.query.TupleQueryResult;
@@ -78,7 +76,7 @@ public class TestAnnotationQuoting {
myRepository.initialize();
RepositoryConnection con = myRepository.getConnection();
String root = "app://600aac93-0ea8-4e9d-9593-081149e31d5a/";
- System.out.write(output.toByteArray());
+ //System.out.write(output.toByteArray());
con.add(new ByteArrayInputStream(output.toByteArray()), root, RDFFormat.TURTLE);
TupleQueryResult results = con.prepareTupleQuery(QueryLanguage.SPARQL,
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/2602a85b/taverna-scufl2-wfdesc/src/test/java/org/apache/taverna/scufl2/wfdesc/TestNested.java
----------------------------------------------------------------------
diff --git a/taverna-scufl2-wfdesc/src/test/java/org/apache/taverna/scufl2/wfdesc/TestNested.java b/taverna-scufl2-wfdesc/src/test/java/org/apache/taverna/scufl2/wfdesc/TestNested.java
index 942d216..4581e2c 100644
--- a/taverna-scufl2-wfdesc/src/test/java/org/apache/taverna/scufl2/wfdesc/TestNested.java
+++ b/taverna-scufl2-wfdesc/src/test/java/org/apache/taverna/scufl2/wfdesc/TestNested.java
@@ -64,7 +64,7 @@ public class TestNested {
nestedWfdesc = File.createTempFile("scufl2-wfdesc", ".ttl");
nestedWfdesc.delete();
// allTypesWfdesc.deleteOnExit();
- System.out.println(nestedWfdesc);
+ // System.out.println(nestedWfdesc);
}
@Test
@@ -112,15 +112,18 @@ public class TestNested {
oldWf = wf;
}
String proc = binding.path("proc").path("value").asText();
+ assertNotNull(proc);
String procType = binding.path("procType").path("value").asText();
String procTypeshort = null;
if (procType != null) {
procTypeshort = URI.create(procType).getFragment();
}
String procLabel = binding.path("procLabel").path("value").asText();
- System.out.println(" Processor " + procLabel + " (" + procTypeshort
- + ")");
- System.out.println(" " + proc + " " + procType);
+ assertNotNull(procLabel);
+ assertNotNull(procTypeshort);
+ //System.out.println(" Processor " + procLabel + " (" + procTypeshort
+ // + ")");
+ //System.out.println(" " + proc + " " + procType);
}
out.reset();
@@ -146,18 +149,22 @@ public class TestNested {
for (JsonNode binding : jsonNode.path("results").path("bindings")) {
String wf = binding.path("wf").path("value").asText();
if (!wf.equals(oldWf)) {
- System.out.println(wf);
+ //System.out.println(wf);
oldWf = wf;
}
String fromProcLabel = binding.path("fromProcLabel").path("value")
.asText();
+ assertNotNull(fromProcLabel);
String toProcLabel = binding.path("toProcLabel").path("value")
.asText();
+ assertNotNull(toProcLabel);
String fromProc = binding.path("fromProc").path("value").asText();
+ assertNotNull(fromProc);
String toProc = binding.path("toProc").path("value").asText();
- System.out.print(" " + fromProcLabel);
- System.out.println(" -> " + toProcLabel);
- System.out.println(" " + fromProc + " -> " + toProc);
+ assertNotNull(toProc);
+ //System.out.print(" " + fromProcLabel);
+ //System.out.println(" -> " + toProcLabel);
+ //System.out.println(" " + fromProc + " -> " + toProc);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/2602a85b/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 e8fdb4b..1e757ad 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
@@ -22,7 +22,9 @@ package org.apache.taverna.scufl2.wfdesc;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -52,9 +54,11 @@ public class TestRoEvoSerializer {
@Test
- public void workflowUUIDs() throws Exception {
- roEvo.workflowHistory(helloWorld.getMainWorkflow(), System.out);
-
+ public void workflowUUIDs() throws Exception {
+ ByteArrayOutputStream os = new ByteArrayOutputStream();
+ roEvo.workflowHistory(helloWorld.getMainWorkflow(), os);
+ assertTrue(500 < os.size());
+ assertTrue(os.toString("UTF-8").indexOf(" a roevo:VersionableResource , prov:Entity ;") > 0);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/2602a85b/taverna-scufl2-wfdesc/src/test/java/org/apache/taverna/scufl2/wfdesc/TestSemanticAnnotations.java
----------------------------------------------------------------------
diff --git a/taverna-scufl2-wfdesc/src/test/java/org/apache/taverna/scufl2/wfdesc/TestSemanticAnnotations.java b/taverna-scufl2-wfdesc/src/test/java/org/apache/taverna/scufl2/wfdesc/TestSemanticAnnotations.java
index 7e89932..666ed9f 100644
--- a/taverna-scufl2-wfdesc/src/test/java/org/apache/taverna/scufl2/wfdesc/TestSemanticAnnotations.java
+++ b/taverna-scufl2-wfdesc/src/test/java/org/apache/taverna/scufl2/wfdesc/TestSemanticAnnotations.java
@@ -58,7 +58,7 @@ public class TestSemanticAnnotations {
public File tempFile() throws IOException {
File bundleFile = File.createTempFile("wfdesc", ".ttl");
// bundleFile.deleteOnExit();
- System.out.println(bundleFile);
+ //System.out.println(bundleFile);
return bundleFile;
}