Skip to content

Commit 307d2e1

Browse files
maximthomasmaximthomas
authored
Take bouncycastle version from commons (#165)
1 parent 615ef0f commit 307d2e1

14 files changed

Lines changed: 72 additions & 61 deletions

File tree

‎openidm-audit/src/test/java/org/forgerock/openidm/audit/impl/RouterAuditEventHandlerTest.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* information: "Portions copyright [year] [name of copyright owner]".
1313
*
1414
* Copyright 2014-2016 ForgeRock AS.
15+
* Portions copyright 2026 3A Systems LLC
1516
*/
1617

1718
package org.forgerock.openidm.audit.impl;
@@ -25,7 +26,6 @@
2526
import static org.forgerock.json.resource.ResourceResponse.FIELD_CONTENT_REVISION;
2627
import static org.forgerock.openidm.audit.impl.RouterAuditEventHandler.EVENT_ID;
2728
import static org.forgerock.util.query.QueryFilter.*;
28-
import static org.forgerock.util.test.assertj.AssertJPromiseAssert.assertThat;
2929

3030
import java.util.ArrayList;
3131
import java.util.Collections;
@@ -46,6 +46,7 @@
4646
import org.forgerock.services.context.RootContext;
4747
import org.forgerock.util.promise.Promise;
4848
import org.forgerock.util.query.QueryFilter;
49+
import org.forgerock.util.test.assertj.AssertJPromiseAssert;
4950
import org.testng.annotations.BeforeMethod;
5051
import org.testng.annotations.Test;
5152

@@ -81,15 +82,15 @@ public void testReadEntry() throws Exception {
8182
));
8283
Promise<ResourceResponse, ResourceException> createPromise =
8384
routerAuditEventHandler.publishEvent(new RootContext(), ACCESS, content);
84-
assertThat(createPromise).succeeded();
85+
AssertJPromiseAssert.assertThat(createPromise).succeeded();
8586
ResourceResponse createResponse = createPromise.getOrThrow();
8687

8788
// when
8889
Promise<ResourceResponse, ResourceException> promise =
8990
routerAuditEventHandler.readEvent(new RootContext(), ACCESS, TEST_ID);
9091

9192
// then
92-
assertThat(promise).succeeded();
93+
AssertJPromiseAssert.assertThat(promise).succeeded();
9394
ResourceResponse readResponse = promise.getOrThrow();
9495
assertThat(readResponse.getId()).isEqualTo(TEST_ID);
9596
assertThat(readResponse.getContent().get(FIELD_CONTENT_ID).required().asString())
@@ -109,7 +110,7 @@ public void testQueryEntries() throws Exception {
109110
));
110111
Promise<ResourceResponse, ResourceException> createPromise =
111112
routerAuditEventHandler.publishEvent(new RootContext(), ACCESS, content);
112-
assertThat(createPromise).succeeded();
113+
AssertJPromiseAssert.assertThat(createPromise).succeeded();
113114
createPromise.getOrThrow();
114115

115116
// when
@@ -130,7 +131,7 @@ public boolean handleResource(ResourceResponse resource) {
130131
}
131132
});
132133
// then
133-
assertThat(promise).succeeded();
134+
AssertJPromiseAssert.assertThat(promise).succeeded();
134135
promise.getOrThrow();
135136
assertThat(responses).hasSize(1);
136137
assertThat(responses.get(0).getId()).isEqualTo(TEST_ID);
@@ -151,7 +152,7 @@ public void testCreateEntry() throws Exception {
151152
routerAuditEventHandler.publishEvent(new RootContext(), ACCESS, content);
152153

153154
// then
154-
assertThat(promise).succeeded();
155+
AssertJPromiseAssert.assertThat(promise).succeeded();
155156
ResourceResponse resource = promise.getOrThrow();
156157
assertThat(resource).isNotNull();
157158
assertThat(resource.getContent().isEqualTo(content.put(FIELD_CONTENT_REVISION, "0"))).isTrue();
@@ -169,7 +170,7 @@ public boolean handleResource(ResourceResponse resource) {
169170
return true;
170171
}
171172
});
172-
assertThat(queryPromise).succeeded();
173+
AssertJPromiseAssert.assertThat(queryPromise).succeeded();
173174
queryPromise.getOrThrow();
174175
assertThat(contentRecords).hasSize(1);
175176
JsonValue dbContent = contentRecords.get(0);

