[java-shib-attribute] branch main updated: Add shib-attribute-testing module.
Scott Cantor
cantor.2 at osu.edu
Tue Sep 20 14:22:54 UTC 2022
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-shib-attribute.
View the commit online:
http://git.shibboleth.net/view/?p=java-shib-attribute.git;a=commit;h=6b729cd70918979a3c9fe5345bc05b2d703bc7e5
The following commit(s) were added to refs/heads/main by this push:
new 6b729cd70 Add shib-attribute-testing module.
6b729cd70 is described below
commit 6b729cd70918979a3c9fe5345bc05b2d703bc7e5
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Sep 20 10:22:51 2022 -0400
Add shib-attribute-testing module.
---
pom.xml | 3 +-
shib-attribute-bom/pom.xml | 7 ++
shib-attribute-filter-impl/pom.xml | 19 +----
.../filter/tests}/AttributeFilterPolicyTest.java | 5 +-
.../attribute/filter/tests}/AttributeRuleTest.java | 3 +-
.../tests}/AttributeValueFilterPolicyTest.java | 4 +-
shib-attribute-filter-spring/pom.xml | 11 +--
shib-attribute-resolver-impl/pom.xml | 6 +-
.../tests}/AttributeResolverWorkContextTest.java | 3 +-
.../tests}/PluginDependencySupportTest.java | 5 +-
.../tests}/ResolvedAttributeDefinitionTest.java | 5 +-
.../resolver/tests}/ResolvedDataConnectorTest.java | 10 +--
shib-attribute-resolver-spring/pom.xml | 22 ++---
.../dc/http/impl/HTTPDataConnectorParserTest.java | 2 +-
.../StorageServiceDataConnectorParserTest.java | 2 +-
.../idp/attribute/resolver/spring/dc/http/test.js | 20 +++++
.../attribute/resolver/spring/dc/http/testsize.js | 20 +++++
.../attribute/resolver/spring/dc/storage/test.js | 18 +++++
.../attribute/resolver/spring/dc/storage/test.json | 10 +++
shib-attribute-testing/.checkstyle | 15 ++++
shib-attribute-testing/pom.xml | 63 +++++++++++++++
.../idp/attribute/filter/testing/MockMatcher.java | 0
.../filter/testing/MockPolicyRequirementRule.java | 1 -
.../idp/attribute/filter/testing/package-info.java | 0
.../impl/testing/SAMLAttributeDataConnector.java | 0
.../resolver/dc/impl/testing/package-info.java | 0
.../resolver/testing/MockAttributeDefinition.java | 0
.../resolver/testing/MockDataConnector.java | 0
.../testing/MockStaticAttributeDefinition.java | 0
.../resolver/testing/MockStaticDataConnector.java | 0
.../resolver/testing/ResolverTestSupport.java | 0
.../attribute/resolver/testing/TestSources.java | 0
.../attribute/resolver/testing/package-info.java | 0
shib-attribute-tests-bom/pom.xml | 93 ----------------------
34 files changed, 191 insertions(+), 156 deletions(-)
diff --git a/pom.xml b/pom.xml
index 841cca62a..4328cf36b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,8 +35,9 @@
<module>shib-attribute-resolver-spring</module>
<module>shib-attribute-filter-spring</module>
+ <module>shib-attribute-testing</module>
+
<module>shib-attribute-bom</module>
- <module>shib-attribute-tests-bom</module>
</modules>
<properties>
diff --git a/shib-attribute-bom/pom.xml b/shib-attribute-bom/pom.xml
index a41f6171b..cc73cd219 100644
--- a/shib-attribute-bom/pom.xml
+++ b/shib-attribute-bom/pom.xml
@@ -67,6 +67,13 @@
<artifactId>shib-attribute-filter-spring</artifactId>
<version>${project.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shib-attribute-testing</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --git a/shib-attribute-filter-impl/pom.xml b/shib-attribute-filter-impl/pom.xml
index 2416b4a8a..b2f230bb6 100644
--- a/shib-attribute-filter-impl/pom.xml
+++ b/shib-attribute-filter-impl/pom.xml
@@ -100,25 +100,8 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>shib-attribute-filter-api</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>shib-attribute-resolver-api</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>shib-attribute-resolver-impl</artifactId>
+ <artifactId>shib-attribute-testing</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/AttributeFilterPolicyTest.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/tests/AttributeFilterPolicyTest.java
similarity index 97%
rename from shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/AttributeFilterPolicyTest.java
rename to shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/tests/AttributeFilterPolicyTest.java
index ab2de7407..55f91fd3d 100644
--- a/shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/AttributeFilterPolicyTest.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/tests/AttributeFilterPolicyTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.attribute.filter;
+package net.shibboleth.idp.attribute.filter.tests;
import java.util.Arrays;
import java.util.Collection;
@@ -23,6 +23,9 @@ import java.util.Collections;
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.StringAttributeValue;
+import net.shibboleth.idp.attribute.filter.AttributeFilterException;
+import net.shibboleth.idp.attribute.filter.AttributeFilterPolicy;
+import net.shibboleth.idp.attribute.filter.AttributeRule;
import net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate;
import net.shibboleth.idp.attribute.filter.context.AttributeFilterContext;
import net.shibboleth.idp.attribute.filter.context.AttributeFilterWorkContext;
diff --git a/shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/AttributeRuleTest.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/tests/AttributeRuleTest.java
similarity index 94%
rename from shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/AttributeRuleTest.java
rename to shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/tests/AttributeRuleTest.java
index 906089f2e..cc6b507cd 100644
--- a/shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/AttributeRuleTest.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/tests/AttributeRuleTest.java
@@ -15,8 +15,9 @@
* limitations under the License.
*/
-package net.shibboleth.idp.attribute.filter;
+package net.shibboleth.idp.attribute.filter.tests;
+import net.shibboleth.idp.attribute.filter.AttributeRule;
import net.shibboleth.idp.attribute.filter.testing.MockMatcher;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
diff --git a/shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/AttributeValueFilterPolicyTest.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/tests/AttributeValueFilterPolicyTest.java
similarity index 98%
rename from shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/AttributeValueFilterPolicyTest.java
rename to shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/tests/AttributeValueFilterPolicyTest.java
index 5a5343025..df757bcb1 100644
--- a/shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/AttributeValueFilterPolicyTest.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/tests/AttributeValueFilterPolicyTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.attribute.filter;
+package net.shibboleth.idp.attribute.filter.tests;
import java.util.Arrays;
import java.util.Collection;
@@ -23,6 +23,8 @@ import java.util.Collection;
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.IdPAttributeValue;
import net.shibboleth.idp.attribute.StringAttributeValue;
+import net.shibboleth.idp.attribute.filter.AttributeRule;
+import net.shibboleth.idp.attribute.filter.Matcher;
import net.shibboleth.idp.attribute.filter.context.AttributeFilterContext;
import net.shibboleth.idp.attribute.filter.context.AttributeFilterWorkContext;
import net.shibboleth.idp.attribute.filter.testing.MockMatcher;
diff --git a/shib-attribute-filter-spring/pom.xml b/shib-attribute-filter-spring/pom.xml
index 35fd0107c..f2d824112 100644
--- a/shib-attribute-filter-spring/pom.xml
+++ b/shib-attribute-filter-spring/pom.xml
@@ -89,18 +89,11 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>shib-attribute-resolver-api</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>shib-attribute-resolver-impl</artifactId>
+ <artifactId>shib-attribute-testing</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/shib-attribute-resolver-impl/pom.xml b/shib-attribute-resolver-impl/pom.xml
index bdb99c91d..a1a8078d0 100644
--- a/shib-attribute-resolver-impl/pom.xml
+++ b/shib-attribute-resolver-impl/pom.xml
@@ -98,15 +98,13 @@
<!-- Test Dependencies -->
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>shib-attribute-resolver-api</artifactId>
+ <artifactId>shib-attribute-impl</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>shib-attribute-impl</artifactId>
+ <artifactId>shib-attribute-testing</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/shib-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolverWorkContextTest.java b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/tests/AttributeResolverWorkContextTest.java
similarity index 98%
rename from shib-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolverWorkContextTest.java
rename to shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/tests/AttributeResolverWorkContextTest.java
index 7469bec57..0f1385280 100644
--- a/shib-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolverWorkContextTest.java
+++ b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/tests/AttributeResolverWorkContextTest.java
@@ -15,13 +15,14 @@
* limitations under the License.
*/
-package net.shibboleth.idp.attribute.resolver;
+package net.shibboleth.idp.attribute.resolver.tests;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import net.shibboleth.idp.attribute.IdPAttribute;
+import net.shibboleth.idp.attribute.resolver.ResolutionException;
import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
import net.shibboleth.idp.attribute.resolver.context.AttributeResolverWorkContext;
import net.shibboleth.idp.attribute.resolver.testing.MockAttributeDefinition;
diff --git a/shib-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/PluginDependencySupportTest.java b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/tests/PluginDependencySupportTest.java
similarity index 98%
rename from shib-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/PluginDependencySupportTest.java
rename to shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/tests/PluginDependencySupportTest.java
index eae86cd71..ff1b9c285 100644
--- a/shib-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/PluginDependencySupportTest.java
+++ b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/tests/PluginDependencySupportTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.attribute.resolver;
+package net.shibboleth.idp.attribute.resolver.tests;
import java.util.Arrays;
import java.util.Collections;
@@ -24,6 +24,9 @@ import java.util.Map;
import net.shibboleth.idp.attribute.IdPAttributeValue;
import net.shibboleth.idp.attribute.StringAttributeValue;
+import net.shibboleth.idp.attribute.resolver.PluginDependencySupport;
+import net.shibboleth.idp.attribute.resolver.ResolverAttributeDefinitionDependency;
+import net.shibboleth.idp.attribute.resolver.ResolverDataConnectorDependency;
import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
import net.shibboleth.idp.attribute.resolver.context.AttributeResolverWorkContext;
import net.shibboleth.idp.attribute.resolver.testing.MockStaticAttributeDefinition;
diff --git a/shib-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/ResolvedAttributeDefinitionTest.java b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/tests/ResolvedAttributeDefinitionTest.java
similarity index 94%
rename from shib-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/ResolvedAttributeDefinitionTest.java
rename to shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/tests/ResolvedAttributeDefinitionTest.java
index 97b19a5ec..1584757bf 100644
--- a/shib-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/ResolvedAttributeDefinitionTest.java
+++ b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/tests/ResolvedAttributeDefinitionTest.java
@@ -15,11 +15,14 @@
* limitations under the License.
*/
-package net.shibboleth.idp.attribute.resolver;
+package net.shibboleth.idp.attribute.resolver.tests;
import java.util.Collections;
import net.shibboleth.idp.attribute.IdPAttribute;
+import net.shibboleth.idp.attribute.resolver.ResolvedAttributeDefinition;
+import net.shibboleth.idp.attribute.resolver.ResolverAttributeDefinitionDependency;
+import net.shibboleth.idp.attribute.resolver.ResolverDataConnectorDependency;
import net.shibboleth.idp.attribute.resolver.testing.MockStaticAttributeDefinition;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
diff --git a/shib-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/ResolvedDataConnectorTest.java b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/tests/ResolvedDataConnectorTest.java
similarity index 93%
rename from shib-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/ResolvedDataConnectorTest.java
rename to shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/tests/ResolvedDataConnectorTest.java
index d58565b43..0fa84f405 100644
--- a/shib-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/ResolvedDataConnectorTest.java
+++ b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/tests/ResolvedDataConnectorTest.java
@@ -15,15 +15,17 @@
* limitations under the License.
*/
-package net.shibboleth.idp.attribute.resolver;
+package net.shibboleth.idp.attribute.resolver.tests;
import java.util.Arrays;
import java.util.Collections;
import java.util.Map;
import net.shibboleth.idp.attribute.IdPAttribute;
-import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
-import net.shibboleth.idp.attribute.resolver.context.AttributeResolverWorkContext;
+import net.shibboleth.idp.attribute.resolver.ResolutionException;
+import net.shibboleth.idp.attribute.resolver.ResolvedDataConnector;
+import net.shibboleth.idp.attribute.resolver.ResolverAttributeDefinitionDependency;
+import net.shibboleth.idp.attribute.resolver.ResolverDataConnectorDependency;
import net.shibboleth.idp.attribute.resolver.testing.MockStaticDataConnector;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
@@ -111,8 +113,6 @@ public class ResolvedDataConnectorTest {
dc.initialize();
ResolvedDataConnector resolvedDataConnector = new ResolvedDataConnector(dc, resolvedData);
- Assert.assertEquals(resolvedDataConnector.doDataConnectorResolve(new AttributeResolutionContext(),
- new AttributeResolverWorkContext()), resolvedData);
Assert.assertNull(resolvedDataConnector.getFailoverDataConnectorId());
Assert.assertEquals(resolvedDataConnector.getResolvedConnector(), dc);
Assert.assertTrue(resolvedDataConnector.isInitialized());
diff --git a/shib-attribute-resolver-spring/pom.xml b/shib-attribute-resolver-spring/pom.xml
index e0ae687d9..566727f7c 100644
--- a/shib-attribute-resolver-spring/pom.xml
+++ b/shib-attribute-resolver-spring/pom.xml
@@ -32,11 +32,6 @@
<artifactId>shib-attribute-impl</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>shib-saml-attribute-api</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>shib-saml-attribute-impl</artifactId>
@@ -122,16 +117,8 @@
<!-- Test Dependencies -->
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>shib-attribute-resolver-api</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>shib-attribute-resolver-impl</artifactId>
+ <artifactId>shib-attribute-testing</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -179,15 +166,16 @@
<artifactId>shib-security</artifactId>
<scope>test</scope>
</dependency>
+ <!-- Needed for Spring wiring in tests. -->
<dependency>
<groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-testing</artifactId>
+ <artifactId>shib-velocity-spring</artifactId>
<scope>test</scope>
</dependency>
- <!-- Needed for Spring wiring in tests. -->
+
<dependency>
<groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-velocity-spring</artifactId>
+ <artifactId>shib-testing</artifactId>
<scope>test</scope>
</dependency>
diff --git a/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/http/impl/HTTPDataConnectorParserTest.java b/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/http/impl/HTTPDataConnectorParserTest.java
index 85bff740e..a44be04ba 100644
--- a/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/http/impl/HTTPDataConnectorParserTest.java
+++ b/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/http/impl/HTTPDataConnectorParserTest.java
@@ -55,7 +55,7 @@ public class HTTPDataConnectorParserTest {
RepositorySupport.buildHTTPSResourceURL("java-shib-attribute",
"shib-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/http/test.json");
- private static final String SCRIPT_PATH = "/net/shibboleth/idp/attribute/resolver/impl/dc/http/";
+ private static final String SCRIPT_PATH = "/net/shibboleth/idp/attribute/resolver/spring/dc/http/";
private static final String CREDS_PATH = "/net/shibboleth/idp/attribute/resolver/spring/dc/http/";
diff --git a/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/storage/impl/StorageServiceDataConnectorParserTest.java b/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/storage/impl/StorageServiceDataConnectorParserTest.java
index 285c7f779..015198204 100644
--- a/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/storage/impl/StorageServiceDataConnectorParserTest.java
+++ b/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/storage/impl/StorageServiceDataConnectorParserTest.java
@@ -49,7 +49,7 @@ import net.shibboleth.shared.spring.util.ApplicationContextBuilder;
@SuppressWarnings("javadoc")
public class StorageServiceDataConnectorParserTest {
- private static final String SCRIPT_PATH = "/net/shibboleth/idp/attribute/resolver/impl/dc/storage/";
+ private static final String SCRIPT_PATH = "/net/shibboleth/idp/attribute/resolver/spring/dc/storage/";
private GenericApplicationContext pendingTeardownContext = null;
diff --git a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/http/test.js b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/http/test.js
new file mode 100644
index 000000000..03592e085
--- /dev/null
+++ b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/http/test.js
@@ -0,0 +1,20 @@
+var HttpClientSupport = Java.type("net.shibboleth.utilities.java.support.httpclient.HttpClientSupport");
+var body = HttpClientSupport.toString(response.getEntity(), "UTF-8", 1024);
+var result = JSON.parse(body);
+
+var IdPAttribute = Java.type("net.shibboleth.idp.attribute.IdPAttribute");
+var StringValue = Java.type("net.shibboleth.idp.attribute.StringAttributeValue");
+var ArrayList = Java.type("java.util.ArrayList");
+
+for (var i=0; i<result.length; i++) {
+
+ var attr = new IdPAttribute(result[i].name);
+ var values = new ArrayList();
+
+ for (var j=0; j<result[i].values.length; j++) {
+ values.add(new StringValue(result[i].values[j]));
+ }
+
+ attr.setValues(values);
+ connectorResults.add(attr);
+}
diff --git a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/http/testsize.js b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/http/testsize.js
new file mode 100644
index 000000000..2fcccade1
--- /dev/null
+++ b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/http/testsize.js
@@ -0,0 +1,20 @@
+var HttpClientSupport = Java.type("net.shibboleth.utilities.java.support.httpclient.HttpClientSupport");
+var body = HttpClientSupport.toString(response.getEntity(), "UTF-8", 10);
+var result = JSON.parse(body);
+
+var IdPAttribute = Java.type("net.shibboleth.idp.attribute.IdPAttribute");
+var StringValue = Java.type("net.shibboleth.idp.attribute.StringAttributeValue");
+var HashSet = Java.type("java.util.HashSet");
+
+for (var i=0; i<result.length; i++) {
+
+ var attr = new IdPAttribute(result[i].name);
+ var values = new HashSet();
+
+ for (var j=0; j<result[i].values.length; j++) {
+ values.add(new StringValue(result[i].values[j]));
+ }
+
+ attr.setValues(values);
+ connectorResults.add(attr);
+}
diff --git a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/storage/test.js b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/storage/test.js
new file mode 100644
index 000000000..00f159b3c
--- /dev/null
+++ b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/storage/test.js
@@ -0,0 +1,18 @@
+var result = JSON.parse(record.getValue());
+
+var IdPAttribute = Java.type("net.shibboleth.idp.attribute.IdPAttribute");
+var StringValue = Java.type("net.shibboleth.idp.attribute.StringAttributeValue");
+var ArrayList = Java.type("java.util.ArrayList");
+
+for (var i=0; i<result.length; i++) {
+
+ var attr = new IdPAttribute(result[i].name);
+ var values = new ArrayList();
+
+ for (var j=0; j<result[i].values.length; j++) {
+ values.add(new StringValue(result[i].values[j]));
+ }
+
+ attr.setValues(values);
+ connectorResults.add(attr);
+}
diff --git a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/storage/test.json b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/storage/test.json
new file mode 100644
index 000000000..c213568b0
--- /dev/null
+++ b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/storage/test.json
@@ -0,0 +1,10 @@
+[
+ {
+ "name" : "foo",
+ "values" : [ "foo1" ]
+ },
+ {
+ "name" : "bar",
+ "values" : [ "bar1", "bar2" ]
+ }
+]
diff --git a/shib-attribute-testing/.checkstyle b/shib-attribute-testing/.checkstyle
new file mode 100644
index 000000000..150185a92
--- /dev/null
+++ b/shib-attribute-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="/java-shib-attribute/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/shib-attribute-testing/pom.xml b/shib-attribute-testing/pom.xml
new file mode 100644
index 000000000..859045214
--- /dev/null
+++ b/shib-attribute-testing/pom.xml
@@ -0,0 +1,63 @@
+<?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"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>net.shibboleth</groupId>
+ <artifactId>shib-attribute-parent</artifactId>
+ <version>5.0.0-SNAPSHOT</version>
+ </parent>
+
+ <name>Shibboleth Attribute :: Testing</name>
+ <description>Testing API</description>
+ <artifactId>shib-attribute-testing</artifactId>
+ <packaging>jar</packaging>
+
+ <properties>
+ <checkstyle.configLocation>${project.basedir}/../resources/checkstyle/checkstyle.xml</checkstyle.configLocation>
+ <automatic.module.name>net.shibboleth.attribute</automatic.module.name>
+ </properties>
+
+ <dependencies>
+ <!-- Compile Dependencies -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shib-attribute-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shib-attribute-filter-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shib-attribute-resolver-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-core-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-profile-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-saml-api</artifactId>
+ </dependency>
+
+ <!-- Provided Dependencies -->
+
+ <!-- Runtime Dependencies -->
+
+ <!-- Test Dependencies -->
+ </dependencies>
+
+</project>
diff --git a/shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/testing/MockMatcher.java b/shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/filter/testing/MockMatcher.java
similarity index 100%
rename from shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/testing/MockMatcher.java
rename to shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/filter/testing/MockMatcher.java
diff --git a/shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/testing/MockPolicyRequirementRule.java b/shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/filter/testing/MockPolicyRequirementRule.java
similarity index 97%
rename from shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/testing/MockPolicyRequirementRule.java
rename to shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/filter/testing/MockPolicyRequirementRule.java
index 77ac8d561..3fc93571a 100644
--- a/shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/testing/MockPolicyRequirementRule.java
+++ b/shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/filter/testing/MockPolicyRequirementRule.java
@@ -21,7 +21,6 @@ import javax.annotation.Nonnull;
import net.shibboleth.idp.attribute.filter.Matcher;
import net.shibboleth.idp.attribute.filter.PolicyRequirementRule;
-import net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate;
import net.shibboleth.idp.attribute.filter.context.AttributeFilterContext;
import net.shibboleth.utilities.java.support.component.AbstractIdentifiedInitializableComponent;
diff --git a/shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/testing/package-info.java b/shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/filter/testing/package-info.java
similarity index 100%
rename from shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/testing/package-info.java
rename to shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/filter/testing/package-info.java
diff --git a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/testing/SAMLAttributeDataConnector.java b/shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/testing/SAMLAttributeDataConnector.java
similarity index 100%
rename from shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/testing/SAMLAttributeDataConnector.java
rename to shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/testing/SAMLAttributeDataConnector.java
diff --git a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/testing/package-info.java b/shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/testing/package-info.java
similarity index 100%
rename from shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/testing/package-info.java
rename to shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/testing/package-info.java
diff --git a/shib-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/testing/MockAttributeDefinition.java b/shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/resolver/testing/MockAttributeDefinition.java
similarity index 100%
rename from shib-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/testing/MockAttributeDefinition.java
rename to shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/resolver/testing/MockAttributeDefinition.java
diff --git a/shib-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/testing/MockDataConnector.java b/shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/resolver/testing/MockDataConnector.java
similarity index 100%
rename from shib-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/testing/MockDataConnector.java
rename to shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/resolver/testing/MockDataConnector.java
diff --git a/shib-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/testing/MockStaticAttributeDefinition.java b/shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/resolver/testing/MockStaticAttributeDefinition.java
similarity index 100%
rename from shib-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/testing/MockStaticAttributeDefinition.java
rename to shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/resolver/testing/MockStaticAttributeDefinition.java
diff --git a/shib-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/testing/MockStaticDataConnector.java b/shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/resolver/testing/MockStaticDataConnector.java
similarity index 100%
rename from shib-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/testing/MockStaticDataConnector.java
rename to shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/resolver/testing/MockStaticDataConnector.java
diff --git a/shib-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/testing/ResolverTestSupport.java b/shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/resolver/testing/ResolverTestSupport.java
similarity index 100%
rename from shib-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/testing/ResolverTestSupport.java
rename to shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/resolver/testing/ResolverTestSupport.java
diff --git a/shib-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/testing/TestSources.java b/shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/resolver/testing/TestSources.java
similarity index 100%
rename from shib-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/testing/TestSources.java
rename to shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/resolver/testing/TestSources.java
diff --git a/shib-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/testing/package-info.java b/shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/resolver/testing/package-info.java
similarity index 100%
rename from shib-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/testing/package-info.java
rename to shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/resolver/testing/package-info.java
diff --git a/shib-attribute-tests-bom/pom.xml b/shib-attribute-tests-bom/pom.xml
deleted file mode 100644
index e0b316af5..000000000
--- a/shib-attribute-tests-bom/pom.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?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"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>net.shibboleth</groupId>
- <artifactId>shib-attribute-parent</artifactId>
- <version>5.0.0-SNAPSHOT</version>
- </parent>
-
- <name>Shibboleth Attribute :: Test BOM</name>
- <description>Bill of Materials</description>
- <artifactId>shib-attribute-tests-bom</artifactId>
- <packaging>pom</packaging>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>shib-attribute-api</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>shib-attribute-impl</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>shib-saml-attribute-api</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>shib-saml-attribute-impl</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>shib-attribute-resolver-api</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>shib-attribute-resolver-impl</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>shib-attribute-resolver-spring</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>shib-attribute-filter-api</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>shib-attribute-filter-impl</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>shib-attribute-filter-spring</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
-</project>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list