[java-identity-provider] branch main updated: Test cleanup.

Scott Cantor cantor.2 at osu.edu
Thu Mar 2 17:02:05 UTC 2023


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

scantor pushed a commit to branch main
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=7e89d30b72290fc01b8d0f7b83359c161d276849

The following commit(s) were added to refs/heads/main by this push:
     new 7e89d30b7 Test cleanup.
7e89d30b7 is described below

commit 7e89d30b72290fc01b8d0f7b83359c161d276849
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Mar 2 12:02:01 2023 -0500

    Test cleanup.
---
 .../shibboleth/idp/test/flows/SetupForResolver.java    |  5 ++++-
 .../impl/SelectRelyingPartyConfigurationTest.java      |  4 ++--
 .../tests/RelyingPartyConfigurationResolverTest.java   | 18 +++++++++---------
 .../saml1/profile/impl/SAML1ActionTestingSupport.java  |  2 +-
 .../saml/saml2/profile/impl/AddAuthnRequestTest.java   |  2 +-
 .../saml2/profile/impl/SAML2ActionTestingSupport.java  |  2 +-
 .../idp/profile/testing/RequestContextBuilder.java     |  2 +-
 7 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/SetupForResolver.java b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/SetupForResolver.java
index fff73043e..01e39386a 100644
--- a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/SetupForResolver.java
+++ b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/SetupForResolver.java
@@ -29,6 +29,9 @@ import net.shibboleth.shared.component.ComponentInitializationException;
 import org.opensaml.profile.action.ActionSupport;
 import org.opensaml.profile.context.ProfileRequestContext;
 
