[java-shib-attribute] 01/02: JSSH-71 Remove the impact of the DestructableComponent Interface
Codeberg
noreply at shibboleth.net
Sun May 31 15:08:32 UTC 2026
This is an automated email from the git hooks/post-receive script.
codeberg pushed a commit to branch dev/JSSH-71
in repository java-shib-attribute.
View the commit online:
https://codeberg.org/Shibboleth/java-shib-attribute/commit/0efc8765e8eca6f56680e4b7d541bf65155e5055
commit 0efc8765e8eca6f56680e4b7d541bf65155e5055
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sun May 24 15:46:01 2026 +0100
JSSH-71 Remove the impact of the DestructableComponent Interface
https://shibboleth.atlassian.net/browse/JSSH-71
Remove needless destroy/isDestroyed calls from tests
---
.../idp/attribute/filter/BaseBridgingClassTester.java | 8 +++-----
.../attribute/filter/impl/AttributeFilterImplTest.java | 18 ++----------------
.../filter/matcher/logic/impl/NotMatcherTest.java | 11 +----------
.../filter/matcher/logic/impl/OrMatcherTest.java | 2 --
.../logic/impl/AbstractComposedPolicyRuleTest.java | 14 ++++++--------
.../policyrule/logic/impl/NotPolicyRuleTest.java | 17 ++++-------------
.../filter/tests/AttributeFilterPolicyTest.java | 12 ++++++------
.../filter/tests/AttributeValueFilterPolicyTest.java | 8 ++++----
.../impl/AttributeTranscoderRegistryImplTest.java | 4 ++--
.../resolver/impl/AttributeResolverImplTest.java | 4 ----
10 files changed, 28 insertions(+), 70 deletions(-)
diff --git a/shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/BaseBridgingClassTester.java b/shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/BaseBridgingClassTester.java
index 785acdebc..00f984243 100644
--- a/shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/BaseBridgingClassTester.java
+++ b/shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/BaseBridgingClassTester.java
@@ -16,20 +16,19 @@ package net.shibboleth.idp.attribute.filter;
import java.util.Arrays;
import java.util.HashMap;
-import java.util.LinkedHashSet;
import java.util.Map;
import javax.annotation.Nonnull;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.IdPAttributeValue;
import net.shibboleth.idp.attribute.StringAttributeValue;
import net.shibboleth.idp.attribute.filter.context.AttributeFilterContext;
import net.shibboleth.shared.component.ComponentInitializationException;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
/**
* Base for the various XX from YY test clases
*/
@@ -70,7 +69,6 @@ public class BaseBridgingClassTester {
Assert.assertEquals(base.getLogPrefix(), s);
base.initialize();
Assert.assertNotEquals(base.getLogPrefix(), s);
- base.destroy();
}
diff --git a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/AttributeFilterImplTest.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/AttributeFilterImplTest.java
index 3ef4a7f83..d6ba7bedb 100644
--- a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/AttributeFilterImplTest.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/AttributeFilterImplTest.java
@@ -485,7 +485,7 @@ public class AttributeFilterImplTest {
Assert.assertTrue(resultAttrs.isEmpty());
}
- @Test public void testInitDestroy() throws ComponentInitializationException {
+ @Test public void testInit() throws ComponentInitializationException {
final MockMatcher matcher = new MockMatcher();
final AttributeRule filterPolicy = new AttributeRule();
filterPolicy.setId("filterPolicy");
@@ -497,10 +497,8 @@ public class AttributeFilterImplTest {
final AttributeFilterPolicy policy = new AttributeFilterPolicy("policy", policyRule, CollectionSupport.singletonList(filterPolicy));
Assert.assertFalse(policyRule.isInitialized());
- Assert.assertFalse(policyRule.isDestroyed());
Assert.assertFalse(matcher.isInitialized());
- Assert.assertFalse(matcher.isDestroyed());
-
+
final AttributeFilterImpl filter = new AttributeFilterImpl("engine", CollectionSupport.singletonList(policy));
policy.initialize();
@@ -509,20 +507,8 @@ public class AttributeFilterImplTest {
filter.initialize();
Assert.assertTrue(policyRule.isInitialized());
- Assert.assertFalse(policyRule.isDestroyed());
Assert.assertTrue(matcher.isInitialized());
- Assert.assertFalse(matcher.isDestroyed());
- // TODO: can't do this because pin above grabs read lock and this requires write lock
- //filter.destroy();
-
- policyRule.destroy();
- policy.destroy();
- matcher.destroy();
- Assert.assertTrue(policyRule.isInitialized());
- Assert.assertTrue(policyRule.isDestroyed());
- Assert.assertTrue(matcher.isInitialized());
- Assert.assertTrue(matcher.isDestroyed());
}
}
diff --git a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/NotMatcherTest.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/NotMatcherTest.java
index fc62f2f1b..548cc1483 100644
--- a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/NotMatcherTest.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/NotMatcherTest.java
@@ -33,7 +33,6 @@ import net.shibboleth.idp.attribute.filter.matcher.impl.AbstractMatcherPolicyRul
import net.shibboleth.idp.attribute.filter.matcher.impl.MockValuePredicateMatcher;
import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.component.ComponentInitializationException;
-import net.shibboleth.shared.component.DestroyedComponentException;
import net.shibboleth.shared.component.UninitializedComponentException;
import net.shibboleth.shared.logic.PredicateSupport;
@@ -56,19 +55,11 @@ public class NotMatcherTest extends AbstractMatcherPolicyRuleTest {
// expect this
}
assertFalse(inMatcher.isInitialized());
- assertFalse(inMatcher.isDestroyed());
+ // assertFalse(inMatcher.isDestroyed());
matcher.setId("test");
matcher.initialize();
- matcher.destroy();
-
- try {
- matcher.initialize();
- } catch (final DestroyedComponentException e) {
- // OK
- }
-
}
@Test public void testGetMatchingValues() throws Exception {
diff --git a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/OrMatcherTest.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/OrMatcherTest.java
index 72e288b6f..55a55f956 100644
--- a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/OrMatcherTest.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/OrMatcherTest.java
@@ -101,8 +101,6 @@ public class OrMatcherTest extends AbstractMatcherPolicyRuleTest {
assertEquals(result.size(), 2);
assertTrue(result.contains(value2) && result.contains(value1));
- matcher.destroy();
-
}
@Test public void testNoMatchingValues() throws Exception {
diff --git a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/AbstractComposedPolicyRuleTest.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/AbstractComposedPolicyRuleTest.java
index 753034995..a29f43661 100644
--- a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/AbstractComposedPolicyRuleTest.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/AbstractComposedPolicyRuleTest.java
@@ -39,21 +39,21 @@ import net.shibboleth.shared.primitive.LoggerFactory;
public class AbstractComposedPolicyRuleTest {
@Test
- public void testInitDestroy() throws ComponentInitializationException {
+ public void testInit() throws ComponentInitializationException {
final List<PolicyRequirementRule> firstList = new ArrayList<>(2);
ComposedPolicyRule rule = new ComposedPolicyRule(CollectionSupport.emptyList());
-
+
for (int i = 0; i < 2;i++) {
firstList.add(new TestMatcher());
}
-
+
for (int i = 0; i < 2;i++) {
firstList.add(new TestMatcher());
}
rule = new ComposedPolicyRule(firstList);
-
+
assertEquals(firstList.size(), rule.getComposedRules().size());
-
+
boolean thrown = false;
try {
rule.getComposedRules().add(new TestMatcher());
@@ -62,10 +62,8 @@ public class AbstractComposedPolicyRuleTest {
}
assertTrue(thrown, "Set into the returned list");
rule.setId("Test");
-
+
rule.initialize();
-
- rule.destroy();
}
@Test
diff --git a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/NotPolicyRuleTest.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/NotPolicyRuleTest.java
index ea7c2e4a2..cc391d3af 100644
--- a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/NotPolicyRuleTest.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/NotPolicyRuleTest.java
@@ -14,7 +14,9 @@
package net.shibboleth.idp.attribute.filter.policyrule.logic.impl;
-import static org.testng.Assert.*;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.fail;
import javax.annotation.Nonnull;
@@ -26,7 +28,6 @@ import net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate;
import net.shibboleth.idp.attribute.filter.matcher.impl.AbstractMatcherPolicyRuleTest;
import net.shibboleth.idp.attribute.filter.matcher.impl.DataSources;
import net.shibboleth.shared.component.ComponentInitializationException;
-import net.shibboleth.shared.component.DestroyedComponentException;
import net.shibboleth.shared.component.UninitializedComponentException;
/** Test the {@link NotPolicyRule} matcher. */
@@ -37,7 +38,7 @@ public class NotPolicyRuleTest extends AbstractMatcherPolicyRuleTest {
super.setUp();
}
- @Test public void testInitDestroy() throws ComponentInitializationException {
+ @Test public void testInit() throws ComponentInitializationException {
final AbstractComposedPolicyRuleTest.TestMatcher inMatcher = new AbstractComposedPolicyRuleTest.TestMatcher();
final NotPolicyRule rule = newNotPolicyRule(inMatcher);
@@ -48,19 +49,9 @@ public class NotPolicyRuleTest extends AbstractMatcherPolicyRuleTest {
// expect this
}
assertFalse(inMatcher.isInitialized());
- assertFalse(inMatcher.isDestroyed());
rule.setId("test");
rule.initialize();
-
- rule.destroy();
-
- try {
- rule.initialize();
- } catch (final DestroyedComponentException e) {
- // OK
- }
-
}
@Test public void testPredicate() throws ComponentInitializationException {
diff --git a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/tests/AttributeFilterPolicyTest.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/tests/AttributeFilterPolicyTest.java
index 07fefe8f2..2eb4b79bc 100644
--- a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/tests/AttributeFilterPolicyTest.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/tests/AttributeFilterPolicyTest.java
@@ -107,9 +107,9 @@ public class AttributeFilterPolicyTest {
AttributeFilterPolicy policy = new AttributeFilterPolicy(ID, localPolicyMatcher, valuePolicyList);
Assert.assertFalse(policy.isInitialized(), "Created");
- Assert.assertFalse(policy.isDestroyed(), "Created");
- Assert.assertFalse(policyMatcher.isDestroyed(), "Created");
- Assert.assertFalse(valueMatcher.isDestroyed(), "Created");
+ // Assert.assertFalse(policy.isDestroyed(), "Created");
+ // Assert.assertFalse(policyMatcher.isDestroyed(), "Created");
+ // Assert.assertFalse(valueMatcher.isDestroyed(), "Created");
policy = new AttributeFilterPolicy(ID, localPolicyMatcher, valuePolicyList);
policy.initialize();
@@ -117,9 +117,9 @@ public class AttributeFilterPolicyTest {
Assert.assertTrue(policyMatcher.isInitialized(), "Initialized");
Assert.assertTrue(valueMatcher.isInitialized(), "Initialized");
- Assert.assertFalse(policy.isDestroyed(), "Initialized");
- Assert.assertFalse(policyMatcher.isDestroyed(), "Initialized");
- Assert.assertFalse(valueMatcher.isDestroyed(), "Initialized");
+ // Assert.assertFalse(policy.isDestroyed(), "Initialized");
+ // Assert.assertFalse(policyMatcher.isDestroyed(), "Initialized");
+ // Assert.assertFalse(valueMatcher.isDestroyed(), "Initialized");
}
diff --git a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/tests/AttributeValueFilterPolicyTest.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/tests/AttributeValueFilterPolicyTest.java
index d10448b9d..32d3899c0 100644
--- a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/tests/AttributeValueFilterPolicyTest.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/tests/AttributeValueFilterPolicyTest.java
@@ -48,8 +48,8 @@ public class AttributeValueFilterPolicyTest {
Assert.assertFalse(policy.isInitialized(), "Created - not initialized");
Assert.assertFalse(matcher.isInitialized(), "Create - not initialized");
- Assert.assertFalse(policy.isDestroyed(), "Created - not destroyed");
- Assert.assertFalse(matcher.isDestroyed(), "Created - not destroyed");
+ // Assert.assertFalse(policy.isDestroyed(), "Created - not destroyed");
+ // Assert.assertFalse(matcher.isDestroyed(), "Created - not destroyed");
policy.setId("id");
policy.setAttributeId("foo");
@@ -58,8 +58,8 @@ public class AttributeValueFilterPolicyTest {
Assert.assertTrue(policy.isInitialized(), "Initialized");
Assert.assertTrue(matcher.isInitialized(), "Initialized");
- Assert.assertFalse(policy.isDestroyed(), "Initialized - not destroyed");
- Assert.assertFalse(matcher.isDestroyed(), "Initialized - not destroyed");
+ // Assert.assertFalse(policy.isDestroyed(), "Initialized - not destroyed");
+ // Assert.assertFalse(matcher.isDestroyed(), "Initialized - not destroyed");
}
diff --git a/shib-attribute-impl/src/test/java/net/shibboleth/idp/attribute/transcoding/impl/AttributeTranscoderRegistryImplTest.java b/shib-attribute-impl/src/test/java/net/shibboleth/idp/attribute/transcoding/impl/AttributeTranscoderRegistryImplTest.java
index 8481a11cc..47d89c980 100644
--- a/shib-attribute-impl/src/test/java/net/shibboleth/idp/attribute/transcoding/impl/AttributeTranscoderRegistryImplTest.java
+++ b/shib-attribute-impl/src/test/java/net/shibboleth/idp/attribute/transcoding/impl/AttributeTranscoderRegistryImplTest.java
@@ -39,6 +39,7 @@ import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.collection.Pair;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.logic.PredicateSupport;
+import net.shibboleth.shared.primitive.AnnotationsSupport;
import net.shibboleth.shared.testing.MockApplicationContext;
import net.shibboleth.idp.attribute.transcoding.BasicNamingFunction;
import net.shibboleth.idp.attribute.transcoding.TranscoderSupport;
@@ -127,8 +128,7 @@ public class AttributeTranscoderRegistryImplTest {
}
@AfterClass public void tearDown() {
- registry.destroy();
- registry = null;
+ AnnotationsSupport.callPreDestroyAnnotation(registry, null, null);
}
diff --git a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java
index 9eb0c98e4..b9c7d70db 100644
--- a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java
+++ b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java
@@ -80,15 +80,11 @@ public class AttributeResolverImplTest {
CollectionSupport.singleton((DataConnector) dataCon));
assertFalse(attrDef.isInitialized());
- assertFalse(attrDef.isDestroyed());
- assertFalse(dataCon.isDestroyed());
attrDef.initialize();
resolver.initialize();
assertTrue(attrDef.isInitialized());
- assertFalse(attrDef.isDestroyed());
assertTrue(dataCon.isInitialized());
- assertFalse(dataCon.isDestroyed());
assertEquals(resolver.ensureId(), "toto");
assertEquals(resolver.getAttributeDefinitions().size(), 1);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list