[java-idp-integration-tests] branch main updated: Updates for jetty-base 10 and 11

[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=dc970a561804b626ffbc3855fbf63169770718c8

The following commit(s) were added to refs/heads/main by this push:
     new dc970a5  Updates for jetty-base 10 and 11
dc970a5 is described below

commit dc970a561804b626ffbc3855fbf63169770718c8
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Mon Aug 7 18:47:06 2023 -0500

    Updates for jetty-base 10 and 11
    
    Update Jetty host and port property replacement
    
    Enable backchannel when testing Jetty
---
 .../net/shibboleth/idp/integration/tests/BaseIntegrationTest.java  | 7 ++-----
 .../tests/saml2/SAML2AttributeQueryIntegrationTest.java            | 7 +++++++
 2 files changed, 9 insertions(+), 5 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 a29b4df..ec9f37e 100644
--- a/src/test/java/net/shibboleth/idp/integration/tests/BaseIntegrationTest.java
+++ b/src/test/java/net/shibboleth/idp/integration/tests/BaseIntegrationTest.java
@@ -617,9 +617,6 @@ public abstract class BaseIntegrationTest {
             // set idp.home system property
             serverCommands.add(0, "-Didp.home=" + System.getProperty("idp.home"));
 
-            // set idp.war.path system property to per-test directory
-            serverCommands.add("-Didp.war.path=" + pathToIdPWAR);
-
             // set tmp directory system property
             serverCommands.add("-Djava.io.tmpdir=" + pathToJettyBase.resolve("tmp").toAbsolutePath());
         } else {
@@ -845,8 +842,8 @@ public abstract class BaseIntegrationTest {
             final Path pathToJettyIdPIni = pathToJettyBase.resolve(Paths.get("start.d", "idp.ini"));
 
             // Jetty with jetty-base 9.4+ listens on all addresses by default
-
-            // Set SSL port to public secure port
+            replaceProperty(pathToJettyIdPIni, "jetty.http.host", privateSecureAddress);
+            replaceProperty(pathToJettyIdPIni, "jetty.http.port", Integer.toString(port));
             replaceProperty(pathToJettyIdPIni, "jetty.ssl.port", Integer.toString(securePort));
 
             // Jetty 9.4 backchannel host and port
diff --git a/src/test/java/net/shibboleth/idp/integration/tests/saml2/SAML2AttributeQueryIntegrationTest.java b/src/test/java/net/shibboleth/idp/integration/tests/saml2/SAML2AttributeQueryIntegrationTest.java
index 4f043f4..61eec0c 100644
--- a/src/test/java/net/shibboleth/idp/integration/tests/saml2/SAML2AttributeQueryIntegrationTest.java
+++ b/src/test/java/net/shibboleth/idp/integration/tests/saml2/SAML2AttributeQueryIntegrationTest.java
@@ -264,6 +264,13 @@ public class SAML2AttributeQueryIntegrationTest extends AbstractSAML2Integration
     @BeforeClass
     protected void enableSOAPEndpoint() throws IOException {
 
+        // Jetty
+        if (pathToJettyBase != null) {
+            final Path pathToIni = pathToJettyBase.resolve(Paths.get("start.d", "idp-backchannel.ini"));
+            Assert.assertTrue(pathToIni.toFile().exists());
+            replaceProperty(pathToIni, "--module", "idp-backchannel");
+        }
+
         // Tomcat
         if (pathToTomcatBase != null) {
 

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