svn commit: r1488601 - /jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/ServerTest.java

[andy]

Author: andy
Date: Sat Jun  1 21:07:58 2013
New Revision: 1488601

URL: http://svn.apache.org/r1488601
Log:
Fix test startup and server creation to avoid multiple JMX registrations (a 
sign of multiple test server initializations)

Modified:
    jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/ServerTest.java

Modified: 
jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/ServerTest.java
URL: 
http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/ServerTest.java?rev=1488601&r1=1488600&r2=1488601&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/ServerTest.java 
(original)
+++ jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/ServerTest.java 
Sat Jun  1 21:07:58 2013
@@ -42,13 +42,20 @@ public class ServerTest extends BaseServ
     // Abstraction that runs one server.
     // Inherit from this class to add starting/stopping a server.  
     
-    private static int referenceCount = 0 ;
-    private static SPARQLServer server = null ; 
+    private static SPARQLServer server = null ;
+    static { setupServer() ; }
+    
+    private static int referenceCount = 0 ; 
     
     // If not inheriting from this class, call:
     
     static public void allocServer()
-    { 
+    {
+//        if ( server == null )
+//            setupServer() ;
+//        else
+//            System.err.println("server not null") ;
+        
         if ( referenceCount == 0 )
             serverStart() ;
         referenceCount ++ ;
@@ -61,12 +68,12 @@ public class ServerTest extends BaseServ
             serverStop() ;
     }
     
-    protected static void serverStart()
+    protected static void setupServer()
     {
         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 BaseServerTest
         ServerConfig conf = FusekiConfig.defaultConfiguration(datasetPath, 
dsg, true) ;
@@ -80,13 +87,18 @@ public class ServerTest extends BaseServ
         server.start() ;
     }
     
-    protected static void serverStop()
-    {
-        server.stop() ;
+    protected static void serverStart() {
+        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) ;
+    }
+    
+    protected static void serverStop() {
+//        server.stop() ;
         Log.logLevel(Fuseki.serverLog.getName(), org.apache.log4j.Level.INFO, 
java.util.logging.Level.INFO) ;
         Log.logLevel(Fuseki.requestLog.getName(), org.apache.log4j.Level.INFO, 
java.util.logging.Level.INFO) ;
         Log.logLevel("org.eclipse.jetty", org.apache.log4j.Level.INFO, 
java.util.logging.Level.INFO) ;
-        server = null ;
+//        server = null ;
     }
     
     public static void resetServer()