Clean up

Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/f6817af8
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/f6817af8
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/f6817af8

Branch: refs/heads/master
Commit: f6817af89f27b3bc0c075b6054328e0534b1d4ff
Parents: e6ec0be
Author: Andy Seaborne <a...@apache.org>
Authored: Wed Oct 12 21:48:31 2016 +0100
Committer: Andy Seaborne <a...@apache.org>
Committed: Wed Oct 12 21:48:31 2016 +0100

----------------------------------------------------------------------
 .../java/org/apache/jena/fuseki/ServerTest.java    | 17 +++++++----------
 .../jena/fuseki/http/TestDatasetAccessorHTTP.java  |  2 --
 .../fuseki/http/TestDatasetGraphAccessorHTTP.java  |  7 ++-----
 .../org/apache/jena/fuseki/http/TestHttpOp.java    |  2 +-
 4 files changed, 10 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/f6817af8/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 baf5274..03b06b0 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
@@ -49,12 +49,13 @@ public class ServerTest
 {
     // Abstraction that runs a SPARQL server for tests.
     
-    public static final int port             = choosePort(3635, 3634, 3653, 
3652, 103635, 103634, 103653, 103652) ;   // Different to the Fuseki2 test 
ports.
+    // Different to the Fuseki2 test ports.
+    public static final int port             = choosePort(3635, 3634, 3653, 
3652, 103635, 103634, 103653, 103652) ;
     public static final String urlRoot       = "http://localhost:"+port+"/"; ;
     public static final String datasetPath   = "/dataset" ;
     public static final String serviceUpdate = 
"http://localhost:"+port+datasetPath+"/update"; ; 
     public static final String serviceQuery  = 
"http://localhost:"+port+datasetPath+"/query"; ; 
-    public static final String serviceREST   = 
"http://localhost:"+port+datasetPath+"/data"; ; // ??????
+    public static final String serviceREST   = 
"http://localhost:"+port+datasetPath+"/data"; ; 
     
     public static final String gn1       = "http://graph/1"; ;
     public static final String gn2       = "http://graph/2"; ;
@@ -76,15 +77,13 @@ public class ServerTest
     // reference count of start/stop server
     private static int countServer = 0 ; 
     
-    static public void allocServer()
-    {
+    static public void allocServer() {
         if ( countServer == 0 )
             setupServer() ;
         countServer++ ;
     }
     
-    static public void freeServer() 
-    {
+    static public void freeServer() {
         if ( countServer >= 0 ) {
             countServer -- ;
             if ( countServer == 0 )
@@ -93,8 +92,7 @@ public class ServerTest
     }
     
     @SuppressWarnings("deprecation")
-    protected static void setupServer()
-    {
+    protected static void setupServer() {
         DatasetGraph dsg = DatasetGraphFactory.create() ;
         server = EmbeddedFusekiServer1.create(port, dsg, datasetPath) ;
         server.start() ;
@@ -107,8 +105,7 @@ public class ServerTest
             server.stop() ;
         server = null ;
     }
-    public static void resetServer()
-    {
+    public static void resetServer() {
         Update clearRequest = new UpdateDrop(Target.ALL) ;
         UpdateProcessor proc = 
UpdateExecutionFactory.createRemote(clearRequest, ServerTest.serviceUpdate) ;
         proc.execute() ;

http://git-wip-us.apache.org/repos/asf/jena/blob/f6817af8/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 913ca74..f7a652e 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
@@ -36,8 +36,6 @@ import org.junit.Test ;
 
 public class TestDatasetAccessorHTTP extends BaseTest 
 {
-    //Model level testing.
-    
     static final String datasetURI_not_1    = "http://localhost:"+port+"/junk"; 
;
     static final String datasetURI_not_2    = serviceREST+"/not" ;
     static final String datasetURI_not_3    = 
"http://localhost:"+port+datasetPath+"/not/data"; ;

http://git-wip-us.apache.org/repos/asf/jena/blob/f6817af8/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 2b45d2b..8794ba3 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
@@ -29,11 +29,8 @@ import org.junit.BeforeClass ;
 public class TestDatasetGraphAccessorHTTP extends 
AbstractTestDatasetGraphAccessor
 {
     @BeforeClass public static void beforeClass() { ServerTest.allocServer() ; 
}
-    @AfterClass public static void afterClass() { ServerTest.freeServer() ; }
-    @Before public void before() { 
-        ServerTest.resetServer() ; 
-    }
-
+    @AfterClass public static void afterClass()   { ServerTest.freeServer() ; }
+    @Before public void before()                  { ServerTest.resetServer() ; 
} 
     
     @Override
     protected DatasetGraphAccessor getDatasetUpdater()

http://git-wip-us.apache.org/repos/asf/jena/blob/f6817af8/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 60f2857..47047c1 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
@@ -36,7 +36,7 @@ import org.junit.BeforeClass ;
 import org.junit.Test ;
 
 // 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.
+// 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" ;

Reply via email to