[java-metadata-aggregator] branch main updated: MDA-245 - Terminology changes
Ian Young
ian at iay.org.uk
Thu May 9 11:07:49 UTC 2024
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=71d155c4850553b17fe585696566c59c395a45f3
The following commit(s) were added to refs/heads/main by this push:
new 71d155c MDA-245 - Terminology changes
71d155c is described below
commit 71d155c4850553b17fe585696566c59c395a45f3
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Thu May 9 12:07:45 2024 +0100
MDA-245 - Terminology changes
https://shibboleth.atlassian.net/browse/MDA-245
---
.../src/test/java/net/shibboleth/metadata/dom/MDA125Test.java | 4 ++--
.../net/shibboleth/metadata/dom/NamespacesStrippingStageTest.java | 5 +++--
.../net/shibboleth/metadata/dom/XMLSignatureValidationStageTest.java | 2 ++
.../java/net/shibboleth/metadata/dom/saml/EntityFilterStageTest.java | 2 ++
.../net/shibboleth/metadata/dom/saml/EntityRoleFilterStageTest.java | 2 ++
.../metadata/dom/saml/mdattr/EntityAttributeFilteringStageTest.java | 4 ++--
.../metadata/validate/x509/X509RSAOpenSSLKeylistValidatorTest.java | 2 ++
.../metadata/validate/x509/testing/BaseX509ValidatorTest.java | 2 +-
8 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/MDA125Test.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/MDA125Test.java
index 76f41c5..411750a 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/MDA125Test.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/MDA125Test.java
@@ -34,10 +34,10 @@ public class MDA125Test {
final XMLSignatureValidationStage stage =
(XMLSignatureValidationStage)appCtx.getBean("us_incommon_checkSignature");
// do NOT initialise the bean, not all required properties have been supplied for the test
- final Collection<String> digests = stage.getBlacklistedDigests();
+ final Collection<String> digests = stage.getDisallowedDigests();
Assert.assertEquals(digests.size(), 1);
Assert.assertTrue(digests.contains("http://www.w3.org/2001/04/xmldsig-more#md5"));
- final Collection<String> methods = stage.getBlacklistedSignatureMethods();
+ final Collection<String> methods = stage.getDisallowedSignatureMethods();
Assert.assertEquals(methods.size(), 1);
Assert.assertTrue(methods.contains("http://www.w3.org/2001/04/xmldsig-more#rsa-md5"));
appCtx.close();
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 8d456bc..b5ae38a 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
@@ -32,7 +32,7 @@ public class NamespacesStrippingStageTest extends BaseDOMTest {
/**
* Test the simple case that is already handled by NamespaceStrippingStage,
- * of blacklisting a single namespace.
+ * of removing a single namespace.
*
* @throws Exception if something goes wrong
*/
@@ -111,10 +111,11 @@ public class NamespacesStrippingStageTest extends BaseDOMTest {
}
/**
- * Test removing.
+ * Test removing (legacy API).
*
* @throws Exception if something goes wrong
*/
+ @Deprecated(forRemoval=true, since="0.10.0")
@Test
public void keepingLegacy() throws Exception {
final Element doc = readXMLData("2-in.xml");
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 698df57..2d4aeff 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
@@ -210,6 +210,7 @@ public class XMLSignatureValidationStageTest extends BaseDOMTest {
*
* @throws Exception if something bad happens
*/
+ @Deprecated(forRemoval=true, since="0.10.0")
@Test
public void testDisallowedDigestLegacy() throws Exception {
final DOMElementItem item = makeItem("signed.xml");
@@ -241,6 +242,7 @@ public class XMLSignatureValidationStageTest extends BaseDOMTest {
*
* @throws Exception if something bad happens
*/
+ @Deprecated(forRemoval=true, since="0.10.0")
@Test
public void testDisallowedSignatureMethodLegacy() throws Exception {
final DOMElementItem item = makeItem("signed.xml");
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 9939792..350c1f2 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
@@ -37,6 +37,7 @@ public class EntityFilterStageTest extends BaseDOMTest {
super(EntityFilterStage.class);
}
+ @Deprecated(forRemoval=true, since="0.10.0")
@Test public void testKeepingLegacy() throws Exception {
final EntityFilterStage stage = new EntityFilterStage();
stage.setId("test");
@@ -51,6 +52,7 @@ public class EntityFilterStageTest extends BaseDOMTest {
Assert.assertEquals(metadataCollection.size(), 1);
}
+ @Deprecated(forRemoval=true, since="0.10.0")
@Test public void testRemovingLegacy() throws Exception {
final EntityFilterStage stage = new EntityFilterStage();
stage.setId("test");
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 5d9e493..2f33842 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
@@ -37,6 +37,7 @@ public class EntityRoleFilterStageTest extends BaseDOMTest {
super(EntityRoleFilterStage.class);
}
+ @Deprecated(forRemoval=true, since="0.10.0")
@Test
public void testKeepingLegacy() throws Exception {
EntityRoleFilterStage stage = new EntityRoleFilterStage();
@@ -56,6 +57,7 @@ public class EntityRoleFilterStageTest extends BaseDOMTest {
.size(), 1);
}
+ @Deprecated(forRemoval=true, since="0.10.0")
@Test
public void testRemovingLegacy() throws Exception {
EntityRoleFilterStage stage = new EntityRoleFilterStage();
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 113218b..27afa3e 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
@@ -171,7 +171,7 @@ public class EntityAttributeFilteringStageTest extends BaseDOMTest {
}
@Test
- public void testKeeping() throws Exception {
+ public void testRemoving() throws Exception {
final List<Item<Element>> items = makeInputItems();
final List<Predicate<EntityAttributeContext>> rules = new ArrayList<>();
rules.add(new EntityCategoryMatcher("http://www.geant.net/uri/dataprotection-code-of-conduct/v1",
@@ -193,7 +193,7 @@ public class EntityAttributeFilteringStageTest extends BaseDOMTest {
// Test legacy API
@Deprecated(forRemoval=true, since="0.10.0")
@Test
- public void testBlacklist() throws Exception {
+ public void testRemovingLegacy() throws Exception {
final List<Item<Element>> items = makeInputItems();
final List<Predicate<EntityAttributeContext>> rules = new ArrayList<>();
rules.add(new EntityCategoryMatcher("http://www.geant.net/uri/dataprotection-code-of-conduct/v1",
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLKeylistValidatorTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLKeylistValidatorTest.java
index 7166236..dea47d9 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLKeylistValidatorTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLKeylistValidatorTest.java
@@ -34,6 +34,7 @@ public class X509RSAOpenSSLKeylistValidatorTest extends BaseX509ValidatorTest {
super(X509RSAOpenSSLKeylistValidator.class);
}
+ @Deprecated(forRemoval=true, since="0.10.0")
@Test
public void testNotBadLegacy() throws Exception {
final X509RSAOpenSSLKeylistValidator val = new X509RSAOpenSSLKeylistValidator();
@@ -49,6 +50,7 @@ public class X509RSAOpenSSLKeylistValidatorTest extends BaseX509ValidatorTest {
val.destroy();
}
+ @Deprecated(forRemoval=true, since="0.10.0")
@Test
public void testGetResourceLegacy() throws Exception {
final var val = new X509RSAOpenSSLKeylistValidator();
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/validate/x509/testing/BaseX509ValidatorTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/validate/x509/testing/BaseX509ValidatorTest.java
index 6702baf..3bb719a 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/validate/x509/testing/BaseX509ValidatorTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/validate/x509/testing/BaseX509ValidatorTest.java
@@ -134,7 +134,7 @@ public abstract class BaseX509ValidatorTest extends BaseTest {
* </p>
*
* @param modulus RSA public modulus to be digested
- * @return value to be compared against the blacklist
+ * @return value to be included in key lists
* @throws StageProcessingException if SHA1 digester can not be acquired, or for internal
* errors related to {@link ByteArrayOutputStream}
*/
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list