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 3578bf5e647a2fab5e29484d36da19de5ba87cf5 Author: Andy Seaborne <[email protected]> AuthorDate: Thu May 30 15:58:13 2024 +0100 Silence logging messages in tests --- .../fuseki/main/TestFusekiMainCmdArguments.java | 25 ++++++++++++++++++++-- .../jena/fuseki/main/TestFusekiStdSetup.java | 9 ++++---- 2 files changed, 27 insertions(+), 7 deletions(-) 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 323e8e5447..d7613ac0f5 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 @@ -25,9 +25,15 @@ import static org.junit.Assert.fail; import java.util.List; +import org.apache.jena.atlas.logging.LogCtl; import org.apache.jena.cmd.CmdException; +import org.apache.jena.fuseki.Fuseki; import org.apache.jena.fuseki.main.cmds.FusekiMain; +import org.apache.jena.fuseki.system.FusekiLogging; +import org.apache.jena.riot.SysRIOT; import org.junit.After; +import org.junit.AfterClass; +import org.junit.BeforeClass; import org.junit.Test; /** @@ -35,6 +41,20 @@ import org.junit.Test; */ public class TestFusekiMainCmdArguments { + private static String level = null; + + @BeforeClass public static void beforeClass() { + // This is not reset by each running server. + FusekiLogging.setLogging(); + level = LogCtl.getLevel(Fuseki.serverLog); + LogCtl.setLevel(Fuseki.serverLog, "WARN"); + } + + @AfterClass public static void afterClass() { + if ( level != null ) + LogCtl.setLevel(Fuseki.serverLog, level); + } + private FusekiServer server = null; @After public void after() { if ( server != null ) @@ -267,7 +287,6 @@ public class TestFusekiMainCmdArguments { testForCmdException(arguments, expectedMessage); } - @Test public void test_error_argConfigFile_MissingFile() { // given @@ -293,7 +312,9 @@ public class TestFusekiMainCmdArguments { List<String> arguments = List.of("--file=testing/Config/invalid.ttl", "/dataset"); String expectedMessage = "Failed to load file: testing/Config/invalid.ttl"; // when, then - testForCmdException(arguments, expectedMessage); + LogCtl.withLevel(SysRIOT.getLogger(), "fatal", + ()-> testForCmdException(arguments, expectedMessage) + ); } @Test diff --git a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/TestFusekiStdSetup.java b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/TestFusekiStdSetup.java index b2594c57c9..90c2a2b876 100644 --- a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/TestFusekiStdSetup.java +++ b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/TestFusekiStdSetup.java @@ -111,11 +111,6 @@ public class TestFusekiStdSetup { exec(URL, "/data", conn -> conn.putDataset(dataset)); } - @Test - public void stdSetup_endpoint_8() { - HttpTest.expect404( () -> exec(URL, "/nonsense", conn -> conn.putDataset(dataset)) ); - } - @Test public void stdSetup_dataset_1() { exec(URL, conn -> conn.queryAsk("ASK{}")); @@ -166,6 +161,10 @@ public class TestFusekiStdSetup { HttpTest.expect404( () -> exec(URL+"2", "", (RDFConnection conn)->conn.queryAsk("ASK{}")) ); } + @Test public void stdSetup_endpoint_bad_6() { + HttpTest.expect404( () -> exec(URL, "/nonsense", conn -> conn.putDataset(dataset)) ); + } + private static void exec(String url, Consumer<RDFConnection> action) { execEx(url, null, action); }
