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 2015/09/09 12:12:16 UTC
[1/2] jena git commit: JENA-1024: Tests of direct connect to dataset,
not service.
Repository: jena
Updated Branches:
refs/heads/master 3599d30eb -> a3c9fb0ad
JENA-1024: Tests of direct connect to dataset, not service.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/7af41c34
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/7af41c34
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/7af41c34
Branch: refs/heads/master
Commit: 7af41c340568623c7f938946aa3574ca05cac9fc
Parents: 3599d30
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Sep 9 11:08:33 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Sep 9 11:08:33 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/jena/fuseki/TS_Fuseki.java | 3 -
.../fuseki/http/TestDatasetAccessorHTTP.java | 94 +++++++++++++++++---
2 files changed, 81 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/7af41c34/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java
index db8a4aa..8806968 100644
--- a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java
+++ b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java
@@ -42,9 +42,6 @@ import org.junit.runners.Suite ;
, TestAdmin.class
})
-
-
-
public class TS_Fuseki extends ServerTest
{
public static final String FusekiTestHome = "target/FusekiHome" ;
http://git-wip-us.apache.org/repos/asf/jena/blob/7af41c34/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/http/TestDatasetAccessorHTTP.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/http/TestDatasetAccessorHTTP.java b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/http/TestDatasetAccessorHTTP.java
index 47a21d5..d7056d3 100644
--- a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/http/TestDatasetAccessorHTTP.java
+++ b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/http/TestDatasetAccessorHTTP.java
@@ -108,14 +108,14 @@ public class TestDatasetAccessorHTTP extends BaseTest
@Test public void head_01()
{
- DatasetAccessor du = create() ;
+ DatasetAccessor du = connectToService() ;
boolean b = du.containsModel(gn1) ;
assertFalse("Blank remote dataset as a named graph", b) ;
}
@Test public void head_02()
{
- DatasetAccessor du = create() ;
+ DatasetAccessor du = connectToService() ;
du.putModel(gn1, model1) ;
boolean exists = du.containsModel(gn1) ;
assertTrue(exists) ;
@@ -130,27 +130,56 @@ public class TestDatasetAccessorHTTP extends BaseTest
@Test public void get_01()
{
- DatasetAccessor du = create() ;
+ DatasetAccessor du = connectToService() ;
Model graph = du.getModel() ;
assertTrue(graph.isEmpty()) ;
}
@Test public void get_02()
{
- DatasetAccessor du = create() ;
+ DatasetAccessor du = connectToService() ;
+ Model graph = du.getModel(gn1) ;
+ assertNull(graph) ;
+ }
+
+ // Dataset direct, not using the service endpoint.
+ @Test public void get_03()
+ {
+ DatasetAccessor du = connectToDataset() ;
+ Model graph = du.getModel() ;
+ assertTrue(graph.isEmpty()) ;
+ }
+
+ @Test public void get_04()
+ {
+ DatasetAccessor du = connectToDataset() ;
Model graph = du.getModel(gn1) ;
assertNull(graph) ;
}
@Test public void delete_01()
{
- DatasetAccessor du = create() ;
+ DatasetAccessor du = connectToService() ;
du.deleteDefault() ;
}
@Test public void delete_02()
{
- DatasetAccessor du = create() ;
+ DatasetAccessor du = connectToService() ;
+ du.deleteModel(gn1) ;
+ boolean exists = du.containsModel(gn1) ;
+ assertFalse("Expected gn1 not to exist", exists) ;
+ }
+
+ @Test public void delete_03()
+ {
+ DatasetAccessor du = connectToDataset() ;
+ du.deleteDefault() ;
+ }
+
+ @Test public void delete_04()
+ {
+ DatasetAccessor du = connectToDataset() ;
du.deleteModel(gn1) ;
boolean exists = du.containsModel(gn1) ;
assertFalse("Expected gn1 not to exist", exists) ;
@@ -158,7 +187,7 @@ public class TestDatasetAccessorHTTP extends BaseTest
@Test public void put_01()
{
- DatasetAccessor du = create() ;
+ DatasetAccessor du = connectToService() ;
du.putModel(model1) ;
Model graph = du.getModel() ;
assertTrue(graph.isIsomorphicWith(model1)) ;
@@ -170,7 +199,7 @@ public class TestDatasetAccessorHTTP extends BaseTest
@Test public void put_02()
{
- DatasetAccessor du = create() ;
+ DatasetAccessor du = connectToService() ;
du.putModel(gn1, model1) ;
boolean exists = du.containsModel(gn1) ;
assertTrue(exists) ;
@@ -192,7 +221,7 @@ public class TestDatasetAccessorHTTP extends BaseTest
@Test public void put_03()
{
- DatasetAccessor du = create() ;
+ DatasetAccessor du = connectToService() ;
du.putModel(model1) ;
du.putModel(model2) ; // PUT overwrites
Model graph = du.getModel() ;
@@ -203,10 +232,23 @@ public class TestDatasetAccessorHTTP extends BaseTest
graph = du.getModel() ;
assertTrue(graph.isEmpty()) ;
}
+
+ @Test public void put_04()
+ {
+ DatasetAccessor du = connectToDataset() ;
+ du.putModel(model1) ;
+ Model graph = du.getModel() ;
+ assertTrue(graph.isIsomorphicWith(model1)) ;
+ // Empty it.
+ du.deleteDefault() ;
+ graph = du.getModel() ;
+ assertTrue(graph.isEmpty()) ;
+ }
+
@Test public void post_01()
{
- DatasetAccessor du = create() ;
+ DatasetAccessor du = connectToService() ;
du.putModel(model1) ;
du.add(model2) ; // POST appends
Model graph = du.getModel() ;
@@ -226,7 +268,7 @@ public class TestDatasetAccessorHTTP extends BaseTest
@Test public void post_02()
{
- DatasetAccessor du = create() ;
+ DatasetAccessor du = connectToService() ;
du.add(model1) ;
du.add(model2) ;
Model graph = du.getModel() ;
@@ -244,17 +286,43 @@ public class TestDatasetAccessorHTTP extends BaseTest
assertTrue(graph.isEmpty()) ;
}
+ @Test public void post_03()
+ {
+ DatasetAccessor du = connectToDataset() ;
+ du.putModel(model1) ;
+ du.add(model2) ; // POST appends
+ Model graph = du.getModel() ;
+
+ Model graph3 = ModelFactory.createDefaultModel() ;
+ graph3.add(model1) ;
+ graph3.add(model2) ;
+
+ assertFalse(graph.isIsomorphicWith(model1)) ;
+ assertFalse(graph.isIsomorphicWith(model2)) ;
+ assertTrue(graph.isIsomorphicWith(graph3)) ;
+ // Empty it.
+ du.deleteDefault() ;
+ graph = du.getModel() ;
+ assertTrue(graph.isEmpty()) ;
+ }
+
@Test public void clearup_1()
{
- DatasetAccessor du = create() ;
+ DatasetAccessor du = connectToService() ;
du.deleteDefault() ;
du.deleteModel(gn1) ;
du.deleteModel(gn2) ;
du.deleteModel(gn99) ;
}
- static DatasetAccessor create()
+ static DatasetAccessor connectToService()
{
return DatasetAccessorFactory.createHTTP(ServerTest.serviceREST) ;
}
+
+ static DatasetAccessor connectToDataset()
+ {
+ return DatasetAccessorFactory.createHTTP(ServerTest.urlDataset) ;
+ }
+
}
[2/2] jena git commit: Change "?default=" to "?default" (there is no
argument)
Posted by an...@apache.org.
Change "?default=" to "?default" (there is no argument)
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/a3c9fb0a
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/a3c9fb0a
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/a3c9fb0a
Branch: refs/heads/master
Commit: a3c9fb0ad41f11d3279121e9870e984f3c4a9208
Parents: 7af41c3
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Sep 9 11:09:20 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Sep 9 11:09:20 2015 +0100
----------------------------------------------------------------------
.../main/java/org/apache/jena/web/DatasetGraphAccessorHTTP.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/a3c9fb0a/jena-arq/src/main/java/org/apache/jena/web/DatasetGraphAccessorHTTP.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/web/DatasetGraphAccessorHTTP.java b/jena-arq/src/main/java/org/apache/jena/web/DatasetGraphAccessorHTTP.java
index 568d832..1ebb22b 100644
--- a/jena-arq/src/main/java/org/apache/jena/web/DatasetGraphAccessorHTTP.java
+++ b/jena-arq/src/main/java/org/apache/jena/web/DatasetGraphAccessorHTTP.java
@@ -220,7 +220,7 @@ public class DatasetGraphAccessorHTTP implements DatasetGraphAccessor {
}
protected final String targetDefault() {
- return remote + "?" + HttpNames.paramGraphDefault + "=" ;
+ return remote + "?" + HttpNames.paramGraphDefault ;
}
protected final String target(Node name) {