[java-idp-oidc] branch main updated: Account for test "API" changes.
Scott Cantor
cantor.2 at osu.edu
Thu Sep 17 19:25:39 UTC 2020
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-idp-oidc.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-oidc.git;a=commit;h=f66c118bb0d7359b18a132e05c59ddd8a8448310
The following commit(s) were added to refs/heads/main by this push:
new f66c118b Account for test "API" changes.
f66c118b is described below
commit f66c118bb0d7359b18a132e05c59ddd8a8448310
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Sep 17 15:25:36 2020 -0400
Account for test "API" changes.
---
.../navigate/AbstractAuthenticationRequestLookupFunctionTest.java | 2 +-
.../context/navigate/AbstractTokenClaimsLookupFunctionTest.java | 2 +-
.../context/navigate/AbstractTokenRequestLookupFunctionTest.java | 2 +-
.../context/navigate/BaseDefaultRequestLookupFunctionTest.java | 2 +-
.../context/navigate/BaseTokenRequestLookupFunctionTest.java | 2 +-
.../profile/context/navigate/DefaultAuthTimeLookupFunctionTest.java | 2 +-
.../navigate/DefaultOIDCMetadataContextLookupFunctionTest.java | 2 +-
.../navigate/DefaultResponseClaimsSetLookupFunctionTest.java | 2 +-
.../navigate/DefaultUserInfoSigningAlgLookupFunctionTest.java | 2 +-
.../navigate/DefaultValidRedirectUrisLookupFunctionTest.java | 2 +-
.../OIDCAuthenticationResponseContextLookupFunctionTest.java | 2 +-
.../navigate/OIDCRegistrationResponseContextLookupFunctionTest.java | 2 +-
.../context/navigate/ProfileResponderIdLookupFunctionTest.java | 3 ++-
.../context/navigate/SectorIdentifierLookupFunctionTest.java | 2 +-
.../context/navigate/TokenRequestRedirectURILookupFunctionTest.java | 3 ++-
.../navigate/UserInfoResponseClaimsSetLookupFunctionTest.java | 2 +-
.../org/geant/idpextension/oauth2/profile/impl/RevokeTokenTest.java | 4 ++--
.../matcher/impl/AttributeInOIDCRequestedClaimsMatcherTest.java | 2 +-
.../filtercontext/impl/AttributeOIDCScopePolicyRuleTest.java | 2 +-
.../oidc/metadata/impl/CredentialMetadataValueResolverTest.java | 2 +-
.../profile/impl/AbstractOIDCAuthenticationRequestActionTest.java | 6 +++---
.../profile/impl/AbstractOIDCAuthenticationResponseActionTest.java | 6 +++---
.../oidc/profile/impl/AbstractOIDCTokenResponseActionTest.java | 5 ++---
.../oidc/profile/impl/AbstractOIDCUserInfoResponseActionTest.java | 5 ++---
.../oidc/profile/impl/AddAccessTokenHashToIDTokenTest.java | 2 +-
.../geant/idpextension/oidc/profile/impl/AddAcrToIDTokenTest.java | 2 +-
.../oidc/profile/impl/AddAttributesToClaimsSetTest.java | 2 +-
.../idpextension/oidc/profile/impl/AddAuthTimeToIDTokenTest.java | 2 +-
.../oidc/profile/impl/AddAuthorizationCodeHashToIDTokenTest.java | 2 +-
.../oidc/profile/impl/AddGrantTypeToClientMetadataTest.java | 2 +-
.../geant/idpextension/oidc/profile/impl/AddIDTokenShellTest.java | 2 +-
.../idpextension/oidc/profile/impl/AddJwksToClientMetadataTest.java | 2 +-
.../geant/idpextension/oidc/profile/impl/AddNonceToIDTokenTest.java | 2 +-
.../AddRequestObjectSecurityConfigurationToClientMetadataTest.java | 2 +-
.../oidc/profile/impl/AddResponseTypesToClientMetadataTest.java | 2 +-
.../profile/impl/AddSecurityConfigurationToClientMetadataTest.java | 2 +-
.../profile/impl/AddTokenDeliveryAttributesToClaimsSetTest.java | 3 ++-
.../geant/idpextension/oidc/profile/impl/AddUserInfoShellTest.java | 2 +-
.../oidc/profile/impl/BaseOIDCClientMetadataPopulationTest.java | 4 ++--
.../oidc/profile/impl/BaseOIDCRegistrationRequestTest.java | 2 +-
.../idpextension/oidc/profile/impl/BaseOIDCResponseActionTest.java | 2 +-
.../oidc/profile/impl/BuildJSONErrorResponseFromEventTest.java | 2 +-
.../geant/idpextension/oidc/profile/impl/CheckRedirectUrisTest.java | 2 +-
.../idpextension/oidc/profile/impl/DecryptRequestObjectTest.java | 4 ++--
.../idpextension/oidc/profile/impl/EncryptProcessedTokenTest.java | 4 ++--
.../profile/impl/FormOutboundAuthenticationResponseMessageTest.java | 2 +-
.../oidc/profile/impl/FormOutboundDiscoveryResponseTest.java | 4 ++--
.../oidc/profile/impl/FormOutboundKeySetResponseMessageTest.java | 4 ++--
.../oidc/profile/impl/FormOutboundTokenResponseMessageTest.java | 2 +-
.../oidc/profile/impl/FormOutboundUserInfoResponseMessageTest.java | 3 ++-
.../oidc/profile/impl/InitializeAuthenticationContextTest.java | 5 ++---
.../InitializeOutboundAuthenticationResponseMessageContextTest.java | 4 ++--
.../profile/impl/InitializeOutboundResponseMessageContextTest.java | 4 ++--
.../oidc/profile/impl/InitializeRelyingPartyContextTest.java | 4 ++--
.../oidc/profile/impl/InitializeSubjectContextTest.java | 2 +-
.../profile/impl/InitializeUnverifiedRelyingPartyContextTest.java | 4 ++--
.../oidc/profile/impl/PopulateOIDCEncryptionParametersTest.java | 2 +-
.../oidc/profile/impl/ProcessRequestedAuthnContextTest.java | 2 +-
.../idpextension/oidc/profile/impl/ReduceValidatedScopeTest.java | 2 +-
.../org/geant/idpextension/oidc/profile/impl/RevokeConsentTest.java | 2 +-
.../oidc/profile/impl/SetAccessTokenToResponseContextTest.java | 2 +-
...tionContextClassReferenceFromAuthzCodeToResponseContextTest.java | 2 +-
...SetAuthenticationContextClassReferenceToResponseContextTest.java | 2 +-
.../profile/impl/SetAuthenticationTimeToResponseContextTest.java | 2 +-
.../profile/impl/SetAuthorizationCodeToResponseContextTest.java | 2 +-
.../oidc/profile/impl/SetConsentFromTokenToResponseContextTest.java | 2 +-
.../oidc/profile/impl/SetConsentToResponseContextTest.java | 2 +-
.../oidc/profile/impl/SetRefreshTokenToResponseContextTest.java | 2 +-
.../oidc/profile/impl/SetRequestedClaimsToResponseContextTest.java | 2 +-
.../oidc/profile/impl/SetRequestedSubjectToResponseContextTest.java | 2 +-
.../profile/impl/SetSectorIdentifierForAttributeResolutionTest.java | 2 +-
.../oidc/profile/impl/SetSubjectToResponseContextTest.java | 2 +-
.../SetTokenDeliveryAttributesFromTokenToResponseContextTest.java | 2 +-
.../impl/SetTokenDeliveryAttributesToResponseContextTest.java | 2 +-
.../org/geant/idpextension/oidc/profile/impl/SignIDTokenTest.java | 3 ++-
.../idpextension/oidc/profile/impl/SignUserInfoResponseTest.java | 3 ++-
.../idpextension/oidc/profile/impl/ValidateAccessTokenTest.java | 2 +-
.../oidc/profile/impl/ValidateEndpointAuthenticationTest.java | 4 ++--
.../org/geant/idpextension/oidc/profile/impl/ValidateGrantTest.java | 2 +-
.../geant/idpextension/oidc/profile/impl/ValidateGrantTypeTest.java | 2 +-
.../org/geant/idpextension/oidc/profile/impl/ValidatePKCETest.java | 2 +-
.../idpextension/oidc/profile/impl/ValidateRedirectURITest.java | 3 ++-
.../idpextension/oidc/profile/impl/ValidateRequestObjectTest.java | 4 ++--
.../idpextension/oidc/profile/impl/ValidateResponseTypeTest.java | 2 +-
.../org/geant/idpextension/oidc/profile/impl/ValidateScopeTest.java | 3 ++-
.../oidc/profile/impl/VerifyRequestedSubjectIdentifierTest.java | 2 +-
.../profile/logic/AttributeResolutionSubjectLookupFunctionTest.java | 4 ++--
.../oidc/profile/logic/SubjectActivationConditionTest.java | 2 +-
.../metadata/impl/ReloadClientResolverServiceConfigurationTest.java | 4 ++--
.../impl/ReloadProviderResolverServiceConfigurationTest.java | 4 ++--
90 files changed, 120 insertions(+), 115 deletions(-)
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/AbstractAuthenticationRequestLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/AbstractAuthenticationRequestLookupFunctionTest.java
index e005ccb0..7709271b 100644
--- a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/AbstractAuthenticationRequestLookupFunctionTest.java
+++ b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/AbstractAuthenticationRequestLookupFunctionTest.java
@@ -16,8 +16,8 @@
package org.geant.idpextension.oidc.profile.context.navigate;
-import net.shibboleth.idp.profile.RequestContextBuilder;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
import java.net.URI;
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/AbstractTokenClaimsLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/AbstractTokenClaimsLookupFunctionTest.java
index 57dff6bc..e88bc299 100644
--- a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/AbstractTokenClaimsLookupFunctionTest.java
+++ b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/AbstractTokenClaimsLookupFunctionTest.java
@@ -16,8 +16,8 @@
package org.geant.idpextension.oidc.profile.context.navigate;
-import net.shibboleth.idp.profile.RequestContextBuilder;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
import net.shibboleth.utilities.java.support.security.impl.SecureRandomIdentifierGenerationStrategy;
import java.net.URI;
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/AbstractTokenRequestLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/AbstractTokenRequestLookupFunctionTest.java
index 91352b45..14abb509 100644
--- a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/AbstractTokenRequestLookupFunctionTest.java
+++ b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/AbstractTokenRequestLookupFunctionTest.java
@@ -16,8 +16,8 @@
package org.geant.idpextension.oidc.profile.context.navigate;
-import net.shibboleth.idp.profile.RequestContextBuilder;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
import java.net.URI;
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/BaseDefaultRequestLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/BaseDefaultRequestLookupFunctionTest.java
index 008898e0..1c2d1216 100644
--- a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/BaseDefaultRequestLookupFunctionTest.java
+++ b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/BaseDefaultRequestLookupFunctionTest.java
@@ -16,8 +16,8 @@
package org.geant.idpextension.oidc.profile.context.navigate;
-import net.shibboleth.idp.profile.RequestContextBuilder;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
import org.geant.idpextension.oidc.messaging.context.OIDCAuthenticationResponseContext;
import org.opensaml.messaging.context.MessageContext;
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/BaseTokenRequestLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/BaseTokenRequestLookupFunctionTest.java
index d99a302a..b358e45e 100644
--- a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/BaseTokenRequestLookupFunctionTest.java
+++ b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/BaseTokenRequestLookupFunctionTest.java
@@ -17,8 +17,8 @@
package org.geant.idpextension.oidc.profile.context.navigate;
import net.minidev.json.JSONArray;
-import net.shibboleth.idp.profile.RequestContextBuilder;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
import net.shibboleth.utilities.java.support.security.impl.SecureRandomIdentifierGenerationStrategy;
import java.net.URI;
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultAuthTimeLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultAuthTimeLookupFunctionTest.java
index 13b5f59d..91984155 100644
--- a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultAuthTimeLookupFunctionTest.java
+++ b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultAuthTimeLookupFunctionTest.java
@@ -18,8 +18,8 @@ package org.geant.idpextension.oidc.profile.context.navigate;
import net.shibboleth.idp.authn.AuthenticationResult;
import net.shibboleth.idp.authn.context.AuthenticationContext;
-import net.shibboleth.idp.profile.RequestContextBuilder;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
import java.time.Instant;
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultOIDCMetadataContextLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultOIDCMetadataContextLookupFunctionTest.java
index 1ce1c8c1..0d111501 100644
--- a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultOIDCMetadataContextLookupFunctionTest.java
+++ b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultOIDCMetadataContextLookupFunctionTest.java
@@ -16,8 +16,8 @@
package org.geant.idpextension.oidc.profile.context.navigate;
-import net.shibboleth.idp.profile.RequestContextBuilder;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
import org.geant.idpextension.oidc.messaging.context.OIDCMetadataContext;
import org.opensaml.messaging.context.MessageContext;
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultResponseClaimsSetLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultResponseClaimsSetLookupFunctionTest.java
index 763c710d..6f534f77 100644
--- a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultResponseClaimsSetLookupFunctionTest.java
+++ b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultResponseClaimsSetLookupFunctionTest.java
@@ -33,8 +33,8 @@ import com.nimbusds.oauth2.sdk.id.Issuer;
import com.nimbusds.oauth2.sdk.id.Subject;
import com.nimbusds.openid.connect.sdk.claims.IDTokenClaimsSet;
-import net.shibboleth.idp.profile.RequestContextBuilder;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
/** Tests for {@link DefaultResponseClaimsSetLookupFunction}. */
public class DefaultResponseClaimsSetLookupFunctionTest {
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultUserInfoSigningAlgLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultUserInfoSigningAlgLookupFunctionTest.java
index 8d433dd8..fffd8c07 100644
--- a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultUserInfoSigningAlgLookupFunctionTest.java
+++ b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultUserInfoSigningAlgLookupFunctionTest.java
@@ -32,8 +32,8 @@ import com.nimbusds.oauth2.sdk.id.ClientID;
import com.nimbusds.openid.connect.sdk.rp.OIDCClientInformation;
import com.nimbusds.openid.connect.sdk.rp.OIDCClientMetadata;
-import net.shibboleth.idp.profile.RequestContextBuilder;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
/** Tests for {@link DefaultUserInfoSigningAlgLookupFunction}. */
public class DefaultUserInfoSigningAlgLookupFunctionTest {
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultValidRedirectUrisLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultValidRedirectUrisLookupFunctionTest.java
index 16dd2afd..651e907c 100644
--- a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultValidRedirectUrisLookupFunctionTest.java
+++ b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultValidRedirectUrisLookupFunctionTest.java
@@ -34,8 +34,8 @@ import com.nimbusds.oauth2.sdk.id.ClientID;
import com.nimbusds.openid.connect.sdk.rp.OIDCClientInformation;
import com.nimbusds.openid.connect.sdk.rp.OIDCClientMetadata;
-import net.shibboleth.idp.profile.RequestContextBuilder;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
/** Tests for {@link DefaultValidRedirectUrisLookupFunction}. */
public class DefaultValidRedirectUrisLookupFunctionTest {
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/OIDCAuthenticationResponseContextLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/OIDCAuthenticationResponseContextLookupFunctionTest.java
index b483b592..35886562 100644
--- a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/OIDCAuthenticationResponseContextLookupFunctionTest.java
+++ b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/OIDCAuthenticationResponseContextLookupFunctionTest.java
@@ -24,8 +24,8 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import net.shibboleth.idp.profile.RequestContextBuilder;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
/** Tests for {@link OIDCAuthenticationResponseContextLookupFunction}. */
public class OIDCAuthenticationResponseContextLookupFunctionTest {
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/OIDCRegistrationResponseContextLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/OIDCRegistrationResponseContextLookupFunctionTest.java
index 6acf8551..f71728ad 100644
--- a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/OIDCRegistrationResponseContextLookupFunctionTest.java
+++ b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/OIDCRegistrationResponseContextLookupFunctionTest.java
@@ -24,8 +24,8 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import net.shibboleth.idp.profile.RequestContextBuilder;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
/** Tests for {@link OIDCRegistrationResponseContextLookupFunction}. */
public class OIDCRegistrationResponseContextLookupFunctionTest {
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/ProfileResponderIdLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/ProfileResponderIdLookupFunctionTest.java
index f2a7c997..e2d3dd92 100644
--- a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/ProfileResponderIdLookupFunctionTest.java
+++ b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/ProfileResponderIdLookupFunctionTest.java
@@ -25,9 +25,10 @@ import org.springframework.webflow.execution.RequestContext;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import net.shibboleth.idp.profile.RequestContextBuilder;
+
import net.shibboleth.idp.profile.config.ProfileConfiguration;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/** Tests for {@link ProfileResponderIdLookupFunction}. */
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/SectorIdentifierLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/SectorIdentifierLookupFunctionTest.java
index 157e01c0..21fdc741 100644
--- a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/SectorIdentifierLookupFunctionTest.java
+++ b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/SectorIdentifierLookupFunctionTest.java
@@ -22,8 +22,8 @@ import java.util.Date;
import java.util.HashSet;
import java.util.Set;
-import net.shibboleth.idp.profile.RequestContextBuilder;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
import org.geant.idpextension.oidc.messaging.context.OIDCMetadataContext;
import org.opensaml.messaging.context.MessageContext;
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestRedirectURILookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestRedirectURILookupFunctionTest.java
index 1d542f9e..2436944e 100644
--- a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestRedirectURILookupFunctionTest.java
+++ b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestRedirectURILookupFunctionTest.java
@@ -35,8 +35,9 @@ import com.nimbusds.oauth2.sdk.TokenRequest;
import com.nimbusds.oauth2.sdk.id.ClientID;
import org.testng.Assert;
-import net.shibboleth.idp.profile.RequestContextBuilder;
+
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
/** Tests for {@link TokenRequestRedirectURILookupFunction}. */
public class TokenRequestRedirectURILookupFunctionTest {
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/UserInfoResponseClaimsSetLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/UserInfoResponseClaimsSetLookupFunctionTest.java
index 2c6f6850..6ede027c 100644
--- a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/UserInfoResponseClaimsSetLookupFunctionTest.java
+++ b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/UserInfoResponseClaimsSetLookupFunctionTest.java
@@ -27,8 +27,8 @@ import org.testng.annotations.Test;
import com.nimbusds.oauth2.sdk.id.Subject;
import com.nimbusds.openid.connect.sdk.claims.UserInfo;
-import net.shibboleth.idp.profile.RequestContextBuilder;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
/** Tests for {@link UserInfoResponseClaimsSetLookupFunction}. */
public class UserInfoResponseClaimsSetLookupFunctionTest {
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oauth2/profile/impl/RevokeTokenTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oauth2/profile/impl/RevokeTokenTest.java
index c27631ba..83a99af7 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oauth2/profile/impl/RevokeTokenTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oauth2/profile/impl/RevokeTokenTest.java
@@ -40,8 +40,8 @@ import com.nimbusds.oauth2.sdk.TokenRevocationRequest;
import com.nimbusds.oauth2.sdk.id.ClientID;
import com.nimbusds.oauth2.sdk.token.BearerAccessToken;
-import net.shibboleth.idp.profile.ActionTestingSupport;
-import net.shibboleth.idp.profile.RequestContextBuilder;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.security.DataSealerException;
import net.shibboleth.utilities.java.support.security.impl.SecureRandomIdentifierGenerationStrategy;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/attribute/filter/matcher/impl/AttributeInOIDCRequestedClaimsMatcherTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/attribute/filter/matcher/impl/AttributeInOIDCRequestedClaimsMatcherTest.java
index b798637e..d6793655 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/attribute/filter/matcher/impl/AttributeInOIDCRequestedClaimsMatcherTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/attribute/filter/matcher/impl/AttributeInOIDCRequestedClaimsMatcherTest.java
@@ -25,8 +25,8 @@ import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.IdPAttributeValue;
import net.shibboleth.idp.attribute.IdPRequestedAttribute;
import net.shibboleth.idp.attribute.filter.context.AttributeFilterContext;
-import net.shibboleth.idp.profile.RequestContextBuilder;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
import org.geant.idpextension.oidc.messaging.context.OIDCAuthenticationResponseContext;
import org.geant.idpextension.oidc.messaging.context.OIDCMetadataContext;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/attribute/filter/spring/policyrule/filtercontext/impl/AttributeOIDCScopePolicyRuleTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/attribute/filter/spring/policyrule/filtercontext/impl/AttributeOIDCScopePolicyRuleTest.java
index ac0d5398..ccf0fbef 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/attribute/filter/spring/policyrule/filtercontext/impl/AttributeOIDCScopePolicyRuleTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/attribute/filter/spring/policyrule/filtercontext/impl/AttributeOIDCScopePolicyRuleTest.java
@@ -18,8 +18,8 @@ package org.geant.idpextension.oidc.attribute.filter.spring.policyrule.filtercon
import net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate;
import net.shibboleth.idp.attribute.filter.context.AttributeFilterContext;
-import net.shibboleth.idp.profile.RequestContextBuilder;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
import org.geant.idpextension.oidc.messaging.context.OIDCAuthenticationResponseContext;
import org.opensaml.messaging.context.MessageContext;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/metadata/impl/CredentialMetadataValueResolverTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/metadata/impl/CredentialMetadataValueResolverTest.java
index 93977e5b..6e662fca 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/metadata/impl/CredentialMetadataValueResolverTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/metadata/impl/CredentialMetadataValueResolverTest.java
@@ -33,10 +33,10 @@ import org.testng.annotations.Test;
import net.minidev.json.JSONArray;
import net.minidev.json.JSONObject;
-import net.shibboleth.idp.profile.RequestContextBuilder;
import net.shibboleth.idp.profile.config.SecurityConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AbstractOIDCAuthenticationRequestActionTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AbstractOIDCAuthenticationRequestActionTest.java
index 3b034764..d57e117e 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AbstractOIDCAuthenticationRequestActionTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AbstractOIDCAuthenticationRequestActionTest.java
@@ -15,8 +15,10 @@
*/
package org.geant.idpextension.oidc.profile.impl;
-import net.shibboleth.idp.profile.ActionTestingSupport;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
+
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
import org.springframework.webflow.execution.Event;
@@ -25,8 +27,6 @@ import org.testng.annotations.Test;
import com.nimbusds.openid.connect.sdk.AuthenticationRequest;
-import net.shibboleth.idp.profile.RequestContextBuilder;
-
/** {@link AbstractOIDCAuthenticationRequestAction} unit test. */
public class AbstractOIDCAuthenticationRequestActionTest {
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AbstractOIDCAuthenticationResponseActionTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AbstractOIDCAuthenticationResponseActionTest.java
index b9486cff..af217aad 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AbstractOIDCAuthenticationResponseActionTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AbstractOIDCAuthenticationResponseActionTest.java
@@ -15,8 +15,10 @@
*/
package org.geant.idpextension.oidc.profile.impl;
-import net.shibboleth.idp.profile.ActionTestingSupport;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
+
import org.geant.idpextension.oidc.messaging.context.OIDCAuthenticationResponseContext;
import org.geant.idpextension.oidc.messaging.context.OIDCMetadataContext;
import org.opensaml.messaging.context.MessageContext;
@@ -29,8 +31,6 @@ import org.testng.annotations.Test;
import com.nimbusds.openid.connect.sdk.AuthenticationRequest;
-import net.shibboleth.idp.profile.RequestContextBuilder;
-
/** {@link AbstractOIDCAuthenticationResponseAction} unit test. */
public class AbstractOIDCAuthenticationResponseActionTest {
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AbstractOIDCTokenResponseActionTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AbstractOIDCTokenResponseActionTest.java
index 9d16c67d..207144a5 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AbstractOIDCTokenResponseActionTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AbstractOIDCTokenResponseActionTest.java
@@ -16,8 +16,9 @@
package org.geant.idpextension.oidc.profile.impl;
-import net.shibboleth.idp.profile.ActionTestingSupport;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
import java.net.URI;
@@ -37,8 +38,6 @@ import com.nimbusds.oauth2.sdk.AuthorizationGrant;
import com.nimbusds.oauth2.sdk.TokenRequest;
import com.nimbusds.oauth2.sdk.id.ClientID;
-import net.shibboleth.idp.profile.RequestContextBuilder;
-
/** {@link AbstractOIDCTokenResponseAction} unit test. */
public class AbstractOIDCTokenResponseActionTest {
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AbstractOIDCUserInfoResponseActionTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AbstractOIDCUserInfoResponseActionTest.java
index 119806f1..ffacdcf4 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AbstractOIDCUserInfoResponseActionTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AbstractOIDCUserInfoResponseActionTest.java
@@ -16,8 +16,9 @@
package org.geant.idpextension.oidc.profile.impl;
-import net.shibboleth.idp.profile.ActionTestingSupport;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
import java.net.URI;
@@ -33,8 +34,6 @@ import org.testng.annotations.Test;
import com.nimbusds.oauth2.sdk.token.BearerAccessToken;
import com.nimbusds.openid.connect.sdk.UserInfoRequest;
-import net.shibboleth.idp.profile.RequestContextBuilder;
-
/** {@link AbstractOIDCUserInfoResponseAction} unit test. */
public class AbstractOIDCUserInfoResponseActionTest {
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddAccessTokenHashToIDTokenTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddAccessTokenHashToIDTokenTest.java
index d7f7ea40..035250fb 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddAccessTokenHashToIDTokenTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddAccessTokenHashToIDTokenTest.java
@@ -20,7 +20,7 @@ import java.net.URISyntaxException;
import java.time.Duration;
import java.time.Instant;
-import net.shibboleth.idp.profile.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import org.opensaml.profile.action.EventIds;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddAcrToIDTokenTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddAcrToIDTokenTest.java
index d10f7761..366c2a01 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddAcrToIDTokenTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddAcrToIDTokenTest.java
@@ -17,7 +17,7 @@ package org.geant.idpextension.oidc.profile.impl;
import java.time.Instant;
-import net.shibboleth.idp.profile.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import org.opensaml.profile.action.EventIds;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddAttributesToClaimsSetTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddAttributesToClaimsSetTest.java
index 8d71bcff..0d450774 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddAttributesToClaimsSetTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddAttributesToClaimsSetTest.java
@@ -32,9 +32,9 @@ import net.shibboleth.idp.attribute.context.AttributeContext;
import net.shibboleth.idp.attribute.transcoding.AttributeTranscoderRegistry;
import net.shibboleth.idp.attribute.transcoding.TranscodingRule;
import net.shibboleth.idp.attribute.transcoding.impl.AttributeTranscoderRegistryImpl;
-import net.shibboleth.idp.profile.ActionTestingSupport;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.test.service.MockReloadableService;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddAuthTimeToIDTokenTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddAuthTimeToIDTokenTest.java
index 37162a61..43c66768 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddAuthTimeToIDTokenTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddAuthTimeToIDTokenTest.java
@@ -19,7 +19,7 @@ import java.time.Instant;
import java.time.temporal.ChronoUnit;
import java.util.Date;
-import net.shibboleth.idp.profile.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import org.opensaml.profile.action.EventIds;
import org.springframework.webflow.execution.Event;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddAuthorizationCodeHashToIDTokenTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddAuthorizationCodeHashToIDTokenTest.java
index d62d5cb5..0305bd5e 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddAuthorizationCodeHashToIDTokenTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddAuthorizationCodeHashToIDTokenTest.java
@@ -19,7 +19,7 @@ package org.geant.idpextension.oidc.profile.impl;
import java.net.URISyntaxException;
import java.time.Instant;
-import net.shibboleth.idp.profile.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import org.opensaml.profile.action.EventIds;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddGrantTypeToClientMetadataTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddGrantTypeToClientMetadataTest.java
index a15724c6..060219d9 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddGrantTypeToClientMetadataTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddGrantTypeToClientMetadataTest.java
@@ -34,7 +34,7 @@ import com.google.common.base.Predicates;
import com.nimbusds.oauth2.sdk.GrantType;
import com.nimbusds.openid.connect.sdk.rp.OIDCClientMetadata;
-import net.shibboleth.idp.profile.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddIDTokenShellTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddIDTokenShellTest.java
index 8f7662b1..81b25259 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddIDTokenShellTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddIDTokenShellTest.java
@@ -16,8 +16,8 @@
package org.geant.idpextension.oidc.profile.impl;
-import net.shibboleth.idp.profile.ActionTestingSupport;
import net.shibboleth.idp.profile.context.navigate.ResponderIdLookupFunction;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import org.geant.idpextension.oidc.config.navigate.AudienceRestrictionsLookupFunction;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddJwksToClientMetadataTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddJwksToClientMetadataTest.java
index 78771baf..10dbbe77 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddJwksToClientMetadataTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddJwksToClientMetadataTest.java
@@ -38,7 +38,7 @@ import org.testng.annotations.Test;
import com.nimbusds.openid.connect.sdk.rp.OIDCClientMetadata;
-import net.shibboleth.idp.profile.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
/**
* Unit tests for {@link AddJwksToClientMetadata}.
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddNonceToIDTokenTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddNonceToIDTokenTest.java
index 456e4e1f..4f16f0cc 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddNonceToIDTokenTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddNonceToIDTokenTest.java
@@ -17,7 +17,7 @@ package org.geant.idpextension.oidc.profile.impl;
import java.time.Instant;
-import net.shibboleth.idp.profile.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import org.opensaml.profile.action.EventIds;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddRequestObjectSecurityConfigurationToClientMetadataTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddRequestObjectSecurityConfigurationToClientMetadataTest.java
index 5007627f..48250891 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddRequestObjectSecurityConfigurationToClientMetadataTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddRequestObjectSecurityConfigurationToClientMetadataTest.java
@@ -32,7 +32,7 @@ import com.nimbusds.jose.JWEAlgorithm;
import com.nimbusds.jose.JWSAlgorithm;
import com.nimbusds.openid.connect.sdk.rp.OIDCClientMetadata;
-import net.shibboleth.idp.profile.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddResponseTypesToClientMetadataTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddResponseTypesToClientMetadataTest.java
index 66cf257b..950ee725 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddResponseTypesToClientMetadataTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddResponseTypesToClientMetadataTest.java
@@ -37,7 +37,7 @@ import com.nimbusds.oauth2.sdk.ResponseType;
import com.nimbusds.openid.connect.sdk.OIDCResponseTypeValue;
import com.nimbusds.openid.connect.sdk.rp.OIDCClientMetadata;
-import net.shibboleth.idp.profile.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddSecurityConfigurationToClientMetadataTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddSecurityConfigurationToClientMetadataTest.java
index 20a63cb2..f536403b 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddSecurityConfigurationToClientMetadataTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddSecurityConfigurationToClientMetadataTest.java
@@ -36,10 +36,10 @@ import com.nimbusds.jose.JWEAlgorithm;
import com.nimbusds.jose.JWSAlgorithm;
import com.nimbusds.openid.connect.sdk.rp.OIDCClientMetadata;
-import net.shibboleth.idp.profile.ActionTestingSupport;
import net.shibboleth.idp.profile.config.ProfileConfiguration;
import net.shibboleth.idp.profile.config.SecurityConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddTokenDeliveryAttributesToClaimsSetTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddTokenDeliveryAttributesToClaimsSetTest.java
index deff58ad..b057804d 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddTokenDeliveryAttributesToClaimsSetTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddTokenDeliveryAttributesToClaimsSetTest.java
@@ -17,7 +17,8 @@
package org.geant.idpextension.oidc.profile.impl;
import java.time.Instant;
-import net.shibboleth.idp.profile.ActionTestingSupport;
+
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import org.geant.idpextension.oidc.messaging.context.OIDCAuthenticationResponseTokenClaimsContext;
import org.opensaml.profile.action.EventIds;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddUserInfoShellTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddUserInfoShellTest.java
index 09a30081..c22046d6 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddUserInfoShellTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddUserInfoShellTest.java
@@ -16,10 +16,10 @@
package org.geant.idpextension.oidc.profile.impl;
-import net.shibboleth.idp.profile.ActionTestingSupport;
import net.shibboleth.idp.profile.IdPEventIds;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.ResponderIdLookupFunction;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/BaseOIDCClientMetadataPopulationTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/BaseOIDCClientMetadataPopulationTest.java
index c0c80682..e1ba39f6 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/BaseOIDCClientMetadataPopulationTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/BaseOIDCClientMetadataPopulationTest.java
@@ -28,9 +28,9 @@ import org.testng.annotations.Test;
import com.nimbusds.openid.connect.sdk.rp.OIDCClientMetadata;
import com.nimbusds.openid.connect.sdk.rp.OIDCClientRegistrationRequest;
-import net.shibboleth.idp.profile.ActionTestingSupport;
-import net.shibboleth.idp.profile.RequestContextBuilder;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/BaseOIDCRegistrationRequestTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/BaseOIDCRegistrationRequestTest.java
index 3c761def..42d37d69 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/BaseOIDCRegistrationRequestTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/BaseOIDCRegistrationRequestTest.java
@@ -21,8 +21,8 @@ import org.springframework.webflow.execution.RequestContext;
import com.nimbusds.openid.connect.sdk.rp.OIDCClientRegistrationRequest;
-import net.shibboleth.idp.profile.RequestContextBuilder;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/BaseOIDCResponseActionTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/BaseOIDCResponseActionTest.java
index c2590abd..19f5c987 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/BaseOIDCResponseActionTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/BaseOIDCResponseActionTest.java
@@ -25,6 +25,7 @@ import java.util.List;
import javax.annotation.Nonnull;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.security.DataSealer;
@@ -62,7 +63,6 @@ import com.nimbusds.openid.connect.sdk.rp.OIDCClientInformation;
import com.nimbusds.openid.connect.sdk.rp.OIDCClientMetadata;
import net.shibboleth.ext.spring.resource.ResourceHelper;
-import net.shibboleth.idp.profile.RequestContextBuilder;
/** base class for tests expecting to have inbound and outbound msg ctxs etc in place. */
public abstract class BaseOIDCResponseActionTest {
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/BuildJSONErrorResponseFromEventTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/BuildJSONErrorResponseFromEventTest.java
index 97703f80..8296a820 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/BuildJSONErrorResponseFromEventTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/BuildJSONErrorResponseFromEventTest.java
@@ -32,8 +32,8 @@ import org.testng.annotations.Test;
import com.nimbusds.oauth2.sdk.ErrorObject;
-import net.shibboleth.idp.profile.RequestContextBuilder;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/CheckRedirectUrisTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/CheckRedirectUrisTest.java
index c3b900f8..925e222e 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/CheckRedirectUrisTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/CheckRedirectUrisTest.java
@@ -41,7 +41,7 @@ import org.testng.annotations.Test;
import com.nimbusds.openid.connect.sdk.rp.OIDCClientMetadata;
import com.nimbusds.openid.connect.sdk.rp.OIDCClientRegistrationRequest;
-import net.shibboleth.idp.profile.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/DecryptRequestObjectTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/DecryptRequestObjectTest.java
index 7e96acd2..3462b389 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/DecryptRequestObjectTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/DecryptRequestObjectTest.java
@@ -16,10 +16,10 @@
package org.geant.idpextension.oidc.profile.impl;
-import net.shibboleth.idp.profile.ActionTestingSupport;
-import net.shibboleth.idp.profile.RequestContextBuilder;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import java.net.URI;
import java.net.URISyntaxException;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/EncryptProcessedTokenTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/EncryptProcessedTokenTest.java
index 465d8b29..deb42533 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/EncryptProcessedTokenTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/EncryptProcessedTokenTest.java
@@ -17,10 +17,10 @@
package org.geant.idpextension.oidc.profile.impl;
import net.minidev.json.JSONObject;
-import net.shibboleth.idp.profile.ActionTestingSupport;
-import net.shibboleth.idp.profile.RequestContextBuilder;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.component.UnmodifiableComponentException;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/FormOutboundAuthenticationResponseMessageTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/FormOutboundAuthenticationResponseMessageTest.java
index 49f8b7ef..5764fbe3 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/FormOutboundAuthenticationResponseMessageTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/FormOutboundAuthenticationResponseMessageTest.java
@@ -20,7 +20,7 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.time.Instant;
-import net.shibboleth.idp.profile.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.profile.action.EventIds;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/FormOutboundDiscoveryResponseTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/FormOutboundDiscoveryResponseTest.java
index 281c719f..b157ff5c 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/FormOutboundDiscoveryResponseTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/FormOutboundDiscoveryResponseTest.java
@@ -37,9 +37,9 @@ import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import net.minidev.json.JSONObject;
-import net.shibboleth.idp.profile.ActionTestingSupport;
-import net.shibboleth.idp.profile.RequestContextBuilder;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/FormOutboundKeySetResponseMessageTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/FormOutboundKeySetResponseMessageTest.java
index 7f5e733d..1a07a06c 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/FormOutboundKeySetResponseMessageTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/FormOutboundKeySetResponseMessageTest.java
@@ -22,11 +22,11 @@ import java.util.List;
import net.minidev.json.JSONArray;
import net.minidev.json.JSONObject;
-import net.shibboleth.idp.profile.ActionTestingSupport;
import net.shibboleth.idp.profile.IdPEventIds;
-import net.shibboleth.idp.profile.RequestContextBuilder;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import org.geant.idpextension.oidc.config.OIDCPublishKeySetConfiguration;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/FormOutboundTokenResponseMessageTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/FormOutboundTokenResponseMessageTest.java
index b1cd5a4a..befe9036 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/FormOutboundTokenResponseMessageTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/FormOutboundTokenResponseMessageTest.java
@@ -20,7 +20,7 @@ import java.net.URISyntaxException;
import java.time.Duration;
import java.time.Instant;
-import net.shibboleth.idp.profile.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.profile.action.EventIds;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/FormOutboundUserInfoResponseMessageTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/FormOutboundUserInfoResponseMessageTest.java
index 5d5b47fc..c609284b 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/FormOutboundUserInfoResponseMessageTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/FormOutboundUserInfoResponseMessageTest.java
@@ -17,7 +17,8 @@
package org.geant.idpextension.oidc.profile.impl;
import java.net.URISyntaxException;
-import net.shibboleth.idp.profile.ActionTestingSupport;
+
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.profile.action.EventIds;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/InitializeAuthenticationContextTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/InitializeAuthenticationContextTest.java
index 9d3eaeb6..5a832790 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/InitializeAuthenticationContextTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/InitializeAuthenticationContextTest.java
@@ -18,8 +18,9 @@ package org.geant.idpextension.oidc.profile.impl;
import net.shibboleth.idp.authn.AuthenticationResult;
import net.shibboleth.idp.authn.context.AuthenticationContext;
-import net.shibboleth.idp.profile.ActionTestingSupport;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
@@ -44,8 +45,6 @@ import com.nimbusds.oauth2.sdk.id.State;
import com.nimbusds.openid.connect.sdk.AuthenticationRequest;
import com.nimbusds.openid.connect.sdk.Prompt;
-import net.shibboleth.idp.profile.RequestContextBuilder;
-
/** {@link InitializeAuthenticationContext} unit test. */
public class InitializeAuthenticationContextTest {
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/InitializeOutboundAuthenticationResponseMessageContextTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/InitializeOutboundAuthenticationResponseMessageContextTest.java
index 0c5bef0d..8135c7fb 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/InitializeOutboundAuthenticationResponseMessageContextTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/InitializeOutboundAuthenticationResponseMessageContextTest.java
@@ -16,8 +16,9 @@
package org.geant.idpextension.oidc.profile.impl;
-import net.shibboleth.idp.profile.ActionTestingSupport;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
import java.net.URI;
import java.net.URISyntaxException;
@@ -44,7 +45,6 @@ import com.nimbusds.openid.connect.sdk.AuthenticationRequest;
import com.nimbusds.openid.connect.sdk.rp.OIDCClientInformation;
import com.nimbusds.openid.connect.sdk.rp.OIDCClientMetadata;
-import net.shibboleth.idp.profile.RequestContextBuilder;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/** {@link InitializeOutboundAuthenticationResponseMessageContext} unit test. */
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/InitializeOutboundResponseMessageContextTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/InitializeOutboundResponseMessageContextTest.java
index ccd2043f..c7138211 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/InitializeOutboundResponseMessageContextTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/InitializeOutboundResponseMessageContextTest.java
@@ -16,8 +16,9 @@
package org.geant.idpextension.oidc.profile.impl;
-import net.shibboleth.idp.profile.ActionTestingSupport;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
import org.opensaml.profile.context.ProfileRequestContext;
import org.springframework.webflow.execution.Event;
@@ -26,7 +27,6 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import net.shibboleth.idp.profile.RequestContextBuilder;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/** {@link InitializeOutboundResponseMessageContext} unit test. */
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/InitializeRelyingPartyContextTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/InitializeRelyingPartyContextTest.java
index 00f37118..7d4d2779 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/InitializeRelyingPartyContextTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/InitializeRelyingPartyContextTest.java
@@ -16,9 +16,10 @@
package org.geant.idpextension.oidc.profile.impl;
-import net.shibboleth.idp.profile.ActionTestingSupport;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
import java.net.URI;
import java.util.Date;
@@ -41,7 +42,6 @@ import com.nimbusds.openid.connect.sdk.AuthenticationRequest;
import com.nimbusds.openid.connect.sdk.rp.OIDCClientInformation;
import com.nimbusds.openid.connect.sdk.rp.OIDCClientMetadata;
-import net.shibboleth.idp.profile.RequestContextBuilder;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/InitializeSubjectContextTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/InitializeSubjectContextTest.java
index 62d52689..dea0f419 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/InitializeSubjectContextTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/InitializeSubjectContextTest.java
@@ -17,7 +17,7 @@
package org.geant.idpextension.oidc.profile.impl;
import net.shibboleth.idp.authn.context.SubjectContext;
-import net.shibboleth.idp.profile.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import java.net.URI;
import java.net.URISyntaxException;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/InitializeUnverifiedRelyingPartyContextTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/InitializeUnverifiedRelyingPartyContextTest.java
index 0c8a830d..c1b998c8 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/InitializeUnverifiedRelyingPartyContextTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/InitializeUnverifiedRelyingPartyContextTest.java
@@ -16,9 +16,10 @@
package org.geant.idpextension.oidc.profile.impl;
-import net.shibboleth.idp.profile.ActionTestingSupport;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
import org.opensaml.profile.context.ProfileRequestContext;
import org.springframework.webflow.execution.Event;
@@ -27,7 +28,6 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import net.shibboleth.idp.profile.RequestContextBuilder;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/PopulateOIDCEncryptionParametersTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/PopulateOIDCEncryptionParametersTest.java
index e8a14c10..ea6404e1 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/PopulateOIDCEncryptionParametersTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/PopulateOIDCEncryptionParametersTest.java
@@ -16,8 +16,8 @@
package org.geant.idpextension.oidc.profile.impl;
-import net.shibboleth.idp.profile.ActionTestingSupport;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ProcessRequestedAuthnContextTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ProcessRequestedAuthnContextTest.java
index 923f3095..e1ca5b9c 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ProcessRequestedAuthnContextTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ProcessRequestedAuthnContextTest.java
@@ -20,7 +20,7 @@ import net.shibboleth.idp.authn.AuthnEventIds;
import net.shibboleth.idp.authn.context.AuthenticationContext;
import net.shibboleth.idp.authn.context.PreferredPrincipalContext;
import net.shibboleth.idp.authn.context.RequestedPrincipalContext;
-import net.shibboleth.idp.profile.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import java.net.URI;
import java.util.ArrayList;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ReduceValidatedScopeTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ReduceValidatedScopeTest.java
index c05be35f..bdda955e 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ReduceValidatedScopeTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ReduceValidatedScopeTest.java
@@ -16,7 +16,7 @@
package org.geant.idpextension.oidc.profile.impl;
-import net.shibboleth.idp.profile.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import java.net.URI;
import java.net.URISyntaxException;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/RevokeConsentTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/RevokeConsentTest.java
index 69a8ea38..8777b9d9 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/RevokeConsentTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/RevokeConsentTest.java
@@ -17,7 +17,7 @@
package org.geant.idpextension.oidc.profile.impl;
import net.shibboleth.idp.consent.context.ConsentManagementContext;
-import net.shibboleth.idp.profile.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetAccessTokenToResponseContextTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetAccessTokenToResponseContextTest.java
index 14769a8c..a8a26f1b 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetAccessTokenToResponseContextTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetAccessTokenToResponseContextTest.java
@@ -17,9 +17,9 @@
package org.geant.idpextension.oidc.profile.impl;
import net.shibboleth.idp.authn.context.SubjectContext;
-import net.shibboleth.idp.profile.ActionTestingSupport;
import net.shibboleth.idp.profile.IdPEventIds;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.security.DataSealerException;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetAuthenticationContextClassReferenceFromAuthzCodeToResponseContextTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetAuthenticationContextClassReferenceFromAuthzCodeToResponseContextTest.java
index ebb6563c..8ea12f2a 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetAuthenticationContextClassReferenceFromAuthzCodeToResponseContextTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetAuthenticationContextClassReferenceFromAuthzCodeToResponseContextTest.java
@@ -16,7 +16,7 @@
package org.geant.idpextension.oidc.profile.impl;
-import net.shibboleth.idp.profile.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.security.DataSealerException;
import java.net.URI;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetAuthenticationContextClassReferenceToResponseContextTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetAuthenticationContextClassReferenceToResponseContextTest.java
index 3dc207c4..449fb2d0 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetAuthenticationContextClassReferenceToResponseContextTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetAuthenticationContextClassReferenceToResponseContextTest.java
@@ -23,7 +23,7 @@ import net.shibboleth.idp.authn.context.AuthenticationContext;
import net.shibboleth.idp.authn.context.PreferredPrincipalContext;
import net.shibboleth.idp.authn.context.RequestedPrincipalContext;
import net.shibboleth.idp.authn.impl.DefaultAuthenticationResultSerializer;
-import net.shibboleth.idp.profile.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import java.security.Principal;
import java.util.ArrayList;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetAuthenticationTimeToResponseContextTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetAuthenticationTimeToResponseContextTest.java
index 2b36ec61..a442afae 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetAuthenticationTimeToResponseContextTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetAuthenticationTimeToResponseContextTest.java
@@ -18,7 +18,7 @@ package org.geant.idpextension.oidc.profile.impl;
import net.shibboleth.idp.authn.AuthenticationResult;
import net.shibboleth.idp.authn.context.AuthenticationContext;
-import net.shibboleth.idp.profile.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import java.time.Instant;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetAuthorizationCodeToResponseContextTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetAuthorizationCodeToResponseContextTest.java
index 140f8c22..906847e3 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetAuthorizationCodeToResponseContextTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetAuthorizationCodeToResponseContextTest.java
@@ -17,9 +17,9 @@
package org.geant.idpextension.oidc.profile.impl;
import net.shibboleth.idp.authn.context.SubjectContext;
-import net.shibboleth.idp.profile.ActionTestingSupport;
import net.shibboleth.idp.profile.IdPEventIds;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.security.DataSealerException;
import java.net.URI;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetConsentFromTokenToResponseContextTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetConsentFromTokenToResponseContextTest.java
index 123f2faa..9fb1c207 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetConsentFromTokenToResponseContextTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetConsentFromTokenToResponseContextTest.java
@@ -17,7 +17,7 @@
package org.geant.idpextension.oidc.profile.impl;
import net.minidev.json.JSONArray;
-import net.shibboleth.idp.profile.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import java.net.URI;
import java.net.URISyntaxException;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetConsentToResponseContextTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetConsentToResponseContextTest.java
index 1d67e49c..2bc60fa5 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetConsentToResponseContextTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetConsentToResponseContextTest.java
@@ -18,8 +18,8 @@ package org.geant.idpextension.oidc.profile.impl;
import net.shibboleth.idp.consent.context.AttributeReleaseContext;
import net.shibboleth.idp.consent.context.ConsentContext;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.idp.consent.Consent;
-import net.shibboleth.idp.profile.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import org.geant.idpextension.oidc.messaging.context.OIDCAuthenticationResponseConsentContext;
import org.opensaml.profile.action.EventIds;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetRefreshTokenToResponseContextTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetRefreshTokenToResponseContextTest.java
index 61f6b654..752f059d 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetRefreshTokenToResponseContextTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetRefreshTokenToResponseContextTest.java
@@ -16,9 +16,9 @@
package org.geant.idpextension.oidc.profile.impl;
-import net.shibboleth.idp.profile.ActionTestingSupport;
import net.shibboleth.idp.profile.IdPEventIds;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.security.DataSealerException;
import java.net.URI;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetRequestedClaimsToResponseContextTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetRequestedClaimsToResponseContextTest.java
index bee619f7..452e3abf 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetRequestedClaimsToResponseContextTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetRequestedClaimsToResponseContextTest.java
@@ -35,7 +35,7 @@ import com.nimbusds.openid.connect.sdk.claims.ACR;
import net.minidev.json.JSONObject;
import net.shibboleth.idp.authn.context.SubjectContext;
-import net.shibboleth.idp.profile.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.test.service.MockReloadableService;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetRequestedSubjectToResponseContextTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetRequestedSubjectToResponseContextTest.java
index 30a3fee1..c51870e0 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetRequestedSubjectToResponseContextTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetRequestedSubjectToResponseContextTest.java
@@ -16,7 +16,7 @@
package org.geant.idpextension.oidc.profile.impl;
-import net.shibboleth.idp.profile.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import java.net.URI;
import org.testng.Assert;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetSectorIdentifierForAttributeResolutionTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetSectorIdentifierForAttributeResolutionTest.java
index eb4dcfda..acc2a138 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetSectorIdentifierForAttributeResolutionTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetSectorIdentifierForAttributeResolutionTest.java
@@ -20,7 +20,7 @@ import java.net.URI;
import java.net.URISyntaxException;
import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
-import net.shibboleth.idp.profile.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetSubjectToResponseContextTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetSubjectToResponseContextTest.java
index 7cee7c9b..c19fbf6c 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetSubjectToResponseContextTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetSubjectToResponseContextTest.java
@@ -17,7 +17,7 @@
package org.geant.idpextension.oidc.profile.impl;
import net.shibboleth.idp.consent.context.ConsentContext;
-import net.shibboleth.idp.profile.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.component.UnmodifiableComponentException;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetTokenDeliveryAttributesFromTokenToResponseContextTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetTokenDeliveryAttributesFromTokenToResponseContextTest.java
index 1279df6c..d6f8b845 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetTokenDeliveryAttributesFromTokenToResponseContextTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetTokenDeliveryAttributesFromTokenToResponseContextTest.java
@@ -16,7 +16,7 @@
package org.geant.idpextension.oidc.profile.impl;
-import net.shibboleth.idp.profile.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetTokenDeliveryAttributesToResponseContextTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetTokenDeliveryAttributesToResponseContextTest.java
index b199bcfb..faed2338 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetTokenDeliveryAttributesToResponseContextTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetTokenDeliveryAttributesToResponseContextTest.java
@@ -31,8 +31,8 @@ import net.shibboleth.idp.attribute.context.AttributeContext;
import net.shibboleth.idp.attribute.transcoding.AttributeTranscoderRegistry;
import net.shibboleth.idp.attribute.transcoding.TranscodingRule;
import net.shibboleth.idp.attribute.transcoding.impl.AttributeTranscoderRegistryImpl;
-import net.shibboleth.idp.profile.ActionTestingSupport;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.test.service.MockReloadableService;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SignIDTokenTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SignIDTokenTest.java
index 7fd5b22e..03c828bc 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SignIDTokenTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SignIDTokenTest.java
@@ -20,7 +20,8 @@ import java.net.URISyntaxException;
import java.security.interfaces.ECPublicKey;
import java.security.interfaces.RSAPublicKey;
import java.time.Instant;
-import net.shibboleth.idp.profile.ActionTestingSupport;
+
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import org.opensaml.profile.action.EventIds;
import org.opensaml.security.credential.Credential;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SignUserInfoResponseTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SignUserInfoResponseTest.java
index 46afffad..58934076 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SignUserInfoResponseTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SignUserInfoResponseTest.java
@@ -19,7 +19,8 @@ package org.geant.idpextension.oidc.profile.impl;
import java.net.URISyntaxException;
import java.security.interfaces.ECPublicKey;
import java.security.interfaces.RSAPublicKey;
-import net.shibboleth.idp.profile.ActionTestingSupport;
+
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import org.geant.idpextension.oidc.profile.context.navigate.DefaultUserInfoSigningAlgLookupFunction;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateAccessTokenTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateAccessTokenTest.java
index 3db777e3..76a422f8 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateAccessTokenTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateAccessTokenTest.java
@@ -16,7 +16,7 @@
package org.geant.idpextension.oidc.profile.impl;
-import net.shibboleth.idp.profile.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.security.DataSealerException;
import java.net.URI;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateEndpointAuthenticationTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateEndpointAuthenticationTest.java
index 9ef9b144..89b6657f 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateEndpointAuthenticationTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateEndpointAuthenticationTest.java
@@ -64,10 +64,10 @@ import com.nimbusds.oauth2.sdk.id.ClientID;
import com.nimbusds.openid.connect.sdk.rp.OIDCClientInformation;
import com.nimbusds.openid.connect.sdk.rp.OIDCClientMetadata;
-import net.shibboleth.idp.profile.ActionTestingSupport;
-import net.shibboleth.idp.profile.RequestContextBuilder;
import net.shibboleth.idp.profile.context.navigate.AbstractRelyingPartyLookupFunction;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateGrantTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateGrantTest.java
index c9eda871..be220107 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateGrantTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateGrantTest.java
@@ -17,7 +17,7 @@
package org.geant.idpextension.oidc.profile.impl;
import net.minidev.json.JSONObject;
-import net.shibboleth.idp.profile.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
import net.shibboleth.utilities.java.support.security.DataSealerException;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateGrantTypeTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateGrantTypeTest.java
index 873cf356..c0d27771 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateGrantTypeTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateGrantTypeTest.java
@@ -21,7 +21,7 @@ import java.net.URISyntaxException;
import java.util.HashSet;
import java.util.Set;
-import net.shibboleth.idp.profile.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import org.geant.idpextension.oidc.messaging.context.OIDCMetadataContext;
import org.geant.idpextension.oidc.profile.OidcEventIds;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidatePKCETest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidatePKCETest.java
index 6663407d..63b50ff8 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidatePKCETest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidatePKCETest.java
@@ -20,7 +20,7 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.time.Instant;
-import net.shibboleth.idp.profile.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import org.geant.idpextension.oidc.config.OIDCCoreProtocolConfiguration;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateRedirectURITest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateRedirectURITest.java
index f735fd09..8edcf725 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateRedirectURITest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateRedirectURITest.java
@@ -17,7 +17,8 @@ package org.geant.idpextension.oidc.profile.impl;
import java.net.URI;
import java.net.URISyntaxException;
-import net.shibboleth.idp.profile.ActionTestingSupport;
+
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import org.geant.idpextension.oidc.messaging.context.OIDCMetadataContext;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateRequestObjectTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateRequestObjectTest.java
index 93387ca0..96c7554e 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateRequestObjectTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateRequestObjectTest.java
@@ -16,9 +16,9 @@
package org.geant.idpextension.oidc.profile.impl;
-import net.shibboleth.idp.profile.ActionTestingSupport;
-import net.shibboleth.idp.profile.RequestContextBuilder;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import java.net.URI;
import java.net.URISyntaxException;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateResponseTypeTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateResponseTypeTest.java
index 79a39adb..dd628021 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateResponseTypeTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateResponseTypeTest.java
@@ -21,7 +21,7 @@ import java.net.URISyntaxException;
import java.util.HashSet;
import java.util.Set;
-import net.shibboleth.idp.profile.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import org.geant.idpextension.oidc.messaging.context.OIDCMetadataContext;
import org.geant.idpextension.oidc.profile.OidcEventIds;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateScopeTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateScopeTest.java
index 7ab93ae9..dc7210f7 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateScopeTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateScopeTest.java
@@ -18,7 +18,8 @@ package org.geant.idpextension.oidc.profile.impl;
import java.net.URI;
import java.net.URISyntaxException;
-import net.shibboleth.idp.profile.ActionTestingSupport;
+
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import org.geant.idpextension.oidc.messaging.context.OIDCMetadataContext;
import org.springframework.webflow.execution.Event;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/VerifyRequestedSubjectIdentifierTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/VerifyRequestedSubjectIdentifierTest.java
index 966e2642..e36827c2 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/VerifyRequestedSubjectIdentifierTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/VerifyRequestedSubjectIdentifierTest.java
@@ -16,7 +16,7 @@
package org.geant.idpextension.oidc.profile.impl;
-import net.shibboleth.idp.profile.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import org.testng.Assert;
import org.geant.idpextension.oidc.profile.OidcEventIds;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/logic/AttributeResolutionSubjectLookupFunctionTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/logic/AttributeResolutionSubjectLookupFunctionTest.java
index c52a356a..b2c9eda7 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/logic/AttributeResolutionSubjectLookupFunctionTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/logic/AttributeResolutionSubjectLookupFunctionTest.java
@@ -30,9 +30,9 @@ import net.shibboleth.idp.attribute.context.AttributeContext;
import net.shibboleth.idp.attribute.transcoding.AttributeTranscoderRegistry;
import net.shibboleth.idp.attribute.transcoding.TranscodingRule;
import net.shibboleth.idp.attribute.transcoding.impl.AttributeTranscoderRegistryImpl;
-import net.shibboleth.idp.profile.RequestContextBuilder;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
import net.shibboleth.idp.saml.attribute.transcoding.AbstractSAML2AttributeTranscoder;
import net.shibboleth.idp.saml.attribute.transcoding.SAML2AttributeTranscoder;
import net.shibboleth.idp.saml.attribute.transcoding.impl.SAML2StringAttributeTranscoder;
@@ -43,7 +43,7 @@ import net.shibboleth.utilities.java.support.test.service.MockReloadableService;
import org.geant.idpextension.oidc.attribute.transcoding.AbstractOIDCAttributeTranscoder;
import org.geant.idpextension.oidc.attribute.transcoding.OIDCAttributeTranscoder;
import org.geant.idpextension.oidc.attribute.transcoding.impl.OIDCStringAttributeTranscoder;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.profile.context.ProfileRequestContext;
import org.springframework.webflow.execution.RequestContext;
import org.testng.Assert;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/logic/SubjectActivationConditionTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/logic/SubjectActivationConditionTest.java
index a623cebb..0658c2f2 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/logic/SubjectActivationConditionTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/logic/SubjectActivationConditionTest.java
@@ -16,8 +16,8 @@
package org.geant.idpextension.oidc.profile.logic;
-import net.shibboleth.idp.profile.RequestContextBuilder;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import org.geant.idpextension.oidc.messaging.context.OIDCAuthenticationResponseContext;
import org.opensaml.messaging.context.MessageContext;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/spring/relyingparty/metadata/impl/ReloadClientResolverServiceConfigurationTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/spring/relyingparty/metadata/impl/ReloadClientResolverServiceConfigurationTest.java
index 65e36a59..1cae3e5b 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/spring/relyingparty/metadata/impl/ReloadClientResolverServiceConfigurationTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/spring/relyingparty/metadata/impl/ReloadClientResolverServiceConfigurationTest.java
@@ -40,9 +40,9 @@ import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import net.shibboleth.ext.spring.service.ReloadableSpringService;
-import net.shibboleth.idp.profile.ActionTestingSupport;
-import net.shibboleth.idp.profile.RequestContextBuilder;
import net.shibboleth.idp.profile.impl.ReloadServiceConfiguration;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
import net.shibboleth.utilities.java.support.service.ReloadableService;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/spring/relyingparty/metadata/impl/ReloadProviderResolverServiceConfigurationTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/spring/relyingparty/metadata/impl/ReloadProviderResolverServiceConfigurationTest.java
index 74414911..1fda4fef 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/spring/relyingparty/metadata/impl/ReloadProviderResolverServiceConfigurationTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/spring/relyingparty/metadata/impl/ReloadProviderResolverServiceConfigurationTest.java
@@ -39,9 +39,9 @@ import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import net.shibboleth.ext.spring.service.ReloadableSpringService;
-import net.shibboleth.idp.profile.ActionTestingSupport;
-import net.shibboleth.idp.profile.RequestContextBuilder;
import net.shibboleth.idp.profile.impl.ReloadServiceConfiguration;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
import net.shibboleth.utilities.java.support.service.ServiceableComponent;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list