[java-opensaml] branch main updated: Unsplit additional test packages.
Scott Cantor
cantor.2 at osu.edu
Fri Sep 18 13:40:19 UTC 2020
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-opensaml.
View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=d5824d13a88b92358cda335b16359937d910da6a
The following commit(s) were added to refs/heads/main by this push:
new d5824d13a Unsplit additional test packages.
d5824d13a is described below
commit d5824d13a88b92358cda335b16359937d910da6a
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Fri Sep 18 09:40:16 2020 -0400
Unsplit additional test packages.
---
.../impl/SAMLProtocolMessageXMLSignatureSecurityHandlerTest.java | 2 +-
.../messaging/context/{ => tests}/SAMLMessageInfoContextTest.java | 3 ++-
.../profile/logic/{ => tests}/EntityAttributesPredicateTest.java | 3 ++-
.../profile/logic/{ => tests}/EntityGroupNamePredicateTest.java | 3 ++-
.../saml/common/{ => testing}/BaseComplexSAMLObjectTestCase.java | 2 +-
.../java/org/opensaml/saml/common/{ => testing}/RoundTripTest.java | 3 ++-
.../org/opensaml/saml/common/{ => testing}/SAMLTestSupport.java | 2 +-
.../support/{ => tests}/AttributeConsumingServiceSelectorTest.java | 3 ++-
.../org/opensaml/saml/saml1/core/{ => tests}/ResponseTest.java | 3 ++-
.../{ => impl}/AbstractSAML1NameIdentifierGeneratorTest.java | 3 ++-
.../assertion/impl/AbstractSubjectConfirmationValidatorTest.java | 2 +-
.../assertion/impl/AudienceRestrictionConditionValidatorTest.java | 2 +-
.../saml/saml2/assertion/impl/AuthnStatementValidatorTest.java | 2 +-
.../assertion/impl/BearerSubjectConfirmationValidatorTest.java | 2 +-
.../impl/DelegationRestrictionConditionValidatorTest.java | 2 +-
.../impl/HolderOfKeySubjectConfirmationValidatorTest.java | 2 +-
.../saml2/assertion/impl/OneTimeUseConditionValidatorTest.java | 2 +-
.../assertion/impl/ProxyRestrictionConditionValidatorTest.java | 2 +-
.../impl/SenderVouchesSubjectConfirmationValidatorTest.java | 2 +-
.../saml2/assertion/{ => tests}/BaseAssertionValidationTest.java | 3 ++-
.../saml/saml2/assertion/{ => tests}/MockAssertionValidator.java | 3 ++-
.../saml2/assertion/{ => tests}/SAML20AssertionValidatorTest.java | 7 ++++++-
.../security/impl/SAML2HTTPPostSimpleSignSecurityHandlerTest.java | 2 +-
.../impl/SAML2HTTPRedirectDeflateSignatureSecurityHandlerTest.java | 2 +-
.../test/java/org/opensaml/saml/saml2/core/AuthnRequestTest.java | 2 +-
.../opensaml/saml/saml2/core/ResponseSuccessAuthnAttribTest.java | 2 +-
.../java/org/opensaml/saml/saml2/core/SignedAssertionTest.java | 2 +-
.../saml/saml2/encryption/{ => tests}/ComplexEncryptionTest.java | 3 ++-
.../saml2/encryption/{ => tests}/DecryptionPlusSigningTest.java | 4 +++-
.../{ => tests}/EncryptedElementTypeEncryptedKeyResolverTest.java | 3 ++-
.../saml/saml2/encryption/{ => tests}/SimpleDecryptionTest.java | 4 +++-
.../saml/saml2/encryption/{ => tests}/SimpleEncryptionTest.java | 3 ++-
.../org/opensaml/saml/saml2/metadata/{ => tests}/MetadataTest.java | 2 +-
.../saml2/profile/{ => impl}/AbstractSAML2NameIDGeneratorTest.java | 3 ++-
.../opensaml/saml/saml2/profile/impl/ValidateAssertionsTest.java | 2 +-
.../saml/security/impl/MetadataCredentialResolverTest.java | 2 +-
.../impl/SAMLMetadataEncryptionParametersResolverTest.java | 2 +-
.../test/java/org/opensaml/soap/{soap11 => testing}/SOAPTest.java | 0
38 files changed, 59 insertions(+), 37 deletions(-)
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/SAMLProtocolMessageXMLSignatureSecurityHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/SAMLProtocolMessageXMLSignatureSecurityHandlerTest.java
index 73a3e0963..a25420425 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/SAMLProtocolMessageXMLSignatureSecurityHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/SAMLProtocolMessageXMLSignatureSecurityHandlerTest.java
@@ -25,9 +25,9 @@ import java.util.List;
import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.messaging.handler.MessageHandlerException;
-import org.opensaml.saml.common.SAMLTestSupport;
import org.opensaml.saml.common.messaging.context.SAMLPeerEntityContext;
import org.opensaml.saml.common.messaging.context.SAMLProtocolContext;
+import org.opensaml.saml.common.testing.SAMLTestSupport;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.core.AuthnRequest;
import org.opensaml.saml.saml2.metadata.SPSSODescriptor;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/messaging/context/SAMLMessageInfoContextTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/messaging/context/tests/SAMLMessageInfoContextTest.java
similarity index 97%
rename from opensaml-saml-impl/src/test/java/org/opensaml/saml/common/messaging/context/SAMLMessageInfoContextTest.java
rename to opensaml-saml-impl/src/test/java/org/opensaml/saml/common/messaging/context/tests/SAMLMessageInfoContextTest.java
index 3525e4d17..7985cdfde 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/messaging/context/SAMLMessageInfoContextTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/messaging/context/tests/SAMLMessageInfoContextTest.java
@@ -15,13 +15,14 @@
* limitations under the License.
*/
-package org.opensaml.saml.common.messaging.context;
+package org.opensaml.saml.common.messaging.context.tests;
import java.time.Instant;
import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.messaging.context.TestContext;
+import org.opensaml.saml.common.messaging.context.SAMLMessageInfoContext;
import org.opensaml.saml.saml1.core.Request;
import org.opensaml.saml.saml2.core.AuthnRequest;
import org.opensaml.saml.saml2.core.Response;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/logic/EntityAttributesPredicateTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/logic/tests/EntityAttributesPredicateTest.java
similarity index 98%
rename from opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/logic/EntityAttributesPredicateTest.java
rename to opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/logic/tests/EntityAttributesPredicateTest.java
index 0448efb40..863aaabea 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/logic/EntityAttributesPredicateTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/logic/tests/EntityAttributesPredicateTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opensaml.saml.common.profile.logic;
+package org.opensaml.saml.common.profile.logic.tests;
import java.util.Collections;
import java.util.regex.Pattern;
@@ -25,6 +25,7 @@ import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import org.opensaml.core.criterion.EntityIdCriterion;
import org.opensaml.core.testing.XMLObjectBaseTestCase;
+import org.opensaml.saml.common.profile.logic.EntityAttributesPredicate;
import org.opensaml.saml.common.profile.logic.EntityAttributesPredicate.Candidate;
import org.opensaml.saml.metadata.resolver.impl.ResourceBackedMetadataResolver;
import org.opensaml.saml.saml2.core.Attribute;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/logic/EntityGroupNamePredicateTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/logic/tests/EntityGroupNamePredicateTest.java
similarity index 97%
rename from opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/logic/EntityGroupNamePredicateTest.java
rename to opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/logic/tests/EntityGroupNamePredicateTest.java
index 6275d474d..b7abd8100 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/logic/EntityGroupNamePredicateTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/logic/tests/EntityGroupNamePredicateTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opensaml.saml.common.profile.logic;
+package org.opensaml.saml.common.profile.logic.tests;
import java.util.Arrays;
import java.util.Collections;
@@ -25,6 +25,7 @@ import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import org.opensaml.core.criterion.EntityIdCriterion;
import org.opensaml.core.testing.XMLObjectBaseTestCase;
+import org.opensaml.saml.common.profile.logic.EntityGroupNamePredicate;
import org.opensaml.saml.metadata.resolver.filter.MetadataNodeProcessor;
import org.opensaml.saml.metadata.resolver.filter.impl.EntitiesDescriptorNameProcessor;
import org.opensaml.saml.metadata.resolver.filter.impl.NodeProcessingMetadataFilter;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/BaseComplexSAMLObjectTestCase.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/testing/BaseComplexSAMLObjectTestCase.java
similarity index 97%
rename from opensaml-saml-impl/src/test/java/org/opensaml/saml/common/BaseComplexSAMLObjectTestCase.java
rename to opensaml-saml-impl/src/test/java/org/opensaml/saml/common/testing/BaseComplexSAMLObjectTestCase.java
index ee85cfcdb..bd03d082e 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/BaseComplexSAMLObjectTestCase.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/testing/BaseComplexSAMLObjectTestCase.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opensaml.saml.common;
+package org.opensaml.saml.common.testing;
import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.testng.annotations.BeforeClass;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/RoundTripTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/testing/RoundTripTest.java
similarity index 98%
rename from opensaml-saml-impl/src/test/java/org/opensaml/saml/common/RoundTripTest.java
rename to opensaml-saml-impl/src/test/java/org/opensaml/saml/common/testing/RoundTripTest.java
index 7de3a2a1a..ffd36d942 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/RoundTripTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/testing/RoundTripTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opensaml.saml.common;
+package org.opensaml.saml.common.testing;
import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
@@ -23,6 +23,7 @@ import org.opensaml.core.xml.io.Marshaller;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.core.xml.io.Unmarshaller;
import org.opensaml.core.xml.io.UnmarshallingException;
+import org.opensaml.saml.common.SAMLObjectBuilder;
import org.opensaml.saml.saml2.metadata.Organization;
import org.opensaml.saml.saml2.metadata.OrganizationDisplayName;
import org.opensaml.saml.saml2.metadata.OrganizationName;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/SAMLTestSupport.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/testing/SAMLTestSupport.java
similarity index 97%
rename from opensaml-saml-impl/src/test/java/org/opensaml/saml/common/SAMLTestSupport.java
rename to opensaml-saml-impl/src/test/java/org/opensaml/saml/common/testing/SAMLTestSupport.java
index f9cbdee8c..5364d877e 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/SAMLTestSupport.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/testing/SAMLTestSupport.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opensaml.saml.common;
+package org.opensaml.saml.common.testing;
import java.util.ArrayList;
import java.util.List;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/support/AttributeConsumingServiceSelectorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/support/tests/AttributeConsumingServiceSelectorTest.java
similarity index 98%
rename from opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/support/AttributeConsumingServiceSelectorTest.java
rename to opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/support/tests/AttributeConsumingServiceSelectorTest.java
index 79469e5f5..d59de43ab 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/support/AttributeConsumingServiceSelectorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/support/tests/AttributeConsumingServiceSelectorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opensaml.saml.metadata.support;
+package org.opensaml.saml.metadata.support.tests;
import java.io.File;
import java.net.URL;
@@ -28,6 +28,7 @@ import org.opensaml.saml.criterion.ProtocolCriterion;
import org.opensaml.saml.ext.saml2mdquery.AttributeQueryDescriptorType;
import org.opensaml.saml.metadata.resolver.impl.FilesystemMetadataResolver;
import org.opensaml.saml.metadata.resolver.impl.PredicateRoleDescriptorResolver;
+import org.opensaml.saml.metadata.support.AttributeConsumingServiceSelector;
import org.opensaml.saml.saml2.metadata.AttributeConsumingService;
import org.opensaml.saml.saml2.metadata.RoleDescriptor;
import org.opensaml.saml.saml2.metadata.SPSSODescriptor;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/ResponseTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/tests/ResponseTest.java
similarity index 96%
rename from opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/ResponseTest.java
rename to opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/tests/ResponseTest.java
index 6da20159d..2e636863c 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/ResponseTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/tests/ResponseTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opensaml.saml.saml1.core;
+package org.opensaml.saml.saml1.core.tests;
import org.testng.annotations.Test;
import org.testng.Assert;
@@ -27,6 +27,7 @@ import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
import org.opensaml.core.xml.io.Unmarshaller;
import org.opensaml.core.xml.io.UnmarshallingException;
+import org.opensaml.saml.saml1.core.Response;
import org.w3c.dom.Document;
/**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/AbstractSAML1NameIdentifierGeneratorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AbstractSAML1NameIdentifierGeneratorTest.java
similarity index 97%
rename from opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/AbstractSAML1NameIdentifierGeneratorTest.java
rename to opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AbstractSAML1NameIdentifierGeneratorTest.java
index dc284cc8c..a7c51e1ac 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/AbstractSAML1NameIdentifierGeneratorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AbstractSAML1NameIdentifierGeneratorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opensaml.saml.saml1.profile;
+package org.opensaml.saml.saml1.profile.impl;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.FunctionSupport;
@@ -24,6 +24,7 @@ import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.profile.context.ProfileRequestContext;
import org.opensaml.saml.common.SAMLException;
import org.opensaml.saml.saml1.core.NameIdentifier;
+import org.opensaml.saml.saml1.profile.AbstractSAML1NameIdentifierGenerator;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/AbstractSubjectConfirmationValidatorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/AbstractSubjectConfirmationValidatorTest.java
index a7ed5f801..bae443d0b 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/AbstractSubjectConfirmationValidatorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/AbstractSubjectConfirmationValidatorTest.java
@@ -26,8 +26,8 @@ import javax.annotation.Nonnull;
import org.opensaml.saml.common.assertion.AssertionValidationException;
import org.opensaml.saml.common.assertion.ValidationContext;
import org.opensaml.saml.common.assertion.ValidationResult;
-import org.opensaml.saml.saml2.assertion.BaseAssertionValidationTest;
import org.opensaml.saml.saml2.assertion.SAML2AssertionValidationParameters;
+import org.opensaml.saml.saml2.assertion.tests.BaseAssertionValidationTest;
import org.opensaml.saml.saml2.core.Assertion;
import org.opensaml.saml.saml2.core.SubjectConfirmation;
import org.testng.Assert;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/AudienceRestrictionConditionValidatorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/AudienceRestrictionConditionValidatorTest.java
index 212b84c2b..7f8b9c06f 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/AudienceRestrictionConditionValidatorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/AudienceRestrictionConditionValidatorTest.java
@@ -23,8 +23,8 @@ import java.util.Map;
import org.opensaml.saml.common.assertion.AssertionValidationException;
import org.opensaml.saml.common.assertion.ValidationContext;
import org.opensaml.saml.common.assertion.ValidationResult;
-import org.opensaml.saml.saml2.assertion.BaseAssertionValidationTest;
import org.opensaml.saml.saml2.assertion.SAML2AssertionValidationParameters;
+import org.opensaml.saml.saml2.assertion.tests.BaseAssertionValidationTest;
import org.opensaml.saml.saml2.core.Audience;
import org.opensaml.saml.saml2.core.AudienceRestriction;
import org.opensaml.saml.saml2.core.Condition;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/AuthnStatementValidatorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/AuthnStatementValidatorTest.java
index 4b37e39b2..a30c9c66d 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/AuthnStatementValidatorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/AuthnStatementValidatorTest.java
@@ -24,8 +24,8 @@ import java.util.Map;
import org.opensaml.saml.common.assertion.AssertionValidationException;
import org.opensaml.saml.common.assertion.ValidationContext;
import org.opensaml.saml.common.assertion.ValidationResult;
-import org.opensaml.saml.saml2.assertion.BaseAssertionValidationTest;
import org.opensaml.saml.saml2.assertion.SAML2AssertionValidationParameters;
+import org.opensaml.saml.saml2.assertion.tests.BaseAssertionValidationTest;
import org.opensaml.saml.saml2.core.Assertion;
import org.opensaml.saml.saml2.core.AttributeStatement;
import org.opensaml.saml.saml2.core.AuthnContext;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/BearerSubjectConfirmationValidatorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/BearerSubjectConfirmationValidatorTest.java
index fe3ce50ac..99f6f61c5 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/BearerSubjectConfirmationValidatorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/BearerSubjectConfirmationValidatorTest.java
@@ -20,7 +20,7 @@ package org.opensaml.saml.saml2.assertion.impl;
import org.opensaml.saml.common.assertion.AssertionValidationException;
import org.opensaml.saml.common.assertion.ValidationContext;
import org.opensaml.saml.common.assertion.ValidationResult;
-import org.opensaml.saml.saml2.assertion.BaseAssertionValidationTest;
+import org.opensaml.saml.saml2.assertion.tests.BaseAssertionValidationTest;
import org.opensaml.saml.saml2.core.SubjectConfirmation;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/DelegationRestrictionConditionValidatorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/DelegationRestrictionConditionValidatorTest.java
index 6ca4a2870..2214c7ac1 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/DelegationRestrictionConditionValidatorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/DelegationRestrictionConditionValidatorTest.java
@@ -21,7 +21,7 @@ import org.opensaml.saml.common.assertion.AssertionValidationException;
import org.opensaml.saml.common.assertion.ValidationContext;
import org.opensaml.saml.common.assertion.ValidationResult;
import org.opensaml.saml.ext.saml2delrestrict.DelegationRestrictionType;
-import org.opensaml.saml.saml2.assertion.BaseAssertionValidationTest;
+import org.opensaml.saml.saml2.assertion.tests.BaseAssertionValidationTest;
import org.opensaml.saml.saml2.core.Condition;
import org.opensaml.saml.saml2.core.OneTimeUse;
import org.testng.Assert;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/HolderOfKeySubjectConfirmationValidatorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/HolderOfKeySubjectConfirmationValidatorTest.java
index 915074e6c..780b043da 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/HolderOfKeySubjectConfirmationValidatorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/HolderOfKeySubjectConfirmationValidatorTest.java
@@ -30,8 +30,8 @@ import java.util.Map;
import org.opensaml.saml.common.assertion.AssertionValidationException;
import org.opensaml.saml.common.assertion.ValidationContext;
import org.opensaml.saml.common.assertion.ValidationResult;
-import org.opensaml.saml.saml2.assertion.BaseAssertionValidationTest;
import org.opensaml.saml.saml2.assertion.SAML2AssertionValidationParameters;
+import org.opensaml.saml.saml2.assertion.tests.BaseAssertionValidationTest;
import org.opensaml.saml.saml2.core.KeyInfoConfirmationDataType;
import org.opensaml.saml.saml2.core.SubjectConfirmation;
import org.opensaml.saml.saml2.core.SubjectConfirmationData;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/OneTimeUseConditionValidatorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/OneTimeUseConditionValidatorTest.java
index d55fd656e..0be88fb0a 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/OneTimeUseConditionValidatorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/OneTimeUseConditionValidatorTest.java
@@ -27,8 +27,8 @@ import org.opensaml.saml.common.assertion.AssertionValidationException;
import org.opensaml.saml.common.assertion.ValidationContext;
import org.opensaml.saml.common.assertion.ValidationResult;
import org.opensaml.saml.ext.saml2delrestrict.DelegationRestrictionType;
-import org.opensaml.saml.saml2.assertion.BaseAssertionValidationTest;
import org.opensaml.saml.saml2.assertion.SAML2AssertionValidationParameters;
+import org.opensaml.saml.saml2.assertion.tests.BaseAssertionValidationTest;
import org.opensaml.saml.saml2.core.Assertion;
import org.opensaml.saml.saml2.core.Condition;
import org.opensaml.saml.saml2.core.OneTimeUse;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/ProxyRestrictionConditionValidatorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/ProxyRestrictionConditionValidatorTest.java
index 0c1d3587a..d2edb85f2 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/ProxyRestrictionConditionValidatorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/ProxyRestrictionConditionValidatorTest.java
@@ -20,7 +20,7 @@ package org.opensaml.saml.saml2.assertion.impl;
import org.opensaml.saml.common.assertion.AssertionValidationException;
import org.opensaml.saml.common.assertion.ValidationContext;
import org.opensaml.saml.common.assertion.ValidationResult;
-import org.opensaml.saml.saml2.assertion.BaseAssertionValidationTest;
+import org.opensaml.saml.saml2.assertion.tests.BaseAssertionValidationTest;
import org.opensaml.saml.saml2.core.Condition;
import org.opensaml.saml.saml2.core.OneTimeUse;
import org.opensaml.saml.saml2.core.ProxyRestriction;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/SenderVouchesSubjectConfirmationValidatorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/SenderVouchesSubjectConfirmationValidatorTest.java
index 29e2b90c8..00a9da82a 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/SenderVouchesSubjectConfirmationValidatorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/SenderVouchesSubjectConfirmationValidatorTest.java
@@ -20,7 +20,7 @@ package org.opensaml.saml.saml2.assertion.impl;
import org.opensaml.saml.common.assertion.AssertionValidationException;
import org.opensaml.saml.common.assertion.ValidationContext;
import org.opensaml.saml.common.assertion.ValidationResult;
-import org.opensaml.saml.saml2.assertion.BaseAssertionValidationTest;
+import org.opensaml.saml.saml2.assertion.tests.BaseAssertionValidationTest;
import org.opensaml.saml.saml2.core.SubjectConfirmation;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/BaseAssertionValidationTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/tests/BaseAssertionValidationTest.java
similarity index 98%
rename from opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/BaseAssertionValidationTest.java
rename to opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/tests/BaseAssertionValidationTest.java
index 918d5605b..089285d34 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/BaseAssertionValidationTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/tests/BaseAssertionValidationTest.java
@@ -16,7 +16,7 @@
*/
-package org.opensaml.saml.saml2.assertion;
+package org.opensaml.saml.saml2.assertion.tests;
import java.io.File;
import java.net.InetAddress;
@@ -39,6 +39,7 @@ import javax.xml.namespace.QName;
import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObjectBuilder;
import org.opensaml.core.xml.io.MarshallingException;
+import org.opensaml.saml.saml2.assertion.SAML2AssertionValidationParameters;
import org.opensaml.saml.saml2.core.Assertion;
import org.opensaml.saml.saml2.core.AuthnContext;
import org.opensaml.saml.saml2.core.AuthnContextClassRef;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/MockAssertionValidator.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/tests/MockAssertionValidator.java
similarity index 96%
rename from opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/MockAssertionValidator.java
rename to opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/tests/MockAssertionValidator.java
index 58cd0c0fa..9811ed5e3 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/MockAssertionValidator.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/tests/MockAssertionValidator.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opensaml.saml.saml2.assertion;
+package org.opensaml.saml.saml2.assertion.tests;
import java.util.Collections;
import java.util.Map;
@@ -23,6 +23,7 @@ import java.util.Map;
import org.opensaml.saml.common.assertion.AssertionValidationException;
import org.opensaml.saml.common.assertion.ValidationContext;
import org.opensaml.saml.common.assertion.ValidationResult;
+import org.opensaml.saml.saml2.assertion.SAML20AssertionValidator;
import org.opensaml.saml.saml2.core.Assertion;
import net.shibboleth.utilities.java.support.collection.Pair;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/SAML20AssertionValidatorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/tests/SAML20AssertionValidatorTest.java
similarity index 98%
rename from opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/SAML20AssertionValidatorTest.java
rename to opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/tests/SAML20AssertionValidatorTest.java
index 6683d3ef7..e79e60e44 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/SAML20AssertionValidatorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/tests/SAML20AssertionValidatorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opensaml.saml.saml2.assertion;
+package org.opensaml.saml.saml2.assertion.tests;
import java.net.URISyntaxException;
import java.security.KeyException;
@@ -45,6 +45,11 @@ import org.opensaml.saml.common.SAMLVersion;
import org.opensaml.saml.common.assertion.AssertionValidationException;
import org.opensaml.saml.common.assertion.ValidationContext;
import org.opensaml.saml.common.assertion.ValidationResult;
+import org.opensaml.saml.saml2.assertion.ConditionValidator;
+import org.opensaml.saml.saml2.assertion.SAML20AssertionValidator;
+import org.opensaml.saml.saml2.assertion.SAML2AssertionValidationParameters;
+import org.opensaml.saml.saml2.assertion.StatementValidator;
+import org.opensaml.saml.saml2.assertion.SubjectConfirmationValidator;
import org.opensaml.saml.saml2.assertion.impl.BearerSubjectConfirmationValidator;
import org.opensaml.saml.saml2.core.Assertion;
import org.opensaml.saml.saml2.core.AuthnStatement;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPPostSimpleSignSecurityHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPPostSimpleSignSecurityHandlerTest.java
index ea173a69d..6a79c6298 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPPostSimpleSignSecurityHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPPostSimpleSignSecurityHandlerTest.java
@@ -41,11 +41,11 @@ import org.opensaml.messaging.context.MessageContext;
import org.opensaml.messaging.encoder.MessageEncodingException;
import org.opensaml.messaging.handler.MessageHandlerException;
import org.opensaml.saml.common.SAMLObjectBuilder;
-import org.opensaml.saml.common.SAMLTestSupport;
import org.opensaml.saml.common.binding.SAMLBindingSupport;
import org.opensaml.saml.common.messaging.context.SAMLEndpointContext;
import org.opensaml.saml.common.messaging.context.SAMLPeerEntityContext;
import org.opensaml.saml.common.messaging.context.SAMLProtocolContext;
+import org.opensaml.saml.common.testing.SAMLTestSupport;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.binding.encoding.impl.HTTPPostSimpleSignEncoder;
import org.opensaml.saml.saml2.core.AuthnRequest;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPRedirectDeflateSignatureSecurityHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPRedirectDeflateSignatureSecurityHandlerTest.java
index 39d83cd8c..3f9cc0f14 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPRedirectDeflateSignatureSecurityHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPRedirectDeflateSignatureSecurityHandlerTest.java
@@ -35,11 +35,11 @@ import org.opensaml.messaging.context.MessageContext;
import org.opensaml.messaging.encoder.MessageEncodingException;
import org.opensaml.messaging.handler.MessageHandlerException;
import org.opensaml.saml.common.SAMLObjectBuilder;
-import org.opensaml.saml.common.SAMLTestSupport;
import org.opensaml.saml.common.binding.SAMLBindingSupport;
import org.opensaml.saml.common.messaging.context.SAMLEndpointContext;
import org.opensaml.saml.common.messaging.context.SAMLPeerEntityContext;
import org.opensaml.saml.common.messaging.context.SAMLProtocolContext;
+import org.opensaml.saml.common.testing.SAMLTestSupport;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.binding.encoding.impl.HTTPRedirectDeflateEncoder;
import org.opensaml.saml.saml2.core.AuthnRequest;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/AuthnRequestTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/AuthnRequestTest.java
index dbe72e47f..7a3fb88ea 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/AuthnRequestTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/AuthnRequestTest.java
@@ -23,8 +23,8 @@ import org.testng.Assert;
import java.time.Instant;
import org.opensaml.core.xml.schema.XSBooleanValue;
-import org.opensaml.saml.common.BaseComplexSAMLObjectTestCase;
import org.opensaml.saml.common.SAMLVersion;
+import org.opensaml.saml.common.testing.BaseComplexSAMLObjectTestCase;
/**
* Tests unmarshalling and marshalling for various request messages.
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/ResponseSuccessAuthnAttribTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/ResponseSuccessAuthnAttribTest.java
index f4517b560..f2417ea6f 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/ResponseSuccessAuthnAttribTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/ResponseSuccessAuthnAttribTest.java
@@ -24,8 +24,8 @@ import java.time.Instant;
import org.opensaml.core.xml.XMLObjectBuilder;
import org.opensaml.core.xml.schema.XSString;
-import org.opensaml.saml.common.BaseComplexSAMLObjectTestCase;
import org.opensaml.saml.common.SAMLVersion;
+import org.opensaml.saml.common.testing.BaseComplexSAMLObjectTestCase;
/**
* Tests unmarshalling and marshalling for various response messages.
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/SignedAssertionTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/SignedAssertionTest.java
index a6b291baf..602188975 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/SignedAssertionTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/SignedAssertionTest.java
@@ -34,8 +34,8 @@ import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.core.xml.io.UnmarshallingException;
import org.opensaml.core.xml.XMLObjectBuilder;
import org.opensaml.saml.common.SAMLObjectBuilder;
-import org.opensaml.saml.common.SAMLTestSupport;
import org.opensaml.saml.common.SAMLVersion;
+import org.opensaml.saml.common.testing.SAMLTestSupport;
import org.opensaml.security.SecurityException;
import org.opensaml.security.credential.BasicCredential;
import org.opensaml.security.credential.CredentialSupport;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/ComplexEncryptionTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/tests/ComplexEncryptionTest.java
similarity index 99%
rename from opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/ComplexEncryptionTest.java
rename to opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/tests/ComplexEncryptionTest.java
index d649936d4..bf979c1e5 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/ComplexEncryptionTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/tests/ComplexEncryptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opensaml.saml.saml2.encryption;
+package org.opensaml.saml.saml2.encryption.tests;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
@@ -29,6 +29,7 @@ import org.opensaml.saml.saml2.core.Assertion;
import org.opensaml.saml.saml2.core.Attribute;
import org.opensaml.saml.saml2.core.EncryptedAssertion;
import org.opensaml.saml.saml2.core.EncryptedAttribute;
+import org.opensaml.saml.saml2.encryption.Encrypter;
import org.opensaml.saml.saml2.encryption.Encrypter.KeyPlacement;
import org.opensaml.security.credential.Credential;
import org.opensaml.xmlsec.algorithm.AlgorithmSupport;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/DecryptionPlusSigningTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/tests/DecryptionPlusSigningTest.java
similarity index 98%
rename from opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/DecryptionPlusSigningTest.java
rename to opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/tests/DecryptionPlusSigningTest.java
index 17eb0c711..8ce8b4f4f 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/DecryptionPlusSigningTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/tests/DecryptionPlusSigningTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opensaml.saml.saml2.encryption;
+package org.opensaml.saml.saml2.encryption.tests;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
@@ -37,6 +37,8 @@ import org.opensaml.saml.saml2.core.Assertion;
import org.opensaml.saml.saml2.core.EncryptedAssertion;
import org.opensaml.saml.saml2.core.Issuer;
import org.opensaml.saml.saml2.core.Response;
+import org.opensaml.saml.saml2.encryption.Decrypter;
+import org.opensaml.saml.saml2.encryption.Encrypter;
import org.opensaml.security.SecurityException;
import org.opensaml.security.credential.Credential;
import org.opensaml.security.credential.CredentialSupport;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/EncryptedElementTypeEncryptedKeyResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/tests/EncryptedElementTypeEncryptedKeyResolverTest.java
similarity index 98%
rename from opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/EncryptedElementTypeEncryptedKeyResolverTest.java
rename to opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/tests/EncryptedElementTypeEncryptedKeyResolverTest.java
index e368b347b..51941c4fa 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/EncryptedElementTypeEncryptedKeyResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/tests/EncryptedElementTypeEncryptedKeyResolverTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opensaml.saml.saml2.encryption;
+package org.opensaml.saml.saml2.encryption.tests;
import org.testng.annotations.Test;
import org.testng.Assert;
@@ -28,6 +28,7 @@ import java.util.List;
import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.saml.saml2.core.EncryptedAssertion;
+import org.opensaml.saml.saml2.encryption.EncryptedElementTypeEncryptedKeyResolver;
import org.opensaml.xmlsec.encryption.EncryptedData;
import org.opensaml.xmlsec.encryption.EncryptedKey;
import org.opensaml.xmlsec.encryption.support.EncryptedKeyResolver;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/SimpleDecryptionTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/tests/SimpleDecryptionTest.java
similarity index 98%
rename from opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/SimpleDecryptionTest.java
rename to opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/tests/SimpleDecryptionTest.java
index 1c82c05f6..de1dfb5af 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/SimpleDecryptionTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/tests/SimpleDecryptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opensaml.saml.saml2.encryption;
+package org.opensaml.saml.saml2.encryption.tests;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
@@ -39,6 +39,8 @@ import org.opensaml.saml.saml2.core.EncryptedID;
import org.opensaml.saml.saml2.core.NameID;
import org.opensaml.saml.saml2.core.NewEncryptedID;
import org.opensaml.saml.saml2.core.NewID;
+import org.opensaml.saml.saml2.encryption.Decrypter;
+import org.opensaml.saml.saml2.encryption.Encrypter;
import org.opensaml.security.credential.BasicCredential;
import org.opensaml.security.credential.Credential;
import org.opensaml.xmlsec.algorithm.AlgorithmSupport;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/SimpleEncryptionTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/tests/SimpleEncryptionTest.java
similarity index 99%
rename from opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/SimpleEncryptionTest.java
rename to opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/tests/SimpleEncryptionTest.java
index 32dfca0bb..2bf0088a0 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/SimpleEncryptionTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/tests/SimpleEncryptionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opensaml.saml.saml2.encryption;
+package org.opensaml.saml.saml2.encryption.tests;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
@@ -33,6 +33,7 @@ import org.opensaml.saml.saml2.core.EncryptedID;
import org.opensaml.saml.saml2.core.NameID;
import org.opensaml.saml.saml2.core.NewEncryptedID;
import org.opensaml.saml.saml2.core.NewID;
+import org.opensaml.saml.saml2.encryption.Encrypter;
import org.opensaml.xmlsec.algorithm.AlgorithmSupport;
import org.opensaml.xmlsec.encryption.support.EncryptionConstants;
import org.opensaml.xmlsec.encryption.support.EncryptionException;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/MetadataTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/tests/MetadataTest.java
similarity index 99%
rename from opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/MetadataTest.java
rename to opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/tests/MetadataTest.java
index 8c3eaafd0..389b6a0b0 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/MetadataTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/tests/MetadataTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opensaml.saml.saml2.metadata;
+package org.opensaml.saml.saml2.metadata.tests;
import java.io.InputStream;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/AbstractSAML2NameIDGeneratorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AbstractSAML2NameIDGeneratorTest.java
similarity index 97%
rename from opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/AbstractSAML2NameIDGeneratorTest.java
rename to opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AbstractSAML2NameIDGeneratorTest.java
index 4f406f877..a1ab6adfb 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/AbstractSAML2NameIDGeneratorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AbstractSAML2NameIDGeneratorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opensaml.saml.saml2.profile;
+package org.opensaml.saml.saml2.profile.impl;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.FunctionSupport;
@@ -24,6 +24,7 @@ import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.profile.context.ProfileRequestContext;
import org.opensaml.saml.common.SAMLException;
import org.opensaml.saml.saml2.core.NameID;
+import org.opensaml.saml.saml2.profile.AbstractSAML2NameIDGenerator;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/ValidateAssertionsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/ValidateAssertionsTest.java
index c742c1e3c..fc8631985 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/ValidateAssertionsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/ValidateAssertionsTest.java
@@ -30,7 +30,7 @@ import org.opensaml.saml.common.assertion.AssertionValidationException;
import org.opensaml.saml.common.assertion.ValidationProcessingData;
import org.opensaml.saml.common.assertion.ValidationResult;
import org.opensaml.saml.common.profile.SAMLEventIds;
-import org.opensaml.saml.saml2.assertion.MockAssertionValidator;
+import org.opensaml.saml.saml2.assertion.tests.MockAssertionValidator;
import org.opensaml.saml.saml2.core.Assertion;
import org.opensaml.saml.saml2.core.Response;
import org.opensaml.saml.saml2.testing.SAML2ActionTestingSupport;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/MetadataCredentialResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/MetadataCredentialResolverTest.java
index fac016b53..4ba2586a2 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/MetadataCredentialResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/MetadataCredentialResolverTest.java
@@ -33,7 +33,7 @@ import net.shibboleth.utilities.java.support.resolver.ResolverException;
import org.opensaml.core.criterion.EntityIdCriterion;
import org.opensaml.core.testing.XMLObjectBaseTestCase;
-import org.opensaml.saml.common.SAMLTestSupport;
+import org.opensaml.saml.common.testing.SAMLTestSupport;
import org.opensaml.saml.criterion.EntityRoleCriterion;
import org.opensaml.saml.criterion.ProtocolCriterion;
import org.opensaml.saml.criterion.RoleDescriptorCriterion;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/SAMLMetadataEncryptionParametersResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/SAMLMetadataEncryptionParametersResolverTest.java
index b6b3fc58e..a4b0e3811 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/SAMLMetadataEncryptionParametersResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/SAMLMetadataEncryptionParametersResolverTest.java
@@ -41,7 +41,7 @@ import net.shibboleth.utilities.java.support.resolver.ResolverException;
import org.opensaml.core.config.ConfigurationService;
import org.opensaml.core.config.InitializationException;
import org.opensaml.core.testing.XMLObjectBaseTestCase;
-import org.opensaml.saml.common.SAMLTestSupport;
+import org.opensaml.saml.common.testing.SAMLTestSupport;
import org.opensaml.saml.criterion.RoleDescriptorCriterion;
import org.opensaml.saml.saml2.metadata.EncryptionMethod;
import org.opensaml.saml.saml2.metadata.EntityDescriptor;
diff --git a/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/SOAPTest.java b/opensaml-soap-impl/src/test/java/org/opensaml/soap/testing/SOAPTest.java
similarity index 100%
rename from opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/SOAPTest.java
rename to opensaml-soap-impl/src/test/java/org/opensaml/soap/testing/SOAPTest.java
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list