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 200ec59304..05013e99f5 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; @@ -25,7 +26,6 @@ import static org.forgerock.json.resource.ResourceResponse.FIELD_CONTENT_REVISION; import static org.forgerock.openidm.audit.impl.RouterAuditEventHandler.EVENT_ID; import static org.forgerock.util.query.QueryFilter.*; -import static org.forgerock.util.test.assertj.AssertJPromiseAssert.assertThat; import java.util.ArrayList; import java.util.Collections; @@ -46,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.BeforeMethod; import org.testng.annotations.Test; @@ -81,7 +82,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 +90,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 +110,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 +131,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 +152,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 +170,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-authnfilter/src/test/java/org/forgerock/openidm/auth/AuthenticationServiceTest.java b/openidm-authnfilter/src/test/java/org/forgerock/openidm/auth/AuthenticationServiceTest.java index ef596db2fc..19f001e772 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; @@ -20,7 +21,6 @@ import static org.forgerock.json.resource.Requests.newActionRequest; import static org.forgerock.json.resource.Requests.newReadRequest; import static org.forgerock.openidm.auth.AuthenticationService.Action; -import static org.forgerock.util.test.assertj.AssertJPromiseAssert.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -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); } 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 5c2c3b77fc..41edbaaacc 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 2026 3A Systems LLC */ package org.forgerock.openidm.config.manage; @@ -23,7 +24,6 @@ import static org.forgerock.json.resource.Requests.*; import static org.forgerock.json.resource.Responses.newResourceResponse; import static org.forgerock.openidm.config.manage.ConfigObjectService.asConfigQueryFilter; -import static org.forgerock.util.test.assertj.AssertJPromiseAssert.assertThat; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.*; @@ -81,6 +81,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; @@ -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(); } 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 69f4cb399a..6520ae939f 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; @@ -24,7 +25,6 @@ import static org.forgerock.json.resource.Responses.newQueryResponse; import static org.forgerock.json.resource.Responses.newResourceResponse; import static org.forgerock.openidm.sync.impl.SynchronizationService.ACTION_PARAM_RESOURCE_NAME; -import static org.forgerock.util.test.assertj.AssertJPromiseAssert.assertThat; import static org.forgerock.json.test.assertj.AssertJJsonValueAssert.assertThat; import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; @@ -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"); diff --git a/openidm-external-email/src/test/java/org/forgerock/openidm/external/email/impl/EmailServiceImplTest.java b/openidm-external-email/src/test/java/org/forgerock/openidm/external/email/impl/EmailServiceImplTest.java index 0ea3dd2a5c..dc17132f6e 100644 --- a/openidm-external-email/src/test/java/org/forgerock/openidm/external/email/impl/EmailServiceImplTest.java +++ b/openidm-external-email/src/test/java/org/forgerock/openidm/external/email/impl/EmailServiceImplTest.java @@ -12,13 +12,13 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015 ForgeRock AS. + * Portions copyright 2026 3A Systems LLC */ package org.forgerock.openidm.external.email.impl; import static org.forgerock.json.JsonValue.field; import static org.forgerock.json.JsonValue.json; import static org.forgerock.json.JsonValue.object; -import static org.forgerock.util.test.assertj.AssertJPromiseAssert.assertThat; import static org.mockito.Matchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doThrow; @@ -38,6 +38,7 @@ import org.forgerock.json.resource.Responses; import org.forgerock.json.resource.UpdateRequest; import org.forgerock.util.promise.Promise; +import org.forgerock.util.test.assertj.AssertJPromiseAssert; import org.testng.annotations.Test; public class EmailServiceImplTest { @@ -66,7 +67,7 @@ public void testSuccessfulActionInstance() throws Exception { ActionResponse expectedResponse = Responses.newActionResponse(JsonValue.json(object( field(STATUS, OK) ))); - assertThat(promise).succeeded().isInstanceOf(ActionResponse.class).isEqualTo(expectedResponse); + AssertJPromiseAssert.assertThat(promise).succeeded().isInstanceOf(ActionResponse.class).isEqualTo(expectedResponse); } @Test @@ -86,7 +87,7 @@ public void testFailedActionInstance() throws Exception { emailService.actionInstance(mock(Context.class), actionRequest); // then - assertThat(promise).failedWithException().isInstanceOf(BadRequestException.class); + AssertJPromiseAssert.assertThat(promise).failedWithException().isInstanceOf(BadRequestException.class); } @Test @@ -99,7 +100,7 @@ public void testPatchInstanceForbidden() throws Exception { emailService.patchInstance(mock(Context.class), mock(PatchRequest.class)); // then - assertThat(promise).failedWithException().isInstanceOf(ForbiddenException.class); + AssertJPromiseAssert.assertThat(promise).failedWithException().isInstanceOf(ForbiddenException.class); } @Test @@ -112,7 +113,7 @@ public void testReadInstanceForbidden() throws Exception { emailService.readInstance(mock(Context.class), mock(ReadRequest.class)); // then - assertThat(promise).failedWithException().isInstanceOf(ForbiddenException.class); + AssertJPromiseAssert.assertThat(promise).failedWithException().isInstanceOf(ForbiddenException.class); } @Test @@ -125,6 +126,6 @@ public void testUpdateInstanceForbidden() throws Exception { emailService.updateInstance(mock(Context.class), mock(UpdateRequest.class)); // then - assertThat(promise).failedWithException().isInstanceOf(ForbiddenException.class); + AssertJPromiseAssert.assertThat(promise).failedWithException().isInstanceOf(ForbiddenException.class); } } 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 6c0dcaf1bc..dd07d230c3 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 2026 3A Systems LLC */ package org.forgerock.openidm.external.rest; @@ -23,7 +24,6 @@ import static org.forgerock.json.resource.test.assertj.AssertJResourceExceptionAssert.assertThat; import static org.forgerock.openidm.external.rest.RestService.*; import static org.forgerock.util.promise.Promises.newResultPromise; -import static org.forgerock.util.test.assertj.AssertJPromiseAssert.assertThat; import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -49,6 +49,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 +196,7 @@ public void testCallAction(final ClientRequestParams clientRequestParams, final // then if (expectedCode != null) { - assertThat(result).failedWithException(); + AssertJPromiseAssert.assertThat(result).failedWithException(); try { result.getOrThrow(); fail(); 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 09729f2fc1..28b988b9a5 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,13 +12,13 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS + * Portions copyright 2026 3A Systems LLC */ package org.forgerock.openidm.idp.impl; import static org.assertj.core.api.Assertions.assertThat; import static org.forgerock.json.JsonValue.*; import static org.forgerock.json.resource.Requests.newReadRequest; -import static org.forgerock.util.test.assertj.AssertJPromiseAssert.assertThat; import static org.forgerock.json.test.assertj.AssertJJsonValueAssert.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -31,6 +31,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 +88,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); 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 292961814c..50e07aed93 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; @@ -19,7 +20,6 @@ import static org.forgerock.json.JsonValue.*; import static org.forgerock.json.resource.Requests.newCreateRequest; import static org.forgerock.json.resource.Requests.newReadRequest; -import static org.forgerock.util.test.assertj.AssertJPromiseAssert.assertThat; import org.forgerock.json.JsonValue; import org.forgerock.json.resource.CreateRequest; @@ -31,6 +31,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 +94,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 +128,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 +137,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 0d35fe59f1..b9ed331635 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; @@ -19,7 +20,6 @@ import static org.forgerock.json.resource.Requests.newQueryRequest; import static org.forgerock.json.resource.Requests.newReadRequest; import static org.forgerock.json.resource.Responses.newResourceResponse; -import static org.forgerock.util.test.assertj.AssertJPromiseAssert.assertThat; import static org.mockito.Mockito.mock; import org.forgerock.json.JsonPointer; @@ -45,6 +45,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 +57,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 +96,7 @@ public boolean handleResource(ResourceResponse resource) { return true; } }); - assertThat(promise).succeeded(); + AssertJPromiseAssert.assertThat(promise).succeeded(); assertThat(handler.getRequests()).hasSize(1); } @@ -111,7 +112,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); } 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 a8b17dd4d2..d30883378a 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,12 +12,12 @@ * 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; import static org.assertj.core.api.Assertions.assertThat; import static org.forgerock.json.JsonValue.*; -import static org.forgerock.util.test.assertj.AssertJPromiseAssert.assertThat; import static org.identityconnectors.framework.common.objects.ObjectClass.GROUP_NAME; import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; @@ -43,6 +43,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 +92,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 +104,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 +114,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) diff --git a/openidm-repo-jdbc/pom.xml b/openidm-repo-jdbc/pom.xml index 69bf87ce07..21f8c598c3 100644 --- a/openidm-repo-jdbc/pom.xml +++ b/openidm-repo-jdbc/pom.xml @@ -132,6 +132,11 @@ 9.1.0 test + + org.assertj + assertj-core + test + org.openidentityplatform.commons util diff --git a/openidm-scheduler/src/test/java/org/forgerock/openidm/scheduler/JobRequestHandlerTest.java b/openidm-scheduler/src/test/java/org/forgerock/openidm/scheduler/JobRequestHandlerTest.java index 21694904c9..74cd3887e1 100644 --- a/openidm-scheduler/src/test/java/org/forgerock/openidm/scheduler/JobRequestHandlerTest.java +++ b/openidm-scheduler/src/test/java/org/forgerock/openidm/scheduler/JobRequestHandlerTest.java @@ -12,11 +12,11 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. + * Portions copyright 2026 3A Systems LLC */ package org.forgerock.openidm.scheduler; import static org.forgerock.json.resource.Resources.newInternalConnectionFactory; -import static org.forgerock.util.test.assertj.AssertJPromiseAssert.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.quartz.impl.StdSchedulerFactory.PROP_SCHED_INSTANCE_ID; @@ -98,7 +98,7 @@ public void testCreateJob(final JsonValue scheduleConfig) throws Exception { jobRequestHandler.handleCreate(new RootContext(), Requests.newCreateRequest("", scheduleConfig)); // then - assertThat(promise).succeeded().isNotNull(); + AssertJPromiseAssert.assertThat(promise).succeeded().isNotNull(); Assertions.assertThat(promise.get().getId()).isNotNull().isNotEqualTo(""); } @@ -115,7 +115,7 @@ public void testReadJob(final JsonValue scheduleConfig) throws Exception { jobRequestHandler.handleRead(new RootContext(), Requests.newReadRequest("", job.get().getId())); // then - assertThat(promise).succeeded().isNotNull(); + AssertJPromiseAssert.assertThat(promise).succeeded().isNotNull(); Assertions.assertThat(promise.get().getId()).isNotNull().isEqualTo(job.get().getId()); } @@ -134,7 +134,7 @@ public void testUpdateJob(final JsonValue scheduleConfig) throws Exception { new RootContext(), Requests.newUpdateRequest("", job.get().getId(), scheduleConfig)); // then - assertThat(promise).succeeded().isNotNull(); + AssertJPromiseAssert.assertThat(promise).succeeded().isNotNull(); Assertions.assertThat(promise.get().getContent().get("enabled").asBoolean()).isNotNull().isEqualTo(true); } @@ -151,7 +151,7 @@ public void testDeleteJob(final JsonValue scheduleConfig) throws Exception { jobRequestHandler.handleDelete(new RootContext(), Requests.newDeleteRequest("", job.get().getId())); // then - assertThat(promise).succeeded().isNotNull(); + AssertJPromiseAssert.assertThat(promise).succeeded().isNotNull(); Assertions.assertThat(promise.get().getId()).isNotNull().isEqualTo(job.get().getId()); } @@ -164,7 +164,7 @@ public void testPatchJob() throws Exception { jobRequestHandler.handlePatch(new RootContext(), Requests.newPatchRequest("", "")); // then - assertThat(promise).failedWithException().isInstanceOf(NotSupportedException.class); + AssertJPromiseAssert.assertThat(promise).failedWithException().isInstanceOf(NotSupportedException.class); } @Test @@ -225,7 +225,7 @@ public void testQueryJobs() throws Exception { JsonValue persisted = getConfig("/schedule-persisted.json"); Promise createPromise = jobRequestHandler.handleCreate(new RootContext(), Requests.newCreateRequest("", persisted)); - assertThat(createPromise).isNotNull().succeeded(); + AssertJPromiseAssert.assertThat(createPromise).isNotNull().succeeded(); } // should have 12 jobs. validateQueryCount( @@ -278,7 +278,7 @@ public boolean handleResource(ResourceResponse resource) { return true; } }); - assertThat(queryPromise).isNotNull().succeeded(); + AssertJPromiseAssert.assertThat(queryPromise).isNotNull().succeeded(); Assertions.assertThat(count.get()).isEqualTo(expectedCount); return queryPromise.getOrThrowUninterruptibly(); } diff --git a/openidm-scheduler/src/test/java/org/forgerock/openidm/scheduler/TriggerRequestHandlerTest.java b/openidm-scheduler/src/test/java/org/forgerock/openidm/scheduler/TriggerRequestHandlerTest.java index 06b5d89f65..83a14d3ce0 100644 --- a/openidm-scheduler/src/test/java/org/forgerock/openidm/scheduler/TriggerRequestHandlerTest.java +++ b/openidm-scheduler/src/test/java/org/forgerock/openidm/scheduler/TriggerRequestHandlerTest.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.scheduler; @@ -19,7 +20,6 @@ import static org.forgerock.json.JsonValue.object; import static org.forgerock.json.resource.Resources.newInternalConnectionFactory; import static org.forgerock.openidm.scheduler.TriggerRequestHandler.TRIGGERS_REPO_RESOURCE_PATH; -import static org.forgerock.util.test.assertj.AssertJPromiseAssert.assertThat; import java.util.UUID; import java.util.concurrent.atomic.AtomicInteger; @@ -41,6 +41,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; public class TriggerRequestHandlerTest { @@ -58,7 +59,7 @@ public void testCreateTrigger() { triggerRequestHandler.handleCreate(new RootContext(), Requests.newCreateRequest("", json(object()))); // then - assertThat(promise).failedWithException().isInstanceOf(NotSupportedException.class); + AssertJPromiseAssert.assertThat(promise).failedWithException().isInstanceOf(NotSupportedException.class); } @Test @@ -73,7 +74,7 @@ public void testReadTrigger() throws ResourceException { triggerRequestHandler.handleRead(new RootContext(), Requests.newReadRequest("", "trigger1")); // then - assertThat(promise).succeeded().isNotNull(); + AssertJPromiseAssert.assertThat(promise).succeeded().isNotNull(); } @Test @@ -87,7 +88,7 @@ public void testUpdateTrigger() { triggerRequestHandler.handleUpdate(new RootContext(), Requests.newUpdateRequest("", json(object()))); // then - assertThat(promise).failedWithException().isInstanceOf(NotSupportedException.class); + AssertJPromiseAssert.assertThat(promise).failedWithException().isInstanceOf(NotSupportedException.class); } @Test @@ -101,7 +102,7 @@ public void testDeleteTrigger() { triggerRequestHandler.handleDelete(new RootContext(), Requests.newDeleteRequest("")); // then - assertThat(promise).failedWithException().isInstanceOf(NotSupportedException.class); + AssertJPromiseAssert.assertThat(promise).failedWithException().isInstanceOf(NotSupportedException.class); } @Test @@ -115,7 +116,7 @@ public void testPatchTrigger() { triggerRequestHandler.handlePatch(new RootContext(), Requests.newPatchRequest("")); // then - assertThat(promise).failedWithException().isInstanceOf(NotSupportedException.class); + AssertJPromiseAssert.assertThat(promise).failedWithException().isInstanceOf(NotSupportedException.class); } @Test @@ -129,7 +130,7 @@ public void testAction() { triggerRequestHandler.handleAction(new RootContext(), Requests.newActionRequest("", "")); // then - assertThat(promise).failedWithException().isInstanceOf(NotSupportedException.class); + AssertJPromiseAssert.assertThat(promise).failedWithException().isInstanceOf(NotSupportedException.class); } @Test @@ -154,7 +155,7 @@ public boolean handleResource(ResourceResponse resourceResponse) { }); // then - assertThat(promise).succeeded().isNotNull(); + AssertJPromiseAssert.assertThat(promise).succeeded().isNotNull(); Assertions.assertThat(count.get()).isEqualTo(NUMBER_OF_TRIGGERS); } diff --git a/pom.xml b/pom.xml index 15f42c57b1..2ec210eeec 100644 --- a/pom.xml +++ b/pom.xml @@ -372,15 +372,10 @@ org.openidentityplatform openicf - 2.0.2 + 2.0.3-SNAPSHOT pom import - - org.bouncycastle - bcmail-jdk18on - 1.78.1 - commons-codec