Author: rvesse
Date: Mon Sep 2 19:36:18 2013
New Revision: 1519506
URL: http://svn.apache.org/r1519506
Log:
Apply patch from JENA-527 to mitigate test hang issues for JDBC
Modified:
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/TS_JdbcDriverRemote.java
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/AbstractRemoteEndpointResultSetTests.java
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResults.java
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithAuth.java
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithGraphUris.java
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithResultSetTypes.java
Modified:
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/TS_JdbcDriverRemote.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/TS_JdbcDriverRemote.java?rev=1519506&r1=1519505&r2=1519506&view=diff
==============================================================================
---
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/TS_JdbcDriverRemote.java
(original)
+++
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/TS_JdbcDriverRemote.java
Mon Sep 2 19:36:18 2013
@@ -17,7 +17,6 @@
*/
package org.apache.jena.jdbc.remote;
-import org.apache.jena.fuseki.Fuseki;
import org.apache.jena.jdbc.remote.connections.TestRemoteEndpointConnection;
import
org.apache.jena.jdbc.remote.connections.TestRemoteEndpointConnectionWithAuth;
import
org.apache.jena.jdbc.remote.connections.TestRemoteEndpointConnectionWithGraphUris;
@@ -31,8 +30,6 @@ import org.apache.jena.jdbc.remote.state
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
-import com.hp.hpl.jena.query.ARQ;
-
/**
* Test Suite for the Jena JDBC Remote Endpoint driver
*
@@ -51,10 +48,7 @@ import com.hp.hpl.jena.query.ARQ;
TestRemoteEndpointResultsWithGraphUris.class,
TestRemoteEndpointResultsWithResultSetTypes.class
})
-public class TS_JdbcDriverRemote {
- static {
- ARQ.init();
- Fuseki.init();
- }
+
+public class TS_JdbcDriverRemote {
}
Modified:
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/AbstractRemoteEndpointResultSetTests.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/AbstractRemoteEndpointResultSetTests.java?rev=1519506&r1=1519505&r2=1519506&view=diff
==============================================================================
---
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/AbstractRemoteEndpointResultSetTests.java
(original)
+++
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/AbstractRemoteEndpointResultSetTests.java
Mon Sep 2 19:36:18 2013
@@ -18,8 +18,14 @@
package org.apache.jena.jdbc.remote.results;
+import org.apache.http.client.HttpClient;
import org.apache.jena.fuseki.Fuseki;
import org.apache.jena.jdbc.results.AbstractResultSetTests;
+import org.apache.jena.riot.web.HttpOp;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+
+import com.hp.hpl.jena.query.ARQ;
/**
* Abstract tests for remote endpoint connection result sets
@@ -27,7 +33,17 @@ import org.apache.jena.jdbc.results.Abst
*/
public abstract class AbstractRemoteEndpointResultSetTests extends
AbstractResultSetTests {
- static {
+ static HttpClient defaultHttpClient = HttpOp.getDefaultHttpClient() ;
+ // Used for all tests except auth tests.
+ static HttpClient globalCachingClient =
HttpOp.createCachingHttpClient() ;
+
+ @BeforeClass public static void beforeClassAbstract1() {
+ ARQ.init();
Fuseki.init();
+ HttpOp.setDefaultHttpClient(globalCachingClient) ;
+ }
+
+ @AfterClass public static void afterClassAbstract1() {
+ HttpOp.setDefaultHttpClient(defaultHttpClient) ;
}
}
Modified:
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResults.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResults.java?rev=1519506&r1=1519505&r2=1519506&view=diff
==============================================================================
---
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResults.java
(original)
+++
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResults.java
Mon Sep 2 19:36:18 2013
@@ -47,7 +47,7 @@ public class TestRemoteEndpointResults e
*/
@BeforeClass
public static void setup() throws SQLException {
- ServerTest.allocServer();
+ ServerTest.allocServer();
connection = new RemoteEndpointConnection(ServerTest.serviceQuery,
ServerTest.serviceUpdate, JenaConnection.DEFAULT_HOLDABILITY,
JdbcCompatibility.DEFAULT);
connection.setJdbcCompatibilityLevel(JdbcCompatibility.HIGH);
@@ -60,11 +60,7 @@ public class TestRemoteEndpointResults e
@After
public void cleanupTest() throws InterruptedException {
ServerTest.resetServer();
-
- // Sleep attempts to avoid a intermittent timing issue on the build
server that can result in hung builds
- Thread.sleep(250);
}
-
/**
* Clean up after tests by de-allocating the Fuseki instance
* @throws SQLException
@@ -72,12 +68,8 @@ public class TestRemoteEndpointResults e
*/
@AfterClass
public static void cleanup() throws SQLException, InterruptedException {
- ServerTest.freeServer();
-
- // Sleep attempts to avoid a intermittent timing issue on the build
server that can result in hung builds
- Thread.sleep(250);
-
connection.close();
+ ServerTest.freeServer();
}
@Override
Modified:
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithAuth.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithAuth.java?rev=1519506&r1=1519505&r2=1519506&view=diff
==============================================================================
---
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithAuth.java
(original)
+++
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithAuth.java
Mon Sep 2 19:36:18 2013
@@ -108,9 +108,6 @@ public class TestRemoteEndpointResultsWi
Update clearRequest = new UpdateDrop(Target.ALL) ;
UpdateProcessor proc =
UpdateExecutionFactory.createRemote(clearRequest, ServerTest.serviceUpdate,
authenticator) ;
proc.execute() ;
-
- // Sleep attempts to avoid a intermittent timing issue on the build
server that can result in hung builds
- Thread.sleep(250);
}
/**
@@ -121,13 +118,12 @@ public class TestRemoteEndpointResultsWi
*/
@AfterClass
public static void cleanup() throws SQLException, InterruptedException {
- server.stop();
// Sleep attempts to avoid a intermittent timing issue on the build
server that can result in hung builds
- Thread.sleep(250);
connection.close();
realmFile.delete();
+ server.stop();
}
@Override
Modified:
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithGraphUris.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithGraphUris.java?rev=1519506&r1=1519505&r2=1519506&view=diff
==============================================================================
---
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithGraphUris.java
(original)
+++
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithGraphUris.java
Mon Sep 2 19:36:18 2013
@@ -69,9 +69,6 @@ public class TestRemoteEndpointResultsWi
@After
public void cleanupTest() throws InterruptedException {
ServerTest.resetServer();
-
- // Sleep attempts to avoid a intermittent timing issue on the build
server that can result in hung builds
- Thread.sleep(250);
}
/**
@@ -81,12 +78,8 @@ public class TestRemoteEndpointResultsWi
*/
@AfterClass
public static void cleanup() throws SQLException, InterruptedException {
- ServerTest.freeServer();
-
- // Sleep attempts to avoid a intermittent timing issue on the build
server that can result in hung builds
- Thread.sleep(250);
-
connection.close();
+ ServerTest.freeServer();
}
@Override
Modified:
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithResultSetTypes.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithResultSetTypes.java?rev=1519506&r1=1519505&r2=1519506&view=diff
==============================================================================
---
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithResultSetTypes.java
(original)
+++
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithResultSetTypes.java
Mon Sep 2 19:36:18 2013
@@ -60,9 +60,6 @@ public class TestRemoteEndpointResultsWi
@After
public void cleanupTest() throws InterruptedException {
ServerTest.resetServer();
-
- // Sleep attempts to avoid a intermittent timing issue on the build
server that can result in hung builds
- Thread.sleep(250);
}
/**
@@ -72,12 +69,11 @@ public class TestRemoteEndpointResultsWi
*/
@AfterClass
public static void cleanup() throws SQLException, InterruptedException {
- ServerTest.freeServer();
// Sleep attempts to avoid a intermittent timing issue on the build
server that can result in hung builds
- Thread.sleep(250);
connection.close();
+ ServerTest.freeServer();
}
@Override
