From 6a15a231fa22e496a011757616c99541a02712b0 Mon Sep 17 00:00:00 2001 From: Valery Kharseko Date: Wed, 25 Mar 2026 10:38:44 +0300 Subject: [PATCH 01/12] Bump org.openidentityplatform.openicf to 2.0.3-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1c8b271b4..00b7e0669 100644 --- a/pom.xml +++ b/pom.xml @@ -371,7 +371,7 @@ org.openidentityplatform openicf - 2.0.2 + 2.0.3-SNAPSHOT pom import From ffd99962dedf7890f231ab2be929f6ed165cfdc7 Mon Sep 17 00:00:00 2001 From: Valera V Harseko Date: Wed, 25 Mar 2026 10:53:36 +0300 Subject: [PATCH 02/12] FIX SynchronizationServiceTest.java:[158,8] error: reference to assertThat is ambiguous --- .../openidm/sync/impl/SynchronizationServiceTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openidm-core/src/test/java/org/forgerock/openidm/sync/impl/SynchronizationServiceTest.java b/openidm-core/src/test/java/org/forgerock/openidm/sync/impl/SynchronizationServiceTest.java index 69f4cb399..6a9f3db74 100644 --- a/openidm-core/src/test/java/org/forgerock/openidm/sync/impl/SynchronizationServiceTest.java +++ b/openidm-core/src/test/java/org/forgerock/openidm/sync/impl/SynchronizationServiceTest.java @@ -53,6 +53,7 @@ import org.forgerock.json.resource.Connection; import org.forgerock.json.resource.CreateRequest; import org.forgerock.util.promise.Promise; +import org.forgerock.util.test.assertj.AssertJPromiseAssert; import org.mockito.ArgumentCaptor; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -155,7 +156,7 @@ public Promise answer(InvocationOnMock invo Promise promise = synchronizationService.actionInstance( mock(Context.class), actionRequest); - assertThat(promise).succeeded(); + AssertJPromiseAssert.assertThat(promise).succeeded(); JsonValue resource = promise.get().getJsonContent().get(0); assertThat(resource).stringAt("resourceName").isEqualTo("system/ldap/account/0123-456789ab-cdef"); assertThat(resource).hasNull("content"); From 2416e7186a4af53bb965086774615f78a5621e99 Mon Sep 17 00:00:00 2001 From: Valera V Harseko Date: Wed, 25 Mar 2026 11:00:42 +0300 Subject: [PATCH 03/12] FIX RouterAuditEventHandlerTest.java:[84,8] error: reference to assertThat is ambiguous --- .../audit/impl/RouterAuditEventHandlerTest.java | 14 ++++++++------ .../sync/impl/SynchronizationServiceTest.java | 1 + 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/openidm-audit/src/test/java/org/forgerock/openidm/audit/impl/RouterAuditEventHandlerTest.java b/openidm-audit/src/test/java/org/forgerock/openidm/audit/impl/RouterAuditEventHandlerTest.java index 200ec5930..ca4f84909 100644 --- a/openidm-audit/src/test/java/org/forgerock/openidm/audit/impl/RouterAuditEventHandlerTest.java +++ b/openidm-audit/src/test/java/org/forgerock/openidm/audit/impl/RouterAuditEventHandlerTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems,LLC */ package org.forgerock.openidm.audit.impl; @@ -46,6 +47,7 @@ import org.forgerock.services.context.RootContext; import org.forgerock.util.promise.Promise; import org.forgerock.util.query.QueryFilter; +import org.forgerock.util.test.assertj.AssertJPromiseAssert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -81,7 +83,7 @@ public void testReadEntry() throws Exception { )); Promise createPromise = routerAuditEventHandler.publishEvent(new RootContext(), ACCESS, content); - assertThat(createPromise).succeeded(); + AssertJPromiseAssert.assertThat(createPromise).succeeded(); ResourceResponse createResponse = createPromise.getOrThrow(); // when @@ -89,7 +91,7 @@ public void testReadEntry() throws Exception { routerAuditEventHandler.readEvent(new RootContext(), ACCESS, TEST_ID); // then - assertThat(promise).succeeded(); + AssertJPromiseAssert.assertThat(promise).succeeded(); ResourceResponse readResponse = promise.getOrThrow(); assertThat(readResponse.getId()).isEqualTo(TEST_ID); assertThat(readResponse.getContent().get(FIELD_CONTENT_ID).required().asString()) @@ -109,7 +111,7 @@ public void testQueryEntries() throws Exception { )); Promise createPromise = routerAuditEventHandler.publishEvent(new RootContext(), ACCESS, content); - assertThat(createPromise).succeeded(); + AssertJPromiseAssert.assertThat(createPromise).succeeded(); createPromise.getOrThrow(); // when @@ -130,7 +132,7 @@ public boolean handleResource(ResourceResponse resource) { } }); // then - assertThat(promise).succeeded(); + AssertJPromiseAssert.assertThat(promise).succeeded(); promise.getOrThrow(); assertThat(responses).hasSize(1); assertThat(responses.get(0).getId()).isEqualTo(TEST_ID); @@ -151,7 +153,7 @@ public void testCreateEntry() throws Exception { routerAuditEventHandler.publishEvent(new RootContext(), ACCESS, content); // then - assertThat(promise).succeeded(); + AssertJPromiseAssert.assertThat(promise).succeeded(); ResourceResponse resource = promise.getOrThrow(); assertThat(resource).isNotNull(); assertThat(resource.getContent().isEqualTo(content.put(FIELD_CONTENT_REVISION, "0"))).isTrue(); @@ -169,7 +171,7 @@ public boolean handleResource(ResourceResponse resource) { return true; } }); - assertThat(queryPromise).succeeded(); + AssertJPromiseAssert.assertThat(queryPromise).succeeded(); queryPromise.getOrThrow(); assertThat(contentRecords).hasSize(1); JsonValue dbContent = contentRecords.get(0); diff --git a/openidm-core/src/test/java/org/forgerock/openidm/sync/impl/SynchronizationServiceTest.java b/openidm-core/src/test/java/org/forgerock/openidm/sync/impl/SynchronizationServiceTest.java index 6a9f3db74..51e8df4da 100644 --- a/openidm-core/src/test/java/org/forgerock/openidm/sync/impl/SynchronizationServiceTest.java +++ b/openidm-core/src/test/java/org/forgerock/openidm/sync/impl/SynchronizationServiceTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Portions copyright 2015-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems,LLC */ package org.forgerock.openidm.sync.impl; From 523c9296c7cba301b1babc63ae4426951e3427d5 Mon Sep 17 00:00:00 2001 From: Valera V Harseko Date: Wed, 25 Mar 2026 11:20:38 +0300 Subject: [PATCH 04/12] FIX ConfigObjectServiceTest.java:[370,8] error: reference to assertThat is ambiguous --- .../openidm/config/manage/ConfigObjectServiceTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openidm-config/src/test/java/org/forgerock/openidm/config/manage/ConfigObjectServiceTest.java b/openidm-config/src/test/java/org/forgerock/openidm/config/manage/ConfigObjectServiceTest.java index 5c2c3b77f..96b555fdd 100644 --- a/openidm-config/src/test/java/org/forgerock/openidm/config/manage/ConfigObjectServiceTest.java +++ b/openidm-config/src/test/java/org/forgerock/openidm/config/manage/ConfigObjectServiceTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2016 ForgeRock AS. + * Portions copyright 2024-2026 3A Systems,LLC */ package org.forgerock.openidm.config.manage; @@ -367,7 +368,7 @@ public void testPatchSendsClusterEvent() { // then verify(clusterManagementService, times(2)).sendEvent(any(ClusterEvent.class)); - assertThat(results).isNotNull().succeeded(); + AssertJPromiseAssert.assertThat(results).isNotNull().succeeded(); } From 95ae9a869c873cacb825a9e1d828155c8665da17 Mon Sep 17 00:00:00 2001 From: Valera V Harseko Date: Wed, 25 Mar 2026 11:21:36 +0300 Subject: [PATCH 05/12] FIX ConfigObjectServiceTest.java:[370,8] error: reference to assertThat is ambiguous --- .../forgerock/openidm/config/manage/ConfigObjectServiceTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/openidm-config/src/test/java/org/forgerock/openidm/config/manage/ConfigObjectServiceTest.java b/openidm-config/src/test/java/org/forgerock/openidm/config/manage/ConfigObjectServiceTest.java index 96b555fdd..ec61d371e 100644 --- a/openidm-config/src/test/java/org/forgerock/openidm/config/manage/ConfigObjectServiceTest.java +++ b/openidm-config/src/test/java/org/forgerock/openidm/config/manage/ConfigObjectServiceTest.java @@ -82,6 +82,7 @@ import org.forgerock.services.context.TransactionIdContext; import org.forgerock.util.promise.Promise; import org.forgerock.util.query.QueryFilter; +import org.forgerock.util.test.assertj.AssertJPromiseAssert; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.InvalidSyntaxException; From 5e4257335f6a63ed7b6c754db0f99533291d0e3b Mon Sep 17 00:00:00 2001 From: Valera V Harseko Date: Wed, 25 Mar 2026 11:26:36 +0300 Subject: [PATCH 06/12] FIX RestServiceTest.java:[198,12] error: reference to assertThat is ambiguous --- .../org/forgerock/openidm/external/rest/RestServiceTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/openidm-external-rest/src/test/java/org/forgerock/openidm/external/rest/RestServiceTest.java b/openidm-external-rest/src/test/java/org/forgerock/openidm/external/rest/RestServiceTest.java index 6c0dcaf1b..9f58cd6f3 100644 --- a/openidm-external-rest/src/test/java/org/forgerock/openidm/external/rest/RestServiceTest.java +++ b/openidm-external-rest/src/test/java/org/forgerock/openidm/external/rest/RestServiceTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. + * Portions copyright 2019-2026 3A Systems, LLC */ package org.forgerock.openidm.external.rest; @@ -49,6 +50,7 @@ import org.forgerock.services.context.Context; import org.forgerock.util.promise.NeverThrowsException; import org.forgerock.util.promise.Promise; +import org.forgerock.util.test.assertj.AssertJPromiseAssert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -195,7 +197,7 @@ public void testCallAction(final ClientRequestParams clientRequestParams, final // then if (expectedCode != null) { - assertThat(result).failedWithException(); + AssertJPromiseAssert.assertThat(result).failedWithException(); try { result.getOrThrow(); fail(); From d945f9e6ce1973e314de56975aea78298e627fb4 Mon Sep 17 00:00:00 2001 From: Valera V Harseko Date: Wed, 25 Mar 2026 11:33:22 +0300 Subject: [PATCH 07/12] FIX IdentityProviderServiceTest.java:[90,8] error: reference to assertThat is ambiguous --- .../openidm/idp/impl/IdentityProviderServiceTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/openidm-identity-provider/src/test/java/org/forgerock/openidm/idp/impl/IdentityProviderServiceTest.java b/openidm-identity-provider/src/test/java/org/forgerock/openidm/idp/impl/IdentityProviderServiceTest.java index 09729f2fc..e0baf3580 100644 --- a/openidm-identity-provider/src/test/java/org/forgerock/openidm/idp/impl/IdentityProviderServiceTest.java +++ b/openidm-identity-provider/src/test/java/org/forgerock/openidm/idp/impl/IdentityProviderServiceTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS + * Portions copyright 2026 3A Systems,LLC */ package org.forgerock.openidm.idp.impl; @@ -31,6 +32,7 @@ import org.forgerock.openidm.idp.config.ProviderConfig; import org.forgerock.services.context.RootContext; import org.forgerock.util.promise.Promise; +import org.forgerock.util.test.assertj.AssertJPromiseAssert; import org.testng.annotations.BeforeSuite; import org.testng.annotations.Test; @@ -87,7 +89,7 @@ public void testReadInstance() throws Exception { final Promise promise = service.readInstance(new RootContext(), newReadRequest("")); - assertThat(promise).succeeded(); + AssertJPromiseAssert.assertThat(promise).succeeded(); final JsonValue response = promise.get().getContent(); assertThat(response).hasArray("providers").hasSize(1); From a89f1aade645b531dec2d22f6bb581da352cfc41 Mon Sep 17 00:00:00 2001 From: Valera V Harseko Date: Wed, 25 Mar 2026 11:41:18 +0300 Subject: [PATCH 08/12] FIX ObjectClassResourceProviderTest.java:[94,8] error: reference to assertThat is ambiguous --- .../openicf/impl/ObjectClassResourceProviderTest.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/openidm-provisioner-openicf/src/test/java/org/forgerock/openidm/provisioner/openicf/impl/ObjectClassResourceProviderTest.java b/openidm-provisioner-openicf/src/test/java/org/forgerock/openidm/provisioner/openicf/impl/ObjectClassResourceProviderTest.java index a8b17dd4d..29bf9603e 100644 --- a/openidm-provisioner-openicf/src/test/java/org/forgerock/openidm/provisioner/openicf/impl/ObjectClassResourceProviderTest.java +++ b/openidm-provisioner-openicf/src/test/java/org/forgerock/openidm/provisioner/openicf/impl/ObjectClassResourceProviderTest.java @@ -12,6 +12,7 @@ * own identifying information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. + * Portions copyright 2026 3A Systems,LLC */ package org.forgerock.openidm.provisioner.openicf.impl; @@ -43,6 +44,7 @@ import org.forgerock.openidm.provisioner.openicf.commons.OperationOptionInfoHelper; import org.forgerock.services.context.RootContext; import org.forgerock.util.promise.Promise; +import org.forgerock.util.test.assertj.AssertJPromiseAssert; import org.identityconnectors.framework.api.ConnectorFacade; import org.identityconnectors.framework.api.operations.APIOperation; import org.identityconnectors.framework.api.operations.CreateApiOp; @@ -91,7 +93,7 @@ public void testUnsupportedCreateWithId() throws Exception { createHttpContext("PUT", httpHeaders), Requests.newCreateRequest("", "fakeId", json(object()))); // then - assertThat(upsertPromise) + AssertJPromiseAssert.assertThat(upsertPromise) .isNotNull() .failedWithException() .hasCauseInstanceOf(UnsupportedOperationException.class) @@ -103,7 +105,7 @@ public void testUnsupportedCreateWithId() throws Exception { createHttpContext("PUT", httpHeaders), Requests.newCreateRequest("", "fakeId", json(object()))); // then - assertThat(upsertPromise) + AssertJPromiseAssert.assertThat(upsertPromise) .isNotNull() .failedWithException() .hasCauseInstanceOf(UnsupportedOperationException.class) @@ -113,7 +115,7 @@ public void testUnsupportedCreateWithId() throws Exception { Promise createPromise = resourceProvider.handleCreate(new RootContext(), Requests.newCreateRequest("", "fakeId", json(object()))); // then - assertThat(createPromise) + AssertJPromiseAssert.assertThat(createPromise) .isNotNull() .failedWithException() .hasCauseInstanceOf(UnsupportedOperationException.class) From d362d499b9a153b071441cf08dddbd84041f673f Mon Sep 17 00:00:00 2001 From: Valera V Harseko Date: Wed, 25 Mar 2026 12:52:43 +0300 Subject: [PATCH 09/12] FIX JDBCDataSourceServiceTest.java:[26,34] error: package org.assertj.core.api does not exist --- openidm-repo-jdbc/pom.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/openidm-repo-jdbc/pom.xml b/openidm-repo-jdbc/pom.xml index 69bf87ce0..abe6093a5 100644 --- a/openidm-repo-jdbc/pom.xml +++ b/openidm-repo-jdbc/pom.xml @@ -22,7 +22,7 @@ ~ your own identifying information: ~ "Portions Copyrighted [year] [name of copyright owner]" ~ - ~ Portions Copyrighted 2024 3A Systems LLC. + ~ Portions Copyrighted 2019-2026 3A Systems LLC. --> 4.0.0 @@ -136,6 +136,12 @@ org.openidentityplatform.commons util + + org.assertj + assertj-core + 3.27.7 + test + From 4c0248bcb9f0fa6c4a3077e5958937bc24ce13ee Mon Sep 17 00:00:00 2001 From: Valera V Harseko Date: Wed, 25 Mar 2026 13:05:29 +0300 Subject: [PATCH 10/12] FIX AuthenticationServiceTest.java:[247,8] error: reference to assertThat is ambiguous --- .../org/forgerock/openidm/auth/AuthenticationServiceTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openidm-authnfilter/src/test/java/org/forgerock/openidm/auth/AuthenticationServiceTest.java b/openidm-authnfilter/src/test/java/org/forgerock/openidm/auth/AuthenticationServiceTest.java index ef596db2f..4fcfbb716 100644 --- a/openidm-authnfilter/src/test/java/org/forgerock/openidm/auth/AuthenticationServiceTest.java +++ b/openidm-authnfilter/src/test/java/org/forgerock/openidm/auth/AuthenticationServiceTest.java @@ -47,6 +47,7 @@ import org.forgerock.services.context.AttributesContext; import org.forgerock.services.context.RootContext; import org.forgerock.util.promise.Promise; +import org.forgerock.util.test.assertj.AssertJPromiseAssert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -244,7 +245,7 @@ public void testLogoutAction() throws Exception { AttributesContext context = new AttributesContext(new RootContext()); Promise promise = authenticationService.actionInstance(context, newActionRequest("", Action.logout.name())); - assertThat(promise).succeeded(); + AssertJPromiseAssert.assertThat(promise).succeeded(); assertThat(promise.get().getJsonContent().get("success").asBoolean()).isTrue(); assertThat(context.getAttributes()).containsEntry(JwtSessionModule.LOGOUT_SESSION_REQUEST_ATTRIBUTE_NAME, true); } From a3fc20edd4afcc5ca2bc1f82146e561327bf57f3 Mon Sep 17 00:00:00 2001 From: Valera V Harseko Date: Wed, 25 Mar 2026 13:20:57 +0300 Subject: [PATCH 11/12] FIX MaintenanceFilterTest.java:[96,12] error: reference to assertThat is ambiguous --- .../maintenance/impl/MaintenanceFilterTest.java | 10 ++++++---- .../maintenance/impl/UpdateLogServiceImplTest.java | 14 ++++++++------ 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/openidm-maintenance/src/test/java/org/forgerock/openidm/maintenance/impl/MaintenanceFilterTest.java b/openidm-maintenance/src/test/java/org/forgerock/openidm/maintenance/impl/MaintenanceFilterTest.java index 292961814..aa2412fd8 100644 --- a/openidm-maintenance/src/test/java/org/forgerock/openidm/maintenance/impl/MaintenanceFilterTest.java +++ b/openidm-maintenance/src/test/java/org/forgerock/openidm/maintenance/impl/MaintenanceFilterTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. + * Portions copyright 2026 3A Systems,LLC */ package org.forgerock.openidm.maintenance.impl; @@ -31,6 +32,7 @@ import org.forgerock.services.context.Context; import org.forgerock.services.context.RootContext; import org.forgerock.util.promise.Promise; +import org.forgerock.util.test.assertj.AssertJPromiseAssert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -93,10 +95,10 @@ public void testFitlerCreate(boolean maintenanceEnabled, String resourcePath, Co final CreateRequest request = newCreateRequest(resourcePath, object); final Promise promise = filter.filterCreate(context, request, handler); if (passRequest) { - assertThat(promise).succeeded(); + AssertJPromiseAssert.assertThat(promise).succeeded(); assertThat(handler.getRequests()).containsExactly(request); } else { - assertThat(promise).failedWithException().isInstanceOf(ServiceUnavailableException.class); + AssertJPromiseAssert.assertThat(promise).failedWithException().isInstanceOf(ServiceUnavailableException.class); assertThat(handler.getRequests()).isEmpty(); } } @@ -127,7 +129,7 @@ public void testFilterRead(String resourcePath) throws Exception { // first create an object final CreateRequest create = newCreateRequest(resourcePath, "1", object); Promise promise = filter.filterCreate(root, create, handler); - assertThat(promise).succeeded(); + AssertJPromiseAssert.assertThat(promise).succeeded(); assertThat(handler.getRequests()).containsExactly(create); handler.addResource(promise.get()); @@ -136,7 +138,7 @@ public void testFilterRead(String resourcePath) throws Exception { // perform the read final ReadRequest request = newReadRequest(resourcePath, "1"); promise = filter.filterRead(root, request, handler); - assertThat(promise).succeeded(); + AssertJPromiseAssert.assertThat(promise).succeeded(); assertThat(handler.getRequests()).containsExactly(create, request); } } diff --git a/openidm-maintenance/src/test/java/org/forgerock/openidm/maintenance/impl/UpdateLogServiceImplTest.java b/openidm-maintenance/src/test/java/org/forgerock/openidm/maintenance/impl/UpdateLogServiceImplTest.java index 0d35fe59f..64549dbf1 100644 --- a/openidm-maintenance/src/test/java/org/forgerock/openidm/maintenance/impl/UpdateLogServiceImplTest.java +++ b/openidm-maintenance/src/test/java/org/forgerock/openidm/maintenance/impl/UpdateLogServiceImplTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. + * Portions copyright 2026 3A Systems,LLC */ package org.forgerock.openidm.maintenance.impl; @@ -45,6 +46,7 @@ import org.forgerock.services.context.RootContext; import org.forgerock.util.promise.Promise; import org.forgerock.util.query.QueryFilter; +import org.forgerock.util.test.assertj.AssertJPromiseAssert; import org.testng.annotations.Test; /** @@ -56,25 +58,25 @@ public class UpdateLogServiceImplTest { @Test public void actionIsNotSupported() { - assertThat(updateLogService.handleAction(mock(Context.class), mock(ActionRequest.class))) + AssertJPromiseAssert.assertThat(updateLogService.handleAction(mock(Context.class), mock(ActionRequest.class))) .failedWithException().isInstanceOf(NotSupportedException.class); } @Test public void createIsNotSupported() { - assertThat(updateLogService.handleCreate(mock(Context.class), mock(CreateRequest.class))) + AssertJPromiseAssert.assertThat(updateLogService.handleCreate(mock(Context.class), mock(CreateRequest.class))) .failedWithException().isInstanceOf(NotSupportedException.class); } @Test public void deleteIsNotSupported() { - assertThat(updateLogService.handleDelete(mock(Context.class), mock(DeleteRequest.class))) + AssertJPromiseAssert.assertThat(updateLogService.handleDelete(mock(Context.class), mock(DeleteRequest.class))) .failedWithException().isInstanceOf(NotSupportedException.class); } @Test public void patchIsNotSupported() { - assertThat(updateLogService.handlePatch(mock(Context.class), mock(PatchRequest.class))) + AssertJPromiseAssert.assertThat(updateLogService.handlePatch(mock(Context.class), mock(PatchRequest.class))) .failedWithException().isInstanceOf(NotSupportedException.class); } @@ -95,7 +97,7 @@ public boolean handleResource(ResourceResponse resource) { return true; } }); - assertThat(promise).succeeded(); + AssertJPromiseAssert.assertThat(promise).succeeded(); assertThat(handler.getRequests()).hasSize(1); } @@ -111,7 +113,7 @@ public void testRead() throws ResourceException { final ReadRequest request = newReadRequest("1"); final Promise promise = updateLogService.handleRead(new RootContext(), request); - assertThat(promise).succeeded(); + AssertJPromiseAssert.assertThat(promise).succeeded(); assertThat(handler.getRequests()).hasSize(1); } From 24e14e37329325bc053f5c55ab74dbe40fa4230c Mon Sep 17 00:00:00 2001 From: Valery Kharseko Date: Wed, 25 Mar 2026 14:57:32 +0300 Subject: [PATCH 12/12] Update AuthenticationServiceTest.java --- .../org/forgerock/openidm/auth/AuthenticationServiceTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openidm-authnfilter/src/test/java/org/forgerock/openidm/auth/AuthenticationServiceTest.java b/openidm-authnfilter/src/test/java/org/forgerock/openidm/auth/AuthenticationServiceTest.java index 4fcfbb716..855af182d 100644 --- a/openidm-authnfilter/src/test/java/org/forgerock/openidm/auth/AuthenticationServiceTest.java +++ b/openidm-authnfilter/src/test/java/org/forgerock/openidm/auth/AuthenticationServiceTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS + * Portions copyright 2026 3A Systems, LLC */ package org.forgerock.openidm.auth; @@ -249,4 +250,4 @@ public void testLogoutAction() throws Exception { assertThat(promise.get().getJsonContent().get("success").asBoolean()).isTrue(); assertThat(context.getAttributes()).containsEntry(JwtSessionModule.LOGOUT_SESSION_REQUEST_ATTRIBUTE_NAME, true); } -} \ No newline at end of file +}