http://git-wip-us.apache.org/repos/asf/jena/blob/7c3a5cfd/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 457ab96..77d019e 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 @@ -18,41 +18,42 @@ package org.apache.jena.fuseki.http; -import static org.apache.jena.fuseki.ServerTest.* ; -import org.apache.jena.atlas.junit.BaseTest ; +import static org.apache.jena.fuseki.ServerCtl.datasetPath ; +import static org.apache.jena.fuseki.ServerCtl.port ; +import static org.apache.jena.fuseki.ServerCtl.serviceGSP ; +import static org.apache.jena.fuseki.ServerCtl.urlDataset ; +import static org.apache.jena.fuseki.ServerTest.gn1 ; +import static org.apache.jena.fuseki.ServerTest.gn2 ; +import static org.apache.jena.fuseki.ServerTest.gn99 ; +import static org.apache.jena.fuseki.ServerTest.model1 ; +import static org.apache.jena.fuseki.ServerTest.model2 ; + import org.apache.jena.atlas.web.HttpException ; +import org.apache.jena.fuseki.AbstractFusekiTest ; import org.apache.jena.fuseki.FusekiTest ; -import org.apache.jena.fuseki.ServerTest ; import org.apache.jena.query.DatasetAccessor ; import org.apache.jena.query.DatasetAccessorFactory ; import org.apache.jena.rdf.model.Model ; import org.apache.jena.rdf.model.ModelFactory ; import org.apache.jena.riot.web.HttpOp ; import org.apache.jena.web.HttpSC ; -import org.junit.AfterClass ; -import org.junit.Before ; -import org.junit.BeforeClass ; import org.junit.Test ; -public class TestDatasetAccessorHTTP extends BaseTest +public class TestDatasetAccessorHTTP extends AbstractFusekiTest { //Model level testing. - static final String datasetURI_not_1 = "http://localhost:"+port+"/junk" ; - static final String datasetURI_not_2 = serviceGSP+"/not" ; - static final String datasetURI_not_3 = "http://localhost:"+port+datasetPath+"/not/data" ; - - @BeforeClass public static void beforeClass() { ServerTest.allocServer() ; } - @AfterClass public static void afterClass() { ServerTest.freeServer() ; } - @Before public void before() { ServerTest.resetServer() ; } + static final String datasetURI_not_1 = "http://localhost:"+port()+"/junk" ; + static final String datasetURI_not_2 = serviceGSP()+"/not" ; + static final String datasetURI_not_3 = "http://localhost:"+port()+datasetPath()+"/not/data" ; @Test public void test_ds_1() { // Can GET the dataset service. try { - HttpOp.execHttpGet(serviceGSP) ; + HttpOp.execHttpGet(serviceGSP()) ; } catch (HttpException ex) { assertTrue(HttpSC.isClientError(ex.getResponseCode())) ; throw ex ; @@ -92,7 +93,7 @@ public class TestDatasetAccessorHTTP extends BaseTest public void test_404_3() { // Right service, wrong graph - DatasetAccessor du = DatasetAccessorFactory.createHTTP(serviceGSP) ; + DatasetAccessor du = DatasetAccessorFactory.createHTTP(serviceGSP()) ; Model graph = du.getModel(gn99) ; assertNull(graph) ; } @@ -308,12 +309,12 @@ public class TestDatasetAccessorHTTP extends BaseTest static DatasetAccessor connectToService() { - return DatasetAccessorFactory.createHTTP(ServerTest.serviceGSP) ; + return DatasetAccessorFactory.createHTTP(serviceGSP()) ; } static DatasetAccessor connectToDataset() { - return DatasetAccessorFactory.createHTTP(ServerTest.urlDataset) ; + return DatasetAccessorFactory.createHTTP(urlDataset()) ; } }
http://git-wip-us.apache.org/repos/asf/jena/blob/7c3a5cfd/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/http/TestDatasetGraphAccessorHTTP.java ---------------------------------------------------------------------- diff --git a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/http/TestDatasetGraphAccessorHTTP.java b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/http/TestDatasetGraphAccessorHTTP.java index 590083d..281a844 100644 --- a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/http/TestDatasetGraphAccessorHTTP.java +++ b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/http/TestDatasetGraphAccessorHTTP.java @@ -18,26 +18,24 @@ package org.apache.jena.fuseki.http; -import org.apache.jena.fuseki.ServerTest ; +import org.apache.jena.fuseki.ServerCtl ; import org.apache.jena.web.AbstractTestDatasetGraphAccessor ; import org.apache.jena.web.DatasetGraphAccessor ; import org.apache.jena.web.DatasetGraphAccessorHTTP ; +import org.junit.After ; import org.junit.AfterClass ; import org.junit.Before ; import org.junit.BeforeClass ; public class TestDatasetGraphAccessorHTTP extends AbstractTestDatasetGraphAccessor { - @BeforeClass public static void beforeClass() { ServerTest.allocServer() ; } - @AfterClass public static void afterClass() { ServerTest.freeServer() ; } - @Before public void before() { - ServerTest.resetServer() ; - } - + @BeforeClass public static void ctlBeforeClass() { ServerCtl.ctlBeforeClass(); } + @AfterClass public static void ctlAfterClass() { ServerCtl.ctlAfterClass(); } + @Before public void ctlBeforeTest() { ServerCtl.ctlBeforeTest(); } + @After public void ctlAfterTest() { ServerCtl.ctlAfterTest(); } @Override - protected DatasetGraphAccessor getDatasetUpdater() - { - return new DatasetGraphAccessorHTTP(ServerTest.serviceGSP) ; + protected DatasetGraphAccessor getDatasetUpdater() { + return new DatasetGraphAccessorHTTP(ServerCtl.serviceGSP()) ; } } http://git-wip-us.apache.org/repos/asf/jena/blob/7c3a5cfd/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/http/TestHttpOp.java ---------------------------------------------------------------------- diff --git a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/http/TestHttpOp.java b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/http/TestHttpOp.java index 062f9ef..2bb7206 100644 --- a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/http/TestHttpOp.java +++ b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/http/TestHttpOp.java @@ -20,11 +20,14 @@ package org.apache.jena.fuseki.http; import static org.apache.jena.fuseki.FusekiTest.exec404; import static org.apache.jena.fuseki.FusekiTest.execWithHttpException; +import static org.apache.jena.fuseki.ServerCtl.serviceGSP ; +import static org.apache.jena.fuseki.ServerCtl.serviceQuery ; +import static org.apache.jena.fuseki.ServerCtl.serviceUpdate ; +import static org.apache.jena.fuseki.ServerCtl.urlRoot ; import org.apache.jena.atlas.lib.IRILib ; import org.apache.jena.atlas.web.TypedInputStream ; import org.apache.jena.fuseki.AbstractFusekiTest ; -import org.apache.jena.fuseki.ServerTest ; import org.apache.jena.riot.WebContent ; import org.apache.jena.riot.web.HttpOp ; import org.apache.jena.sparql.engine.http.Params ; @@ -35,12 +38,12 @@ import org.junit.Test ; // especially error cases abnd unusual usage that the higher level APIs don't use. public class TestHttpOp extends AbstractFusekiTest { - static String pingURL = ServerTest.urlRoot+"$/ping" ; - static String gspServiceURL = ServerTest.serviceGSP ; - static String defaultGraphURL = ServerTest.serviceGSP+"?default" ; - static String namedGraphURL = ServerTest.serviceGSP+"?graph=http://example/g" ; - static String queryURL = ServerTest.serviceQuery ; - static String updateURL = ServerTest.serviceUpdate ; + static String pingURL = urlRoot()+"$/ping" ; + static String gspServiceURL = serviceGSP() ; + static String defaultGraphURL = serviceGSP()+"?default" ; + static String namedGraphURL = serviceGSP()+"?graph=http://example/g" ; + static String queryURL = serviceQuery() ; + static String updateURL = serviceUpdate() ; static String simpleQuery = queryURL+"?query="+IRILib.encodeUriComponent("ASK{}") ; @@ -52,7 +55,7 @@ public class TestHttpOp extends AbstractFusekiTest { @Test public void httpGet_02() { - exec404(() -> HttpOp.execHttpGet(ServerTest.urlRoot + "does-not-exist")); + exec404(() -> HttpOp.execHttpGet(urlRoot() + "does-not-exist")); } @Test public void httpGet_03() { @@ -60,7 +63,7 @@ public class TestHttpOp extends AbstractFusekiTest { } @Test public void httpGet_04() { - String x = HttpOp.execHttpGetString(ServerTest.urlRoot+"does-not-exist") ; + String x = HttpOp.execHttpGetString(urlRoot()+"does-not-exist") ; assertNull(x) ; } http://git-wip-us.apache.org/repos/asf/jena/blob/7c3a5cfd/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnection.java ---------------------------------------------------------------------- diff --git a/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnection.java b/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnection.java index e7b9107..ccde079 100644 --- a/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnection.java +++ b/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnection.java @@ -55,7 +55,7 @@ public class TestRemoteEndpointConnection extends AbstractRemoteEndpointConnecti @Override protected JenaConnection getConnection(Dataset ds) throws SQLException { // Set up the dataset - TestUtils.copyToRemoteDataset(ds, ServerCtl.serviceREST()); + TestUtils.copyToRemoteDataset(ds, ServerCtl.serviceGSP()); return new RemoteEndpointConnection(ServerCtl.serviceQuery(), ServerCtl.serviceUpdate(), JenaConnection.DEFAULT_HOLDABILITY, JdbcCompatibility.DEFAULT); } http://git-wip-us.apache.org/repos/asf/jena/blob/7c3a5cfd/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithAuth.java ---------------------------------------------------------------------- diff --git a/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithAuth.java b/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithAuth.java index 2d75c82..08d8360 100644 --- a/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithAuth.java +++ b/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithAuth.java @@ -126,7 +126,7 @@ public class TestRemoteEndpointConnectionWithAuth extends AbstractRemoteEndpoint @Override protected JenaConnection getConnection(Dataset ds) throws SQLException { // Set up the dataset - TestUtils.copyToRemoteDataset(ds, ServerCtl.serviceREST(), client); + TestUtils.copyToRemoteDataset(ds, ServerCtl.serviceGSP(), client); return new RemoteEndpointConnection(ServerCtl.serviceQuery(), ServerCtl.serviceUpdate(), null, null, null, null, client, JenaConnection.DEFAULT_HOLDABILITY, JdbcCompatibility.DEFAULT, null, null); http://git-wip-us.apache.org/repos/asf/jena/blob/7c3a5cfd/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithGraphUris.java ---------------------------------------------------------------------- diff --git a/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithGraphUris.java b/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithGraphUris.java index 95f82d3..21d73d2 100644 --- a/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithGraphUris.java +++ b/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithGraphUris.java @@ -79,7 +79,7 @@ public class TestRemoteEndpointConnectionWithGraphUris extends AbstractRemoteEnd // Set up the dataset ds = TestUtils.renameGraph(ds, null, DEFAULT_GRAPH_URI); Assert.assertEquals(0, ds.getDefaultModel().size()); - TestUtils.copyToRemoteDataset(ds, ServerCtl.serviceREST()); + TestUtils.copyToRemoteDataset(ds, ServerCtl.serviceGSP()); return new RemoteEndpointConnection(ServerCtl.serviceQuery(), ServerCtl.serviceUpdate(), defaultGraphs, namedGraphs, defaultGraphs, namedGraphs, null, JenaConnection.DEFAULT_HOLDABILITY, JdbcCompatibility.DEFAULT, null, null); } http://git-wip-us.apache.org/repos/asf/jena/blob/7c3a5cfd/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithResultSetTypes.java ---------------------------------------------------------------------- diff --git a/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithResultSetTypes.java b/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithResultSetTypes.java index b2396d7..eca16f1 100644 --- a/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithResultSetTypes.java +++ b/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithResultSetTypes.java @@ -56,7 +56,7 @@ public class TestRemoteEndpointConnectionWithResultSetTypes extends AbstractRemo @Override protected JenaConnection getConnection(Dataset ds) throws SQLException { // Set up the dataset - TestUtils.copyToRemoteDataset(ds, ServerCtl.serviceREST()); + TestUtils.copyToRemoteDataset(ds, ServerCtl.serviceGSP()); return new RemoteEndpointConnection(ServerCtl.serviceQuery(), ServerCtl.serviceUpdate(), null, null, null, null, null, JenaConnection.DEFAULT_HOLDABILITY, JdbcCompatibility.DEFAULT, WebContent.contentTypeTextTSV, WebContent.contentTypeRdfJson); } } http://git-wip-us.apache.org/repos/asf/jena/blob/7c3a5cfd/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResults.java ---------------------------------------------------------------------- diff --git a/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResults.java b/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResults.java index 7de87c3..009fc71 100644 --- a/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResults.java +++ b/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResults.java @@ -74,7 +74,7 @@ public class TestRemoteEndpointResults extends AbstractRemoteEndpointResultSetTe @Override protected ResultSet createResults(Dataset ds, String query, int resultSetType) throws SQLException { - TestUtils.copyToRemoteDataset(ds, ServerCtl.serviceREST()); + TestUtils.copyToRemoteDataset(ds, ServerCtl.serviceGSP()); Statement stmt = connection.createStatement(resultSetType, ResultSet.CONCUR_READ_ONLY); return stmt.executeQuery(query); } http://git-wip-us.apache.org/repos/asf/jena/blob/7c3a5cfd/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithAuth.java ---------------------------------------------------------------------- diff --git a/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithAuth.java b/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithAuth.java index 8f7b8a1..78b7d2b 100644 --- a/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithAuth.java +++ b/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithAuth.java @@ -133,7 +133,7 @@ public class TestRemoteEndpointResultsWithAuth extends AbstractRemoteEndpointRes @Override protected ResultSet createResults(Dataset ds, String query, int resultSetType) throws SQLException { - TestUtils.copyToRemoteDataset(ds, ServerCtl.serviceREST(), client); + TestUtils.copyToRemoteDataset(ds, ServerCtl.serviceGSP(), client); Statement stmt = connection.createStatement(resultSetType, ResultSet.CONCUR_READ_ONLY); return stmt.executeQuery(query); } http://git-wip-us.apache.org/repos/asf/jena/blob/7c3a5cfd/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithGraphUris.java ---------------------------------------------------------------------- diff --git a/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithGraphUris.java b/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithGraphUris.java index 9cfb46a..9988249 100644 --- a/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithGraphUris.java +++ b/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithGraphUris.java @@ -84,7 +84,7 @@ public class TestRemoteEndpointResultsWithGraphUris extends AbstractRemoteEndpoi @Override protected ResultSet createResults(Dataset ds, String query, int resultSetType) throws SQLException { ds = TestUtils.renameGraph(ds, null, DEFAULT_GRAPH_URI); - TestUtils.copyToRemoteDataset(ds, ServerCtl.serviceREST()); + TestUtils.copyToRemoteDataset(ds, ServerCtl.serviceGSP()); Statement stmt = connection.createStatement(resultSetType, ResultSet.CONCUR_READ_ONLY); return stmt.executeQuery(query); } http://git-wip-us.apache.org/repos/asf/jena/blob/7c3a5cfd/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithResultSetTypes.java ---------------------------------------------------------------------- diff --git a/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithResultSetTypes.java b/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithResultSetTypes.java index 2076193..b7587cb 100644 --- a/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithResultSetTypes.java +++ b/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithResultSetTypes.java @@ -75,7 +75,7 @@ public class TestRemoteEndpointResultsWithResultSetTypes extends AbstractRemoteE @Override protected ResultSet createResults(Dataset ds, String query, int resultSetType) throws SQLException { - TestUtils.copyToRemoteDataset(ds, ServerCtl.serviceREST()); + TestUtils.copyToRemoteDataset(ds, ServerCtl.serviceGSP()); Statement stmt = connection.createStatement(resultSetType, ResultSet.CONCUR_READ_ONLY); return stmt.executeQuery(query); }