Author: andy
Date: Sat Sep 7 14:39:59 2013
New Revision: 1520778
URL: http://svn.apache.org/r1520778
Log:
Use connection caching in testing
Modified:
jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java
jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestHttpOp.java
Modified:
jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java?rev=1520778&r1=1520777&r2=1520778&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java
(original)
+++ jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java
Sat Sep 7 14:39:59 2013
@@ -18,10 +18,12 @@
package org.apache.jena.fuseki;
+import org.apache.http.client.HttpClient ;
import org.apache.jena.atlas.logging.Log ;
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 ;
@@ -39,6 +41,22 @@ import org.junit.runners.Suite ;
})
public class TS_Fuseki extends ServerTest
{
+ // Use HttpOp caching of connections during testing to stop
+ // swamping kernel socket management (seems to be most
+ // acute on Java 1.6)
+
+ static HttpClient defaultHttpClient = HttpOp.getDefaultHttpClient() ;
+ // Used for all tests except auth tests.
+ static HttpClient globalCachingClient = HttpOp.createCachingHttpClient() ;
+
+ @BeforeClass public static void beforeClassAbstract1() {
+ HttpOp.setDefaultHttpClient(globalCachingClient) ;
+ }
+
+ @AfterClass public static void afterClassAbstract1() {
+ HttpOp.setDefaultHttpClient(defaultHttpClient) ;
+ }
+
@BeforeClass static public void beforeClass() {
Log.disable(Fuseki.requestLogName) ; }
@AfterClass static public void afterClass() {
Log.setInfo(Fuseki.requestLogName) ;}
}
Modified:
jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestHttpOp.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestHttpOp.java?rev=1520778&r1=1520777&r2=1520778&view=diff
==============================================================================
---
jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestHttpOp.java
(original)
+++
jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestHttpOp.java
Sat Sep 7 14:39:59 2013
@@ -36,7 +36,7 @@ import org.junit.Test ;
import com.hp.hpl.jena.sparql.engine.http.Params ;
import com.hp.hpl.jena.util.FileUtils ;
-// This a mixture of testign HttpOp and testing basic operation of the SPARQL
server
+// This a mixture of testing HttpOp and testing basic operation of the SPARQL
server
// especially error cases abnd unusual usage that the higher level APIs don't
use.
public class TestHttpOp extends BaseTest {
