[java-oidfed-common] branch main updated: Modified the metadata cache tests to deal with un-precise system clocks.

[Codeberg]

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

codeberg pushed a commit to branch main
in repository java-oidfed-common.

View the commit online:
https://codeberg.org/Shibboleth/java-oidfed-common/commit/e9f96a55dbfa8ffe5be44a3c5c895f307de438d8

The following commit(s) were added to refs/heads/main by this push:
     new e9f96a5  Modified the metadata cache tests to deal with un-precise system clocks.
e9f96a5 is described below

commit e9f96a55dbfa8ffe5be44a3c5c895f307de438d8
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Fri May 15 14:23:43 2026 +0300

    Modified the metadata cache tests to deal with un-precise system clocks.
---
 .../flow/cache/EntityConfigurationMetadataCacheTest.java  |  2 +-
 .../oidfed/flow/cache/SignedKeysetMetadataCacheTest.java  |  2 +-
 .../flow/cache/SubordinateStatementMetadataCacheTest.java | 15 +++------------
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/oidfed-common-conf-impl/src/test/java/net/shibboleth/oidfed/flow/cache/EntityConfigurationMetadataCacheTest.java b/oidfed-common-conf-impl/src/test/java/net/shibboleth/oidfed/flow/cache/EntityConfigurationMetadataCacheTest.java
index 4cc247e..5b2d6ac 100644
--- a/oidfed-common-conf-impl/src/test/java/net/shibboleth/oidfed/flow/cache/EntityConfigurationMetadataCacheTest.java
+++ b/oidfed-common-conf-impl/src/test/java/net/shibboleth/oidfed/flow/cache/EntityConfigurationMetadataCacheTest.java
@@ -585,7 +585,7 @@ public class EntityConfigurationMetadataCacheTest extends AbstractFederationFlow
                     entityConfigurationCache.get(new CriteriaSet(new SubjectEntityIDCriterion(entityId),
                             new ResponseContainerExpirationCriterion(Instant.now().plusSeconds(300))));
             Assert.assertNotNull(result);
-            Assert.assertEquals(result.size(), 0);
+            Assert.assertTrue(result.size() == 0 || result.get(0).getStatement() == null);
         } catch (MetadataCacheException e) {
             Assert.fail("Could not resolve entity configuration", e);
         }
diff --git a/oidfed-common-conf-impl/src/test/java/net/shibboleth/oidfed/flow/cache/SignedKeysetMetadataCacheTest.java b/oidfed-common-conf-impl/src/test/java/net/shibboleth/oidfed/flow/cache/SignedKeysetMetadataCacheTest.java
index ed9ad09..f1e05d6 100644
--- a/oidfed-common-conf-impl/src/test/java/net/shibboleth/oidfed/flow/cache/SignedKeysetMetadataCacheTest.java
+++ b/oidfed-common-conf-impl/src/test/java/net/shibboleth/oidfed/flow/cache/SignedKeysetMetadataCacheTest.java
@@ -224,7 +224,7 @@ public class SignedKeysetMetadataCacheTest extends AbstractFederationFlowTest {
                             new SubjectSignedKeysetUriCriterion(signedJwksUri),
                             new SubjectEntityStatementCriterion(entityConfiguration)));
             Assert.assertNotNull(result);
-            Assert.assertEquals(result.size(), 0);
+            Assert.assertTrue(result.size() == 0 || result.get(0).getStatement() == null);
         } catch (MetadataCacheException e) {
             Assert.fail("Could not resolve signed keyset", e);
         }
diff --git a/oidfed-common-conf-impl/src/test/java/net/shibboleth/oidfed/flow/cache/SubordinateStatementMetadataCacheTest.java b/oidfed-common-conf-impl/src/test/java/net/shibboleth/oidfed/flow/cache/SubordinateStatementMetadataCacheTest.java
index 31e7ffa..6a37b8e 100644
--- a/oidfed-common-conf-impl/src/test/java/net/shibboleth/oidfed/flow/cache/SubordinateStatementMetadataCacheTest.java
+++ b/oidfed-common-conf-impl/src/test/java/net/shibboleth/oidfed/flow/cache/SubordinateStatementMetadataCacheTest.java
@@ -626,7 +626,7 @@ public class SubordinateStatementMetadataCacheTest extends AbstractFederationFlo
             throws MetadataCacheException, UnsupportedOperationException, IOException, URISyntaxException {
         final String entityId = uniqueClientId();
         mapResponse(entityConfigurationUrl(anchorId), mockResponse(trustedAnchorConfiguration()));
-        assertNoSubordinateStatement(entityId, false);
+        assertNoSubordinateStatement(entityId);
     }
 
     @Test
@@ -637,26 +637,17 @@ public class SubordinateStatementMetadataCacheTest extends AbstractFederationFlo
         when(federationHttpClient.executeOpen(any(),
                 argThat(new RequestUriMatcher(subordinateStatementUrl(anchorFetchEndpoint, entityId))),
                 any())).thenThrow(IOException.class);
-        assertNoSubordinateStatement(entityId, false);
+        assertNoSubordinateStatement(entityId);
     }
 
     protected void assertNoSubordinateStatement(final String entityId) {
-        assertNoSubordinateStatement(entityId, true);
-    }
-
-    protected void assertNoSubordinateStatement(final String entityId, final boolean containerExists) {
         try {
             final List<SubordinateStatementContainer> result =
                     subordinateStatementCache.get(new CriteriaSet(new SubjectEntityIDCriterion(entityId),
                             new ResponseContainerExpirationCriterion(Instant.now().plusSeconds(300)), 
                             new IssuerEntityIDCriterion(anchorId)));
             Assert.assertNotNull(result);
-            if (containerExists) {
-                Assert.assertEquals(result.size(), 1);
-                Assert.assertNull(result.get(0).getStatement());
-            } else {
-                Assert.assertEquals(result.size(), 0);
-            }
+            Assert.assertTrue(result.size() == 0 || result.get(0).getStatement() == null);
         } catch (MetadataCacheException e) {
             Assert.fail("Could not resolve entity configuration", e);
         }

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