‎openidm-authnfilter/src/test/java/org/forgerock/openidm/auth/AuthenticationServiceTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* information: "Portions copyright [year] [name of copyright owner]".
1313
*
1414
* Copyright 2016 ForgeRock AS
15+
* Portions copyright 2026 3A Systems LLC
1516
*/
1617
package org.forgerock.openidm.auth;
1718

@@ -20,7 +21,6 @@
2021
import static org.forgerock.json.resource.Requests.newActionRequest;
2122
import static org.forgerock.json.resource.Requests.newReadRequest;
2223
import static org.forgerock.openidm.auth.AuthenticationService.Action;
23-
import static org.forgerock.util.test.assertj.AssertJPromiseAssert.assertThat;
2424
import static org.mockito.Mockito.mock;
2525
import static org.mockito.Mockito.when;
2626

@@ -47,6 +47,7 @@
4747
import org.forgerock.services.context.AttributesContext;
4848
import org.forgerock.services.context.RootContext;
4949
import org.forgerock.util.promise.Promise;
50+
import org.forgerock.util.test.assertj.AssertJPromiseAssert;
5051
import org.testng.annotations.AfterMethod;
5152
import org.testng.annotations.BeforeMethod;
5253
import org.testng.annotations.Test;
@@ -244,7 +245,7 @@ public void testLogoutAction() throws Exception {
244245
AttributesContext context = new AttributesContext(new RootContext());
245246
Promise<ActionResponse, ResourceException> promise =
246247
authenticationService.actionInstance(context, newActionRequest("", Action.logout.name()));
247-
assertThat(promise).succeeded();
248+
AssertJPromiseAssert.assertThat(promise).succeeded();
248249
assertThat(promise.get().getJsonContent().get("success").asBoolean()).isTrue();
249250
assertThat(context.getAttributes()).containsEntry(JwtSessionModule.LOGOUT_SESSION_REQUEST_ATTRIBUTE_NAME, true);
250251
}

‎openidm-config/src/test/java/org/forgerock/openidm/config/manage/ConfigObjectServiceTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* information: "Portions copyright [year] [name of copyright owner]".
1313
*
1414
* Copyright 2014-2016 ForgeRock AS.
15+
* Portions copyright 2026 3A Systems LLC
1516
*/
1617
package org.forgerock.openidm.config.manage;
1718

@@ -23,7 +24,6 @@
2324
import static org.forgerock.json.resource.Requests.*;
2425
import static org.forgerock.json.resource.Responses.newResourceResponse;
2526
import static org.forgerock.openidm.config.manage.ConfigObjectService.asConfigQueryFilter;
26-
import static org.forgerock.util.test.assertj.AssertJPromiseAssert.assertThat;
2727
import static org.mockito.Matchers.any;
2828
import static org.mockito.Matchers.anyString;
2929
import static org.mockito.Mockito.*;
@@ -81,6 +81,7 @@
8181
import org.forgerock.services.context.TransactionIdContext;
8282
import org.forgerock.util.promise.Promise;
8383
import org.forgerock.util.query.QueryFilter;
84+
import org.forgerock.util.test.assertj.AssertJPromiseAssert;
8485
import org.osgi.framework.Bundle;
8586
import org.osgi.framework.BundleContext;
8687
import org.osgi.framework.InvalidSyntaxException;
@@ -367,7 +368,7 @@ public void testPatchSendsClusterEvent() {
367368

368369
// then
369370
verify(clusterManagementService, times(2)).sendEvent(any(ClusterEvent.class));
370-
assertThat(results).isNotNull().succeeded();
371+
AssertJPromiseAssert.assertThat(results).isNotNull().succeeded();
371372
}
372373

373374

