svn commit: r1521107 - in /jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote: connections/TestRemoteEndpointConnectionWithAuth.java results/TestRemoteEndpointResultsWithAuth.java

[andy]

Author: andy
Date: Mon Sep  9 13:48:18 2013
New Revision: 1521107

URL: http://svn.apache.org/r1521107
Log:
Switch to logging control via testing log4j.properties

Modified:
    
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithAuth.java
    
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithAuth.java

Modified: 
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithAuth.java
URL: 
http://svn.apache.org/viewvc/jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithAuth.java?rev=1521107&r1=1521106&r2=1521107&view=diff
==============================================================================
--- 
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithAuth.java
 (original)
+++ 
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithAuth.java
 Mon Sep  9 13:48:18 2013
@@ -23,6 +23,7 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.sql.SQLException;
 
+import org.apache.jena.atlas.lib.Lib ;
 import org.apache.jena.atlas.logging.Log;
 import org.apache.jena.atlas.web.auth.HttpAuthenticator;
 import org.apache.jena.atlas.web.auth.SimpleAuthenticator;
@@ -75,10 +76,6 @@ public class TestRemoteEndpointConnectio
         writer.write(USER + ": " + PASSWORD + ", fuseki\n");
         writer.close();
 
-        Log.logLevel(Fuseki.serverLog.getName(), org.apache.log4j.Level.WARN, 
java.util.logging.Level.WARNING);
-        Log.logLevel(Fuseki.requestLog.getName(), org.apache.log4j.Level.WARN, 
java.util.logging.Level.WARNING);
-        Log.logLevel("org.eclipse.jetty", org.apache.log4j.Level.WARN, 
java.util.logging.Level.WARNING);
-
         DatasetGraph dsg = DatasetGraphFactory.createMem();
         // This must agree with ServerTest
         ServerConfig conf = 
FusekiConfig.defaultConfiguration(ServerTest.datasetPath, dsg, true, false);
@@ -106,6 +103,7 @@ public class TestRemoteEndpointConnectio
     @AfterClass
     public static void cleanup() {
         server.stop();
+        Lib.sleep(250); 
         realmFile.delete();
     }
 

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=1521107&r1=1521106&r2=1521107&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  9 13:48:18 2013
@@ -80,10 +80,6 @@ public class TestRemoteEndpointResultsWi
         writer.write(USER + ": " + PASSWORD + ", fuseki\n");
         writer.close();
 
-        Log.logLevel(Fuseki.serverLog.getName(), org.apache.log4j.Level.WARN, 
java.util.logging.Level.WARNING);
-        Log.logLevel(Fuseki.requestLog.getName(), org.apache.log4j.Level.WARN, 
java.util.logging.Level.WARNING);
-        Log.logLevel("org.eclipse.jetty", org.apache.log4j.Level.WARN, 
java.util.logging.Level.WARNING);
-
         DatasetGraph dsg = DatasetGraphFactory.createMem();
         // This must agree with ServerTest
         ServerConfig conf = 
FusekiConfig.defaultConfiguration(ServerTest.datasetPath, dsg, true, false);