+/**
+ * Test action that sets up context tree for attribute resolution.
+ */
 public class SetupForResolver extends AbstractProfileAction {
     
     @Override
@@ -42,7 +45,7 @@ public class SetupForResolver extends AbstractProfileAction {
         
         final RelyingPartyConfiguration config = new RelyingPartyConfiguration();
         config.setId("test");
-        config.setResponderId(AbstractFlowTest.IDP_ENTITY_ID);
+        config.setIssuer(AbstractFlowTest.IDP_ENTITY_ID);
         try {
             config.initialize();
         } catch (final ComponentInitializationException e) {
diff --git a/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/SelectRelyingPartyConfigurationTest.java b/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/SelectRelyingPartyConfigurationTest.java
index 1b94ef45a..dd84051ee 100644
--- a/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/SelectRelyingPartyConfigurationTest.java
+++ b/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/SelectRelyingPartyConfigurationTest.java
@@ -117,7 +117,7 @@ public class SelectRelyingPartyConfigurationTest {
 
         final var config = new net.shibboleth.profile.relyingparty.RelyingPartyConfiguration();
         config.setId("foo");
-        config.setResponderId("http://idp.example.org");
+        config.setIssuer("http://idp.example.org");
         config.setDetailedErrors(true);
         config.initialize();
 
@@ -145,7 +145,7 @@ public class SelectRelyingPartyConfigurationTest {
 
         final var config = new net.shibboleth.profile.relyingparty.RelyingPartyConfiguration();
         config.setId("foo");
-        config.setResponderId("http://idp.example.org");
+        config.setIssuer("http://idp.example.org");
         config.setDetailedErrors(true);
         config.initialize();
 
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/tests/RelyingPartyConfigurationResolverTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/tests/RelyingPartyConfigurationResolverTest.java
index 3b48fb23e..e027b0db7 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/tests/RelyingPartyConfigurationResolverTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/tests/RelyingPartyConfigurationResolverTest.java
@@ -68,38 +68,38 @@ public class RelyingPartyConfigurationResolverTest extends XMLObjectBaseTestCase
     public void setup() throws Exception {
         anonRP = new RelyingPartyConfiguration();
         anonRP.setId("anonRPId");
-        anonRP.setResponderId("anonRPResp");
+        anonRP.setIssuer("anonRPResp");
         anonRP.setDetailedErrors(true);
         anonRP.initialize();
         
         defaultRP = new RelyingPartyConfiguration();
         defaultRP.setId("defaultRPId");
-        defaultRP.setResponderId("defaultRPResp");
+        defaultRP.setIssuer("defaultRPResp");
         defaultRP.setDetailedErrors(true);
         defaultRP.initialize();
         
         oneByName = RelyingPartyConfigurationSupport.byName(CollectionSupport.singleton("rp1"));
-        oneByName.setResponderId("foo");
+        oneByName.setIssuer("foo");
         oneByName.setDetailedErrors(true);
         oneByName.initialize();
 
         twoByName = RelyingPartyConfigurationSupport.byName(CollectionSupport.singleton("rp2"));
-        twoByName.setResponderId("foo");
+        twoByName.setIssuer("foo");
         twoByName.setDetailedErrors(true);
         twoByName.initialize();
 
         threeByName = RelyingPartyConfigurationSupport.byName(CollectionSupport.singleton("rp3"));
-        threeByName.setResponderId("foo");
+        threeByName.setIssuer("foo");
         threeByName.setDetailedErrors(true);
         threeByName.initialize();
         
         oneByGroup = RelyingPartyConfigurationSupport.byGroup(CollectionSupport.singleton("group1"), null);
-        oneByGroup.setResponderId("foo");
+        oneByGroup.setIssuer("foo");
         oneByGroup.setDetailedErrors(true);
         oneByGroup.initialize();
         
         twoByGroup = RelyingPartyConfigurationSupport.byGroup(CollectionSupport.singleton("group2"), null);
-        twoByGroup.setResponderId("foo");
+        twoByGroup.setIssuer("foo");
         twoByGroup.setDetailedErrors(true);
         twoByGroup.initialize();
         
@@ -107,7 +107,7 @@ public class RelyingPartyConfigurationResolverTest extends XMLObjectBaseTestCase
         candidate1.setValues(CollectionSupport.singleton("tag1"));
         oneByTag = RelyingPartyConfigurationSupport.byTag(CollectionSupport.singleton(candidate1), true, true);
         oneByTag.setId("byTag1");
-        oneByTag.setResponderId("foo");
+        oneByTag.setIssuer("foo");
         oneByTag.setDetailedErrors(true);
         oneByTag.initialize();
         
@@ -115,7 +115,7 @@ public class RelyingPartyConfigurationResolverTest extends XMLObjectBaseTestCase
         candidate2.setValues(CollectionSupport.singleton("tag2"));
         twoByTag = RelyingPartyConfigurationSupport.byTag(CollectionSupport.singleton(candidate2), true, true);
         twoByTag.setId("byTag2");
-        twoByTag.setResponderId("foo");
+        twoByTag.setIssuer("foo");
         twoByTag.setDetailedErrors(true);
         twoByTag.initialize();
         
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/SAML1ActionTestingSupport.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/SAML1ActionTestingSupport.java
index 2d5bd1333..5afa46a59 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/SAML1ActionTestingSupport.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/SAML1ActionTestingSupport.java
@@ -69,7 +69,7 @@ public final class SAML1ActionTestingSupport extends org.opensaml.saml.saml1.tes
 
         final RelyingPartyConfiguration rpConfig = new RelyingPartyConfiguration();
         rpConfig.setId(id);
-        rpConfig.setResponderId(ActionTestingSupport.OUTBOUND_MSG_ISSUER);
+        rpConfig.setIssuer(ActionTestingSupport.OUTBOUND_MSG_ISSUER);
         rpConfig.setDetailedErrors(true);
         rpConfig.setProfileConfigurations(buildProfileConfigurations());
         rpConfig.initialize();
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnRequestTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnRequestTest.java
index 0a8073ee9..e92f9127e 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnRequestTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnRequestTest.java
@@ -92,7 +92,7 @@ public class AddAuthnRequestTest extends OpenSAMLInitBaseTestCase {
         rpc.setRelyingPartyId(ActionTestingSupport.INBOUND_MSG_ISSUER);
         final RelyingPartyConfiguration rp = new RelyingPartyConfiguration();
         rp.setId("mock");
-        rp.setResponderId(ActionTestingSupport.OUTBOUND_MSG_ISSUER);
+        rp.setIssuer(ActionTestingSupport.OUTBOUND_MSG_ISSUER);
         rp.setDetailedErrors(true);
         rp.initialize();
         rpc.setConfiguration(rp);
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/SAML2ActionTestingSupport.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/SAML2ActionTestingSupport.java
index 86ce6dfbd..9552b864d 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/SAML2ActionTestingSupport.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/SAML2ActionTestingSupport.java
@@ -69,7 +69,7 @@ public final class SAML2ActionTestingSupport extends org.opensaml.saml.saml2.tes
 
         final RelyingPartyConfiguration rpConfig = new RelyingPartyConfiguration();
         rpConfig.setId(id);
-        rpConfig.setResponderId(ActionTestingSupport.OUTBOUND_MSG_ISSUER);
+        rpConfig.setIssuer(ActionTestingSupport.OUTBOUND_MSG_ISSUER);
         rpConfig.setDetailedErrors(true);
         rpConfig.setProfileConfigurations(buildProfileConfigurations());
         rpConfig.initialize();
diff --git a/idp-testing/src/main/java/net/shibboleth/idp/profile/testing/RequestContextBuilder.java b/idp-testing/src/main/java/net/shibboleth/idp/profile/testing/RequestContextBuilder.java
index f7e3df2e6..68895edaf 100644
--- a/idp-testing/src/main/java/net/shibboleth/idp/profile/testing/RequestContextBuilder.java
+++ b/idp-testing/src/main/java/net/shibboleth/idp/profile/testing/RequestContextBuilder.java
@@ -452,7 +452,7 @@ public class RequestContextBuilder {
 
         RelyingPartyConfiguration rp = new RelyingPartyConfiguration();
         rp.setId("mock");
-        rp.setResponderId(responderId);
+        rp.setIssuer(responderId);
         rp.setDetailedErrors(true);
         rp.setProfileConfigurations(profileConfigs);
         rp.initialize();

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


More information about the commits mailing list