Move ServerCtl into Fuseki1; use in Fuseki1 tests
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/722b3f37 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/722b3f37 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/722b3f37 Branch: refs/heads/master Commit: 722b3f371abf5d31ce1f1564da134a7a76f03ca0 Parents: 926fc52 Author: Andy Seaborne <a...@apache.org> Authored: Fri Oct 14 15:22:25 2016 +0100 Committer: ajs6f <aj...@virginia.edu> Committed: Fri Oct 14 10:32:34 2016 -0400 ---------------------------------------------------------------------- .../java/org/apache/jena/fuseki/ServerCtl.java | 108 +++++++++++++++++++ .../java/org/apache/jena/fuseki/ServerTest.java | 11 +- .../java/org/apache/jena/fuseki/TS_Fuseki.java | 18 +--- .../fuseki/http/TestDatasetAccessorHTTP.java | 22 ++-- .../http/TestDatasetGraphAccessorHTTP.java | 9 +- .../org/apache/jena/fuseki/http/TestHttpOp.java | 20 ++-- .../org/apache/jena/jdbc/remote/ServerCtl.java | 106 ------------------ .../jena/jdbc/remote/TS_JdbcDriverRemote.java | 1 + .../TestRemoteEndpointConnection.java | 6 +- ...stRemoteEndpointConnectionWithGraphUris.java | 7 +- ...oteEndpointConnectionWithResultSetTypes.java | 7 +- .../metadata/TestRemoteConnectionMetadata.java | 7 +- .../results/TestRemoteEndpointResults.java | 7 +- .../TestRemoteEndpointResultsWithGraphUris.java | 3 +- ...RemoteEndpointResultsWithResultSetTypes.java | 2 +- .../TestRemoteEndpointStatements.java | 7 +- 16 files changed, 158 insertions(+), 183 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/722b3f37/jena-fuseki1/src/test/java/org/apache/jena/fuseki/ServerCtl.java ---------------------------------------------------------------------- diff --git a/jena-fuseki1/src/test/java/org/apache/jena/fuseki/ServerCtl.java b/jena-fuseki1/src/test/java/org/apache/jena/fuseki/ServerCtl.java new file mode 100644 index 0000000..da957a4 --- /dev/null +++ b/jena-fuseki1/src/test/java/org/apache/jena/fuseki/ServerCtl.java @@ -0,0 +1,108 @@ +/** + * 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; + +import org.apache.http.client.HttpClient ; +import org.apache.http.impl.client.CloseableHttpClient ; +import org.apache.jena.atlas.io.IO ; +import org.apache.jena.riot.web.HttpOp ; + +public class ServerCtl { + static { Fuseki.init(); } + + /* Put this in each test class using the Fuseki server: + @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(); } + */ + + static HttpClient defaultHttpClient = HttpOp.getDefaultHttpClient(); + + // 2 choices: server over whole test suite or server over each test class. + // Preferred "true" - stop-start server between test classes. + // Note: it is import to cleanly close a PoolingHttpClient across server restarts + // otherwise the pooled connections remian for the old server. + + static final boolean SERVER_PER_CLASS = true ; + public static void ctlBeforeTestSuite() { + if ( ! SERVER_PER_CLASS ) { + setPoolingHttpClient() ; + ServerTest.allocServer(); + } + } + + public static void ctlAfterTestSuite() { + if ( ! SERVER_PER_CLASS ) { + ServerTest.freeServer(); + resetDefaultHttpClient() ; + } + } + + /** + * Setup for the tests by allocating a Fuseki instance to work with + */ + public static void ctlBeforeClass() { + if ( SERVER_PER_CLASS ) { + setPoolingHttpClient() ; + ServerTest.allocServer(); + } + } + + /** + * Clean up after tests by de-allocating the Fuseki instance + */ + public static void ctlAfterClass() { + if ( SERVER_PER_CLASS ) { + ServerTest.freeServer(); + resetDefaultHttpClient() ; + } + } + + /** + * Placeholder. + */ + public static void ctlBeforeTest() { + } + + /** + * Clean up after each test by resetting the Fuseki dataset + */ + public static void ctlAfterTest() { + ServerTest.resetServer(); + } + + /** Set a PoolingHttpClient */ + private static void setPoolingHttpClient() { + setHttpClient(HttpOp.createPoolingHttpClient()) ; + } + + /** Restore the original setup */ + private static void resetDefaultHttpClient() { + setHttpClient(defaultHttpClient); + } + + /** Set the HttpClient - close the old one if appropriate */ + private static void setHttpClient(HttpClient newHttpClient) { + HttpClient hc = HttpOp.getDefaultHttpClient() ; + if ( hc instanceof CloseableHttpClient ) + IO.close((CloseableHttpClient)hc) ; + HttpOp.setDefaultHttpClient(newHttpClient) ; + } +} http://git-wip-us.apache.org/repos/asf/jena/blob/722b3f37/jena-fuseki1/src/test/java/org/apache/jena/fuseki/ServerTest.java ---------------------------------------------------------------------- diff --git a/jena-fuseki1/src/test/java/org/apache/jena/fuseki/ServerTest.java b/jena-fuseki1/src/test/java/org/apache/jena/fuseki/ServerTest.java index f6783a7..38b51bb 100644 --- a/jena-fuseki1/src/test/java/org/apache/jena/fuseki/ServerTest.java +++ b/jena-fuseki1/src/test/java/org/apache/jena/fuseki/ServerTest.java @@ -48,11 +48,6 @@ import org.apache.jena.update.UpdateProcessor ; */ public class ServerTest { - // Note: - // @Before public void before() { ServerTest.resetServer() ; } - // If using SPARQL Update to reset the server. - // It can hit the server before it has started properly. - static { Fuseki.init(); } // Abstraction that runs a SPARQL server for tests. @@ -83,12 +78,12 @@ public class ServerTest // reference count of start/stop server private static AtomicInteger countServer = new AtomicInteger() ; - static public void allocServer() { + /*package*/ static void allocServer() { if ( countServer.getAndIncrement() == 0 ) setupServer() ; } - static public void freeServer() { + /*package*/ static void freeServer() { if ( countServer.decrementAndGet() == 0 ) teardownServer() ; } @@ -112,7 +107,7 @@ public class ServerTest server = null ; } - public static void resetServer() { + /*package*/ static void resetServer() { if (countServer.get() == 0) throw new RuntimeException("No server started!"); if ( CLEAR_DSG_DIRECTLY ) { http://git-wip-us.apache.org/repos/asf/jena/blob/722b3f37/jena-fuseki1/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java ---------------------------------------------------------------------- diff --git a/jena-fuseki1/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java b/jena-fuseki1/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java index 13f3903..8cfe649 100644 --- a/jena-fuseki1/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java +++ b/jena-fuseki1/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java @@ -18,12 +18,9 @@ package org.apache.jena.fuseki; -import org.apache.http.client.HttpClient; -import org.apache.jena.atlas.logging.LogCtl ; import org.apache.jena.fuseki.http.TestDatasetAccessorHTTP ; import org.apache.jena.fuseki.http.TestDatasetGraphAccessorHTTP ; import org.apache.jena.fuseki.http.TestHttpOp ; -import org.apache.jena.riot.web.HttpOp ; import org.junit.AfterClass ; import org.junit.BeforeClass ; import org.junit.runner.RunWith ; @@ -38,25 +35,16 @@ import org.junit.runners.Suite ; , TestQuery.class , TestAuth.class }) + public class TS_Fuseki extends ServerTest { - // Use HttpOp caching of connections during testing to avoid - // swamping kernel socket management - static HttpClient defaultHttpClient = HttpOp.getDefaultHttpClient() ; - // Used for all tests except auth tests. - static final HttpClient globalPoolingClient = HttpOp.createPoolingHttpClient(); - @BeforeClass static public void beforeClass() { - HttpOp.setDefaultHttpClient(globalPoolingClient) ; - LogCtl.disable(Fuseki.requestLogName) ; - // Suppress pooling client retry messages. - LogCtl.setLevel("org.apache.http.impl.execchain.RetryExec", "WARN") ; + ServerCtl.ctlBeforeTestSuite(); } @AfterClass static public void afterClass() { - HttpOp.setDefaultHttpClient(defaultHttpClient) ; - LogCtl.setInfo(Fuseki.requestLogName) ; + ServerCtl.ctlAfterTestSuite(); } } http://git-wip-us.apache.org/repos/asf/jena/blob/722b3f37/jena-fuseki1/src/test/java/org/apache/jena/fuseki/http/TestDatasetAccessorHTTP.java ---------------------------------------------------------------------- diff --git a/jena-fuseki1/src/test/java/org/apache/jena/fuseki/http/TestDatasetAccessorHTTP.java b/jena-fuseki1/src/test/java/org/apache/jena/fuseki/http/TestDatasetAccessorHTTP.java index c6251f6..7b2e168 100644 --- a/jena-fuseki1/src/test/java/org/apache/jena/fuseki/http/TestDatasetAccessorHTTP.java +++ b/jena-fuseki1/src/test/java/org/apache/jena/fuseki/http/TestDatasetAccessorHTTP.java @@ -18,17 +18,11 @@ package org.apache.jena.fuseki.http; -import static org.apache.jena.fuseki.ServerTest.datasetPath ; -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 static org.apache.jena.fuseki.ServerTest.port ; -import static org.apache.jena.fuseki.ServerTest.serviceREST ; +import static org.apache.jena.fuseki.ServerTest.* ; import org.apache.jena.atlas.junit.BaseTest ; import org.apache.jena.atlas.web.HttpException ; +import org.apache.jena.fuseki.ServerCtl ; import org.apache.jena.fuseki.ServerTest ; import org.apache.jena.query.DatasetAccessor ; import org.apache.jena.query.DatasetAccessorFactory ; @@ -36,10 +30,7 @@ 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.After ; -import org.junit.AfterClass ; -import org.junit.BeforeClass ; -import org.junit.Test ; +import org.junit.* ; public class TestDatasetAccessorHTTP extends BaseTest @@ -48,9 +39,10 @@ public class TestDatasetAccessorHTTP extends BaseTest static final String datasetURI_not_2 = serviceREST+"/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() ; } - @After public void after() { 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(); } @Test(expected=HttpException.class) public void test_ds_1() http://git-wip-us.apache.org/repos/asf/jena/blob/722b3f37/jena-fuseki1/src/test/java/org/apache/jena/fuseki/http/TestDatasetGraphAccessorHTTP.java ---------------------------------------------------------------------- diff --git a/jena-fuseki1/src/test/java/org/apache/jena/fuseki/http/TestDatasetGraphAccessorHTTP.java b/jena-fuseki1/src/test/java/org/apache/jena/fuseki/http/TestDatasetGraphAccessorHTTP.java index 723103a..ef548d6 100644 --- a/jena-fuseki1/src/test/java/org/apache/jena/fuseki/http/TestDatasetGraphAccessorHTTP.java +++ b/jena-fuseki1/src/test/java/org/apache/jena/fuseki/http/TestDatasetGraphAccessorHTTP.java @@ -18,19 +18,22 @@ package org.apache.jena.fuseki.http; +import org.apache.jena.fuseki.ServerCtl ; import org.apache.jena.fuseki.ServerTest ; 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() ; } - @After public void after() { 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() http://git-wip-us.apache.org/repos/asf/jena/blob/722b3f37/jena-fuseki1/src/test/java/org/apache/jena/fuseki/http/TestHttpOp.java ---------------------------------------------------------------------- diff --git a/jena-fuseki1/src/test/java/org/apache/jena/fuseki/http/TestHttpOp.java b/jena-fuseki1/src/test/java/org/apache/jena/fuseki/http/TestHttpOp.java index 47047c1..ad3acc9 100644 --- a/jena-fuseki1/src/test/java/org/apache/jena/fuseki/http/TestHttpOp.java +++ b/jena-fuseki1/src/test/java/org/apache/jena/fuseki/http/TestHttpOp.java @@ -25,28 +25,28 @@ import org.apache.jena.atlas.junit.BaseTest ; import org.apache.jena.atlas.lib.IRILib ; import org.apache.jena.atlas.web.HttpException ; import org.apache.jena.atlas.web.TypedInputStream ; +import org.apache.jena.fuseki.ServerCtl ; 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 ; import org.apache.jena.util.FileUtils ; import org.apache.jena.web.HttpSC ; -import org.junit.AfterClass ; -import org.junit.BeforeClass ; -import org.junit.Test ; +import org.junit.* ; // This a mixture of testing HttpOp and testing basic operation of the SPARQL server // especially error cases and unusual usage that the higher level APIs don't use. public class TestHttpOp extends BaseTest { - static String pingURL = ServerTest.urlRoot+"ping.txt" ; - @BeforeClass public static void beforeClass() { ServerTest.allocServer() ; } - @AfterClass public static void afterClass() { ServerTest.freeServer() ; } - - static String graphURL = ServerTest.serviceREST+"?default" ; - static String queryURL = ServerTest.serviceQuery ; - static String updateURL = ServerTest.serviceUpdate ; + @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(); } + static String pingURL = ServerTest.urlRoot + "ping.txt" ; + static String graphURL = ServerTest.serviceREST + "?default" ; + static String queryURL = ServerTest.serviceQuery ; + static String updateURL = ServerTest.serviceUpdate ; static String simpleQuery = queryURL+"?query="+IRILib.encodeUriComponent("ASK{}") ; // Basic operations http://git-wip-us.apache.org/repos/asf/jena/blob/722b3f37/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/ServerCtl.java ---------------------------------------------------------------------- diff --git a/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/ServerCtl.java b/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/ServerCtl.java deleted file mode 100644 index 66bc4dc..0000000 --- a/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/ServerCtl.java +++ /dev/null @@ -1,106 +0,0 @@ -/** - * 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.jdbc.remote; - -import org.apache.http.client.HttpClient ; -import org.apache.http.impl.client.CloseableHttpClient ; -import org.apache.jena.atlas.io.IO ; -import org.apache.jena.fuseki.Fuseki ; -import org.apache.jena.fuseki.ServerTest ; -import org.apache.jena.riot.web.HttpOp ; - -public class ServerCtl { - static { Fuseki.init(); } - - /* Put this in each test class using the Fuseki server: - @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(); } - */ - - // One server, all tests. - //static { ServerTest.allocServer(); } - - // Use HttpOp caching of connections during testing to avoid - // swamping kernel socket management - static HttpClient defaultHttpClient = HttpOp.getDefaultHttpClient(); - - // Used for all tests except auth tests. - //static final HttpClient globalPoolingClient = HttpOp.createPoolingHttpClient(); - - public static void ctlBeforeTestSuite() { - // Does not work to have pool across server free/alloc. - // This may be to do with timing when using localhost - // and a high frequence connection churn. - //setPoolingHttpClient() ; - } - - public static void ctlAfterTestSuite() { - //resetDefaultHttpClient(); - } - - /** - * Setup for the tests by allocating a Fuseki instance to work with - */ - public static void ctlBeforeClass() { - setPoolingHttpClient() ; - ServerTest.allocServer(); - } - - /** - * Clean up after tests by de-allocating the Fuseki instance - */ - public static void ctlAfterClass() { - ServerTest.freeServer(); - resetDefaultHttpClient() ; - } - - /** - * Placeholder. - */ - public static void ctlBeforeTest() { - } - - /** - * Clean up after each test by resetting the Fuseki dataset - */ - public static void ctlAfterTest() { - ServerTest.resetServer(); - } - - /** Set a PoolingHttpClient */ - private static void setPoolingHttpClient() { - setHttpClient(HttpOp.createPoolingHttpClient()) ; - } - - /** Restore the original setup */ - private static void resetDefaultHttpClient() { - setHttpClient(defaultHttpClient); - } - - /** Set the HttpClient - close the old one if appropriate */ - private static void setHttpClient(HttpClient newHttpClient) { - HttpClient hc = HttpOp.getDefaultHttpClient() ; - if ( hc instanceof CloseableHttpClient ) - IO.close((CloseableHttpClient)hc) ; - HttpOp.setDefaultHttpClient(newHttpClient) ; - } - -} http://git-wip-us.apache.org/repos/asf/jena/blob/722b3f37/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/TS_JdbcDriverRemote.java ---------------------------------------------------------------------- diff --git a/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/TS_JdbcDriverRemote.java b/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/TS_JdbcDriverRemote.java index 5fadd00..372f379 100644 --- a/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/TS_JdbcDriverRemote.java +++ b/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/TS_JdbcDriverRemote.java @@ -17,6 +17,7 @@ */ package org.apache.jena.jdbc.remote; +import org.apache.jena.fuseki.ServerCtl ; import org.apache.jena.jdbc.remote.connections.TestRemoteEndpointConnection; import org.apache.jena.jdbc.remote.connections.TestRemoteEndpointConnectionWithAuth; import org.apache.jena.jdbc.remote.connections.TestRemoteEndpointConnectionWithGraphUris; http://git-wip-us.apache.org/repos/asf/jena/blob/722b3f37/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 37cb8ad..dcc4f3c 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 @@ -20,10 +20,10 @@ 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.remote.ServerCtl ; import org.apache.jena.jdbc.utils.TestUtils; import org.apache.jena.query.Dataset ; import org.junit.After; @@ -39,8 +39,8 @@ public class TestRemoteEndpointConnection extends AbstractRemoteEndpointConnecti @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(); } + @Before public void ctlBeforeTest() { ServerCtl.ctlBeforeTest(); } + @After public void ctlAfterTest() { ServerCtl.ctlAfterTest(); } @Override protected boolean supportsTimeouts() { http://git-wip-us.apache.org/repos/asf/jena/blob/722b3f37/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 e4beca0..b6183e1 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 @@ -23,11 +23,10 @@ import java.util.ArrayList; 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.remote.ServerCtl ; -import org.apache.jena.jdbc.remote.connections.RemoteEndpointConnection; import org.apache.jena.jdbc.utils.TestUtils; import org.apache.jena.query.Dataset ; import org.junit.* ; @@ -47,8 +46,8 @@ public class TestRemoteEndpointConnectionWithGraphUris extends AbstractRemoteEnd @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(); } + @Before public void ctlBeforeTest() { ServerCtl.ctlBeforeTest(); } + @After public void ctlAfterTest() { ServerCtl.ctlAfterTest(); } @Override protected boolean supportsTimeouts() { http://git-wip-us.apache.org/repos/asf/jena/blob/722b3f37/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 620b21f..0fbb148 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 @@ -20,11 +20,10 @@ 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.remote.ServerCtl ; -import org.apache.jena.jdbc.remote.connections.RemoteEndpointConnection; import org.apache.jena.jdbc.utils.TestUtils; import org.apache.jena.query.Dataset ; import org.apache.jena.riot.WebContent; @@ -41,8 +40,8 @@ public class TestRemoteEndpointConnectionWithResultSetTypes extends AbstractRemo @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(); } + @Before public void ctlBeforeTest() { ServerCtl.ctlBeforeTest(); } + @After public void ctlAfterTest() { ServerCtl.ctlAfterTest(); } @Override protected boolean supportsTimeouts() { http://git-wip-us.apache.org/repos/asf/jena/blob/722b3f37/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 7367d3b..e3e6c86 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 @@ -23,12 +23,11 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.List; -import org.apache.jena.fuseki.Fuseki; +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; -import org.apache.jena.jdbc.remote.ServerCtl ; import org.apache.jena.jdbc.remote.connections.RemoteEndpointConnection; import org.junit.After; import org.junit.AfterClass; @@ -43,8 +42,8 @@ public class TestRemoteConnectionMetadata extends AbstractDatabaseMetadataTests @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(); } + @Before public void ctlBeforeTest() { ServerCtl.ctlBeforeTest(); } + @After public void ctlAfterTest() { ServerCtl.ctlAfterTest(); } @Override protected JenaConnection getConnection() throws SQLException { http://git-wip-us.apache.org/repos/asf/jena/blob/722b3f37/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 53711b7..fe56c28 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 @@ -22,14 +22,13 @@ import java.sql.ResultSet; 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.ServerCtl ; import org.apache.jena.jdbc.remote.connections.RemoteEndpointConnection; import org.apache.jena.jdbc.utils.TestUtils; import org.apache.jena.query.Dataset ; -import org.apache.jena.riot.web.HttpOp; import org.junit.After; import org.junit.AfterClass; import org.junit.Before ; @@ -45,8 +44,8 @@ public class TestRemoteEndpointResults extends AbstractRemoteEndpointResultSetTe //@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(); } + @Before public void ctlBeforeTest() { ServerCtl.ctlBeforeTest(); } + @After public void ctlAfterTest() { ServerCtl.ctlAfterTest(); } /** * Setup for the tests by allocating a Fuseki instance to work with http://git-wip-us.apache.org/repos/asf/jena/blob/722b3f37/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 da2e8e7..7d7e554 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 @@ -24,14 +24,13 @@ import java.sql.Statement; 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.ServerCtl ; import org.apache.jena.jdbc.remote.connections.RemoteEndpointConnection; import org.apache.jena.jdbc.utils.TestUtils; import org.apache.jena.query.Dataset ; -import org.apache.jena.riot.web.HttpOp; import org.junit.After; import org.junit.AfterClass; import org.junit.Before ; http://git-wip-us.apache.org/repos/asf/jena/blob/722b3f37/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 7a7d46f..5cc0b4c 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 @@ -22,10 +22,10 @@ import java.sql.ResultSet; 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.ServerCtl ; import org.apache.jena.jdbc.remote.connections.RemoteEndpointConnection; import org.apache.jena.jdbc.utils.TestUtils; import org.apache.jena.query.Dataset ; http://git-wip-us.apache.org/repos/asf/jena/blob/722b3f37/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 16b8758..b04fbaf 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 @@ -20,11 +20,10 @@ package org.apache.jena.jdbc.remote.statements; import java.sql.SQLException; -import org.apache.jena.fuseki.Fuseki; +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.ServerCtl ; import org.apache.jena.jdbc.remote.connections.RemoteEndpointConnection; import org.apache.jena.jdbc.statements.AbstractJenaStatementTests; import org.junit.After; @@ -40,8 +39,8 @@ public class TestRemoteEndpointStatements extends AbstractJenaStatementTests { @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(); } + @Before public void ctlBeforeTest() { ServerCtl.ctlBeforeTest(); } + @After public void ctlAfterTest() { ServerCtl.ctlAfterTest(); } @Override protected JenaConnection getConnection() throws SQLException {