Tidy test setup
diff --git a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/TestFusekiShaclValidation.java b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/TestFusekiShaclValidation.java
index dd2eb15..a4d0974 100644
--- a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/TestFusekiShaclValidation.java
+++ b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/TestFusekiShaclValidation.java
@@ -21,7 +21,6 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import org.apache.jena.atlas.web.WebLib;
import org.apache.jena.graph.Graph;
import org.apache.jena.http.HttpRDF;
import org.apache.jena.rdfconnection.RDFConnection;
@@ -39,14 +38,12 @@
@BeforeClass
public static void beforeClass() {
- int port = WebLib.choosePort();
-
FusekiServer server = FusekiServer.create()
- .port(port)
+ .port(0)
.parseConfigFile(DIR+"config-validation.ttl")
.build();
server.start();
- serverURL = "http://localhost:"+port;
+ serverURL = "http://localhost:"+server.getPort();
}
@AfterClass
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 dba4d92..ccb6158 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
@@ -43,9 +43,6 @@
private static AuthSetup auth2 = new AuthSetup("localhost", port, "user2", "pw2", null);
private static AuthSetup auth3 = new AuthSetup("localhost", port, "user3", "pw3", null);
- // @BeforeClass : subclass must set "server".
- // Setup : user1 and user2 can query, user1 and user3 can update.
-
@Test public void no_auth() {
// No user -> fails login
expectQuery401(() -> {
diff --git a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/access/TestPasswdOnly.java b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/access/TestPasswdOnly.java
index 8ac038a..eb4d4ac 100644
--- a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/access/TestPasswdOnly.java
+++ b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/access/TestPasswdOnly.java
@@ -41,20 +41,21 @@
public class TestPasswdOnly {
protected static FusekiServer server;
protected static int port;
-
- private static AuthSetup auth1 = new AuthSetup("localhost", port, "user1", "pw1", null);
+ private static AuthSetup auth1;
@BeforeClass public static void beforeClass () {
port = WebLib.choosePort();
server = FusekiServer.create()
//.verbose(true)
- .port(port)
+ .port(0)
.add("/db", DatasetGraphFactory.createTxnMem())
.passwordFile("testing/Access/passwd")
// Should be default.
//.serverAuthPolicy(Auth.ANY_USER)
.build();
server.start();
+ port = server.getPort();
+ auth1 = new AuthSetup("localhost", port, "user1", "pw1", null);
}
@AfterClass public static void afterClass () {
