T3-1226 fixed in SCUFL2 0.14.1-SNAPSHOT
diff --git a/pom.xml b/pom.xml
index 61d8516..37b63c2 100755
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
<name>SCUFL2 to wfdesc</name>
<description>Convert Scufl2 workflow to wfdesc structure (from Wf4Ever RO ontology)</description>
<properties>
- <scufl2.version>0.14.0</scufl2.version>
+ <scufl2.version>0.14.1-SNAPSHOT</scufl2.version>
<elmo.version>1.5</elmo.version>
<sesame.version>2.2.4</sesame.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/src/test/java/org/purl/wf4ever/wfdesc/scufl/TestAnnotationQuoting.java b/src/test/java/org/purl/wf4ever/wfdesc/scufl/TestAnnotationQuoting.java
index b7a1dc8..4d25bcc 100644
--- a/src/test/java/org/purl/wf4ever/wfdesc/scufl/TestAnnotationQuoting.java
+++ b/src/test/java/org/purl/wf4ever/wfdesc/scufl/TestAnnotationQuoting.java
@@ -57,7 +57,7 @@
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,
@@ -66,15 +66,17 @@
"PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> " +
"PREFIX roterms: <http://purl.org/wf4ever/roterms#> " +
"PREFIX dc: <http://purl.org/dc/elements/1.1/> " +
+ "PREFIX dcterms: <http://purl.org/dc/terms/> " +
"PREFIX biocat: <http://biocatalogue.org/attribute/> " +
- "SELECT ?author ?title ?desc ?portDesc ?example " +
+ "SELECT ?author ?title ?desc ?portDesc ?example " +
"WHERE { " +
"?wf a wfdesc:Workflow ; " +
- " dc:title ?title ; " +
- " dc:description ?desc ; " +
+ " dc:creator ?author ; " +
+ " dcterms:title ?title ; " +
+ " dcterms:description ?desc ; " +
" wfdesc:hasInput ?in . " +
"?in a wfdesc:Input ; " +
- " dc:description ?portDesc ; " +
+ " dcterms:description ?portDesc ; " +
" biocat:exampleData ?example . " +
"}").evaluate();
@@ -86,8 +88,8 @@
assertEquals("T3-1226 test with 'single quote'", bind.getValue("title").stringValue());
// Note: The quotes below are only escaped in this Java source code
assertEquals("This comment contains \"\"\"triple quotes\"\"\" inside.", bind.getValue("desc").stringValue());
- assertEquals("\"quote at the start", "portDesc");
- assertEquals("quote at the end\"", "example");
+ assertEquals("\"quote at the start", bind.getValue("portDesc").stringValue());
+ assertEquals("quote at the end\"", bind.getValue("example").stringValue());
}
