[java-idp-plugin-oidc-op-oidfed] 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-idp-plugin-oidc-op-oidfed.

View the commit online:
https://codeberg.org/Shibboleth/java-idp-plugin-oidc-op-oidfed/commit/248b33383c7751255f6cfbd21ad4cd0644c325e0

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

commit 248b33383c7751255f6cfbd21ad4cd0644c325e0
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Fri May 15 13:39:47 2026 +0300

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

diff --git a/idp-oidfed-op-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/oidfed/cache/EntityConfigurationMetadataCacheTest.java b/idp-oidfed-op-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/oidfed/cache/EntityConfigurationMetadataCacheTest.java
index 43c44e5..7973b18 100644
--- a/idp-oidfed-op-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/oidfed/cache/EntityConfigurationMetadataCacheTest.java
+++ b/idp-oidfed-op-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/oidfed/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/idp-oidfed-op-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/oidfed/cache/SignedKeysetMetadataCacheTest.java b/idp-oidfed-op-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/oidfed/cache/SignedKeysetMetadataCacheTest.java
index 44ab21e..97ecb20 100644
--- a/idp-oidfed-op-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/oidfed/cache/SignedKeysetMetadataCacheTest.java
+++ b/idp-oidfed-op-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/oidfed/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/idp-oidfed-op-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/oidfed/cache/SubordinateStatementMetadataCacheTest.java b/idp-oidfed-op-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/oidfed/cache/SubordinateStatementMetadataCacheTest.java
index 9b505f8..16376f1 100644
--- a/idp-oidfed-op-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/oidfed/cache/SubordinateStatementMetadataCacheTest.java
+++ b/idp-oidfed-op-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/oidfed/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.