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 5daaa76b518113163502dc25c3fcc717f648fc77 Author: Andy Seaborne <[email protected]> AuthorDate: Mon Jul 15 10:13:09 2024 +0100 Run tests on safe ports --- .../org/apache/jena/fuseki/main/TestCrossOriginFilter.java | 6 +++++- .../apache/jena/fuseki/main/TestFusekiMainCmdArguments.java | 13 ++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/TestCrossOriginFilter.java b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/TestCrossOriginFilter.java index 252a4e42f6..7c366efad6 100644 --- a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/TestCrossOriginFilter.java +++ b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/TestCrossOriginFilter.java @@ -40,6 +40,7 @@ import java.util.Set; import java.util.function.Consumer; import org.apache.jena.atlas.lib.Lib; +import org.apache.jena.atlas.web.WebLib; import org.apache.jena.fuseki.system.FusekiLogging; import org.apache.jena.http.HttpLib; import org.apache.jena.riot.web.HttpNames; @@ -205,7 +206,10 @@ public class TestCrossOriginFilter { "Origin", "localhost:12345", "Access-Control-Request-Headers", defaultHeaders}; String expectedAllowedHeaders = "X-Requested-With,Content-Type,Accept,Origin,Last-Modified,Authorization"; - FusekiServer server = server("--mem", "/ds"); + int port = WebLib.choosePort(); + FusekiServer server = server("--port="+port, "--mem", "/ds"); + assertEquals(port, server.getHttpPort()); + executeWithServer(server, "/ds", URL->{ // when HttpResponse<InputStream> response = httpOptions(URL, headersToPass); diff --git a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/TestFusekiMainCmdArguments.java b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/TestFusekiMainCmdArguments.java index d7613ac0f5..082475bdd9 100644 --- a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/TestFusekiMainCmdArguments.java +++ b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/TestFusekiMainCmdArguments.java @@ -26,6 +26,7 @@ import static org.junit.Assert.fail; import java.util.List; import org.apache.jena.atlas.logging.LogCtl; +import org.apache.jena.atlas.web.WebLib; import org.apache.jena.cmd.CmdException; import org.apache.jena.fuseki.Fuseki; import org.apache.jena.fuseki.main.cmds.FusekiMain; @@ -83,20 +84,20 @@ public class TestFusekiMainCmdArguments { @Test public void test_contextpath_1() { + int port = WebLib.choosePort(); // given - List<String> arguments = List.of("--mem", "--contextpath=/ABC", "/path"); - String expectedMessage = "port : bad port number: 'ERROR'"; + List<String> arguments = List.of("--port="+port, "--mem", "--contextpath=/ABC", "/path"); // when buildServer(buildCmdLineArguments(arguments)); // then assertNotNull(server); + assertEquals(port, server.getHttpPort()); } @Test public void test_contextpath_2() { // given - List<String> arguments = List.of("--mem", "--contextpath=ABC", "/path"); - String expectedMessage = "port : bad port number: 'ERROR'"; + List<String> arguments = List.of("--port=0", "--mem", "--contextpath=ABC", "/path"); // when buildServer(buildCmdLineArguments(arguments)); // then @@ -106,8 +107,7 @@ public class TestFusekiMainCmdArguments { @Test public void test_contextpath_3() { // given - List<String> arguments = List.of("--mem", "--contextpath=/", "/path"); - String expectedMessage = "port : bad port number: 'ERROR'"; + List<String> arguments = List.of("--port=0", "--mem", "--contextpath=/", "/path"); // when buildServer(buildCmdLineArguments(arguments)); // then @@ -444,5 +444,4 @@ public class TestFusekiMainCmdArguments { server = FusekiMain.build(cmdline); server.start(); } - }
