[java-shib-attribute] 01/02: JSSH-71 Remove the impact of the DestructableComponent Interface

[Codeberg]

This is an automated email from the git hooks/post-receive script.

codeberg pushed a commit to branch main
in repository java-shib-attribute.

View the commit online:
https://codeberg.org/Shibboleth/java-shib-attribute/commit/03f66aa337463b6b15b6769f9cf204499ebe2cbd

commit 03f66aa337463b6b15b6769f9cf204499ebe2cbd
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sun Aug 2 16:02:15 2026 +0100

    JSSH-71 Remove the impact of the DestructableComponent Interface
    
    https://shibboleth.atlassian.net/browse/JSSH-71
    
    Revert all debugging changes
---
 .../resolver/spring/AttributeResolverTest.java     | 28 +++++++++-------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java b/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java
index 700c6beb1..234202345 100644
--- a/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java
+++ b/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java
@@ -116,7 +116,6 @@ public class AttributeResolverTest extends OpenSAMLInitBaseTestCase {
                 new ClassPathResource(LDAP_INIT_FILE),
                 10391);
         directoryServer.start();
-        assertEquals(directoryServer.openConnectionCount(), 0);
 
         // RDBMS
         datasource = DatabaseTestingSupport.GetMockDataSource(DB_INIT_FILE, "myTestDB");
@@ -129,10 +128,9 @@ public class AttributeResolverTest extends OpenSAMLInitBaseTestCase {
      * @throws InterruptedException 
      */
     @AfterClass public void teardownDataConnectors() throws InterruptedException {
-        tearDownTestContext();
         if (directoryServer != null) {
             if (directoryServer.openConnectionCount() > 0) {
-                Thread.sleep(200);
+                Thread.sleep(100);
             }
             assert directoryServer != null;
             assertEquals(directoryServer.openConnectionCount(), 0);
@@ -164,11 +162,11 @@ public class AttributeResolverTest extends OpenSAMLInitBaseTestCase {
         return result;
     }
     
-    @Test(enabled = false) public void service() throws ComponentInitializationException, ServiceException, ResolutionException {
+    @Test public void service() throws ComponentInitializationException, ServiceException, ResolutionException {
         helper(false);
     }
     
-    @Test(enabled = false) public void serviceNullStrip() throws ComponentInitializationException, ServiceException, ResolutionException {
+    @Test public void serviceNullStrip() throws ComponentInitializationException, ServiceException, ResolutionException {
         helper(true);
     }
 
@@ -345,7 +343,7 @@ public class AttributeResolverTest extends OpenSAMLInitBaseTestCase {
     }
 
     @SuppressWarnings("unchecked")
-    @Test(enabled = false) public void idp2052() throws IOException, ResolutionException
+    @Test public void idp2052() throws IOException, ResolutionException
     {
         Path p = Files.createTempFile("Attr", "2052");
 
@@ -393,7 +391,7 @@ public class AttributeResolverTest extends OpenSAMLInitBaseTestCase {
         Files.delete(p);
     }
 
-    @Test(enabled = false) public void mappedTemplate() throws Exception {
+    @Test public void mappedTemplate() throws Exception {
         final ReloadableService<AttributeResolver> attributeResolverService = getResolver("net/shibboleth/idp/attribute/resolver/spring/mappedTemplateService.xml");
 
         attributeResolverService.initialize();
@@ -412,7 +410,7 @@ public class AttributeResolverTest extends OpenSAMLInitBaseTestCase {
         assertEquals(resolvedAttributes.get("testing").getValues().size(), 2);
     }
 
-    @Test(enabled = false) public void selective() throws ResolutionException, ComponentInitializationException {
+    @Test public void selective() throws ResolutionException, ComponentInitializationException {
         final GenericApplicationContext context = new GenericApplicationContext();
         setTestContext(context);
         context.setDisplayName("ApplicationContext: " + AttributeResolverTest.class);
@@ -444,12 +442,11 @@ public class AttributeResolverTest extends OpenSAMLInitBaseTestCase {
         assertTrue(resolutionContext.getResolvedIdPAttributes().isEmpty());
     }
     
-    @Test(enabled = true) public void preResolve() throws ResolutionException, ComponentInitializationException {
+    @Test public void preResolve() throws ResolutionException, ComponentInitializationException {
         final GenericApplicationContext context = new GenericApplicationContext();
         setTestContext(context);
         context.setDisplayName("ApplicationContext: " + AttributeResolverTest.class);
-        assertEquals(directoryServer.openConnectionCount(), 0);
-        
+
         final SchemaTypeAwareXMLBeanDefinitionReader beanDefinitionReader =
                 new SchemaTypeAwareXMLBeanDefinitionReader(context);
 
@@ -463,7 +460,6 @@ public class AttributeResolverTest extends OpenSAMLInitBaseTestCase {
 
         resolver.resolveAttributes(resolutionContext);
         assertEquals(resolutionContext.getResolvedIdPAttributes().size(), 2);
-        assertEquals(directoryServer.openConnectionCount(), 0);
         final IdPAttribute pre =  resolutionContext.getResolvedIdPAttributes().get("pre");
         /* 
          * pre:
@@ -475,7 +471,6 @@ public class AttributeResolverTest extends OpenSAMLInitBaseTestCase {
          * it is preresolved so...
          */
         assertEquals(pre.getValues().size(), 1);
-        assertEquals(directoryServer.openConnectionCount(), 0);
         assertEquals(pre.getValues().get(0).getDisplayValue(), "preValueOnly");
         final IdPAttribute postOnly =  resolutionContext.getResolvedIdPAttributes().get("postOnly");
         /*
@@ -485,10 +480,9 @@ public class AttributeResolverTest extends OpenSAMLInitBaseTestCase {
          */
         assertEquals(postOnly.getValues().size(), 1);
         assertEquals(postOnly.getValues().get(0).getDisplayValue(), "preOnly");
-        assertEquals(directoryServer.openConnectionCount(), 0);
-}
+    }
 
-    @Test(enabled = false) public void selectiveNavigate() throws ResolutionException, ComponentInitializationException {
+    @Test public void selectiveNavigate() throws ResolutionException, ComponentInitializationException {
         final GenericApplicationContext context = new GenericApplicationContext();
         setTestContext(context);
         context.setDisplayName("ApplicationContext: " + AttributeResolverTest.class);
@@ -530,7 +524,7 @@ public class AttributeResolverTest extends OpenSAMLInitBaseTestCase {
         assertTrue(resolutionContext.getResolvedIdPAttributes().isEmpty());
     }
     
-    @Test(enabled = false) public void multiFile() throws ResolutionException {
+    @Test public void multiFile() throws ResolutionException {
         final ReloadableService<AttributeResolver> attributeResolverService = getResolver("net/shibboleth/idp/attribute/resolver/spring/multiFileService.xml");
         
         final AttributeResolutionContext resolutionContext =

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.