This is an automated email from the ASF dual-hosted git repository. andy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/jena.git
commit e38913adfb20779c7ea7b31b06e408ff8185b777 Author: Andy Seaborne <[email protected]> AuthorDate: Mon Apr 8 16:11:12 2024 +0100 Allocate test server on a dynamic port per test --- .../main/access/AbstractTestFusekiSecurityAssembler.java | 2 +- .../fuseki/main/access/AbstractTestServiceDatasetAuth.java | 9 +++++---- .../jena/fuseki/main/access/TestServiceDataAuthBuild.java | 4 ++-- .../jena/fuseki/main/access/TestServiceDataAuthConfig.java | 10 +++++----- 4 files changed, 13 insertions(+), 12 deletions(-) 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 42e81ae350..5d823fad79 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 @@ public abstract class AbstractTestFusekiSecurityAssembler { 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 ccb6158d7a..898cf83957 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 @@ import org.junit.Test; */ 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 80871ac333..33c109e56a 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 @@ public class TestServiceDataAuthBuild extends AbstractTestServiceDatasetAuth { private FusekiServer server; - @Before public void before () { + @Before public void before() { server = FusekiServer.create() //.verbose(true) .port(port) @@ -38,7 +38,7 @@ public class TestServiceDataAuthBuild extends AbstractTestServiceDatasetAuth { 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 da3f665c82..0a1768dbb1 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.Endpoint; 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(); }
