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 2018/05/19 19:27:20 UTC
[11/11] jena git commit: More model-from-dataset tests.
More model-from-dataset tests.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/fe08834d
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/fe08834d
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/fe08834d
Branch: refs/heads/master
Commit: fe08834ded791c243f44fad8988e651064dae040
Parents: 8384d9d
Author: Andy Seaborne <an...@apache.org>
Authored: Sat May 19 20:08:26 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat May 19 20:08:26 2018 +0100
----------------------------------------------------------------------
.../test/assembler/TestDatasetAssembler.java | 20 ++++++++++++++--
.../apache/jena/test/txn/TestDataset2Graph.java | 1 +
.../testing/Assembler/assem_dsg1_inf_tdb1.ttl | 1 -
.../testing/Assembler/assem_dsg1_inf_tdb2.ttl | 1 -
.../testing/Assembler/assem_dsg1_tdb1.ttl | 24 ++++++++++++++++++++
.../testing/Assembler/assem_dsg1_tdb2.ttl | 23 +++++++++++++++++++
6 files changed, 66 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/fe08834d/jena-integration-tests/src/test/java/org/apache/jena/test/assembler/TestDatasetAssembler.java
----------------------------------------------------------------------
diff --git a/jena-integration-tests/src/test/java/org/apache/jena/test/assembler/TestDatasetAssembler.java b/jena-integration-tests/src/test/java/org/apache/jena/test/assembler/TestDatasetAssembler.java
index 31f7db6..5cd1ec3 100644
--- a/jena-integration-tests/src/test/java/org/apache/jena/test/assembler/TestDatasetAssembler.java
+++ b/jena-integration-tests/src/test/java/org/apache/jena/test/assembler/TestDatasetAssembler.java
@@ -114,7 +114,23 @@ public class TestDatasetAssembler {
assertNotNull(ds);
}
- @Test public void dsg1_inf_tdb1_1() {
+ @Test public void dsg1_tdb1() {
+ Dataset ds = (Dataset)AssemblerUtils.build(DIR+"assem_dsg1_tdb1.ttl", DatasetAssemblerVocab.tDatasetOne);
+ assertNotNull(ds);
+ assertNotNull(ds.getDefaultModel());
+ assertTrue(ds instanceof DatasetOne);
+ useIt(ds);
+ }
+
+ @Test public void dsg1_tdb2() {
+ Dataset ds = (Dataset)AssemblerUtils.build(DIR+"assem_dsg1_tdb2.ttl", DatasetAssemblerVocab.tDatasetOne);
+ assertNotNull(ds);
+ assertNotNull(ds.getDefaultModel());
+ assertTrue(ds instanceof DatasetOne);
+ useIt(ds);
+ }
+
+ @Test public void dsg1_inf_tdb1() {
Dataset ds = (Dataset)AssemblerUtils.build(DIR+"assem_dsg1_inf_tdb1.ttl", DatasetAssemblerVocab.tDatasetOne);
assertNotNull(ds);
assertNotNull(ds.getDefaultModel());
@@ -122,7 +138,7 @@ public class TestDatasetAssembler {
useIt(ds);
}
- @Test public void dsg1_inf_tdb1_2() {
+ @Test public void dsg1_inf_tdb2() {
Dataset ds = (Dataset)AssemblerUtils.build(DIR+"assem_dsg1_inf_tdb2.ttl", DatasetAssemblerVocab.tDatasetOne);
assertNotNull(ds);
assertNotNull(ds.getDefaultModel());
http://git-wip-us.apache.org/repos/asf/jena/blob/fe08834d/jena-integration-tests/src/test/java/org/apache/jena/test/txn/TestDataset2Graph.java
----------------------------------------------------------------------
diff --git a/jena-integration-tests/src/test/java/org/apache/jena/test/txn/TestDataset2Graph.java b/jena-integration-tests/src/test/java/org/apache/jena/test/txn/TestDataset2Graph.java
index 4d515b6..542cccd 100644
--- a/jena-integration-tests/src/test/java/org/apache/jena/test/txn/TestDataset2Graph.java
+++ b/jena-integration-tests/src/test/java/org/apache/jena/test/txn/TestDataset2Graph.java
@@ -110,6 +110,7 @@ public class TestDataset2Graph {
@Test public void dsgGraphTxn_dataset_create() {
testOverDS(creator.create(), false);
}
+
private static void testInfModel(Dataset ds0) {
Txn.executeWrite(ds0, ()->{});
Model baseModel = ds0.getDefaultModel();
http://git-wip-us.apache.org/repos/asf/jena/blob/fe08834d/jena-integration-tests/testing/Assembler/assem_dsg1_inf_tdb1.ttl
----------------------------------------------------------------------
diff --git a/jena-integration-tests/testing/Assembler/assem_dsg1_inf_tdb1.ttl b/jena-integration-tests/testing/Assembler/assem_dsg1_inf_tdb1.ttl
index 00cd419..edcb84d 100644
--- a/jena-integration-tests/testing/Assembler/assem_dsg1_inf_tdb1.ttl
+++ b/jena-integration-tests/testing/Assembler/assem_dsg1_inf_tdb1.ttl
@@ -28,4 +28,3 @@ PREFIX ja: <http://jena.hpl.hp.com/2005/11/Assembler#>
<#tdbDataset> rdf:type tdb:DatasetTDB ;
tdb:location "--mem--" ;
.
-
http://git-wip-us.apache.org/repos/asf/jena/blob/fe08834d/jena-integration-tests/testing/Assembler/assem_dsg1_inf_tdb2.ttl
----------------------------------------------------------------------
diff --git a/jena-integration-tests/testing/Assembler/assem_dsg1_inf_tdb2.ttl b/jena-integration-tests/testing/Assembler/assem_dsg1_inf_tdb2.ttl
index 76c5010..4afeb3c 100644
--- a/jena-integration-tests/testing/Assembler/assem_dsg1_inf_tdb2.ttl
+++ b/jena-integration-tests/testing/Assembler/assem_dsg1_inf_tdb2.ttl
@@ -27,4 +27,3 @@ PREFIX ja: <http://jena.hpl.hp.com/2005/11/Assembler#>
<#tdbDataset> rdf:type tdb2:DatasetTDB2 ;
tdb2:location "--mem--" ;
.
-
http://git-wip-us.apache.org/repos/asf/jena/blob/fe08834d/jena-integration-tests/testing/Assembler/assem_dsg1_tdb1.ttl
----------------------------------------------------------------------
diff --git a/jena-integration-tests/testing/Assembler/assem_dsg1_tdb1.ttl b/jena-integration-tests/testing/Assembler/assem_dsg1_tdb1.ttl
new file mode 100644
index 0000000..3d73a3f
--- /dev/null
+++ b/jena-integration-tests/testing/Assembler/assem_dsg1_tdb1.ttl
@@ -0,0 +1,24 @@
+## Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0
+
+## Assembler for a dataset of a single inference model,
+## with the base storage in TDB1.
+
+PREFIX : <#>
+PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+PREFIX tdb: <http://jena.hpl.hp.com/2008/tdb#>
+PREFIX ja: <http://jena.hpl.hp.com/2005/11/Assembler#>
+
+<#dataset> rdf:type ja:RDFDatasetOne ;
+ ja:defaultGraph <#tdbGraph> ;
+ .
+
+## Graph from TDB
+<#tdbGraph> rdf:type tdb:GraphTDB ;
+ tdb:dataset <#tdbDataset> .
+
+
+## Base data in TDB.
+<#tdbDataset> rdf:type tdb:DatasetTDB ;
+ tdb:location "--mem--" ;
+ .
http://git-wip-us.apache.org/repos/asf/jena/blob/fe08834d/jena-integration-tests/testing/Assembler/assem_dsg1_tdb2.ttl
----------------------------------------------------------------------
diff --git a/jena-integration-tests/testing/Assembler/assem_dsg1_tdb2.ttl b/jena-integration-tests/testing/Assembler/assem_dsg1_tdb2.ttl
new file mode 100644
index 0000000..d9c71b9
--- /dev/null
+++ b/jena-integration-tests/testing/Assembler/assem_dsg1_tdb2.ttl
@@ -0,0 +1,23 @@
+## Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0
+
+## Assembler for a dataset of a single inference model,
+## with the base storage in TDB2.
+
+PREFIX : <#>
+PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+PREFIX tdb2: <http://jena.apache.org/2016/tdb#>
+PREFIX ja: <http://jena.hpl.hp.com/2005/11/Assembler#>
+
+<#dataset> rdf:type ja:RDFDatasetOne ;
+ ja:defaultGraph <#tdbGraph> ;
+ .
+
+## Graph from the database
+<#tdbGraph> rdf:type tdb2:GraphTDB2 ;
+ tdb2:dataset <#tdbDataset> .
+
+## Base data in TDB2.
+<#tdbDataset> rdf:type tdb2:DatasetTDB2 ;
+ tdb2:location "--mem--" ;
+ .