This is an automated email from the ASF dual-hosted git repository. andy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/jena.git
commit 44959c1027dc55aadc70cde4fa9121ea11ce4dda Author: Andy Seaborne <[email protected]> AuthorDate: Mon Jul 14 07:48:17 2025 +0100 Replace use of TestEnv in TestGSP and TestDSP --- .../org/apache/jena/sparql/exec/http/TestDSP.java | 51 +++-- .../org/apache/jena/sparql/exec/http/TestGSP.java | 205 ++++++++++----------- .../java/org/apache/jena/test/conn/EnvTest.java | 2 +- 3 files changed, 127 insertions(+), 131 deletions(-) diff --git a/jena-integration-tests/src/test/java/org/apache/jena/sparql/exec/http/TestDSP.java b/jena-integration-tests/src/test/java/org/apache/jena/sparql/exec/http/TestDSP.java index 0ae8198fab..00e037912a 100644 --- a/jena-integration-tests/src/test/java/org/apache/jena/sparql/exec/http/TestDSP.java +++ b/jena-integration-tests/src/test/java/org/apache/jena/sparql/exec/http/TestDSP.java @@ -26,41 +26,52 @@ import static org.junit.Assert.assertTrue; import java.io.StringReader; -import org.apache.jena.fuseki.main.ConfigureTests; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.apache.jena.fuseki.main.FusekiServer; import org.apache.jena.http.HttpOp; import org.apache.jena.riot.Lang; import org.apache.jena.riot.RDFDataMgr; import org.apache.jena.sparql.core.DatasetGraph; import org.apache.jena.sparql.core.DatasetGraphFactory; import org.apache.jena.sparql.util.IsoMatcher; -import org.apache.jena.test.conn.EnvTest; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; public class TestDSP { static String DIR = "testing/RDFLink/"; - private static EnvTest env; - @BeforeClass public static void beforeClass() { - env = EnvTest.create("/ds"); - } + private FusekiServer server = null; + private final String dsName = "/data"; + private final boolean verbose = false; - @Before public void before() { - env.clear(); + + @Before public void makeServer() { + DatasetGraph dsg = DatasetGraphFactory.createTxnMem(); + server = FusekiServer.create() + .verbose(verbose) + .enablePing(true) + //.addServlet(data, holder) + .add(dsName, dsg) + .build() + .start(); } - @AfterClass public static void afterClass() { - if ( ConfigureTests.CloseTestServers ) - EnvTest.stop(env); + @After public void releaseServer() { + if ( server != null ) + server.stop(); } - private String url(String path) { return env.datasetPath(path); } - // Test DSP against the dataset itself. - static String dspServiceURL() { return env.datasetPath("/"); } + private String url(String path) { + return server.datasetURL(path); + } + + // GSP endpoint + private String dspServiceURL() { + return url(dsName); + } static DatasetGraph dataset = makeDatasetGraph(); static DatasetGraph makeDatasetGraph() { @@ -89,13 +100,13 @@ public class TestDSP { public void dsp_clear_01() { // DELETE on the GSP endpoint would be the default graph. // DELETE on the dataset endpoint is not supported by Fuseki - this does "CLER ALL" - DSP.service(env.datasetURL()).clear(); + DSP.service(dspServiceURL()).clear(); } @Test public void dsp_clear_02() { DSP.service(dspServiceURL()).POST(dataset); - DSP.service(env.datasetURL()).clear(); + DSP.service(dspServiceURL()).clear(); DatasetGraph dsg = DSP.service(dspServiceURL()).GET(); assertFalse(dsg.find().hasNext()); } diff --git a/jena-integration-tests/src/test/java/org/apache/jena/sparql/exec/http/TestGSP.java b/jena-integration-tests/src/test/java/org/apache/jena/sparql/exec/http/TestGSP.java index 942caa643b..7ad53c8a58 100644 --- a/jena-integration-tests/src/test/java/org/apache/jena/sparql/exec/http/TestGSP.java +++ b/jena-integration-tests/src/test/java/org/apache/jena/sparql/exec/http/TestGSP.java @@ -18,153 +18,145 @@ package org.apache.jena.sparql.exec.http; +import static org.apache.jena.fuseki.test.HttpTest.expect400; +import static org.apache.jena.fuseki.test.HttpTest.expect404; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import java.io.StringReader; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; import org.apache.jena.atlas.web.HttpException; -import org.apache.jena.fuseki.main.ConfigureTests; - -import static org.apache.jena.fuseki.test.HttpTest.*; +import org.apache.jena.fuseki.main.FusekiServer; import org.apache.jena.graph.Graph; import org.apache.jena.graph.Node; import org.apache.jena.graph.NodeFactory; import org.apache.jena.http.HttpOp; import org.apache.jena.riot.Lang; -import org.apache.jena.riot.RDFDataMgr; import org.apache.jena.riot.RDFFormat; +import org.apache.jena.riot.RDFParser; import org.apache.jena.riot.WebContent; import org.apache.jena.sparql.core.DatasetGraph; import org.apache.jena.sparql.core.DatasetGraphFactory; import org.apache.jena.sparql.graph.GraphFactory; import org.apache.jena.sparql.sse.SSE; import org.apache.jena.sparql.util.IsoMatcher; -import org.apache.jena.test.conn.EnvTest; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; public class TestGSP { static String DIR = "testing/RDFLink/"; - private static EnvTest env; - @BeforeClass public static void beforeClass() { - env = EnvTest.create("/ds"); + private FusekiServer server = null; + private final boolean verbose = false; + + private final String dsName = "/data"; + + @Before public void makeServer() { + DatasetGraph dsg = DatasetGraphFactory.createTxnMem(); + server = FusekiServer.create() + .verbose(verbose) + .enablePing(true) + //.addServlet(data, holder) + .add(dsName, dsg) + .build() + .start(); } - @Before public void before() { - env.clear(); + @After public void releaseServer() { + if ( server != null ) + server.stop(); } - @AfterClass public static void afterClass() { - if ( ConfigureTests.CloseTestServers ) - EnvTest.stop(env); + + private String url(String path) { + return server.datasetURL(path); } - private static Graph graph1 = SSE.parseGraph("(graph (:s :p :x) (:s :p 1))"); - private static Graph graph2 = SSE.parseGraph("(graph (:s :p :x) (:s :p 2))"); + // GSP endpoint + private String gspServiceURL() { + return url(dsName); + } - private String url(String path) { return env.datasetPath(path); } + private String defaultGraphURL() { + return gspServiceURL() + "?default"; + } - // Test GSP against the /data endpoint (including dataset operations). - static String gspServiceURL() { return env.datasetPath("/data"); } + private String namedGraphURL() { + return gspServiceURL() + "?graph=http://example/g";; + } - static String defaultGraphURL() { return gspServiceURL()+"?default"; } - static String namedGraphURL() { return gspServiceURL()+"?graph=http://example/g";; } + private static Graph graph1 = SSE.parseGraph("(graph (:s :p :x) (:s :p 1))"); + private static Graph graph2 = SSE.parseGraph("(graph (:s :p :x) (:s :p 2))"); // Graph, with one triple in it. static Graph graph = makeGraph(); static Graph makeGraph() { Graph graph = GraphFactory.createDefaultGraph(); - RDFDataMgr.read(graph, new StringReader("PREFIX : <http://example/> :s :p :o ."), null, Lang.TTL); + RDFParser.fromString("PREFIX : <http://example/> :s :p :o .", Lang.TTL).parse(graph); return graph; } static DatasetGraph dataset = makeDatasetGraph(); static DatasetGraph makeDatasetGraph() { DatasetGraph dataset = DatasetGraphFactory.createTxnMem(); - RDFDataMgr.read(dataset, new StringReader("PREFIX : <http://example/> :s :p :o . :g { :sg :pg :og }"), null, Lang.TRIG); + RDFParser.fromString("PREFIX : <http://example/> :s :p :o . :g { :sg :pg :og }", Lang.TRIG).parse(dataset); return dataset; } - @Test public void gsp_put_get_01() { - GSP.service(gspServiceURL()) - .defaultGraph() - .PUT(graph); - Graph g = GSP.service(gspServiceURL()) - .defaultGraph() - .GET(); + @Test + public void gsp_put_get_01() { + GSP.service(gspServiceURL()).defaultGraph().PUT(graph); + Graph g = GSP.service(gspServiceURL()).defaultGraph().GET(); assertNotNull(g); - assertTrue(IsoMatcher.isomorphic(graph,g)); + assertTrue(IsoMatcher.isomorphic(graph, g)); } - @Test(expected=HttpException.class) + @Test(expected = HttpException.class) public void gsp_bad_put_01() { // No .defaultGraph GSP.service(gspServiceURL()).PUT(graph); } - @Test(expected=HttpException.class) + @Test(expected = HttpException.class) public void gsp_bad_get_err_02() { // No .defaultGraph GSP.service(gspServiceURL()).GET(); } - @Test public void gsp_post_get_ct_01() { + @Test + public void gsp_post_get_ct_01() { String graphName = "http://example/graph";; - GSP.service(gspServiceURL()) - .graphName(graphName) - .POST(graph); - Graph g1 = GSP.service(gspServiceURL()) - .defaultGraph() - .acceptHeader("application/rdf+xml") - .GET(); + GSP.service(gspServiceURL()).graphName(graphName).POST(graph); + Graph g1 = GSP.service(gspServiceURL()).defaultGraph().acceptHeader("application/rdf+xml").GET(); assertNotNull(g1); assertTrue(g1.isEmpty()); - Graph g2 = GSP.service(gspServiceURL()) - .graphName(graphName) - .acceptHeader("application/rdf+xml") - .GET(); + Graph g2 = GSP.service(gspServiceURL()).graphName(graphName).acceptHeader("application/rdf+xml").GET(); assertNotNull(g2); assertFalse(g2.isEmpty()); - assertTrue(IsoMatcher.isomorphic(graph,g2)); + assertTrue(IsoMatcher.isomorphic(graph, g2)); } - @Test public void gsp_put_get_ct_02() { - GSP.service(gspServiceURL()) - .defaultGraph() - .contentType(RDFFormat.NTRIPLES) - .PUT(graph); - Graph g1 = GSP.service(gspServiceURL()) - .defaultGraph() - .accept(Lang.RDFXML) - .GET(); + @Test + public void gsp_put_get_ct_02() { + GSP.service(gspServiceURL()).defaultGraph().contentType(RDFFormat.NTRIPLES).PUT(graph); + Graph g1 = GSP.service(gspServiceURL()).defaultGraph().accept(Lang.RDFXML).GET(); assertNotNull(g1); assertFalse(g1.isEmpty()); - assertTrue(IsoMatcher.isomorphic(graph,g1)); + assertTrue(IsoMatcher.isomorphic(graph, g1)); } - @Test public void gsp_put_delete_01() { - GSP.service(gspServiceURL()) - .defaultGraph() - .PUT(graph); - Graph g1 = GSP.service(gspServiceURL()) - .defaultGraph() - .GET(); + @Test + public void gsp_put_delete_01() { + GSP.service(gspServiceURL()).defaultGraph().PUT(graph); + Graph g1 = GSP.service(gspServiceURL()).defaultGraph().GET(); assertFalse(g1.isEmpty()); - GSP.service(gspServiceURL()) - .defaultGraph() - .DELETE(); - Graph g2 = GSP.service(gspServiceURL()) - .defaultGraph() - .GET(); + GSP.service(gspServiceURL()).defaultGraph().DELETE(); + Graph g2 = GSP.service(gspServiceURL()).defaultGraph().GET(); assertTrue(g2.isEmpty()); // And just to make sure ... @@ -173,32 +165,36 @@ public class TestGSP { assertTrue(s2.isEmpty()); } - @Test public void gsp_dft_ct_1() { - GSP.service(url("/ds")).defaultGraph().contentType(RDFFormat.RDFXML).PUT(DIR+"data-rdfxml"); + @Test + public void gsp_dft_ct_1() { + GSP.service(gspServiceURL()).defaultGraph().contentType(RDFFormat.RDFXML).PUT(DIR + "data-rdfxml"); } - @Test public void gsp_dft_ct_2() { - GSP.service(url("/ds")).defaultGraph().contentTypeHeader(WebContent.contentTypeRDFXML).PUT(DIR+"data-rdfxml"); + @Test + public void gsp_dft_ct_2() { + GSP.service(gspServiceURL()).defaultGraph().contentTypeHeader(WebContent.contentTypeRDFXML).PUT(DIR + "data-rdfxml"); } // ---------------------------------------- - @Test public void gspHead_dataset_1() { + @Test + public void gspHead_dataset_1() { // Base URL, default content type => N-Quads (dump format) String h = HttpOp.httpHead(gspServiceURL(), null); assertNotNull(h); assertEquals(Lang.NQUADS.getHeaderString(), h); } - - @Test public void gspHead_dataset_2() { + @Test + public void gspHead_dataset_2() { String ct = Lang.TRIG.getHeaderString(); String h = HttpOp.httpHead(gspServiceURL(), ct); assertNotNull(h); assertEquals(ct, h); } - @Test public void gspHead_graph_1() { + @Test + public void gspHead_graph_1() { String target = defaultGraphURL(); String h = HttpOp.httpHead(target, null); assertNotNull(h); @@ -206,7 +202,8 @@ public class TestGSP { assertEquals(Lang.RDFXML.getHeaderString(), h); } - @Test public void gspHead_graph_2() { + @Test + public void gspHead_graph_2() { String target = defaultGraphURL(); String ct = Lang.TTL.getHeaderString(); String h = HttpOp.httpHead(target, ct); @@ -214,53 +211,41 @@ public class TestGSP { assertEquals(ct, h); } - @Test public void gsp_union_get() { + @Test + public void gsp_union_get() { Node gn1 = NodeFactory.createURI("http://example/graph1";); Node gn2 = NodeFactory.createURI("http://example/graph2";); - GSP.service(gspServiceURL()) - .graphName(gn1) - .PUT(graph1); - GSP.service(gspServiceURL()) - .graphName(gn2) - .PUT(graph2); + GSP.service(gspServiceURL()).graphName(gn1).PUT(graph1); + GSP.service(gspServiceURL()).graphName(gn2).PUT(graph2); // get union Graph g = GSP.service(gspServiceURL()).graphName("union").GET(); assertEquals(3, g.size()); } - @Test public void gsp_union_post() { - expect400(()->{ + @Test + public void gsp_union_post() { + expect400(() -> { GSP.service(gspServiceURL()).graphName("union").POST(graph1); }); } // 404 - @Test public void gsp_404_put_delete_get() { + @Test + public void gsp_404_put_delete_get() { String graphName = "http://example/graph2";; Node gn = NodeFactory.createURI("http://example/graph2";); - GSP.service(gspServiceURL()) - .graphName(gn) - .PUT(graph); - Graph g = GSP.service(gspServiceURL()) - .graphName(graphName) - .GET(); + GSP.service(gspServiceURL()).graphName(gn).PUT(graph); + Graph g = GSP.service(gspServiceURL()).graphName(graphName).GET(); assertFalse(g.isEmpty()); - GSP.service(gspServiceURL()) - .graphName(gn) - .DELETE(); - expect404(()-> - GSP.service(gspServiceURL()) - .graphName(graphName) - .GET() - ); + GSP.service(gspServiceURL()).graphName(gn).DELETE(); + expect404(() -> GSP.service(gspServiceURL()).graphName(graphName).GET()); } - @Test public void gsp_404_graph() { + @Test + public void gsp_404_graph() { String graphName = "http://example/graph404";; - expect404( - ()->GSP.service(gspServiceURL()).graphName(graphName).GET() - ); + expect404(() -> GSP.service(gspServiceURL()).graphName(graphName).GET()); } } diff --git a/jena-integration-tests/src/test/java/org/apache/jena/test/conn/EnvTest.java b/jena-integration-tests/src/test/java/org/apache/jena/test/conn/EnvTest.java index 7228c7d87c..7d503f50aa 100644 --- a/jena-integration-tests/src/test/java/org/apache/jena/test/conn/EnvTest.java +++ b/jena-integration-tests/src/test/java/org/apache/jena/test/conn/EnvTest.java @@ -73,7 +73,7 @@ public class EnvTest { return create(dsName, null); } - public static EnvTest create(String dsName, DatasetGraph dsg) { + private static EnvTest create(String dsName, DatasetGraph dsg) { return new EnvTest(dsName, dsg, null, null); }
