[java-opensaml] branch main updated: Initial migration of non-core test APIs into testing module.
Scott Cantor
cantor.2 at osu.edu
Thu Sep 15 13:59:35 UTC 2022
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=d3e40cb14949cbb4d516c73463a0fd9fd57e9138
The following commit(s) were added to refs/heads/main by this push:
new d3e40cb14 Initial migration of non-core test APIs into testing module.
d3e40cb14 is described below
commit d3e40cb14949cbb4d516c73463a0fd9fd57e9138
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Sep 15 09:59:32 2022 -0400
Initial migration of non-core test APIs into testing module.
---
opensaml-bom/pom.xml | 7 +++
opensaml-core/pom.xml | 1 -
opensaml-parent/pom.xml | 2 +
opensaml-profile-api/pom.xml | 2 -
opensaml-profile-impl/pom.xml | 3 +-
.../profile/action/impl/DecodeMessageTest.java | 1 -
.../profile/action/impl/EncodeMessageTest.java | 1 -
.../profile/action/impl/SetProfileIdTest.java | 1 -
opensaml-saml-api/pom.xml | 8 ---
opensaml-saml-impl/pom.xml | 19 +------
opensaml-security-impl/pom.xml | 3 +-
opensaml-soap-impl/pom.xml | 3 +-
opensaml-storage-impl/pom.xml | 11 +---
opensaml-testing/.checkstyle | 15 ++++++
opensaml-testing/.gitignore | 2 +
{opensaml-saml-api => opensaml-testing}/pom.xml | 58 ++++++++++------------
.../profile/testing/ActionTestingSupport.java | 0
.../profile/testing/RequestContextBuilder.java | 0
.../saml1/testing/SAML1ActionTestingSupport.java | 0
.../saml2/testing/SAML2ActionTestingSupport.java | 0
.../opensaml/security/testing/MockTrustEngine.java | 0
.../testing/SecurityProviderTestSupport.java | 0
.../storage/testing/StorageServiceTest.java | 0
opensaml-xmlsec-api/pom.xml | 10 ----
opensaml-xmlsec-impl/pom.xml | 3 +-
.../xmlsec/algorithm/AlgorithmDescriptorsTest.java | 0
.../xmlsec/algorithm/AlgorithmRegistryTest.java | 0
.../xmlsec/algorithm/AlgorithmSupportTest.java | 0
28 files changed, 59 insertions(+), 91 deletions(-)
diff --git a/opensaml-bom/pom.xml b/opensaml-bom/pom.xml
index 3d71b1dd2..c33c17e94 100644
--- a/opensaml-bom/pom.xml
+++ b/opensaml-bom/pom.xml
@@ -118,6 +118,13 @@
<artifactId>opensaml-xmlsec-impl</artifactId>
<version>${project.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>opensaml-testing</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --git a/opensaml-core/pom.xml b/opensaml-core/pom.xml
index f8a41cb04..35f39848c 100644
--- a/opensaml-core/pom.xml
+++ b/opensaml-core/pom.xml
@@ -42,7 +42,6 @@
<!-- Runtime Dependencies -->
<!-- Test Dependencies -->
-
</dependencies>
<build>
diff --git a/opensaml-parent/pom.xml b/opensaml-parent/pom.xml
index b1fcaa6f0..315528364 100644
--- a/opensaml-parent/pom.xml
+++ b/opensaml-parent/pom.xml
@@ -50,6 +50,8 @@
<module>../opensaml-spring</module>
+ <module>../opensaml-testing</module>
+
<module>../opensaml-bom</module>
<module>../opensaml-tests-bom</module>
</modules>
diff --git a/opensaml-profile-api/pom.xml b/opensaml-profile-api/pom.xml
index af359bc9f..86c25f4c5 100644
--- a/opensaml-profile-api/pom.xml
+++ b/opensaml-profile-api/pom.xml
@@ -80,8 +80,6 @@
<artifactId>shib-spring</artifactId>
<scope>test</scope>
</dependency>
-
- <!-- Managed Dependencies -->
</dependencies>
<scm>
diff --git a/opensaml-profile-impl/pom.xml b/opensaml-profile-impl/pom.xml
index 6668b72b8..2201e2654 100644
--- a/opensaml-profile-impl/pom.xml
+++ b/opensaml-profile-impl/pom.xml
@@ -83,9 +83,8 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>opensaml-profile-api</artifactId>
+ <artifactId>opensaml-testing</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/opensaml-profile-impl/src/test/java/org/opensaml/profile/action/impl/DecodeMessageTest.java b/opensaml-profile-impl/src/test/java/org/opensaml/profile/action/impl/DecodeMessageTest.java
index 3c65f873e..057d31e20 100644
--- a/opensaml-profile-impl/src/test/java/org/opensaml/profile/action/impl/DecodeMessageTest.java
+++ b/opensaml-profile-impl/src/test/java/org/opensaml/profile/action/impl/DecodeMessageTest.java
@@ -24,7 +24,6 @@ import org.opensaml.messaging.decoder.AbstractMessageDecoder;
import org.opensaml.messaging.decoder.MessageDecoder;
import org.opensaml.messaging.decoder.MessageDecodingException;
import org.opensaml.profile.action.EventIds;
-import org.opensaml.profile.action.impl.DecodeMessage;
import org.opensaml.profile.context.ProfileRequestContext;
import org.opensaml.profile.testing.ActionTestingSupport;
import org.testng.Assert;
diff --git a/opensaml-profile-impl/src/test/java/org/opensaml/profile/action/impl/EncodeMessageTest.java b/opensaml-profile-impl/src/test/java/org/opensaml/profile/action/impl/EncodeMessageTest.java
index 3df254e74..95c318925 100644
--- a/opensaml-profile-impl/src/test/java/org/opensaml/profile/action/impl/EncodeMessageTest.java
+++ b/opensaml-profile-impl/src/test/java/org/opensaml/profile/action/impl/EncodeMessageTest.java
@@ -30,7 +30,6 @@ import org.opensaml.messaging.encoder.AbstractMessageEncoder;
import org.opensaml.messaging.encoder.MessageEncoder;
import org.opensaml.messaging.encoder.MessageEncodingException;
import org.opensaml.profile.action.EventIds;
-import org.opensaml.profile.action.impl.EncodeMessage;
import org.opensaml.profile.context.ProfileRequestContext;
import org.opensaml.profile.testing.ActionTestingSupport;
import org.testng.Assert;
diff --git a/opensaml-profile-impl/src/test/java/org/opensaml/profile/action/impl/SetProfileIdTest.java b/opensaml-profile-impl/src/test/java/org/opensaml/profile/action/impl/SetProfileIdTest.java
index 2fce6858c..a38175083 100644
--- a/opensaml-profile-impl/src/test/java/org/opensaml/profile/action/impl/SetProfileIdTest.java
+++ b/opensaml-profile-impl/src/test/java/org/opensaml/profile/action/impl/SetProfileIdTest.java
@@ -17,7 +17,6 @@
package org.opensaml.profile.action.impl;
-import org.opensaml.profile.action.impl.SetProfileId;
import org.opensaml.profile.context.EventContext;
import org.opensaml.profile.context.ProfileRequestContext;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
diff --git a/opensaml-saml-api/pom.xml b/opensaml-saml-api/pom.xml
index 5bb82eca5..be229a846 100644
--- a/opensaml-saml-api/pom.xml
+++ b/opensaml-saml-api/pom.xml
@@ -87,14 +87,6 @@
<!-- Runtime Dependencies -->
<!-- Test Dependencies -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>opensaml-profile-api</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
</dependencies>
<scm>
diff --git a/opensaml-saml-impl/pom.xml b/opensaml-saml-impl/pom.xml
index 9244feedf..470c9ce25 100644
--- a/opensaml-saml-impl/pom.xml
+++ b/opensaml-saml-impl/pom.xml
@@ -167,30 +167,15 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>opensaml-messaging-api</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>opensaml-profile-api</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>opensaml-saml-api</artifactId>
+ <artifactId>opensaml-security-api</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>opensaml-security-api</artifactId>
+ <artifactId>opensaml-testing</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/opensaml-security-impl/pom.xml b/opensaml-security-impl/pom.xml
index 3b9dac453..de4f02fc8 100644
--- a/opensaml-security-impl/pom.xml
+++ b/opensaml-security-impl/pom.xml
@@ -86,9 +86,8 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>opensaml-security-api</artifactId>
+ <artifactId>opensaml-testing</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/opensaml-soap-impl/pom.xml b/opensaml-soap-impl/pom.xml
index 7917a4767..518a2695a 100644
--- a/opensaml-soap-impl/pom.xml
+++ b/opensaml-soap-impl/pom.xml
@@ -96,9 +96,8 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>opensaml-profile-api</artifactId>
+ <artifactId>opensaml-testing</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/opensaml-storage-impl/pom.xml b/opensaml-storage-impl/pom.xml
index fe70e0e25..5f0d86314 100644
--- a/opensaml-storage-impl/pom.xml
+++ b/opensaml-storage-impl/pom.xml
@@ -94,17 +94,8 @@
<!-- Test Dependencies -->
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>opensaml-storage-api</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>opensaml-profile-api</artifactId>
+ <artifactId>opensaml-testing</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/opensaml-testing/.checkstyle b/opensaml-testing/.checkstyle
new file mode 100644
index 000000000..c04bf97d7
--- /dev/null
+++ b/opensaml-testing/.checkstyle
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
+
+ <local-check-config name="Shibboleth Checkstyle" location="/opensaml-parent/resources/checkstyle/checkstyle.xml" type="project" description="">
+ <additional-data name="cache-file" value="true"/>
+ <additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
+ <additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
+ </local-check-config>
+
+ <fileset name="main source" enabled="true" check-config-name="Shibboleth Checkstyle" local="true">
+ <file-match-pattern match-pattern="src/main/java/.*\.java$" include-pattern="true"/>
+ </fileset>
+
+</fileset-config>
diff --git a/opensaml-testing/.gitignore b/opensaml-testing/.gitignore
new file mode 100644
index 000000000..1df25bfc8
--- /dev/null
+++ b/opensaml-testing/.gitignore
@@ -0,0 +1,2 @@
+/test-output
+/target
diff --git a/opensaml-saml-api/pom.xml b/opensaml-testing/pom.xml
similarity index 67%
copy from opensaml-saml-api/pom.xml
copy to opensaml-testing/pom.xml
index 5bb82eca5..6bf30a137 100644
--- a/opensaml-saml-api/pom.xml
+++ b/opensaml-testing/pom.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -11,13 +11,13 @@
<relativePath>../opensaml-parent</relativePath>
</parent>
- <name>OpenSAML :: SAML Provider API</name>
- <description>SAML Provider API</description>
- <artifactId>opensaml-saml-api</artifactId>
+ <name>OpenSAML :: Testing</name>
+ <description>Testing APIs</description>
+ <artifactId>opensaml-testing</artifactId>
<packaging>jar</packaging>
<properties>
- <automatic.module.name>org.opensaml.saml</automatic.module.name>
+ <automatic.module.name>org.opensaml.testing</automatic.module.name>
</properties>
<dependencies>
@@ -42,59 +42,53 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>opensaml-security-api</artifactId>
+ <artifactId>opensaml-saml-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>opensaml-soap-api</artifactId>
+ <artifactId>opensaml-security-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>opensaml-xmlsec-api</artifactId>
+ <artifactId>opensaml-storage-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-security</artifactId>
- </dependency>
-
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <!-- Normally test scope. -->
+ <scope>compile</scope>
+ </dependency>
+
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
+ <groupId>org.xmlunit</groupId>
+ <artifactId>xmlunit-core</artifactId>
+ <!-- Normally test scope. -->
+ <scope>compile</scope>
</dependency>
-
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
+ <groupId>org.xmlunit</groupId>
+ <artifactId>xmlunit-matchers</artifactId>
+ <!-- Normally test scope. -->
+ <scope>compile</scope>
</dependency>
-
+
<dependency>
- <groupId>org.apache.santuario</groupId>
- <artifactId>xmlsec</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<!-- Provided Dependencies -->
- <dependency>
- <groupId>jakarta.servlet</groupId>
- <artifactId>jakarta.servlet-api</artifactId>
- </dependency>
<!-- Runtime Dependencies -->
<!-- Test Dependencies -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>opensaml-profile-api</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
+
</dependencies>
<scm>
diff --git a/opensaml-profile-api/src/test/java/org/opensaml/profile/testing/ActionTestingSupport.java b/opensaml-testing/src/main/java/org/opensaml/profile/testing/ActionTestingSupport.java
similarity index 100%
rename from opensaml-profile-api/src/test/java/org/opensaml/profile/testing/ActionTestingSupport.java
rename to opensaml-testing/src/main/java/org/opensaml/profile/testing/ActionTestingSupport.java
diff --git a/opensaml-profile-api/src/test/java/org/opensaml/profile/testing/RequestContextBuilder.java b/opensaml-testing/src/main/java/org/opensaml/profile/testing/RequestContextBuilder.java
similarity index 100%
rename from opensaml-profile-api/src/test/java/org/opensaml/profile/testing/RequestContextBuilder.java
rename to opensaml-testing/src/main/java/org/opensaml/profile/testing/RequestContextBuilder.java
diff --git a/opensaml-saml-api/src/test/java/org/opensaml/saml/saml1/testing/SAML1ActionTestingSupport.java b/opensaml-testing/src/main/java/org/opensaml/saml/saml1/testing/SAML1ActionTestingSupport.java
similarity index 100%
rename from opensaml-saml-api/src/test/java/org/opensaml/saml/saml1/testing/SAML1ActionTestingSupport.java
rename to opensaml-testing/src/main/java/org/opensaml/saml/saml1/testing/SAML1ActionTestingSupport.java
diff --git a/opensaml-saml-api/src/test/java/org/opensaml/saml/saml2/testing/SAML2ActionTestingSupport.java b/opensaml-testing/src/main/java/org/opensaml/saml/saml2/testing/SAML2ActionTestingSupport.java
similarity index 100%
rename from opensaml-saml-api/src/test/java/org/opensaml/saml/saml2/testing/SAML2ActionTestingSupport.java
rename to opensaml-testing/src/main/java/org/opensaml/saml/saml2/testing/SAML2ActionTestingSupport.java
diff --git a/opensaml-security-api/src/test/java/org/opensaml/security/testing/MockTrustEngine.java b/opensaml-testing/src/main/java/org/opensaml/security/testing/MockTrustEngine.java
similarity index 100%
rename from opensaml-security-api/src/test/java/org/opensaml/security/testing/MockTrustEngine.java
rename to opensaml-testing/src/main/java/org/opensaml/security/testing/MockTrustEngine.java
diff --git a/opensaml-security-api/src/test/java/org/opensaml/security/testing/SecurityProviderTestSupport.java b/opensaml-testing/src/main/java/org/opensaml/security/testing/SecurityProviderTestSupport.java
similarity index 100%
rename from opensaml-security-api/src/test/java/org/opensaml/security/testing/SecurityProviderTestSupport.java
rename to opensaml-testing/src/main/java/org/opensaml/security/testing/SecurityProviderTestSupport.java
diff --git a/opensaml-storage-api/src/test/java/org/opensaml/storage/testing/StorageServiceTest.java b/opensaml-testing/src/main/java/org/opensaml/storage/testing/StorageServiceTest.java
similarity index 100%
rename from opensaml-storage-api/src/test/java/org/opensaml/storage/testing/StorageServiceTest.java
rename to opensaml-testing/src/main/java/org/opensaml/storage/testing/StorageServiceTest.java
diff --git a/opensaml-xmlsec-api/pom.xml b/opensaml-xmlsec-api/pom.xml
index d015be2d5..7773ee7b5 100644
--- a/opensaml-xmlsec-api/pom.xml
+++ b/opensaml-xmlsec-api/pom.xml
@@ -67,16 +67,6 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>opensaml-security-api</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
-
</dependencies>
<scm>
diff --git a/opensaml-xmlsec-impl/pom.xml b/opensaml-xmlsec-impl/pom.xml
index 4ccb509e1..284fe26cc 100644
--- a/opensaml-xmlsec-impl/pom.xml
+++ b/opensaml-xmlsec-impl/pom.xml
@@ -80,9 +80,8 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>opensaml-security-api</artifactId>
+ <artifactId>opensaml-testing</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/opensaml-xmlsec-api/src/test/java/org/opensaml/xmlsec/algorithm/AlgorithmDescriptorsTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/algorithm/AlgorithmDescriptorsTest.java
similarity index 100%
rename from opensaml-xmlsec-api/src/test/java/org/opensaml/xmlsec/algorithm/AlgorithmDescriptorsTest.java
rename to opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/algorithm/AlgorithmDescriptorsTest.java
diff --git a/opensaml-xmlsec-api/src/test/java/org/opensaml/xmlsec/algorithm/AlgorithmRegistryTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/algorithm/AlgorithmRegistryTest.java
similarity index 100%
rename from opensaml-xmlsec-api/src/test/java/org/opensaml/xmlsec/algorithm/AlgorithmRegistryTest.java
rename to opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/algorithm/AlgorithmRegistryTest.java
diff --git a/opensaml-xmlsec-api/src/test/java/org/opensaml/xmlsec/algorithm/AlgorithmSupportTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/algorithm/AlgorithmSupportTest.java
similarity index 100%
rename from opensaml-xmlsec-api/src/test/java/org/opensaml/xmlsec/algorithm/AlgorithmSupportTest.java
rename to opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/algorithm/AlgorithmSupportTest.java
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list