[java-idp-integration-tests] branch main updated: Fix CAS tests by enabling the CAS module

[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=83d352076abb7077ed7da44ae2d6a4464f7e5b19

The following commit(s) were added to refs/heads/main by this push:
       new  83d3520   Fix CAS tests by enabling the CAS module
83d3520 is described below

commit 83d352076abb7077ed7da44ae2d6a4464f7e5b19
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Fri Oct 2 12:25:06 2020 -0500

    Fix CAS tests by enabling the CAS module
---
 .../java/net/shibboleth/idp/test/BaseIntegrationTest.java     | 11 ++++++++---
 .../java/net/shibboleth/idp/test/cas/CASIntegrationTest.java  |  4 ++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java b/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java
index 641e8fa..70716f5 100644
--- a/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java
+++ b/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java
@@ -1200,17 +1200,22 @@ public abstract class BaseIntegrationTest
     }
 
     /**
-     * Enable CAS protocol for the default relying party.
+     * Enable CAS for the default relying party.
      *
-     * @throws IOException ...
+     * @throws IOException if an error occurs replacing text in relying-party.xml
+     * @throws ModuleException if an error occurs
      */
-    public void enableCASProtocol() throws IOException {
+    public void enableCAS() throws IOException, ModuleException {
         final Path pathToRelyingPartyXML = Paths.get("conf", "relying-party.xml");
 
         final String regex = "<ref bean=\"Liberty.SSOS\" />";
         final String replacement = regex + "\n" + "<ref bean=\"CAS.LoginConfiguration\" />\n"
                 + "<ref bean=\"CAS.ProxyConfiguration\" />\n" + "<ref bean=\"CAS.ValidateConfiguration\" />";
         replaceIdPHomeFile(pathToRelyingPartyXML, regex, replacement);
+        
+        if (!idpVersion.startsWith("3")) {
+            enableModules(Collections.singletonList("idp.profile.CAS"), pathToIdPHome);
+        }
     }
 
     /**
diff --git a/src/test/java/net/shibboleth/idp/test/cas/CASIntegrationTest.java b/src/test/java/net/shibboleth/idp/test/cas/CASIntegrationTest.java
index fa49702..6e42cd8 100644
--- a/src/test/java/net/shibboleth/idp/test/cas/CASIntegrationTest.java
+++ b/src/test/java/net/shibboleth/idp/test/cas/CASIntegrationTest.java
@@ -105,7 +105,7 @@ public class CASIntegrationTest extends BaseIntegrationTest {
 
         enableLogout();
 
-        enableCASProtocol();
+        enableCAS();
 
         enableLocalhostCASServiceDefinition();
 
@@ -135,7 +135,7 @@ public class CASIntegrationTest extends BaseIntegrationTest {
 
         enableLogout();
 
-        enableCASProtocol();
+        enableCAS();
 
         enableLocalhostCASServiceDefinition();
 

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