[java-idp-integration-tests] branch main updated: Fix logging and some cleanup

[Tom Zeller]

This is an automated email from the git hooks/post-receive script.

tzeller pushed a commit to branch main
in repository java-idp-integration-tests.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-integration-tests.git;a=commit;h=e50d1a9fb7e11c512cf6435e73aabed54f224034

The following commit(s) were added to refs/heads/main by this push:
     new e50d1a9  Fix logging and some cleanup
e50d1a9 is described below

commit e50d1a9fb7e11c512cf6435e73aabed54f224034
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Tue Sep 3 21:33:25 2024 -0500

    Fix logging and some cleanup
---
 .../idp/integration/tests/BaseIntegrationTest.java | 24 ++++++++--------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/test/java/net/shibboleth/idp/integration/tests/BaseIntegrationTest.java b/src/test/java/net/shibboleth/idp/integration/tests/BaseIntegrationTest.java
index b7381d2..022b56b 100644
--- a/src/test/java/net/shibboleth/idp/integration/tests/BaseIntegrationTest.java
+++ b/src/test/java/net/shibboleth/idp/integration/tests/BaseIntegrationTest.java
@@ -690,17 +690,11 @@ public abstract class BaseIntegrationTest {
             log.debug("Not setting up Jetty WebInfIncludeJarPattern because system property 'tomcat' is true");
             return;
         }
-        if (jettyVersion.startsWith("9")) {
-            return;
-        } ;
         final Path idpIni = pathToJettyBase.resolve(Paths.get("start.d", "idp.ini"));
-        log.debug("Path to idp.ini '{}'", idpIni.toAbsolutePath());
-        if (idpIni.toAbsolutePath().toFile().exists()) {
-            log.debug("Disabling Jetty SNI host check for version '{}'", jettyVersion);
-            replaceFile(idpIni, "\\z", System.lineSeparator() + "jetty.ssl.sniHostCheck=false");
-        } else {
-            Assert.fail("Unable to find idp.ini");
-        }
+        log.debug("Path to start.d/idp.ini '{}'", idpIni.toAbsolutePath());
+        Assert.assertTrue(idpIni.toFile().exists());
+        log.debug("Disabling Jetty SNI host check for version '{}'", jettyVersion);
+        replaceFile(idpIni, "\\z", System.lineSeparator() + "jetty.ssl.sniHostCheck=false");
     }
  
     /**
@@ -987,8 +981,8 @@ public abstract class BaseIntegrationTest {
         final Path pathToLogbackXML = Paths.get("conf", "logback.xml");
 
         // Set IdP logging to DEBUG from INFO.
-        final String oldText = "<variable name=\"idp.loglevel.idp\" value=\"INFO\" />";
-        final String newText = "<variable name=\"idp.loglevel.idp\" value=\"DEBUG\" />";
+        final String oldText = "idp.loglevel.idp:-INFO";
+        final String newText = "idp.loglevel.idp:-DEBUG";
         replaceIdPHomeFile(pathToLogbackXML, oldText, newText);
 
         logUnencryptedSAML();
@@ -1312,8 +1306,8 @@ public abstract class BaseIntegrationTest {
         LoggerFactory.getLogger(BaseIntegrationTest.class).debug("Replacing regex '{}' with '{}' in file '{}'", regex,
                 replacement, pathToFile);
 
-        Assert.assertNotNull(pathToFile, "Path not found");
-        Assert.assertTrue(pathToFile.toAbsolutePath().toFile().exists(), "Path does not exist");
+        Assert.assertNotNull(pathToFile, "Path not found " + pathToFile);
+        Assert.assertTrue(pathToFile.toAbsolutePath().toFile().exists(), "Path does not exist " + pathToFile);
 
         final Charset charset = StandardCharsets.UTF_8;
 
@@ -1569,7 +1563,7 @@ public abstract class BaseIntegrationTest {
         final Path pathToLogbackXML = Paths.get("conf", "logback.xml");
         
         final String oldMessagesText = "idp.loglevel.messages:-INFO";
-        final String newMessagesText = "idp.loglevel.messages:-DEBUG";
+        final String newMessagesText = "idp.loglevel.messages:-TRACE";
         replaceIdPHomeFile(pathToLogbackXML, oldMessagesText, newMessagesText);
         
         final String oldEncryptionText = "idp.loglevel.encryption:-INFO";

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.