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/10/19 13:10:08 UTC
[4/6] jena git commit: JENA-1248: Tests for multiple embedded Fuseki
servers.
JENA-1248: Tests for multiple embedded Fuseki servers.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/41f42dfc
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/41f42dfc
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/41f42dfc
Branch: refs/heads/master
Commit: 41f42dfcadc8b53c5e308f32a87062b8d739558d
Parents: 0cfe4a6
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Oct 18 22:00:08 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Oct 18 22:09:52 2016 +0100
----------------------------------------------------------------------
.../jena/fuseki/embedded/TS_EmbeddedFuseki.java | 3 +-
.../fuseki/embedded/TestEmbeddedFuseki.java | 13 +-
.../fuseki/embedded/TestMultipleEmbedded.java | 148 +++++++++++++++++++
3 files changed, 157 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/41f42dfc/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/TS_EmbeddedFuseki.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/TS_EmbeddedFuseki.java b/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/TS_EmbeddedFuseki.java
index c66149d..07b4728 100644
--- a/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/TS_EmbeddedFuseki.java
+++ b/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/TS_EmbeddedFuseki.java
@@ -28,7 +28,8 @@ import org.junit.runners.Suite.SuiteClasses ;
@RunWith(Suite.class)
@SuiteClasses({
- TestEmbeddedFuseki.class
+ TestEmbeddedFuseki.class
+ , TestMultipleEmbedded.class
})
public class TS_EmbeddedFuseki {
@BeforeClass public static void setupForFusekiServer() {
http://git-wip-us.apache.org/repos/asf/jena/blob/41f42dfc/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/TestEmbeddedFuseki.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/TestEmbeddedFuseki.java b/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/TestEmbeddedFuseki.java
index 6926fa6..4c5e866 100644
--- a/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/TestEmbeddedFuseki.java
+++ b/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/TestEmbeddedFuseki.java
@@ -61,7 +61,7 @@ public class TestEmbeddedFuseki {
@Test public void embedded_01() {
DatasetGraph dsg = dataset() ;
FusekiEmbeddedServer server = FusekiEmbeddedServer.create().add("/ds", dsg).build() ;
- assertTrue(DataAccessPointRegistry.get().isRegistered("/ds")) ;
+ assertTrue(server.getDataAccessPointRegistry().isRegistered("/ds")) ;
server.start() ;
query("http://localhost:3330/ds/query", "SELECT * { ?s ?p ?o}", qExec-> {
ResultSet rs = qExec.execSelect() ;
@@ -73,10 +73,11 @@ public class TestEmbeddedFuseki {
@Test public void embedded_02() {
DatasetGraph dsg = dataset() ;
FusekiEmbeddedServer server = FusekiEmbeddedServer.make(3330, "/ds2", dsg) ;
+ DataAccessPointRegistry registry = server.getDataAccessPointRegistry() ;
// But no /ds
- assertEquals(1, DataAccessPointRegistry.get().size()) ;
- assertTrue(DataAccessPointRegistry.get().isRegistered("/ds2")) ;
- assertFalse(DataAccessPointRegistry.get().isRegistered("/ds")) ;
+ assertEquals(1, registry.size()) ;
+ assertTrue(registry.isRegistered("/ds2")) ;
+ assertFalse(registry.isRegistered("/ds")) ;
try {
server.start() ;
} finally { server.stop() ; }
@@ -261,11 +262,11 @@ public class TestEmbeddedFuseki {
return entity ;
}
- private DatasetGraph dataset() {
+ /*package*/ static DatasetGraph dataset() {
return DatasetGraphFactory.createTxnMem() ;
}
- private static void query(String URL, String query, Consumer<QueryExecution> body) {
+ /*package*/ static void query(String URL, String query, Consumer<QueryExecution> body) {
try (QueryExecution qExec = QueryExecutionFactory.sparqlService(URL, query) ) {
body.accept(qExec);
}
http://git-wip-us.apache.org/repos/asf/jena/blob/41f42dfc/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/TestMultipleEmbedded.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/TestMultipleEmbedded.java b/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/TestMultipleEmbedded.java
new file mode 100644
index 0000000..3bf8fdc
--- /dev/null
+++ b/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/TestMultipleEmbedded.java
@@ -0,0 +1,148 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.fuseki.embedded;
+
+import static org.apache.jena.fuseki.embedded.TestEmbeddedFuseki.dataset ;
+import static org.apache.jena.fuseki.embedded.TestEmbeddedFuseki.query ;
+import static org.junit.Assert.assertEquals ;
+import static org.junit.Assert.assertTrue ;
+
+import java.io.OutputStream ;
+
+import org.apache.http.HttpEntity ;
+import org.apache.http.entity.ContentProducer ;
+import org.apache.http.entity.EntityTemplate ;
+import org.apache.jena.atlas.web.ContentType ;
+import org.apache.jena.fuseki.FusekiException ;
+import org.apache.jena.graph.Graph ;
+import org.apache.jena.query.ResultSet ;
+import org.apache.jena.query.ResultSetFormatter ;
+import org.apache.jena.riot.RDFDataMgr ;
+import org.apache.jena.riot.RDFFormat ;
+import org.apache.jena.sparql.core.DatasetGraph ;
+import org.apache.jena.sparql.core.Quad ;
+import org.apache.jena.sparql.sse.SSE ;
+import org.apache.jena.system.Txn ;
+import org.junit.Test ;
+
+public class TestMultipleEmbedded {
+
+ static Quad q1 = SSE.parseQuad("(_ :s :p 1)") ;
+ static Quad q2 = SSE.parseQuad("(_ :s :p 2)") ;
+
+ @Test(expected=FusekiException.class)
+ public void multiple_01() {
+ DatasetGraph dsg = dataset() ;
+
+ FusekiEmbeddedServer server1 = FusekiEmbeddedServer.create().setPort(9900).add("/ds1", dsg).build() ;
+ // Bad.
+ FusekiEmbeddedServer server2 = FusekiEmbeddedServer.create().setPort(9900).add("/ds2", dsg).build() ;
+
+ server1.start();
+
+ try {
+ server2.start();
+ } catch (FusekiException ex) {
+ assertTrue(ex.getCause() instanceof java.net.BindException ) ;
+ throw ex ;
+ } finally {
+ try { server1.stop() ; } catch (Exception ex) {}
+ try { server2.stop() ; } catch (Exception ex) {}
+ }
+ }
+
+ @Test
+ public void multiple_02() {
+ DatasetGraph dsg = dataset() ;
+ FusekiEmbeddedServer server1 = FusekiEmbeddedServer.create().setPort(9900).add("/ds1", dsg).build() ;
+ // Good
+ FusekiEmbeddedServer server2 = FusekiEmbeddedServer.create().setPort(9901).add("/ds2", dsg).build() ;
+
+ try {
+ server1.start();
+ server2.start();
+ } finally {
+ try { server1.stop() ; } catch (Exception ex) {}
+ try { server2.stop() ; } catch (Exception ex) {}
+ }
+ }
+
+ @Test
+ public void multiple_03() {
+ DatasetGraph dsg1 = dataset() ;
+ DatasetGraph dsg2 = dataset() ;
+ // Same name.
+ FusekiEmbeddedServer server1 = FusekiEmbeddedServer.create().setPort(9900).add("/ds", dsg1).build().start() ;
+ Txn.executeWrite(dsg1, ()->dsg1.add(q1));
+ FusekiEmbeddedServer server2 = FusekiEmbeddedServer.create().setPort(9901).add("/ds", dsg2).build().start() ;
+ Txn.executeWrite(dsg2, ()->dsg2.add(q2));
+ query("http://localhost:9900/ds/", "SELECT * {?s ?p 1}", qExec->{
+ ResultSet rs = qExec.execSelect() ;
+ int x = ResultSetFormatter.consume(rs) ;
+ assertEquals(1, x) ;
+ }) ;
+ query("http://localhost:9901/ds/", "SELECT * {?s ?p 1}", qExec->{
+ ResultSet rs = qExec.execSelect() ;
+ int x = ResultSetFormatter.consume(rs) ;
+ assertEquals(0, x) ;
+ }) ;
+ server1.stop();
+
+ query("http://localhost:9901/ds/", "SELECT * {?s ?p 2}", qExec->{
+ ResultSet rs = qExec.execSelect() ;
+ int x = ResultSetFormatter.consume(rs) ;
+ assertEquals(1, x) ;
+ }) ;
+ server2.stop();
+ }
+
+ @Test
+ public void multiple_04() {
+ DatasetGraph dsg = dataset() ;
+ // Same name.
+ FusekiEmbeddedServer server1 = FusekiEmbeddedServer.create().setPort(9900).add("/ds", dsg).build().start() ;
+ Txn.executeWrite(dsg, ()->dsg.add(q1));
+ FusekiEmbeddedServer server2 = FusekiEmbeddedServer.create().setPort(9901).add("/ds", dsg).build().start() ;
+ Txn.executeWrite(dsg, ()->dsg.add(q2));
+
+ query("http://localhost:9900/ds/", "SELECT * {?s ?p ?o}", qExec->{
+ ResultSet rs = qExec.execSelect() ;
+ int x = ResultSetFormatter.consume(rs) ;
+ assertEquals(2, x) ;
+ }) ;
+ server1.stop();
+ server2.stop();
+ }
+
+ /** Create an HttpEntity for the graph */
+ protected static HttpEntity graphToHttpEntity(final Graph graph) {
+ final RDFFormat syntax = RDFFormat.TURTLE_BLOCKS ;
+ ContentProducer producer = new ContentProducer() {
+ @Override
+ public void writeTo(OutputStream out) {
+ RDFDataMgr.write(out, graph, syntax) ;
+ }
+ } ;
+ EntityTemplate entity = new EntityTemplate(producer) ;
+ ContentType ct = syntax.getLang().getContentType() ;
+ entity.setContentType(ct.getContentType()) ;
+ return entity ;
+ }
+}
+