You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2016/11/17 12:05:01 UTC
[1/2] jena git commit: Include local name from manifest in test name.
Repository: jena
Updated Branches:
refs/heads/master d033b3d5b -> b4f615a4a
Include local name from manifest in test name.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/9fc51719
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/9fc51719
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/9fc51719
Branch: refs/heads/master
Commit: 9fc517199b5c99eeded1ecb5646a963f09da79a2
Parents: d033b3d
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Nov 17 11:19:49 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Nov 17 11:19:49 2016 +0000
----------------------------------------------------------------------
.../src/test/java/org/apache/jena/sparql/junit/TestItem.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/9fc51719/jena-arq/src/test/java/org/apache/jena/sparql/junit/TestItem.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/junit/TestItem.java b/jena-arq/src/test/java/org/apache/jena/sparql/junit/TestItem.java
index c6a4c40..eedd64e 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/junit/TestItem.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/junit/TestItem.java
@@ -191,10 +191,12 @@ public class TestItem
}
private String _getName() {
+
Statement s = testResource.getProperty(TestManifest.name) ;
+ String ln = s.getSubject().getLocalName();
if ( s == null )
- return "<<unset>>" ;
- return s.getString() ;
+ return ln+" <<unset>>" ;
+ return "("+ln+") "+s.getString() ;
}
private Resource _getAction() {
[2/2] jena git commit: Allow quad data in qt:data.
Posted by an...@apache.org.
Allow quad data in qt:data.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/b4f615a4
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/b4f615a4
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/b4f615a4
Branch: refs/heads/master
Commit: b4f615a4adb401ffbc4d3321f679e4f043d7e790
Parents: 9fc5171
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Nov 17 11:20:18 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Nov 17 11:20:18 2016 +0000
----------------------------------------------------------------------
.../org/apache/jena/sparql/junit/QueryTest.java | 21 +++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/b4f615a4/jena-arq/src/test/java/org/apache/jena/sparql/junit/QueryTest.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/junit/QueryTest.java b/jena-arq/src/test/java/org/apache/jena/sparql/junit/QueryTest.java
index 519316f..3c81071 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/junit/QueryTest.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/junit/QueryTest.java
@@ -30,6 +30,7 @@ import org.apache.jena.atlas.logging.Log;
import org.apache.jena.graph.Node;
import org.apache.jena.graph.NodeFactory;
import org.apache.jena.query.Dataset;
+import org.apache.jena.query.DatasetFactory;
import org.apache.jena.query.Query;
import org.apache.jena.query.QueryException;
import org.apache.jena.query.QueryExecution;
@@ -48,6 +49,7 @@ import org.apache.jena.rdf.model.StmtIterator;
import org.apache.jena.riot.Lang;
import org.apache.jena.riot.RDFDataMgr;
import org.apache.jena.riot.checker.CheckerLiterals;
+import org.apache.jena.riot.system.IRIResolver;
import org.apache.jena.shared.JenaException;
import org.apache.jena.sparql.SystemARQ;
import org.apache.jena.sparql.core.Var;
@@ -61,7 +63,6 @@ import org.apache.jena.sparql.expr.nodevalue.NodeFunctions;
import org.apache.jena.sparql.resultset.RDFOutput;
import org.apache.jena.sparql.resultset.ResultSetCompare;
import org.apache.jena.sparql.resultset.SPARQLResult;
-import org.apache.jena.sparql.util.DatasetUtils;
import org.apache.jena.sparql.util.IsoMatcher;
import org.apache.jena.sparql.vocabulary.ResultSetGraphVocab;
import org.apache.jena.util.FileUtils;
@@ -157,7 +158,21 @@ public class QueryTest extends EarlTestCase
private static Dataset createDataset(List<String> defaultGraphURIs, List<String> namedGraphURIs)
{
- return DatasetUtils.createDataset(defaultGraphURIs, namedGraphURIs, null) ;
+ // Allow "qt:data" to be quads in defaultGraphURIs.
+ Dataset ds = DatasetFactory.createGeneral();
+ if ( defaultGraphURIs != null ) {
+ for ( String sourceURI : defaultGraphURIs) {
+ RDFDataMgr.read(ds, sourceURI);
+ }
+ }
+ if ( namedGraphURIs != null ) {
+ for ( String sourceURI : namedGraphURIs ) {
+ String absSourceURI = IRIResolver.resolveString(sourceURI) ;
+ Model m = ds.getNamedModel(absSourceURI);
+ RDFDataMgr.read(m, sourceURI);
+ }
+ }
+ return ds;
}
@Override
@@ -260,7 +275,7 @@ public class QueryTest extends EarlTestCase
boolean b2 = resultSetEquivalent(query, resultsExpected, resultsActual) ;
printFailedResultSetTest(query, qe, resultsExpected, resultsActual) ;
}
- assertTrue("Results do not match: "+testItem.getName(), b) ;
+ assertTrue("Results do not match", b) ;
return ;
}