Align to redesigned Fuseki tests (ServerCtl). Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/355d4c4d Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/355d4c4d Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/355d4c4d
Branch: refs/heads/master Commit: 355d4c4dc4e878033cc6a7c03bf77c46f96ee90a Parents: 6d63d21 Author: Andy Seaborne <a...@apache.org> Authored: Sat Oct 15 18:35:20 2016 +0100 Committer: Andy Seaborne <a...@apache.org> Committed: Sat Oct 15 18:35:20 2016 +0100 ---------------------------------------------------------------------- .../jena/jdbc/remote/RemoteEndpointDriver.java | 1 - .../remote/metadata/RemoteEndpointMetadata.java | 1 - .../connections/TestRemoteEndpointConnection.java | 7 +++---- .../TestRemoteEndpointConnectionWithAuth.java | 16 ++++++++-------- .../TestRemoteEndpointConnectionWithGraphUris.java | 7 +++---- ...tRemoteEndpointConnectionWithResultSetTypes.java | 7 +++---- .../metadata/TestRemoteConnectionMetadata.java | 3 +-- .../remote/results/TestRemoteEndpointResults.java | 5 ++--- .../results/TestRemoteEndpointResultsWithAuth.java | 14 +++++++------- .../TestRemoteEndpointResultsWithGraphUris.java | 5 ++--- ...TestRemoteEndpointResultsWithResultSetTypes.java | 5 ++--- .../statements/TestRemoteEndpointStatements.java | 3 +-- 12 files changed, 32 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/355d4c4d/jena-jdbc/jena-jdbc-driver-remote/src/main/java/org/apache/jena/jdbc/remote/RemoteEndpointDriver.java ---------------------------------------------------------------------- diff --git a/jena-jdbc/jena-jdbc-driver-remote/src/main/java/org/apache/jena/jdbc/remote/RemoteEndpointDriver.java b/jena-jdbc/jena-jdbc-driver-remote/src/main/java/org/apache/jena/jdbc/remote/RemoteEndpointDriver.java index 2526cae..3729d97 100644 --- a/jena-jdbc/jena-jdbc-driver-remote/src/main/java/org/apache/jena/jdbc/remote/RemoteEndpointDriver.java +++ b/jena-jdbc/jena-jdbc-driver-remote/src/main/java/org/apache/jena/jdbc/remote/RemoteEndpointDriver.java @@ -35,7 +35,6 @@ import org.apache.jena.jdbc.JdbcCompatibility; import org.apache.jena.jdbc.JenaDriver; import org.apache.jena.jdbc.connections.JenaConnection; import org.apache.jena.jdbc.remote.connections.RemoteEndpointConnection; -import org.apache.jena.riot.web.HttpOp; import org.apache.jena.system.JenaSystem ; /** http://git-wip-us.apache.org/repos/asf/jena/blob/355d4c4d/jena-jdbc/jena-jdbc-driver-remote/src/main/java/org/apache/jena/jdbc/remote/metadata/RemoteEndpointMetadata.java ---------------------------------------------------------------------- diff --git a/jena-jdbc/jena-jdbc-driver-remote/src/main/java/org/apache/jena/jdbc/remote/metadata/RemoteEndpointMetadata.java b/jena-jdbc/jena-jdbc-driver-remote/src/main/java/org/apache/jena/jdbc/remote/metadata/RemoteEndpointMetadata.java index d9fd794..5fde4ca 100644 --- a/jena-jdbc/jena-jdbc-driver-remote/src/main/java/org/apache/jena/jdbc/remote/metadata/RemoteEndpointMetadata.java +++ b/jena-jdbc/jena-jdbc-driver-remote/src/main/java/org/apache/jena/jdbc/remote/metadata/RemoteEndpointMetadata.java @@ -33,7 +33,6 @@ import org.apache.jena.jdbc.remote.connections.RemoteEndpointConnection ; public class RemoteEndpointMetadata extends JenaMetadata { private Version jdbc; - @SuppressWarnings("unused") private RemoteEndpointConnection remoteConn; /** http://git-wip-us.apache.org/repos/asf/jena/blob/355d4c4d/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 dcc4f3c..e7b9107 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 @@ -21,7 +21,6 @@ package org.apache.jena.jdbc.remote.connections; import java.sql.SQLException; import org.apache.jena.fuseki.ServerCtl ; -import org.apache.jena.fuseki.ServerTest; import org.apache.jena.jdbc.JdbcCompatibility; import org.apache.jena.jdbc.connections.JenaConnection; import org.apache.jena.jdbc.utils.TestUtils; @@ -50,14 +49,14 @@ public class TestRemoteEndpointConnection extends AbstractRemoteEndpointConnecti @Override protected JenaConnection getConnection() throws SQLException { - return new RemoteEndpointConnection(ServerTest.serviceQuery, ServerTest.serviceUpdate, JenaConnection.DEFAULT_HOLDABILITY, JdbcCompatibility.DEFAULT); + return new RemoteEndpointConnection(ServerCtl.serviceQuery(), ServerCtl.serviceUpdate(), JenaConnection.DEFAULT_HOLDABILITY, JdbcCompatibility.DEFAULT); } @Override protected JenaConnection getConnection(Dataset ds) throws SQLException { // Set up the dataset - TestUtils.copyToRemoteDataset(ds, ServerTest.serviceREST); - return new RemoteEndpointConnection(ServerTest.serviceQuery, ServerTest.serviceUpdate, JenaConnection.DEFAULT_HOLDABILITY, JdbcCompatibility.DEFAULT); + TestUtils.copyToRemoteDataset(ds, ServerCtl.serviceREST()); + return new RemoteEndpointConnection(ServerCtl.serviceQuery(), ServerCtl.serviceUpdate(), JenaConnection.DEFAULT_HOLDABILITY, JdbcCompatibility.DEFAULT); } http://git-wip-us.apache.org/repos/asf/jena/blob/355d4c4d/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 62a76de..2d75c82 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 @@ -28,7 +28,7 @@ import org.apache.http.auth.UsernamePasswordCredentials; import org.apache.http.client.HttpClient; import org.apache.http.impl.client.BasicCredentialsProvider; import org.apache.http.impl.client.HttpClients; -import org.apache.jena.fuseki.ServerTest ; +import org.apache.jena.fuseki.ServerCtl ; import org.apache.jena.fuseki.server.FusekiConfig ; import org.apache.jena.fuseki.server.SPARQLServer ; import org.apache.jena.fuseki.server.ServerConfig ; @@ -81,9 +81,9 @@ public class TestRemoteEndpointConnectionWithAuth extends AbstractRemoteEndpoint DatasetGraph dsg = DatasetGraphFactory.create(); // This must agree with ServerTest - ServerConfig conf = FusekiConfig.defaultConfiguration(ServerTest.datasetPath, dsg, true, false); - conf.port = ServerTest.port; - conf.pagesPort = ServerTest.port; + ServerConfig conf = FusekiConfig.defaultConfiguration(ServerCtl.datasetPath(), dsg, true, false); + conf.port = ServerCtl.port(); + conf.pagesPort = ServerCtl.port(); conf.authConfigFile = realmFile.getAbsolutePath(); server = new SPARQLServer(conf); @@ -96,7 +96,7 @@ public class TestRemoteEndpointConnectionWithAuth extends AbstractRemoteEndpoint @After public void cleanupTest() { Update clearRequest = new UpdateDrop(Target.ALL) ; - UpdateProcessor proc = UpdateExecutionFactory.createRemote(clearRequest, ServerTest.serviceUpdate, client) ; + UpdateProcessor proc = UpdateExecutionFactory.createRemote(clearRequest, ServerCtl.serviceUpdate(), client) ; proc.execute() ; } @@ -118,7 +118,7 @@ public class TestRemoteEndpointConnectionWithAuth extends AbstractRemoteEndpoint @Override protected JenaConnection getConnection() throws SQLException { - return new RemoteEndpointConnection(ServerTest.serviceQuery, ServerTest.serviceUpdate, null, null, null, null, + return new RemoteEndpointConnection(ServerCtl.serviceQuery(), ServerCtl.serviceUpdate(), null, null, null, null, client, JenaConnection.DEFAULT_HOLDABILITY, JdbcCompatibility.DEFAULT, null, null); } @@ -126,8 +126,8 @@ public class TestRemoteEndpointConnectionWithAuth extends AbstractRemoteEndpoint @Override protected JenaConnection getConnection(Dataset ds) throws SQLException { // Set up the dataset - TestUtils.copyToRemoteDataset(ds, ServerTest.serviceREST, client); - return new RemoteEndpointConnection(ServerTest.serviceQuery, ServerTest.serviceUpdate, null, null, null, null, + TestUtils.copyToRemoteDataset(ds, ServerCtl.serviceREST(), 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/355d4c4d/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 b6183e1..95f82d3 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 @@ -24,7 +24,6 @@ import java.util.Iterator; import java.util.List; import org.apache.jena.fuseki.ServerCtl ; -import org.apache.jena.fuseki.ServerTest; import org.apache.jena.jdbc.JdbcCompatibility; import org.apache.jena.jdbc.connections.JenaConnection; import org.apache.jena.jdbc.utils.TestUtils; @@ -60,7 +59,7 @@ public class TestRemoteEndpointConnectionWithGraphUris extends AbstractRemoteEnd protected JenaConnection getConnection() throws SQLException { List<String> defaultGraphs = new ArrayList<String>(); defaultGraphs.add(DEFAULT_GRAPH_URI); - return new RemoteEndpointConnection(ServerTest.serviceQuery, ServerTest.serviceUpdate, defaultGraphs, null, + return new RemoteEndpointConnection(ServerCtl.serviceQuery(), ServerCtl.serviceUpdate(), defaultGraphs, null, defaultGraphs, null, null, JenaConnection.DEFAULT_HOLDABILITY, JdbcCompatibility.DEFAULT, null, null); } @@ -80,8 +79,8 @@ 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, ServerTest.serviceREST); - return new RemoteEndpointConnection(ServerTest.serviceQuery, ServerTest.serviceUpdate, defaultGraphs, namedGraphs, + TestUtils.copyToRemoteDataset(ds, ServerCtl.serviceREST()); + 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/355d4c4d/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 0fbb148..b2396d7 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 @@ -21,7 +21,6 @@ package org.apache.jena.jdbc.remote.connections; import java.sql.SQLException; import org.apache.jena.fuseki.ServerCtl ; -import org.apache.jena.fuseki.ServerTest; import org.apache.jena.jdbc.JdbcCompatibility; import org.apache.jena.jdbc.connections.JenaConnection; import org.apache.jena.jdbc.utils.TestUtils; @@ -51,13 +50,13 @@ public class TestRemoteEndpointConnectionWithResultSetTypes extends AbstractRemo @Override protected JenaConnection getConnection() throws SQLException { - return new RemoteEndpointConnection(ServerTest.serviceQuery, ServerTest.serviceUpdate, null, null, null, null, null, JenaConnection.DEFAULT_HOLDABILITY, JdbcCompatibility.DEFAULT, WebContent.contentTypeTextTSV, WebContent.contentTypeRdfJson); + return new RemoteEndpointConnection(ServerCtl.serviceQuery(), ServerCtl.serviceUpdate(), null, null, null, null, null, JenaConnection.DEFAULT_HOLDABILITY, JdbcCompatibility.DEFAULT, WebContent.contentTypeTextTSV, WebContent.contentTypeRdfJson); } @Override protected JenaConnection getConnection(Dataset ds) throws SQLException { // Set up the dataset - TestUtils.copyToRemoteDataset(ds, ServerTest.serviceREST); - return new RemoteEndpointConnection(ServerTest.serviceQuery, ServerTest.serviceUpdate, null, null, null, null, null, JenaConnection.DEFAULT_HOLDABILITY, JdbcCompatibility.DEFAULT, WebContent.contentTypeTextTSV, WebContent.contentTypeRdfJson); + TestUtils.copyToRemoteDataset(ds, ServerCtl.serviceREST()); + 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/355d4c4d/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/metadata/TestRemoteConnectionMetadata.java ---------------------------------------------------------------------- diff --git a/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/metadata/TestRemoteConnectionMetadata.java b/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/metadata/TestRemoteConnectionMetadata.java index e3e6c86..bc83bbe 100644 --- a/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/metadata/TestRemoteConnectionMetadata.java +++ b/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/metadata/TestRemoteConnectionMetadata.java @@ -24,7 +24,6 @@ import java.util.ArrayList; import java.util.List; import org.apache.jena.fuseki.ServerCtl ; -import org.apache.jena.fuseki.ServerTest; import org.apache.jena.jdbc.JdbcCompatibility; import org.apache.jena.jdbc.connections.JenaConnection; import org.apache.jena.jdbc.metadata.results.AbstractDatabaseMetadataTests; @@ -47,7 +46,7 @@ public class TestRemoteConnectionMetadata extends AbstractDatabaseMetadataTests @Override protected JenaConnection getConnection() throws SQLException { - return new RemoteEndpointConnection(ServerTest.serviceQuery, ServerTest.serviceUpdate, JenaConnection.DEFAULT_HOLDABILITY, JdbcCompatibility.DEFAULT); + return new RemoteEndpointConnection(ServerCtl.serviceQuery(), ServerCtl.serviceUpdate(), JenaConnection.DEFAULT_HOLDABILITY, JdbcCompatibility.DEFAULT); } @Override http://git-wip-us.apache.org/repos/asf/jena/blob/355d4c4d/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 fe56c28..7de87c3 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 @@ -23,7 +23,6 @@ import java.sql.SQLException; import java.sql.Statement; import org.apache.jena.fuseki.ServerCtl ; -import org.apache.jena.fuseki.ServerTest; import org.apache.jena.jdbc.JdbcCompatibility; import org.apache.jena.jdbc.connections.JenaConnection; import org.apache.jena.jdbc.remote.connections.RemoteEndpointConnection; @@ -54,7 +53,7 @@ public class TestRemoteEndpointResults extends AbstractRemoteEndpointResultSetTe @BeforeClass public static void setup() throws SQLException { ServerCtl.ctlBeforeClass(); - connection = new RemoteEndpointConnection(ServerTest.serviceQuery, ServerTest.serviceUpdate, JenaConnection.DEFAULT_HOLDABILITY, JdbcCompatibility.DEFAULT); + connection = new RemoteEndpointConnection(ServerCtl.serviceQuery(), ServerCtl.serviceUpdate(), JenaConnection.DEFAULT_HOLDABILITY, JdbcCompatibility.DEFAULT); connection.setJdbcCompatibilityLevel(JdbcCompatibility.HIGH); } @@ -75,7 +74,7 @@ public class TestRemoteEndpointResults extends AbstractRemoteEndpointResultSetTe @Override protected ResultSet createResults(Dataset ds, String query, int resultSetType) throws SQLException { - TestUtils.copyToRemoteDataset(ds, ServerTest.serviceREST); + TestUtils.copyToRemoteDataset(ds, ServerCtl.serviceREST()); Statement stmt = connection.createStatement(resultSetType, ResultSet.CONCUR_READ_ONLY); return stmt.executeQuery(query); } http://git-wip-us.apache.org/repos/asf/jena/blob/355d4c4d/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 f4241e5..8f7b8a1 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 @@ -30,7 +30,7 @@ import org.apache.http.auth.UsernamePasswordCredentials; import org.apache.http.client.HttpClient; import org.apache.http.impl.client.BasicCredentialsProvider; import org.apache.http.impl.client.HttpClients; -import org.apache.jena.fuseki.ServerTest; +import org.apache.jena.fuseki.ServerCtl ; import org.apache.jena.fuseki.server.FusekiConfig; import org.apache.jena.fuseki.server.SPARQLServer; import org.apache.jena.fuseki.server.ServerConfig; @@ -88,15 +88,15 @@ public class TestRemoteEndpointResultsWithAuth extends AbstractRemoteEndpointRes DatasetGraph dsg = DatasetGraphFactory.create(); // This must agree with ServerTest - ServerConfig conf = FusekiConfig.defaultConfiguration(ServerTest.datasetPath, dsg, true, false); - conf.port = ServerTest.port; - conf.pagesPort = ServerTest.port; + ServerConfig conf = FusekiConfig.defaultConfiguration(ServerCtl.datasetPath(), dsg, true, false); + conf.port = ServerCtl.port(); + conf.pagesPort = ServerCtl.port(); conf.authConfigFile = realmFile.getAbsolutePath(); server = new SPARQLServer(conf); server.start(); - connection = new RemoteEndpointConnection(ServerTest.serviceQuery, ServerTest.serviceUpdate, null, null, null, null, + connection = new RemoteEndpointConnection(ServerCtl.serviceQuery(), ServerCtl.serviceUpdate(), null, null, null, null, client, JenaConnection.DEFAULT_HOLDABILITY, JdbcCompatibility.DEFAULT, null, null); connection.setJdbcCompatibilityLevel(JdbcCompatibility.HIGH); } @@ -107,7 +107,7 @@ public class TestRemoteEndpointResultsWithAuth extends AbstractRemoteEndpointRes @After public void cleanupTest() { Update clearRequest = new UpdateDrop(Target.ALL) ; - UpdateProcessor proc = UpdateExecutionFactory.createRemote(clearRequest, ServerTest.serviceUpdate, client) ; + UpdateProcessor proc = UpdateExecutionFactory.createRemote(clearRequest, ServerCtl.serviceUpdate(), client) ; proc.execute() ; } @@ -133,7 +133,7 @@ public class TestRemoteEndpointResultsWithAuth extends AbstractRemoteEndpointRes @Override protected ResultSet createResults(Dataset ds, String query, int resultSetType) throws SQLException { - TestUtils.copyToRemoteDataset(ds, ServerTest.serviceREST, client); + TestUtils.copyToRemoteDataset(ds, ServerCtl.serviceREST(), client); Statement stmt = connection.createStatement(resultSetType, ResultSet.CONCUR_READ_ONLY); return stmt.executeQuery(query); } http://git-wip-us.apache.org/repos/asf/jena/blob/355d4c4d/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 7d7e554..9cfb46a 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 @@ -25,7 +25,6 @@ import java.util.List; import org.apache.jena.ext.com.google.common.collect.Lists; import org.apache.jena.fuseki.ServerCtl ; -import org.apache.jena.fuseki.ServerTest; import org.apache.jena.jdbc.JdbcCompatibility; import org.apache.jena.jdbc.connections.JenaConnection; import org.apache.jena.jdbc.remote.connections.RemoteEndpointConnection; @@ -63,7 +62,7 @@ public class TestRemoteEndpointResultsWithGraphUris extends AbstractRemoteEndpoi public static void setup() throws SQLException { ServerCtl.ctlBeforeClass(); List<String> defaultGraphUris = Lists.newArrayList(DEFAULT_GRAPH_URI); - connection = new RemoteEndpointConnection(ServerTest.serviceQuery, ServerTest.serviceUpdate, defaultGraphUris, null, defaultGraphUris, null, null, JenaConnection.DEFAULT_HOLDABILITY, JdbcCompatibility.DEFAULT, null, null); + connection = new RemoteEndpointConnection(ServerCtl.serviceQuery(), ServerCtl.serviceUpdate(), defaultGraphUris, null, defaultGraphUris, null, null, JenaConnection.DEFAULT_HOLDABILITY, JdbcCompatibility.DEFAULT, null, null); connection.setJdbcCompatibilityLevel(JdbcCompatibility.HIGH); } @@ -85,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, ServerTest.serviceREST); + TestUtils.copyToRemoteDataset(ds, ServerCtl.serviceREST()); Statement stmt = connection.createStatement(resultSetType, ResultSet.CONCUR_READ_ONLY); return stmt.executeQuery(query); } http://git-wip-us.apache.org/repos/asf/jena/blob/355d4c4d/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 5cc0b4c..2076193 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 @@ -23,7 +23,6 @@ import java.sql.SQLException; import java.sql.Statement; import org.apache.jena.fuseki.ServerCtl ; -import org.apache.jena.fuseki.ServerTest; import org.apache.jena.jdbc.JdbcCompatibility; import org.apache.jena.jdbc.connections.JenaConnection; import org.apache.jena.jdbc.remote.connections.RemoteEndpointConnection; @@ -55,7 +54,7 @@ public class TestRemoteEndpointResultsWithResultSetTypes extends AbstractRemoteE @BeforeClass public static void setup() throws SQLException { ServerCtl.ctlBeforeClass(); - connection = new RemoteEndpointConnection(ServerTest.serviceQuery, ServerTest.serviceUpdate, null, null, null, null, null, JenaConnection.DEFAULT_HOLDABILITY, JdbcCompatibility.DEFAULT, WebContent.contentTypeTextTSV, WebContent.contentTypeRdfJson); + connection = new RemoteEndpointConnection(ServerCtl.serviceQuery(), ServerCtl.serviceUpdate(), null, null, null, null, null, JenaConnection.DEFAULT_HOLDABILITY, JdbcCompatibility.DEFAULT, WebContent.contentTypeTextTSV, WebContent.contentTypeRdfJson); connection.setJdbcCompatibilityLevel(JdbcCompatibility.HIGH); } @@ -76,7 +75,7 @@ public class TestRemoteEndpointResultsWithResultSetTypes extends AbstractRemoteE @Override protected ResultSet createResults(Dataset ds, String query, int resultSetType) throws SQLException { - TestUtils.copyToRemoteDataset(ds, ServerTest.serviceREST); + TestUtils.copyToRemoteDataset(ds, ServerCtl.serviceREST()); Statement stmt = connection.createStatement(resultSetType, ResultSet.CONCUR_READ_ONLY); return stmt.executeQuery(query); } http://git-wip-us.apache.org/repos/asf/jena/blob/355d4c4d/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/statements/TestRemoteEndpointStatements.java ---------------------------------------------------------------------- diff --git a/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/statements/TestRemoteEndpointStatements.java b/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/statements/TestRemoteEndpointStatements.java index b04fbaf..9b64cce 100644 --- a/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/statements/TestRemoteEndpointStatements.java +++ b/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/statements/TestRemoteEndpointStatements.java @@ -21,7 +21,6 @@ package org.apache.jena.jdbc.remote.statements; import java.sql.SQLException; import org.apache.jena.fuseki.ServerCtl ; -import org.apache.jena.fuseki.ServerTest; import org.apache.jena.jdbc.JdbcCompatibility; import org.apache.jena.jdbc.connections.JenaConnection; import org.apache.jena.jdbc.remote.connections.RemoteEndpointConnection; @@ -44,7 +43,7 @@ public class TestRemoteEndpointStatements extends AbstractJenaStatementTests { @Override protected JenaConnection getConnection() throws SQLException { - return new RemoteEndpointConnection(ServerTest.serviceQuery, ServerTest.serviceUpdate, JenaConnection.DEFAULT_HOLDABILITY, JdbcCompatibility.DEFAULT); + return new RemoteEndpointConnection(ServerCtl.serviceQuery(), ServerCtl.serviceUpdate(), JenaConnection.DEFAULT_HOLDABILITY, JdbcCompatibility.DEFAULT); }