‎openidm-core/src/test/java/org/forgerock/openidm/sync/impl/SynchronizationServiceTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* information: "Portions copyright [year] [name of copyright owner]".
1313
*
1414
* Portions copyright 2015-2016 ForgeRock AS.
15+
* Portions copyright 2026 3A Systems LLC
1516
*/
1617

1718
package org.forgerock.openidm.sync.impl;
@@ -24,7 +25,6 @@
2425
import static org.forgerock.json.resource.Responses.newQueryResponse;
2526
import static org.forgerock.json.resource.Responses.newResourceResponse;
2627
import static org.forgerock.openidm.sync.impl.SynchronizationService.ACTION_PARAM_RESOURCE_NAME;
27-
import static org.forgerock.util.test.assertj.AssertJPromiseAssert.assertThat;
2828
import static org.forgerock.json.test.assertj.AssertJJsonValueAssert.assertThat;
2929
import static org.mockito.Matchers.any;
3030
import static org.mockito.Mockito.mock;
@@ -53,6 +53,7 @@
5353
import org.forgerock.json.resource.Connection;
5454
import org.forgerock.json.resource.CreateRequest;
5555
import org.forgerock.util.promise.Promise;
56+
import org.forgerock.util.test.assertj.AssertJPromiseAssert;
5657
import org.mockito.ArgumentCaptor;
5758
import org.mockito.invocation.InvocationOnMock;
5859
import org.mockito.stubbing.Answer;
@@ -155,7 +156,7 @@ public Promise<ResourceResponse, ResourceException> answer(InvocationOnMock invo
155156
Promise<ActionResponse, ResourceException> promise = synchronizationService.actionInstance(
156157
mock(Context.class), actionRequest);
157158

158-
assertThat(promise).succeeded();
159+
AssertJPromiseAssert.assertThat(promise).succeeded();
159160
JsonValue resource = promise.get().getJsonContent().get(0);
160161
assertThat(resource).stringAt("resourceName").isEqualTo("system/ldap/account/0123-456789ab-cdef");
161162
assertThat(resource).hasNull("content");

‎openidm-external-email/src/test/java/org/forgerock/openidm/external/email/impl/EmailServiceImplTest.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
* information: "Portions copyright [year] [name of copyright owner]".
1313
*
1414
* Copyright 2015 ForgeRock AS.
15+
* Portions copyright 2026 3A Systems LLC
1516
*/
1617
package org.forgerock.openidm.external.email.impl;
1718

1819
import static org.forgerock.json.JsonValue.field;
1920
import static org.forgerock.json.JsonValue.json;
2021
import static org.forgerock.json.JsonValue.object;
21-
import static org.forgerock.util.test.assertj.AssertJPromiseAssert.assertThat;
2222
import static org.mockito.Matchers.any;
2323
import static org.mockito.Mockito.doNothing;
2424
import static org.mockito.Mockito.doThrow;
@@ -38,6 +38,7 @@
3838
import org.forgerock.json.resource.Responses;
3939
import org.forgerock.json.resource.UpdateRequest;
4040
import org.forgerock.util.promise.Promise;
41+
import org.forgerock.util.test.assertj.AssertJPromiseAssert;
4142
import org.testng.annotations.Test;
4243

4344
public class EmailServiceImplTest {
@@ -66,7 +67,7 @@ public void testSuccessfulActionInstance() throws Exception {
6667
ActionResponse expectedResponse = Responses.newActionResponse(JsonValue.json(object(
6768
field(STATUS, OK)
6869
)));
69-
assertThat(promise).succeeded().isInstanceOf(ActionResponse.class).isEqualTo(expectedResponse);
70+
AssertJPromiseAssert.assertThat(promise).succeeded().isInstanceOf(ActionResponse.class).isEqualTo(expectedResponse);
7071
}
7172

7273
@Test
@@ -86,7 +87,7 @@ public void testFailedActionInstance() throws Exception {
8687
emailService.actionInstance(mock(Context.class), actionRequest);
8788

8889
// then
89-
assertThat(promise).failedWithException().isInstanceOf(BadRequestException.class);
90+
AssertJPromiseAssert.assertThat(promise).failedWithException().isInstanceOf(BadRequestException.class);
9091
}
9192

9293
@Test
@@ -99,7 +100,7 @@ public void testPatchInstanceForbidden() throws Exception {
99100
emailService.patchInstance(mock(Context.class), mock(PatchRequest.class));
100101

101102
// then
102-
assertThat(promise).failedWithException().isInstanceOf(ForbiddenException.class);
103+
AssertJPromiseAssert.assertThat(promise).failedWithException().isInstanceOf(ForbiddenException.class);
103104
}
104105

105106
@Test
@@ -112,7 +113,7 @@ public void testReadInstanceForbidden() throws Exception {
112113
emailService.readInstance(mock(Context.class), mock(ReadRequest.class));
113114

114115
// then
115-
assertThat(promise).failedWithException().isInstanceOf(ForbiddenException.class);
116+
AssertJPromiseAssert.assertThat(promise).failedWithException().isInstanceOf(ForbiddenException.class);
116117
}
117118

118119
@Test
@@ -125,6 +126,6 @@ public void testUpdateInstanceForbidden() throws Exception {
125126
emailService.updateInstance(mock(Context.class), mock(UpdateRequest.class));
126127

127128
// then
128-
assertThat(promise).failedWithException().isInstanceOf(ForbiddenException.class);
129+
AssertJPromiseAssert.assertThat(promise).failedWithException().isInstanceOf(ForbiddenException.class);
129130
}
130131
}

‎openidm-external-rest/src/test/java/org/forgerock/openidm/external/rest/RestServiceTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* information: "Portions copyright [year] [name of copyright owner]".
1313
*
1414
* Copyright 2016 ForgeRock AS.
15+
* Portions copyright 2026 3A Systems LLC
1516
*/
1617

1718
package org.forgerock.openidm.external.rest;
@@ -23,7 +24,6 @@
2324
import static org.forgerock.json.resource.test.assertj.AssertJResourceExceptionAssert.assertThat;
2425
import static org.forgerock.openidm.external.rest.RestService.*;
2526
import static org.forgerock.util.promise.Promises.newResultPromise;
26-
import static org.forgerock.util.test.assertj.AssertJPromiseAssert.assertThat;
2727
import static org.mockito.Matchers.any;
2828
import static org.mockito.Mockito.mock;
2929
import static org.mockito.Mockito.when;
@@ -49,6 +49,7 @@
4949
import org.forgerock.services.context.Context;
5050
import org.forgerock.util.promise.NeverThrowsException;
5151
import org.forgerock.util.promise.Promise;
52+
import org.forgerock.util.test.assertj.AssertJPromiseAssert;
5253
import org.testng.annotations.DataProvider;
5354
import org.testng.annotations.Test;
5455

@@ -195,7 +196,7 @@ public void testCallAction(final ClientRequestParams clientRequestParams, final
195196

196197
// then
197198
if (expectedCode != null) {
198-
assertThat(result).failedWithException();
199+
AssertJPromiseAssert.assertThat(result).failedWithException();
199200
try {
200201
result.getOrThrow();
201202
fail();

‎openidm-identity-provider/src/test/java/org/forgerock/openidm/idp/impl/IdentityProviderServiceTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
* information: "Portions copyright [year] [name of copyright owner]".
1313
*
1414
* Copyright 2016 ForgeRock AS
15+
* Portions copyright 2026 3A Systems LLC
1516
*/
1617
package org.forgerock.openidm.idp.impl;
1718

1819
import static org.assertj.core.api.Assertions.assertThat;
1920
import static org.forgerock.json.JsonValue.*;
2021
import static org.forgerock.json.resource.Requests.newReadRequest;
21-
import static org.forgerock.util.test.assertj.AssertJPromiseAssert.assertThat;
2222
import static org.forgerock.json.test.assertj.AssertJJsonValueAssert.assertThat;
2323
import static org.mockito.Mockito.mock;
2424
import static org.mockito.Mockito.when;
@@ -31,6 +31,7 @@
3131
import org.forgerock.openidm.idp.config.ProviderConfig;
3232
import org.forgerock.services.context.RootContext;
3333
import org.forgerock.util.promise.Promise;
34+
import org.forgerock.util.test.assertj.AssertJPromiseAssert;
3435
import org.testng.annotations.BeforeSuite;
3536
import org.testng.annotations.Test;
3637

@@ -87,7 +88,7 @@ public void testReadInstance() throws Exception {
8788

8889
final Promise<ResourceResponse, ResourceException> promise =
8990
service.readInstance(new RootContext(), newReadRequest(""));
90-
assertThat(promise).succeeded();
91+
AssertJPromiseAssert.assertThat(promise).succeeded();
9192
final JsonValue response = promise.get().getContent();
9293

9394
assertThat(response).hasArray("providers").hasSize(1);

‎openidm-maintenance/src/test/java/org/forgerock/openidm/maintenance/impl/MaintenanceFilterTest.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
* information: "Portions copyright [year] [name of copyright owner]".
1313
*
1414
* Copyright 2016 ForgeRock AS.
15+
* Portions copyright 2026 3A Systems LLC
1516
*/
1617
package org.forgerock.openidm.maintenance.impl;
1718

1819
import static org.assertj.core.api.Assertions.assertThat;
1920
import static org.forgerock.json.JsonValue.*;
2021
import static org.forgerock.json.resource.Requests.newCreateRequest;
2122
import static org.forgerock.json.resource.Requests.newReadRequest;
22-
import static org.forgerock.util.test.assertj.AssertJPromiseAssert.assertThat;
2323

2424
import org.forgerock.json.JsonValue;
2525
import org.forgerock.json.resource.CreateRequest;
@@ -31,6 +31,7 @@
3131
import org.forgerock.services.context.Context;
3232
import org.forgerock.services.context.RootContext;
3333
import org.forgerock.util.promise.Promise;
34+
import org.forgerock.util.test.assertj.AssertJPromiseAssert;
3435
import org.testng.annotations.DataProvider;
3536
import org.testng.annotations.Test;
3637

@@ -93,10 +94,10 @@ public void testFitlerCreate(boolean maintenanceEnabled, String resourcePath, Co
9394
final CreateRequest request = newCreateRequest(resourcePath, object);
9495
final Promise<ResourceResponse, ResourceException> promise = filter.filterCreate(context, request, handler);
9596
if (passRequest) {
96-
assertThat(promise).succeeded();
97+
AssertJPromiseAssert.assertThat(promise).succeeded();
9798
assertThat(handler.getRequests()).containsExactly(request);
9899
} else {
99-
assertThat(promise).failedWithException().isInstanceOf(ServiceUnavailableException.class);
100+
AssertJPromiseAssert.assertThat(promise).failedWithException().isInstanceOf(ServiceUnavailableException.class);
100101
assertThat(handler.getRequests()).isEmpty();
101102
}
102103
}
@@ -127,7 +128,7 @@ public void testFilterRead(String resourcePath) throws Exception {
127128
// first create an object
128129
final CreateRequest create = newCreateRequest(resourcePath, "1", object);
129130
Promise<ResourceResponse, ResourceException> promise = filter.filterCreate(root, create, handler);
130-
assertThat(promise).succeeded();
131+
AssertJPromiseAssert.assertThat(promise).succeeded();
131132
assertThat(handler.getRequests()).containsExactly(create);
132133

133134
handler.addResource(promise.get());
@@ -136,7 +137,7 @@ public void testFilterRead(String resourcePath) throws Exception {
136137
// perform the read
137138
final ReadRequest request = newReadRequest(resourcePath, "1");
138139
promise = filter.filterRead(root, request, handler);
139-
assertThat(promise).succeeded();
140+
AssertJPromiseAssert.assertThat(promise).succeeded();
140141
assertThat(handler.getRequests()).containsExactly(create, request);
141142
}
142143
}

0 commit comments

Comments
 (0)