[java-metadata-aggregator] branch main updated: MDA-286 - Migrate testing APIs into sub-packages
Ian Young
ian at iay.org.uk
Thu Apr 6 10:36:05 UTC 2023
This is an automated email from the git hooks/post-receive script.
iay pushed a commit to branch main
in repository java-metadata-aggregator.
View the commit online:
http://git.shibboleth.net/view/?p=java-metadata-aggregator.git;a=commit;h=38ac764ec2fa8eaf60fd3c0a8adcbdfc3671de9b
The following commit(s) were added to refs/heads/main by this push:
new 38ac764 MDA-286 - Migrate testing APIs into sub-packages
38ac764 is described below
commit 38ac764ec2fa8eaf60fd3c0a8adcbdfc3671de9b
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Thu Apr 6 11:35:22 2023 +0100
MDA-286 - Migrate testing APIs into sub-packages
https://shibboleth.atlassian.net/browse/MDA-286
---
...actCompositeItemIdentificationStrategyTest.java | 2 ++
.../DeduplicatingItemIdMergeStrategyTest.java | 1 +
.../FirstItemIdItemIdentificationStrategyTest.java | 2 ++
.../SimpleItemCollectionSerializerTest.java | 2 ++
.../dom/AbstractDOMValidationStageTest.java | 1 +
.../net/shibboleth/metadata/dom/ContainerTest.java | 2 ++
.../metadata/dom/DOMElementItemTest.java | 1 +
.../metadata/dom/DOMElementSerializerTest.java | 1 +
.../metadata/dom/DOMFilesystemSourceStageTest.java | 2 +-
.../metadata/dom/DOMResourceSourceStageTest.java | 2 +-
.../metadata/dom/ElementStrippingStageTest.java | 1 +
.../dom/ElementWhitespaceTrimmingStageTest.java | 1 +
.../metadata/dom/ElementsStrippingStageTest.java | 1 +
.../dom/EmptyContainerStrippingStageTest.java | 1 +
.../dom/MultiOutputXSLTransformationStageTest.java | 1 +
.../metadata/dom/NamespaceStrippingStageTest.java | 1 +
.../metadata/dom/NamespacesStrippingStageTest.java | 1 +
...tMakerTest.java => SimpleElementMakerTest.java} | 6 +++--
...cherTest.java => SimpleElementMatcherTest.java} | 6 +++--
.../dom/StringAttributeValidationStageTest.java | 1 +
.../dom/StringElementValidationStageTest.java | 1 +
.../dom/WhitespaceTrimmingVisitorTest.java | 1 +
.../metadata/dom/XMLSchemaValidationStageTest.java | 1 +
.../metadata/dom/XMLSignatureSigningStageTest.java | 1 +
.../dom/XMLSignatureValidationStageTest.java | 1 +
.../metadata/dom/XPathFilteringStageTest.java | 1 +
.../dom/XPathItemSelectionStrategyTest.java | 2 ++
.../metadata/dom/XSLTtransformationStageTest.java | 1 +
.../metadata/dom/XSLValidationStageTest.java | 1 +
.../metadata/dom/ds/X509ValidationStageTest.java | 2 +-
.../dom/saml/AttributeElementMakerTest.java | 2 +-
.../dom/saml/AttributeElementMatcherTest.java | 2 +-
.../dom/saml/AttributeValueElementMakerTest.java | 2 +-
.../dom/saml/AttributeValueElementMatcherTest.java | 2 +-
.../metadata/dom/saml/CRDetectionStageTest.java | 2 +-
.../dom/saml/ContactPersonFilterStageTest.java | 2 +-
.../saml/DiscoFeedCollectionSerializerTest.java | 2 +-
.../saml/EntitiesDescriptorAssemblerStageTest.java | 2 +-
.../EntitiesDescriptorDisassemblerStageTest.java | 2 +-
.../EntityDescriptorItemIdPopulationStageTest.java | 2 +-
.../metadata/dom/saml/EntityFilterStageTest.java | 2 +-
.../dom/saml/EntityRoleFilterStageTest.java | 2 +-
.../metadata/dom/saml/GenerateIdStageTest.java | 2 +-
.../dom/saml/PullUpCacheDurationStageTest.java | 2 +-
.../dom/saml/PullUpValidUntilStageTest.java | 2 +-
.../dom/saml/RemoveOrganizationStageTest.java | 2 +-
.../saml/SAMLStringElementCheckingStageTest.java | 2 +-
.../dom/saml/SetCacheDurationStageTest.java | 2 +-
.../metadata/dom/saml/SetValidUntilStageTest.java | 2 +-
.../dom/saml/ValidateValidUntilStageTest.java | 2 +-
.../mdattr/EntityAttributeAddingStageTest.java | 2 +-
.../mdattr/EntityAttributeFilteringStageTest.java | 2 +-
...EntityRegistrationAuthorityFilterStageTest.java | 2 +-
...ionAuthorityItemIdentificationStrategyTest.java | 2 +-
.../RegistrationAuthorityPopulationStageTest.java | 2 +-
.../dom/saml/mdui/IPHintValidationStageTest.java | 2 +-
.../metadata/dom/{ => testing}/BaseDOMTest.java | 5 +++--
.../dom/{ => testing}/BaseDOMTestTest.java | 2 +-
.../testing/package-info.java} | 26 ++--------------------
.../metadata/pipeline/AbstractStageTest.java | 3 ++-
.../metadata/pipeline/CompositeStageTest.java | 5 +++--
.../FilesInDirectoryMultiOutputStrategyTest.java | 2 +-
.../pipeline/ItemIdTransformStageTest.java | 2 +-
.../pipeline/ItemMetadataAddingStageTest.java | 2 +-
.../pipeline/ItemMetadataFilterStageTest.java | 2 +-
.../pipeline/ItemMetadataTerminationStageTest.java | 2 +-
.../metadata/pipeline/ItemOrderingStageTest.java | 2 +-
.../MultiOutputSerializationStageTest.java | 2 +-
.../pipeline/PipelineDemultiplexerStageTest.java | 4 +++-
.../metadata/pipeline/PipelineMergeStageTest.java | 3 ++-
.../metadata/pipeline/ScriptletStageTest.java | 6 ++---
.../metadata/pipeline/SerializationStageTest.java | 2 +-
.../metadata/pipeline/SimplePipelineTest.java | 3 ++-
.../metadata/pipeline/SplitMergeStageTest.java | 4 +++-
.../pipeline/StaticItemSourceStageTest.java | 2 +-
.../pipeline/StatusMetadataLoggingStageTest.java | 2 +-
.../metadata/{ => testing}/BaseTest.java | 2 +-
.../metadata/{ => testing}/BaseTestTest.java | 2 +-
.../{pipeline => testing}/CountingStage.java | 4 +++-
.../{pipeline => testing}/MarkerStage.java | 5 +++--
.../metadata/{ => testing}/MockItem.java | 5 ++++-
.../metadata/{ => testing}/MockItemTest.java | 2 +-
.../{pipeline => testing}/TerminatingStage.java | 7 ++++--
.../metadata/{ => testing}/TestMarker.java | 3 ++-
.../package-info.java} | 25 ++-------------------
.../metadata/validate/AcceptAllValidatorTest.java | 2 +-
.../metadata/validate/BaseValidatorTest.java | 2 +-
.../metadata/validate/RejectAllValidatorTest.java | 2 +-
.../metadata/validate/ValidatorSequenceTest.java | 2 +-
.../string/AcceptStringRegexValidatorTest.java | 2 +-
.../string/AcceptStringValueValidatorTest.java | 2 +-
.../string/RejectStringRegexValidatorTest.java | 2 +-
.../string/RejectStringValueValidatorTest.java | 2 +-
.../validate/x509/BaseX509ValidatorTest.java | 4 ++--
.../validate/x509/X509DSADetectorTest.java | 2 +-
.../x509/X509RSAKeyLengthValidatorTest.java | 2 +-
.../x509/X509RSAOpenSSLBlacklistValidatorTest.java | 2 +-
.../metadata/validate/x509/MDA183Test.java | 4 ++--
.../x509/X509RSAOpenSSLBlacklistValidatorTest.java | 2 +-
99 files changed, 139 insertions(+), 129 deletions(-)
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/AbstractCompositeItemIdentificationStrategyTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/AbstractCompositeItemIdentificationStrategyTest.java
index 55a6db5..44c3892 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/AbstractCompositeItemIdentificationStrategyTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/AbstractCompositeItemIdentificationStrategyTest.java
@@ -6,6 +6,8 @@ import javax.annotation.Nonnull;
import org.testng.Assert;
import org.testng.annotations.Test;
+import net.shibboleth.metadata.testing.MockItem;
+
public class AbstractCompositeItemIdentificationStrategyTest {
/**
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/DeduplicatingItemIdMergeStrategyTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/DeduplicatingItemIdMergeStrategyTest.java
index 543e349..1eb72fd 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/DeduplicatingItemIdMergeStrategyTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/DeduplicatingItemIdMergeStrategyTest.java
@@ -7,6 +7,7 @@ import java.util.List;
import org.testng.Assert;
import org.testng.annotations.Test;
+import net.shibboleth.metadata.testing.MockItem;
import net.shibboleth.shared.collection.CollectionSupport;
public class DeduplicatingItemIdMergeStrategyTest {
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/FirstItemIdItemIdentificationStrategyTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/FirstItemIdItemIdentificationStrategyTest.java
index 2ae1470..23eeece 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/FirstItemIdItemIdentificationStrategyTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/FirstItemIdItemIdentificationStrategyTest.java
@@ -21,6 +21,8 @@ package net.shibboleth.metadata;
import org.testng.Assert;
import org.testng.annotations.Test;
+import net.shibboleth.metadata.testing.MockItem;
+
public class FirstItemIdItemIdentificationStrategyTest {
@Test
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/SimpleItemCollectionSerializerTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/SimpleItemCollectionSerializerTest.java
index 193a801..01a90ce 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/SimpleItemCollectionSerializerTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/SimpleItemCollectionSerializerTest.java
@@ -28,6 +28,8 @@ import javax.annotation.Nonnull;
import org.testng.Assert;
import org.testng.annotations.Test;
+import net.shibboleth.metadata.testing.MockItem;
+
public class SimpleItemCollectionSerializerTest {
@Test
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/AbstractDOMValidationStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/AbstractDOMValidationStageTest.java
index 4c7cf43..3f0090f 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/AbstractDOMValidationStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/AbstractDOMValidationStageTest.java
@@ -29,6 +29,7 @@ import org.w3c.dom.Element;
import net.shibboleth.metadata.ErrorStatus;
import net.shibboleth.metadata.Item;
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
import net.shibboleth.metadata.pipeline.StageProcessingException;
import net.shibboleth.metadata.validate.BaseValidator;
import net.shibboleth.metadata.validate.Validator;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/ContainerTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/ContainerTest.java
index fb1e224..79d6558 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/ContainerTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/ContainerTest.java
@@ -10,6 +10,8 @@ import org.testng.annotations.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
+
public class ContainerTest extends BaseDOMTest {
private final Document doc;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/DOMElementItemTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/DOMElementItemTest.java
index 38234d6..273f594 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/DOMElementItemTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/DOMElementItemTest.java
@@ -8,6 +8,7 @@ import org.w3c.dom.Element;
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.ItemId;
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
import net.shibboleth.shared.logic.ConstraintViolationException;
public class DOMElementItemTest extends BaseDOMTest {
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/DOMElementSerializerTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/DOMElementSerializerTest.java
index 333586a..7b5833b 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/DOMElementSerializerTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/DOMElementSerializerTest.java
@@ -22,6 +22,7 @@ import java.util.ArrayList;
import java.util.Collection;
import net.shibboleth.metadata.Item;
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/DOMFilesystemSourceStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/DOMFilesystemSourceStageTest.java
index e04b40f..05e3052 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/DOMFilesystemSourceStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/DOMFilesystemSourceStageTest.java
@@ -22,9 +22,9 @@ import java.io.FileFilter;
import java.net.URL;
import java.util.ArrayList;
-import net.shibboleth.metadata.BaseTest;
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.pipeline.StageProcessingException;
+import net.shibboleth.metadata.testing.BaseTest;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.logic.ConstraintViolationException;
import net.shibboleth.shared.xml.impl.BasicParserPool;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/DOMResourceSourceStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/DOMResourceSourceStageTest.java
index fdd1717..976c875 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/DOMResourceSourceStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/DOMResourceSourceStageTest.java
@@ -35,9 +35,9 @@ import org.testng.Assert;
import org.testng.annotations.Test;
import org.w3c.dom.Element;
-import net.shibboleth.metadata.BaseTest;
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.pipeline.StageProcessingException;
+import net.shibboleth.metadata.testing.BaseTest;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.xml.impl.BasicParserPool;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/ElementStrippingStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/ElementStrippingStageTest.java
index abf28df..f3ebb9d 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/ElementStrippingStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/ElementStrippingStageTest.java
@@ -21,6 +21,7 @@ import java.util.ArrayList;
import java.util.List;
import net.shibboleth.metadata.Item;
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
import net.shibboleth.shared.component.ComponentInitializationException;
import org.testng.annotations.Test;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/ElementWhitespaceTrimmingStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/ElementWhitespaceTrimmingStageTest.java
index 716f8e1..72cce35 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/ElementWhitespaceTrimmingStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/ElementWhitespaceTrimmingStageTest.java
@@ -31,6 +31,7 @@ import org.w3c.dom.Element;
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.dom.saml.SAMLMetadataSupport;
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.xml.XMLParserException;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/ElementsStrippingStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/ElementsStrippingStageTest.java
index 231582c..c824f77 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/ElementsStrippingStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/ElementsStrippingStageTest.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import net.shibboleth.metadata.Item;
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
import net.shibboleth.shared.component.ComponentInitializationException;
import org.testng.annotations.Test;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/EmptyContainerStrippingStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/EmptyContainerStrippingStageTest.java
index ae154e0..30225bc 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/EmptyContainerStrippingStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/EmptyContainerStrippingStageTest.java
@@ -21,6 +21,7 @@ import java.util.ArrayList;
import java.util.List;
import net.shibboleth.metadata.Item;
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
import org.testng.annotations.Test;
import org.w3c.dom.Element;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStageTest.java
index b92c355..2d04731 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStageTest.java
@@ -31,6 +31,7 @@ import net.shibboleth.metadata.InfoStatus;
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.ItemMetadata;
import net.shibboleth.metadata.WarningStatus;
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
import net.shibboleth.shared.xml.XMLParserException;
import org.springframework.core.io.Resource;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/NamespaceStrippingStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/NamespaceStrippingStageTest.java
index 3a19f51..8fedda5 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/NamespaceStrippingStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/NamespaceStrippingStageTest.java
@@ -21,6 +21,7 @@ import java.util.ArrayList;
import java.util.List;
import net.shibboleth.metadata.Item;
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
import net.shibboleth.shared.component.ComponentInitializationException;
import org.testng.annotations.Test;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/NamespacesStrippingStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/NamespacesStrippingStageTest.java
index a8b740c..7cab063 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/NamespacesStrippingStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/NamespacesStrippingStageTest.java
@@ -24,6 +24,7 @@ import org.testng.annotations.Test;
import org.w3c.dom.Element;
import net.shibboleth.metadata.Item;
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
public class NamespacesStrippingStageTest extends BaseDOMTest {
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/ElementMakerTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/SimpleElementMakerTest.java
similarity index 83%
rename from mda-framework/src/test/java/net/shibboleth/metadata/dom/ElementMakerTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/SimpleElementMakerTest.java
index 52b371c..d89ba1b 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/ElementMakerTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/SimpleElementMakerTest.java
@@ -8,11 +8,13 @@ import org.testng.annotations.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-public class ElementMakerTest extends BaseDOMTest {
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
+
+public class SimpleElementMakerTest extends BaseDOMTest {
private final Document doc;
- protected ElementMakerTest() throws Exception {
+ protected SimpleElementMakerTest() throws Exception {
super(SimpleElementMaker.class);
setUp();
doc = getParserPool().newDocument();
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/ElementMatcherTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/SimpleElementMatcherTest.java
similarity index 85%
rename from mda-framework/src/test/java/net/shibboleth/metadata/dom/ElementMatcherTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/SimpleElementMatcherTest.java
index 3f85a02..2c46403 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/ElementMatcherTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/SimpleElementMatcherTest.java
@@ -9,11 +9,13 @@ import org.testng.annotations.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-public class ElementMatcherTest extends BaseDOMTest {
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
+
+public class SimpleElementMatcherTest extends BaseDOMTest {
private final Document doc;
- protected ElementMatcherTest() throws Exception {
+ protected SimpleElementMatcherTest() throws Exception {
super(SimpleElementMatcher.class);
setUp();
doc = getParserPool().newDocument();
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/StringAttributeValidationStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/StringAttributeValidationStageTest.java
index 8c55dca..0502817 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/StringAttributeValidationStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/StringAttributeValidationStageTest.java
@@ -13,6 +13,7 @@ import org.w3c.dom.Element;
import net.shibboleth.metadata.ErrorStatus;
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.dom.saml.SAMLMetadataSupport;
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
import net.shibboleth.metadata.validate.RejectAllValidator;
import net.shibboleth.metadata.validate.Validator;
import net.shibboleth.metadata.validate.testing.CollectingValidator;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/StringElementValidationStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/StringElementValidationStageTest.java
index 75a4b8c..b06e4aa 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/StringElementValidationStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/StringElementValidationStageTest.java
@@ -15,6 +15,7 @@ import org.w3c.dom.Element;
import net.shibboleth.metadata.ErrorStatus;
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.dom.saml.SAMLMetadataSupport;
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
import net.shibboleth.metadata.validate.RejectAllValidator;
import net.shibboleth.metadata.validate.Validator;
import net.shibboleth.metadata.validate.string.AcceptStringRegexValidator;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/WhitespaceTrimmingVisitorTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/WhitespaceTrimmingVisitorTest.java
index 25ef899..83ec193 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/WhitespaceTrimmingVisitorTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/WhitespaceTrimmingVisitorTest.java
@@ -27,6 +27,7 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import net.shibboleth.metadata.dom.saml.SAMLMetadataSupport;
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
import net.shibboleth.shared.xml.ElementSupport;
import net.shibboleth.shared.xml.ParserPool;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/XMLSchemaValidationStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/XMLSchemaValidationStageTest.java
index e08958d..a1bd43f 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/XMLSchemaValidationStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/XMLSchemaValidationStageTest.java
@@ -29,6 +29,7 @@ import org.w3c.dom.Element;
import net.shibboleth.metadata.ErrorStatus;
import net.shibboleth.metadata.Item;
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
public class XMLSchemaValidationStageTest extends BaseDOMTest {
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/XMLSignatureSigningStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/XMLSignatureSigningStageTest.java
index 5fb454f..4c5bfa5 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/XMLSignatureSigningStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/XMLSignatureSigningStageTest.java
@@ -39,6 +39,7 @@ import org.xmlunit.input.NormalizedSource;
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.dom.ds.XMLDSIGSupport;
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.logic.ConstraintViolationException;
import net.shibboleth.shared.xml.ElementSupport;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/XMLSignatureValidationStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/XMLSignatureValidationStageTest.java
index fec818c..756def5 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/XMLSignatureValidationStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/XMLSignatureValidationStageTest.java
@@ -29,6 +29,7 @@ import javax.annotation.Nonnull;
import net.shibboleth.metadata.ErrorStatus;
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.WarningStatus;
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
import net.shibboleth.shared.xml.XMLParserException;
import org.cryptacular.util.CertUtil;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/XPathFilteringStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/XPathFilteringStageTest.java
index e8f570a..d2c5e87 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/XPathFilteringStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/XPathFilteringStageTest.java
@@ -23,6 +23,7 @@ import java.util.List;
import java.util.Map;
import net.shibboleth.metadata.Item;
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
import net.shibboleth.metadata.pipeline.StageProcessingException;
import net.shibboleth.shared.component.ComponentInitializationException;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/XPathItemSelectionStrategyTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/XPathItemSelectionStrategyTest.java
index b4f9de2..418fa38 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/XPathItemSelectionStrategyTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/XPathItemSelectionStrategyTest.java
@@ -23,6 +23,8 @@ import java.util.Map;
import org.testng.Assert;
import org.testng.annotations.Test;
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
+
/** {@link XPathItemSelectionStrategy} unit test. */
public class XPathItemSelectionStrategyTest extends BaseDOMTest {
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/XSLTtransformationStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/XSLTtransformationStageTest.java
index f401870..a9f58fb 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/XSLTtransformationStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/XSLTtransformationStageTest.java
@@ -36,6 +36,7 @@ import net.shibboleth.metadata.InfoStatus;
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.ItemMetadata;
import net.shibboleth.metadata.WarningStatus;
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.xml.XMLParserException;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/XSLValidationStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/XSLValidationStageTest.java
index da5c83d..9c0a804 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/XSLValidationStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/XSLValidationStageTest.java
@@ -27,6 +27,7 @@ import net.shibboleth.metadata.InfoStatus;
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.ItemMetadata;
import net.shibboleth.metadata.WarningStatus;
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
import net.shibboleth.shared.xml.XMLParserException;
import org.springframework.core.io.Resource;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/ds/X509ValidationStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/ds/X509ValidationStageTest.java
index dd87b30..ca6dff3 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/ds/X509ValidationStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/ds/X509ValidationStageTest.java
@@ -28,8 +28,8 @@ import javax.annotation.Nonnull;
import net.shibboleth.metadata.ErrorStatus;
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.WarningStatus;
-import net.shibboleth.metadata.dom.BaseDOMTest;
import net.shibboleth.metadata.dom.DOMElementItem;
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
import net.shibboleth.metadata.validate.Validator;
import net.shibboleth.metadata.validate.x509.X509RSAKeyLengthValidator;
import net.shibboleth.shared.component.ComponentInitializationException;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/AttributeElementMakerTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/AttributeElementMakerTest.java
index edcd85c..ed718d4 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/AttributeElementMakerTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/AttributeElementMakerTest.java
@@ -8,8 +8,8 @@ import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
-import net.shibboleth.metadata.dom.BaseDOMTest;
import net.shibboleth.metadata.dom.Container;
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
public class AttributeElementMakerTest extends BaseDOMTest {
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/AttributeElementMatcherTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/AttributeElementMatcherTest.java
index 2f226e5..592117e 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/AttributeElementMatcherTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/AttributeElementMatcherTest.java
@@ -9,7 +9,7 @@ import org.testng.annotations.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import net.shibboleth.metadata.dom.BaseDOMTest;
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
import net.shibboleth.shared.xml.ElementSupport;
public class AttributeElementMatcherTest extends BaseDOMTest {
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/AttributeValueElementMakerTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/AttributeValueElementMakerTest.java
index 19336b1..e2d75c8 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/AttributeValueElementMakerTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/AttributeValueElementMakerTest.java
@@ -6,8 +6,8 @@ import org.testng.annotations.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import net.shibboleth.metadata.dom.BaseDOMTest;
import net.shibboleth.metadata.dom.Container;
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
public class AttributeValueElementMakerTest extends BaseDOMTest {
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/AttributeValueElementMatcherTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/AttributeValueElementMatcherTest.java
index 08f5fde..33b3cd2 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/AttributeValueElementMatcherTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/AttributeValueElementMatcherTest.java
@@ -9,7 +9,7 @@ import org.testng.annotations.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import net.shibboleth.metadata.dom.BaseDOMTest;
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
import net.shibboleth.shared.xml.ElementSupport;
public class AttributeValueElementMatcherTest extends BaseDOMTest {
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/CRDetectionStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/CRDetectionStageTest.java
index 9d42a01..a40b59d 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/CRDetectionStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/CRDetectionStageTest.java
@@ -34,7 +34,7 @@ import net.shibboleth.metadata.ErrorStatus;
import net.shibboleth.metadata.InfoStatus;
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.WarningStatus;
-import net.shibboleth.metadata.dom.BaseDOMTest;
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
import net.shibboleth.shared.xml.impl.BasicParserPool;
public class CRDetectionStageTest extends BaseDOMTest {
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStageTest.java
index b8c1c14..f501a45 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStageTest.java
@@ -24,8 +24,8 @@ import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.dom.BaseDOMTest;
import net.shibboleth.metadata.dom.DOMElementItem;
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.component.DestroyedComponentException;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializerTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializerTest.java
index 2b4bdf3..217c9c0 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializerTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializerTest.java
@@ -18,7 +18,7 @@ import org.w3c.dom.Element;
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.ItemCollectionSerializer;
-import net.shibboleth.metadata.dom.BaseDOMTest;
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.xml.XMLParserException;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStageTest.java
index 5444a00..8101c2d 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStageTest.java
@@ -28,8 +28,8 @@ import org.testng.annotations.Test;
import org.w3c.dom.Element;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.dom.BaseDOMTest;
import net.shibboleth.metadata.dom.DOMElementItem;
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
import net.shibboleth.metadata.pipeline.ItemOrderingStrategy;
/** Unit test for the {@link EntitiesDescriptorAssemblerStage} class. */
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorDisassemblerStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorDisassemblerStageTest.java
index 285a592..304e39b 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorDisassemblerStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorDisassemblerStageTest.java
@@ -20,8 +20,8 @@ package net.shibboleth.metadata.dom.saml;
import java.util.ArrayList;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.dom.BaseDOMTest;
import net.shibboleth.metadata.dom.DOMElementItem;
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/EntityDescriptorItemIdPopulationStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/EntityDescriptorItemIdPopulationStageTest.java
index 6480e7f..9034543 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/EntityDescriptorItemIdPopulationStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/EntityDescriptorItemIdPopulationStageTest.java
@@ -22,8 +22,8 @@ import java.util.List;
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.ItemId;
-import net.shibboleth.metadata.dom.BaseDOMTest;
import net.shibboleth.metadata.dom.DOMElementItem;
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/EntityFilterStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/EntityFilterStageTest.java
index 21662e1..8192558 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/EntityFilterStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/EntityFilterStageTest.java
@@ -27,8 +27,8 @@ import org.testng.annotations.Test;
import org.w3c.dom.Element;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.dom.BaseDOMTest;
import net.shibboleth.metadata.dom.DOMElementItem;
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.xml.ElementSupport;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStageTest.java
index ec9c257..ccbe9a5 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStageTest.java
@@ -23,8 +23,8 @@ import java.util.List;
import javax.annotation.Nonnull;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.dom.BaseDOMTest;
import net.shibboleth.metadata.dom.DOMElementItem;
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.xml.ElementSupport;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/GenerateIdStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/GenerateIdStageTest.java
index 4eb29ae..929fac6 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/GenerateIdStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/GenerateIdStageTest.java
@@ -28,8 +28,8 @@ import java.util.regex.Pattern;
import javax.xml.namespace.QName;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.dom.BaseDOMTest;
import net.shibboleth.metadata.dom.DOMElementItem;
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
import net.shibboleth.metadata.util.FixedStringIdentifierGenerationStrategy;
import net.shibboleth.shared.xml.impl.BasicParserPool;
import net.shibboleth.shared.collection.CollectionSupport;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/PullUpCacheDurationStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/PullUpCacheDurationStageTest.java
index 0dbb1aa..ef7ef62 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/PullUpCacheDurationStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/PullUpCacheDurationStageTest.java
@@ -22,8 +22,8 @@ import java.util.ArrayList;
import java.util.List;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.dom.BaseDOMTest;
import net.shibboleth.metadata.dom.DOMElementItem;
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
import net.shibboleth.shared.xml.AttributeSupport;
import net.shibboleth.shared.xml.ElementSupport;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/PullUpValidUntilStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/PullUpValidUntilStageTest.java
index 2b010b3..b63b290 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/PullUpValidUntilStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/PullUpValidUntilStageTest.java
@@ -23,8 +23,8 @@ import java.util.ArrayList;
import java.util.List;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.dom.BaseDOMTest;
import net.shibboleth.metadata.dom.DOMElementItem;
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
import net.shibboleth.shared.xml.AttributeSupport;
import net.shibboleth.shared.xml.ElementSupport;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/RemoveOrganizationStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/RemoveOrganizationStageTest.java
index d3c2277..b0dee7b 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/RemoveOrganizationStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/RemoveOrganizationStageTest.java
@@ -21,8 +21,8 @@ import java.util.ArrayList;
import java.util.List;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.dom.BaseDOMTest;
import net.shibboleth.metadata.dom.DOMElementItem;
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
import net.shibboleth.shared.xml.ElementSupport;
import org.testng.Assert;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/SAMLStringElementCheckingStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/SAMLStringElementCheckingStageTest.java
index c658cdc..41ab36b 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/SAMLStringElementCheckingStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/SAMLStringElementCheckingStageTest.java
@@ -10,8 +10,8 @@ import org.w3c.dom.Element;
import net.shibboleth.metadata.ErrorStatus;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.dom.BaseDOMTest;
import net.shibboleth.metadata.dom.DOMElementItem;
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
import net.shibboleth.shared.collection.CollectionSupport;
public class SAMLStringElementCheckingStageTest extends BaseDOMTest {
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/SetCacheDurationStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/SetCacheDurationStageTest.java
index 8036a18..7766f15 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/SetCacheDurationStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/SetCacheDurationStageTest.java
@@ -26,8 +26,8 @@ import javax.xml.datatype.DatatypeConfigurationException;
import javax.xml.datatype.DatatypeFactory;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.dom.BaseDOMTest;
import net.shibboleth.metadata.dom.DOMElementItem;
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
import net.shibboleth.shared.logic.ConstraintViolationException;
import net.shibboleth.shared.xml.AttributeSupport;
import net.shibboleth.shared.xml.impl.BasicParserPool;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/SetValidUntilStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/SetValidUntilStageTest.java
index ddbedbd..aa7d7c9 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/SetValidUntilStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/SetValidUntilStageTest.java
@@ -22,8 +22,8 @@ import java.time.Instant;
import java.util.ArrayList;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.dom.BaseDOMTest;
import net.shibboleth.metadata.dom.DOMElementItem;
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
import net.shibboleth.shared.logic.ConstraintViolationException;
import net.shibboleth.shared.xml.AttributeSupport;
import net.shibboleth.shared.xml.impl.BasicParserPool;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/ValidateValidUntilStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/ValidateValidUntilStageTest.java
index 6def451..2975db7 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/ValidateValidUntilStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/ValidateValidUntilStageTest.java
@@ -18,8 +18,8 @@
package net.shibboleth.metadata.dom.saml;
import net.shibboleth.metadata.ErrorStatus;
-import net.shibboleth.metadata.dom.BaseDOMTest;
import net.shibboleth.metadata.dom.DOMElementItem;
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
import net.shibboleth.shared.xml.AttributeSupport;
import java.time.Duration;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStageTest.java
index e329382..b890d57 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStageTest.java
@@ -7,8 +7,8 @@ import java.util.List;
import javax.annotation.Nonnull;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.dom.BaseDOMTest;
import net.shibboleth.metadata.dom.DOMElementItem;
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
import net.shibboleth.metadata.pipeline.Pipeline;
import net.shibboleth.metadata.pipeline.SimplePipeline;
import net.shibboleth.metadata.pipeline.Stage;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStageTest.java
index 750b17e..59c3403 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStageTest.java
@@ -26,11 +26,11 @@ import javax.annotation.Nonnull;
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.WarningStatus;
-import net.shibboleth.metadata.dom.BaseDOMTest;
import net.shibboleth.metadata.dom.DOMElementItem;
import net.shibboleth.metadata.dom.saml.mdattr.EntityAttributeFilteringStage.ContextImpl;
import net.shibboleth.metadata.dom.saml.mdattr.EntityAttributeFilteringStage.EntityAttributeContext;
import net.shibboleth.metadata.dom.saml.mdrpi.RegistrationAuthorityPopulationStage;
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdrpi/EntityRegistrationAuthorityFilterStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdrpi/EntityRegistrationAuthorityFilterStageTest.java
index ae03912..5370f9c 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdrpi/EntityRegistrationAuthorityFilterStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdrpi/EntityRegistrationAuthorityFilterStageTest.java
@@ -25,8 +25,8 @@ import org.testng.annotations.Test;
import org.w3c.dom.Element;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.dom.BaseDOMTest;
import net.shibboleth.metadata.dom.DOMElementItem;
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.xml.ElementSupport;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityItemIdentificationStrategyTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityItemIdentificationStrategyTest.java
index 69a4867..67955ea 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityItemIdentificationStrategyTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityItemIdentificationStrategyTest.java
@@ -28,7 +28,7 @@ import org.testng.annotations.Test;
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.ItemId;
-import net.shibboleth.metadata.MockItem;
+import net.shibboleth.metadata.testing.MockItem;
public class RegistrationAuthorityItemIdentificationStrategyTest {
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityPopulationStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityPopulationStageTest.java
index 3f1f728..a7ff61e 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityPopulationStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityPopulationStageTest.java
@@ -24,8 +24,8 @@ import java.util.List;
import net.shibboleth.metadata.ErrorStatus;
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.ItemMetadata;
-import net.shibboleth.metadata.dom.BaseDOMTest;
import net.shibboleth.metadata.dom.DOMElementItem;
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
import net.shibboleth.shared.collection.ClassToInstanceMultiMap;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.xml.XMLParserException;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdui/IPHintValidationStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdui/IPHintValidationStageTest.java
index 58c142e..fc066a0 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdui/IPHintValidationStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdui/IPHintValidationStageTest.java
@@ -7,8 +7,8 @@ import java.util.List;
import net.shibboleth.metadata.ErrorStatus;
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.ItemMetadata;
-import net.shibboleth.metadata.dom.BaseDOMTest;
import net.shibboleth.metadata.dom.DOMElementItem;
+import net.shibboleth.metadata.dom.testing.BaseDOMTest;
import net.shibboleth.shared.collection.ClassToInstanceMultiMap;
import org.testng.Assert;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/BaseDOMTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/testing/BaseDOMTest.java
similarity index 98%
rename from mda-framework/src/test/java/net/shibboleth/metadata/dom/BaseDOMTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/testing/BaseDOMTest.java
index d4a0bea..b92a4bf 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/BaseDOMTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/testing/BaseDOMTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.metadata.dom;
+package net.shibboleth.metadata.dom.testing;
import java.io.InputStream;
import java.io.StringReader;
@@ -33,10 +33,11 @@ import org.xmlunit.builder.Input;
import org.xmlunit.diff.Diff;
import org.xmlunit.input.NormalizedSource;
-import net.shibboleth.metadata.BaseTest;
import net.shibboleth.metadata.ErrorStatus;
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.ItemMetadata;
+import net.shibboleth.metadata.dom.DOMElementItem;
+import net.shibboleth.metadata.testing.BaseTest;
import net.shibboleth.shared.collection.ClassToInstanceMultiMap;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.logic.Constraint;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/BaseDOMTestTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/testing/BaseDOMTestTest.java
similarity index 98%
rename from mda-framework/src/test/java/net/shibboleth/metadata/dom/BaseDOMTestTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/testing/BaseDOMTestTest.java
index f677dee..26d1c19 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/BaseDOMTestTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/testing/BaseDOMTestTest.java
@@ -1,4 +1,4 @@
-package net.shibboleth.metadata.dom;
+package net.shibboleth.metadata.dom.testing;
import javax.xml.parsers.DocumentBuilderFactory;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/TerminatingStage.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/testing/package-info.java
similarity index 58%
copy from mda-framework/src/test/java/net/shibboleth/metadata/pipeline/TerminatingStage.java
copy to mda-framework/src/test/java/net/shibboleth/metadata/dom/testing/package-info.java
index 2264766..7164086 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/TerminatingStage.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/testing/package-info.java
@@ -14,29 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-package net.shibboleth.metadata.pipeline;
-
-import java.util.List;
-
-import javax.annotation.Nonnull;
-
-import net.shibboleth.metadata.Item;
-
/**
- * Stage that throws a {@link TerminationException} when it is called.
- *
- * @param <T> type of {@link Item} being processed
+ * Testing utility classes for DOM-related processing.
*/
-class TerminatingStage<T> extends AbstractStage<T> {
-
- /** Constructor. */
- public TerminatingStage() {
- setId("TerminatingStage");
- }
-
- @Override
- protected void doExecute(@Nonnull List<Item<T>> items) throws StageProcessingException {
- throw new TerminationException("from TerminatingStage");
- }
-}
+package net.shibboleth.metadata.dom.testing;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/AbstractStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/AbstractStageTest.java
index 8fbc816..480a362 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/AbstractStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/AbstractStageTest.java
@@ -24,7 +24,8 @@ import java.util.List;
import java.util.function.Predicate;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.MockItem;
+import net.shibboleth.metadata.testing.CountingStage;
+import net.shibboleth.metadata.testing.MockItem;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/CompositeStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/CompositeStageTest.java
index d4351b0..bdfcb68 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/CompositeStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/CompositeStageTest.java
@@ -12,8 +12,9 @@ import ch.qos.logback.classic.Logger;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.read.ListAppender;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.MockItem;
-import net.shibboleth.metadata.TestMarker;
+import net.shibboleth.metadata.testing.MarkerStage;
+import net.shibboleth.metadata.testing.MockItem;
+import net.shibboleth.metadata.testing.TestMarker;
import net.shibboleth.shared.collection.CollectionSupport;
public class CompositeStageTest {
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/FilesInDirectoryMultiOutputStrategyTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/FilesInDirectoryMultiOutputStrategyTest.java
index 918c495..14d9b78 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/FilesInDirectoryMultiOutputStrategyTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/FilesInDirectoryMultiOutputStrategyTest.java
@@ -28,7 +28,7 @@ import org.testng.annotations.Test;
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.ItemId;
-import net.shibboleth.metadata.MockItem;
+import net.shibboleth.metadata.testing.MockItem;
public class FilesInDirectoryMultiOutputStrategyTest {
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/ItemIdTransformStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/ItemIdTransformStageTest.java
index b5daaf7..eb54f92 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/ItemIdTransformStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/ItemIdTransformStageTest.java
@@ -26,7 +26,7 @@ import org.testng.annotations.Test;
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.ItemId;
-import net.shibboleth.metadata.MockItem;
+import net.shibboleth.metadata.testing.MockItem;
import net.shibboleth.shared.collection.CollectionSupport;
public class ItemIdTransformStageTest {
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/ItemMetadataAddingStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/ItemMetadataAddingStageTest.java
index 9635882..b7e5efc 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/ItemMetadataAddingStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/ItemMetadataAddingStageTest.java
@@ -25,9 +25,9 @@ import net.shibboleth.metadata.InfoStatus;
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.ItemMetadata;
import net.shibboleth.metadata.ItemTag;
-import net.shibboleth.metadata.MockItem;
import net.shibboleth.metadata.StatusMetadata;
import net.shibboleth.metadata.WarningStatus;
+import net.shibboleth.metadata.testing.MockItem;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/ItemMetadataFilterStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/ItemMetadataFilterStageTest.java
index 0385eab..b8378bd 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/ItemMetadataFilterStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/ItemMetadataFilterStageTest.java
@@ -25,8 +25,8 @@ import net.shibboleth.metadata.ErrorStatus;
import net.shibboleth.metadata.InfoStatus;
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.ItemMetadata;
-import net.shibboleth.metadata.MockItem;
import net.shibboleth.metadata.WarningStatus;
+import net.shibboleth.metadata.testing.MockItem;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/ItemMetadataTerminationStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/ItemMetadataTerminationStageTest.java
index a3f283c..b560e14 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/ItemMetadataTerminationStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/ItemMetadataTerminationStageTest.java
@@ -25,8 +25,8 @@ import net.shibboleth.metadata.ErrorStatus;
import net.shibboleth.metadata.InfoStatus;
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.ItemMetadata;
-import net.shibboleth.metadata.MockItem;
import net.shibboleth.metadata.WarningStatus;
+import net.shibboleth.metadata.testing.MockItem;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/ItemOrderingStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/ItemOrderingStageTest.java
index 110ba94..59d98c0 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/ItemOrderingStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/ItemOrderingStageTest.java
@@ -11,7 +11,7 @@ import org.testng.Assert;
import org.testng.annotations.Test;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.MockItem;
+import net.shibboleth.metadata.testing.MockItem;
import net.shibboleth.shared.collection.CollectionSupport;
public class ItemOrderingStageTest {
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/MultiOutputSerializationStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/MultiOutputSerializationStageTest.java
index 0c2cdba..fe0274f 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/MultiOutputSerializationStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/MultiOutputSerializationStageTest.java
@@ -34,8 +34,8 @@ import org.testng.annotations.Test;
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.ItemId;
import net.shibboleth.metadata.ItemSerializer;
-import net.shibboleth.metadata.MockItem;
import net.shibboleth.metadata.pipeline.MultiOutputSerializationStage.Destination;
+import net.shibboleth.metadata.testing.MockItem;
public class MultiOutputSerializationStageTest {
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStageTest.java
index 5b09e94..aaf41b6 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStageTest.java
@@ -27,8 +27,10 @@ import org.testng.Assert;
import org.testng.annotations.Test;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.MockItem;
import net.shibboleth.metadata.SimpleItemCollectionFactory;
+import net.shibboleth.metadata.testing.CountingStage;
+import net.shibboleth.metadata.testing.MockItem;
+import net.shibboleth.metadata.testing.TerminatingStage;
import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.collection.Pair;
import net.shibboleth.shared.component.ComponentInitializationException;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/PipelineMergeStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/PipelineMergeStageTest.java
index cc40121..b7b111b 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/PipelineMergeStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/PipelineMergeStageTest.java
@@ -28,7 +28,8 @@ import javax.annotation.Nonnull;
import net.shibboleth.metadata.DeduplicatingItemIdMergeStrategy;
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.ItemId;
-import net.shibboleth.metadata.MockItem;
+import net.shibboleth.metadata.testing.MockItem;
+import net.shibboleth.metadata.testing.TerminatingStage;
import net.shibboleth.shared.collection.CollectionSupport;
import org.testng.Assert;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/ScriptletStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/ScriptletStageTest.java
index b7fac92..d19a1e5 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/ScriptletStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/ScriptletStageTest.java
@@ -8,10 +8,10 @@ import org.testng.Assert;
import org.testng.annotations.Test;
import net.shibboleth.shared.spring.resource.ResourceHelper;
-import net.shibboleth.metadata.BaseTest;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.MockItem;
-import net.shibboleth.metadata.TestMarker;
+import net.shibboleth.metadata.testing.BaseTest;
+import net.shibboleth.metadata.testing.MockItem;
+import net.shibboleth.metadata.testing.TestMarker;
import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.scripting.EvaluableScript;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/SerializationStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/SerializationStageTest.java
index 469b423..f551e00 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/SerializationStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/SerializationStageTest.java
@@ -15,7 +15,7 @@ import org.testng.annotations.Test;
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.ItemCollectionSerializer;
-import net.shibboleth.metadata.MockItem;
+import net.shibboleth.metadata.testing.MockItem;
import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.component.ComponentInitializationException;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/SimplePipelineTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/SimplePipelineTest.java
index 3dc5996..cd29f46 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/SimplePipelineTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/SimplePipelineTest.java
@@ -23,7 +23,8 @@ import java.util.List;
import javax.annotation.Nonnull;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.MockItem;
+import net.shibboleth.metadata.testing.CountingStage;
+import net.shibboleth.metadata.testing.MockItem;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.logic.ConstraintViolationException;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/SplitMergeStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/SplitMergeStageTest.java
index d36f555..bdc5c92 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/SplitMergeStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/SplitMergeStageTest.java
@@ -27,8 +27,10 @@ import org.testng.Assert;
import org.testng.annotations.Test;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.MockItem;
import net.shibboleth.metadata.SimpleItemCollectionFactory;
+import net.shibboleth.metadata.testing.CountingStage;
+import net.shibboleth.metadata.testing.MockItem;
+import net.shibboleth.metadata.testing.TerminatingStage;
import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.component.ComponentInitializationException;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/StaticItemSourceStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/StaticItemSourceStageTest.java
index 207325c..6965b31 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/StaticItemSourceStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/StaticItemSourceStageTest.java
@@ -7,7 +7,7 @@ import org.testng.Assert;
import org.testng.annotations.Test;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.MockItem;
+import net.shibboleth.metadata.testing.MockItem;
import net.shibboleth.shared.collection.CollectionSupport;
public class StaticItemSourceStageTest {
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/StatusMetadataLoggingStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/StatusMetadataLoggingStageTest.java
index 874be9a..9f611d7 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/StatusMetadataLoggingStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/StatusMetadataLoggingStageTest.java
@@ -18,8 +18,8 @@ import net.shibboleth.metadata.ErrorStatus;
import net.shibboleth.metadata.InfoStatus;
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.ItemIdentificationStrategy;
-import net.shibboleth.metadata.MockItem;
import net.shibboleth.metadata.WarningStatus;
+import net.shibboleth.metadata.testing.MockItem;
import net.shibboleth.shared.collection.CollectionSupport;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/BaseTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/testing/BaseTest.java
similarity index 99%
rename from mda-framework/src/test/java/net/shibboleth/metadata/BaseTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/testing/BaseTest.java
index 425451a..8e31b8c 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/BaseTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/testing/BaseTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.metadata;
+package net.shibboleth.metadata.testing;
import java.io.IOException;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/BaseTestTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/testing/BaseTestTest.java
similarity index 92%
rename from mda-framework/src/test/java/net/shibboleth/metadata/BaseTestTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/testing/BaseTestTest.java
index e9ba1de..ef056ba 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/BaseTestTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/testing/BaseTestTest.java
@@ -1,5 +1,5 @@
-package net.shibboleth.metadata;
+package net.shibboleth.metadata.testing;
import java.nio.charset.StandardCharsets;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/CountingStage.java b/mda-framework/src/test/java/net/shibboleth/metadata/testing/CountingStage.java
similarity index 92%
rename from mda-framework/src/test/java/net/shibboleth/metadata/pipeline/CountingStage.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/testing/CountingStage.java
index afcff26..5ad9ef1 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/CountingStage.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/testing/CountingStage.java
@@ -15,13 +15,15 @@
* limitations under the License.
*/
-package net.shibboleth.metadata.pipeline;
+package net.shibboleth.metadata.testing;
import java.util.List;
import javax.annotation.Nonnull;
import net.shibboleth.metadata.Item;
+import net.shibboleth.metadata.pipeline.AbstractStage;
+import net.shibboleth.metadata.pipeline.StageProcessingException;
/**
* Stage that counts the number of times it was invoked and the number of items it has observed.
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/MarkerStage.java b/mda-framework/src/test/java/net/shibboleth/metadata/testing/MarkerStage.java
similarity index 83%
rename from mda-framework/src/test/java/net/shibboleth/metadata/pipeline/MarkerStage.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/testing/MarkerStage.java
index 8610f93..a8e1d9d 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/MarkerStage.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/testing/MarkerStage.java
@@ -1,11 +1,12 @@
-package net.shibboleth.metadata.pipeline;
+package net.shibboleth.metadata.testing;
import javax.annotation.Nonnull;
import javax.annotation.concurrent.GuardedBy;
import javax.annotation.concurrent.ThreadSafe;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.TestMarker;
+import net.shibboleth.metadata.pipeline.AbstractIteratingStage;
+import net.shibboleth.metadata.pipeline.StageProcessingException;
/**
* A stage which adds a sequentially numbered {link @TestMarker} to item metadata.
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/MockItem.java b/mda-framework/src/test/java/net/shibboleth/metadata/testing/MockItem.java
similarity index 93%
rename from mda-framework/src/test/java/net/shibboleth/metadata/MockItem.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/testing/MockItem.java
index 09889a3..653aa54 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/MockItem.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/testing/MockItem.java
@@ -15,13 +15,16 @@
* limitations under the License.
*/
-package net.shibboleth.metadata;
+package net.shibboleth.metadata.testing;
import java.util.Objects;
import javax.annotation.Nonnull;
import javax.annotation.concurrent.NotThreadSafe;
+import net.shibboleth.metadata.AbstractItem;
+import net.shibboleth.metadata.Item;
+
/** A mock implementation of {@link Item}. */
@NotThreadSafe
public class MockItem extends AbstractItem<String> {
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/MockItemTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/testing/MockItemTest.java
similarity index 89%
rename from mda-framework/src/test/java/net/shibboleth/metadata/MockItemTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/testing/MockItemTest.java
index ed7a553..de5cde9 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/MockItemTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/testing/MockItemTest.java
@@ -1,5 +1,5 @@
-package net.shibboleth.metadata;
+package net.shibboleth.metadata.testing;
import org.testng.annotations.Test;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/TerminatingStage.java b/mda-framework/src/test/java/net/shibboleth/metadata/testing/TerminatingStage.java
similarity index 82%
copy from mda-framework/src/test/java/net/shibboleth/metadata/pipeline/TerminatingStage.java
copy to mda-framework/src/test/java/net/shibboleth/metadata/testing/TerminatingStage.java
index 2264766..8849432 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/TerminatingStage.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/testing/TerminatingStage.java
@@ -15,20 +15,23 @@
* limitations under the License.
*/
-package net.shibboleth.metadata.pipeline;
+package net.shibboleth.metadata.testing;
import java.util.List;
import javax.annotation.Nonnull;
import net.shibboleth.metadata.Item;
+import net.shibboleth.metadata.pipeline.AbstractStage;
+import net.shibboleth.metadata.pipeline.StageProcessingException;
+import net.shibboleth.metadata.pipeline.TerminationException;
/**
* Stage that throws a {@link TerminationException} when it is called.
*
* @param <T> type of {@link Item} being processed
*/
-class TerminatingStage<T> extends AbstractStage<T> {
+public class TerminatingStage<T> extends AbstractStage<T> {
/** Constructor. */
public TerminatingStage() {
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/TestMarker.java b/mda-framework/src/test/java/net/shibboleth/metadata/testing/TestMarker.java
similarity index 95%
rename from mda-framework/src/test/java/net/shibboleth/metadata/TestMarker.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/testing/TestMarker.java
index 2060858..43674d1 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/TestMarker.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/testing/TestMarker.java
@@ -15,11 +15,12 @@
* limitations under the License.
*/
-package net.shibboleth.metadata;
+package net.shibboleth.metadata.testing;
import javax.annotation.Nonnull;
import javax.annotation.concurrent.Immutable;
+import net.shibboleth.metadata.ItemMetadata;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.StringSupport;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/TerminatingStage.java b/mda-framework/src/test/java/net/shibboleth/metadata/testing/package-info.java
similarity index 58%
rename from mda-framework/src/test/java/net/shibboleth/metadata/pipeline/TerminatingStage.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/testing/package-info.java
index 2264766..d827667 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/TerminatingStage.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/testing/package-info.java
@@ -15,28 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.metadata.pipeline;
-
-import java.util.List;
-
-import javax.annotation.Nonnull;
-
-import net.shibboleth.metadata.Item;
-
/**
- * Stage that throws a {@link TerminationException} when it is called.
- *
- * @param <T> type of {@link Item} being processed
+ * Test utility classes for the Metadata Aggregator.
*/
-class TerminatingStage<T> extends AbstractStage<T> {
-
- /** Constructor. */
- public TerminatingStage() {
- setId("TerminatingStage");
- }
-
- @Override
- protected void doExecute(@Nonnull List<Item<T>> items) throws StageProcessingException {
- throw new TerminationException("from TerminatingStage");
- }
-}
+package net.shibboleth.metadata.testing;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/validate/AcceptAllValidatorTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/validate/AcceptAllValidatorTest.java
index 812feb3..69f6b7b 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/validate/AcceptAllValidatorTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/validate/AcceptAllValidatorTest.java
@@ -8,7 +8,7 @@ import org.testng.annotations.Test;
import net.shibboleth.metadata.ErrorStatus;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.MockItem;
+import net.shibboleth.metadata.testing.MockItem;
import net.shibboleth.metadata.validate.Validator.Action;
public class AcceptAllValidatorTest {
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/validate/BaseValidatorTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/validate/BaseValidatorTest.java
index 9fbcb4a..ec9fb95 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/validate/BaseValidatorTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/validate/BaseValidatorTest.java
@@ -10,7 +10,7 @@ import org.testng.annotations.Test;
import net.shibboleth.metadata.ErrorStatus;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.MockItem;
+import net.shibboleth.metadata.testing.MockItem;
import net.shibboleth.metadata.validate.Validator.Action;
public class BaseValidatorTest {
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/validate/RejectAllValidatorTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/validate/RejectAllValidatorTest.java
index 9ea17f8..dd73c5c 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/validate/RejectAllValidatorTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/validate/RejectAllValidatorTest.java
@@ -8,7 +8,7 @@ import org.testng.annotations.Test;
import net.shibboleth.metadata.ErrorStatus;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.MockItem;
+import net.shibboleth.metadata.testing.MockItem;
import net.shibboleth.metadata.validate.Validator.Action;
public class RejectAllValidatorTest {
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/validate/ValidatorSequenceTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/validate/ValidatorSequenceTest.java
index baad4e8..4d4d9e6 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/validate/ValidatorSequenceTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/validate/ValidatorSequenceTest.java
@@ -9,7 +9,7 @@ import org.testng.annotations.Test;
import net.shibboleth.metadata.ErrorStatus;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.MockItem;
+import net.shibboleth.metadata.testing.MockItem;
import net.shibboleth.metadata.validate.Validator.Action;
public class ValidatorSequenceTest {
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/validate/string/AcceptStringRegexValidatorTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/validate/string/AcceptStringRegexValidatorTest.java
index f04eb47..903b57f 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/validate/string/AcceptStringRegexValidatorTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/validate/string/AcceptStringRegexValidatorTest.java
@@ -8,7 +8,7 @@ import org.testng.annotations.Test;
import net.shibboleth.metadata.ErrorStatus;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.MockItem;
+import net.shibboleth.metadata.testing.MockItem;
import net.shibboleth.metadata.validate.Validator;
import net.shibboleth.metadata.validate.Validator.Action;
import net.shibboleth.shared.component.ComponentInitializationException;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/validate/string/AcceptStringValueValidatorTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/validate/string/AcceptStringValueValidatorTest.java
index 5a9cd2d..3c6bcc1 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/validate/string/AcceptStringValueValidatorTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/validate/string/AcceptStringValueValidatorTest.java
@@ -8,7 +8,7 @@ import org.testng.annotations.Test;
import net.shibboleth.metadata.ErrorStatus;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.MockItem;
+import net.shibboleth.metadata.testing.MockItem;
import net.shibboleth.metadata.validate.Validator;
import net.shibboleth.metadata.validate.Validator.Action;
import net.shibboleth.shared.component.ComponentInitializationException;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/validate/string/RejectStringRegexValidatorTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/validate/string/RejectStringRegexValidatorTest.java
index fc6cb93..45f51a6 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/validate/string/RejectStringRegexValidatorTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/validate/string/RejectStringRegexValidatorTest.java
@@ -8,7 +8,7 @@ import org.testng.annotations.Test;
import net.shibboleth.metadata.ErrorStatus;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.MockItem;
+import net.shibboleth.metadata.testing.MockItem;
import net.shibboleth.metadata.validate.Validator;
import net.shibboleth.metadata.validate.Validator.Action;
import net.shibboleth.shared.component.ComponentInitializationException;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/validate/string/RejectStringValueValidatorTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/validate/string/RejectStringValueValidatorTest.java
index 4563c69..ca1fd5d 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/validate/string/RejectStringValueValidatorTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/validate/string/RejectStringValueValidatorTest.java
@@ -8,7 +8,7 @@ import org.testng.annotations.Test;
import net.shibboleth.metadata.ErrorStatus;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.MockItem;
+import net.shibboleth.metadata.testing.MockItem;
import net.shibboleth.metadata.validate.Validator;
import net.shibboleth.metadata.validate.Validator.Action;
import net.shibboleth.shared.component.ComponentInitializationException;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/validate/x509/BaseX509ValidatorTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/validate/x509/BaseX509ValidatorTest.java
index 5041fc3..a409be5 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/validate/x509/BaseX509ValidatorTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/validate/x509/BaseX509ValidatorTest.java
@@ -27,11 +27,11 @@ import javax.annotation.Nonnull;
import org.springframework.core.io.Resource;
import org.testng.Assert;
-import net.shibboleth.metadata.BaseTest;
import net.shibboleth.metadata.ErrorStatus;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.MockItem;
import net.shibboleth.metadata.WarningStatus;
+import net.shibboleth.metadata.testing.BaseTest;
+import net.shibboleth.metadata.testing.MockItem;
import net.shibboleth.metadata.validate.Validator;
public abstract class BaseX509ValidatorTest extends BaseTest {
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/validate/x509/X509DSADetectorTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/validate/x509/X509DSADetectorTest.java
index 2a8fc2d..0c414e8 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/validate/x509/X509DSADetectorTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/validate/x509/X509DSADetectorTest.java
@@ -7,7 +7,7 @@ import org.testng.Assert;
import org.testng.annotations.Test;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.MockItem;
+import net.shibboleth.metadata.testing.MockItem;
import net.shibboleth.metadata.validate.Validator.Action;
public class X509DSADetectorTest extends BaseX509ValidatorTest {
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAKeyLengthValidatorTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAKeyLengthValidatorTest.java
index 1bafc9a..f95c330 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAKeyLengthValidatorTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAKeyLengthValidatorTest.java
@@ -21,7 +21,7 @@ package net.shibboleth.metadata.validate.x509;
import java.security.cert.X509Certificate;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.MockItem;
+import net.shibboleth.metadata.testing.MockItem;
import net.shibboleth.metadata.validate.Validator;
import org.testng.Assert;
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidatorTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidatorTest.java
index 444c1c6..fb1b610 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidatorTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidatorTest.java
@@ -25,7 +25,7 @@ import org.testng.Assert;
import org.testng.annotations.Test;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.MockItem;
+import net.shibboleth.metadata.testing.MockItem;
import net.shibboleth.metadata.validate.Validator;
import net.shibboleth.shared.component.ComponentInitializationException;
diff --git a/mda-keylists-rsa/src/test/java/net/shibboleth/metadata/validate/x509/MDA183Test.java b/mda-keylists-rsa/src/test/java/net/shibboleth/metadata/validate/x509/MDA183Test.java
index 277fd7b..b6577b0 100644
--- a/mda-keylists-rsa/src/test/java/net/shibboleth/metadata/validate/x509/MDA183Test.java
+++ b/mda-keylists-rsa/src/test/java/net/shibboleth/metadata/validate/x509/MDA183Test.java
@@ -22,11 +22,11 @@ import org.springframework.core.io.Resource;
import org.testng.Assert;
import org.testng.annotations.Test;
-import net.shibboleth.metadata.BaseTest;
import net.shibboleth.metadata.ErrorStatus;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.MockItem;
import net.shibboleth.metadata.pipeline.StageProcessingException;
+import net.shibboleth.metadata.testing.BaseTest;
+import net.shibboleth.metadata.testing.MockItem;
import net.shibboleth.metadata.validate.Validator;
public class MDA183Test extends BaseTest {
diff --git a/mda-keylists-rsa/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidatorTest.java b/mda-keylists-rsa/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidatorTest.java
index 63bf0a4..9464ee2 100644
--- a/mda-keylists-rsa/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidatorTest.java
+++ b/mda-keylists-rsa/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidatorTest.java
@@ -25,7 +25,7 @@ import org.testng.Assert;
import org.testng.annotations.Test;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.MockItem;
+import net.shibboleth.metadata.testing.MockItem;
import net.shibboleth.metadata.validate.Validator;
public class X509RSAOpenSSLBlacklistValidatorTest extends BaseX509ValidatorTest {
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list