Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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.openig.thread;
Expand Down Expand Up @@ -84,7 +85,7 @@ public void shouldScheduleWithRunnableLongTimeUnit() throws Exception {
doReturn(scheduledFuture).when(delegate())
.schedule(nullable(Runnable.class), eq(1L), eq(TimeUnit.SECONDS));

assertThat(executorService().schedule(runnable, 1, TimeUnit.SECONDS)).isSameAs(scheduledFuture);
assertThat((Object)executorService().schedule(runnable, 1, TimeUnit.SECONDS)).isSameAs(scheduledFuture);

verify(delegate()).schedule(runnableCapture.capture(), eq(1L), eq(TimeUnit.SECONDS));
assertThatCapturedRunnableIsMdcAware();
Expand All @@ -96,7 +97,7 @@ public void shouldScheduleWithCallableLongTimeUnit() throws Exception {
doReturn(scheduledFuture).when(delegate())
.schedule(nullable(Callable.class), eq(1L), eq(TimeUnit.SECONDS));

assertThat(executorService().schedule(callable, 1, TimeUnit.SECONDS)).isSameAs(scheduledFuture);
assertThat((Object)executorService().schedule(callable, 1, TimeUnit.SECONDS)).isSameAs(scheduledFuture);

verify(delegate()).schedule(callableCapture.capture(), eq(1L), eq(TimeUnit.SECONDS));
assertThatCaptureCallableIsMdcAware();
Expand All @@ -107,7 +108,7 @@ public void shouldScheduleAtFixedRateWithRunnableLongTimeUnit() throws Exception
doReturn(scheduledFuture).when(delegate())
.scheduleAtFixedRate(nullable(Runnable.class), eq(1L), eq(2L), eq(TimeUnit.SECONDS));

assertThat(executorService().scheduleAtFixedRate(runnable, 1, 2, TimeUnit.SECONDS)).isSameAs(scheduledFuture);
assertThat((Object)executorService().scheduleAtFixedRate(runnable, 1, 2, TimeUnit.SECONDS)).isSameAs(scheduledFuture);

verify(delegate()).scheduleAtFixedRate(runnableCapture.capture(), eq(1L), eq(2L), eq(TimeUnit.SECONDS));
assertThatCapturedRunnableIsMdcAware();
Expand All @@ -118,7 +119,7 @@ public void shouldScheduleWithFixedDelayWithRunnableLongTimeUnit() throws Except
doReturn(scheduledFuture).when(delegate())
.scheduleWithFixedDelay(nullable(Runnable.class), eq(1L), eq(2L), eq(TimeUnit.SECONDS));

assertThat(executorService().scheduleWithFixedDelay(runnable, 1, 2, TimeUnit.SECONDS))
assertThat((Object)executorService().scheduleWithFixedDelay(runnable, 1, 2, TimeUnit.SECONDS))
.isSameAs(scheduledFuture);

verify(delegate()).scheduleWithFixedDelay(runnableCapture.capture(), eq(1L), eq(2L), eq(TimeUnit.SECONDS));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2015-2016 ForgeRock AS.
* Portions Copyright 2026 3A Systems, LLC
*/
package org.forgerock.openig.filter.oauth2.client;

Expand Down Expand Up @@ -149,7 +150,7 @@ public void shouldPerformDynamicRegistration() throws Exception {
verify(handler).handle(eq(context), captor.capture());
Request request = captor.getValue();
assertThat(request.getMethod()).isEqualTo("POST");
assertThat(request.getEntity().toString()).containsSequence("redirect_uris", "contact", "scopes");
assertThat(request.getEntity().toString()).contains("redirect_uris", "contact", "scopes");
}

@Test(expectedExceptions = RegistrationException.class)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ private static Object[][] realms() {
public static void shouldSucceedToCreateBaseUri(final String realm) throws Exception {
assertThat(normalizeToJsonEndpoint(new URI("http://www.example.com:8090/openam/"), realm).toASCIIString())
.endsWith("/")
.containsSequence("http://www.example.com:8090/openam/json/",
.contains("http://www.example.com:8090/openam/json/",
realm != null ? realm.trim() : "");
}

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1059,7 +1059,7 @@
<dependency>
<groupId>org.openidentityplatform.openam</groupId>
<artifactId>openam</artifactId>
<version>16.0.5</version>
<version>16.0.6</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
Loading