Allocate test server on a dynamic port per test
diff --git a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/access/AbstractTestFusekiSecurityAssembler.java b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/access/AbstractTestFusekiSecurityAssembler.java
index 42e81ae..5d823fa 100644
--- a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/access/AbstractTestFusekiSecurityAssembler.java
+++ b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/access/AbstractTestFusekiSecurityAssembler.java
@@ -71,13 +71,13 @@
private boolean sharedDatabase;
- // Parameterized tests don't provide a convenient way to run code at the start and end of each parameter run and access the parameters.
private static FusekiServer server;
private FusekiServer getServer() {
if ( server == null )
server = setup(assemblerFile, false);
return server;
}
+
@AfterClass public static void afterClass() {
server.stop();
server = null;
diff --git a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/access/AbstractTestServiceDatasetAuth.java b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/access/AbstractTestServiceDatasetAuth.java
index ccb6158..898cf83 100644
--- a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/access/AbstractTestServiceDatasetAuth.java
+++ b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/access/AbstractTestServiceDatasetAuth.java
@@ -38,10 +38,11 @@
*/
public abstract class AbstractTestServiceDatasetAuth {
- protected static int port = WebLib.choosePort();
- private static AuthSetup auth1 = new AuthSetup("localhost", port, "user1", "pw1", null);
- private static AuthSetup auth2 = new AuthSetup("localhost", port, "user2", "pw2", null);
- private static AuthSetup auth3 = new AuthSetup("localhost", port, "user3", "pw3", null);
+ // Need the port for server and for the AuthSetup.
+ protected int port = WebLib.choosePort();
+ private AuthSetup auth1 = new AuthSetup("localhost", port, "user1", "pw1", null);
+ private AuthSetup auth2 = new AuthSetup("localhost", port, "user2", "pw2", null);
+ private AuthSetup auth3 = new AuthSetup("localhost", port, "user3", "pw3", null);
@Test public void no_auth() {
// No user -> fails login
diff --git a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/access/TestServiceDataAuthBuild.java b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/access/TestServiceDataAuthBuild.java
index 80871ac..33c109e 100644
--- a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/access/TestServiceDataAuthBuild.java
+++ b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/access/TestServiceDataAuthBuild.java
@@ -29,7 +29,7 @@
private FusekiServer server;
- @Before public void before () {
+ @Before public void before() {
server = FusekiServer.create()
//.verbose(true)
.port(port)
@@ -38,7 +38,7 @@
server.start();
}
- @After public void afterClass () {
+ @After public void after () {
server.stop();
}
diff --git a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/access/TestServiceDataAuthConfig.java b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/access/TestServiceDataAuthConfig.java
index da3f665..0a1768d 100644
--- a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/access/TestServiceDataAuthConfig.java
+++ b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/access/TestServiceDataAuthConfig.java
@@ -26,22 +26,22 @@
import org.apache.jena.fuseki.server.Operation;
import org.apache.jena.sparql.core.DatasetGraph;
import org.apache.jena.sparql.core.DatasetGraphFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
+import org.junit.After;
+import org.junit.Before;
/**
* AbstractTestServiceDatasetAuth with a programmatically built server which should be
* the same as the {@link TestServiceDataAuthConfig configuration file version}.
*/
public class TestServiceDataAuthConfig extends AbstractTestServiceDatasetAuth {
- private static FusekiServer server;
+ private FusekiServer server;
- @BeforeClass public static void beforeClass () {
+ @Before public void before() {
server = build(port, null);
server.start();
}
- @AfterClass public static void afterClass () {
+ @After public void after () {
server.stop();
}
