removes hamcrest from test dependencies

Signed-off-by: Oleh Dokuka <[email protected]>
Signed-off-by: Oleh Dokuka <[email protected]>

Author: Oleh Dokuka

build.gradle

@@ -42,7 +42,6 @@ subprojects {
     ext['slf4j.version'] = '1.7.30'
     ext['jmh.version'] = '1.33'
     ext['junit.version'] = '5.8.1'
-    ext['hamcrest.version'] = '1.3'
     ext['micrometer.version'] = '1.7.5'
     ext['assertj.version'] = '3.21.0'
     ext['netflix.limits.version'] = '0.3.6'
@@ -86,7 +85,6 @@ subprojects {
                 entry 'mockito-junit-jupiter'
                 entry 'mockito-core'
             }
-            dependency "org.hamcrest:hamcrest-library:${ext['hamcrest.version']}"
             dependencySet(group: 'org.openjdk.jmh', version: ext['jmh.version']) {
                 entry 'jmh-core'
                 entry 'jmh-generator-annprocess'

rsocket-core/build.gradle

@@ -40,8 +40,6 @@ dependencies {
     testRuntimeOnly 'ch.qos.logback:logback-classic'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
 
-    testImplementation 'org.hamcrest:hamcrest-library'
-
     jcstressImplementation(project(":rsocket-test"))
     jcstressImplementation "ch.qos.logback:logback-classic"
 }

rsocket-core/src/test/java/io/rsocket/core/RSocketRequesterTest.java

@@ -34,10 +34,7 @@
 import static io.rsocket.frame.FrameType.REQUEST_N;
 import static io.rsocket.frame.FrameType.REQUEST_RESPONSE;
 import static io.rsocket.frame.FrameType.REQUEST_STREAM;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.anyOf;
-import static org.hamcrest.Matchers.empty;
-import static org.hamcrest.Matchers.is;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;
@@ -76,7 +73,6 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Stream;
-import org.assertj.core.api.Assertions;
 import org.assertj.core.api.Assumptions;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -126,12 +122,13 @@ public void testHandleKeepAlive() {
     rule.connection.addToReceivedBuffer(
         KeepAliveFrameCodec.encode(rule.alloc(), true, 0, Unpooled.EMPTY_BUFFER));
     ByteBuf sent = rule.connection.awaitFrame();
-    assertThat("Unexpected frame sent.", frameType(sent), is(FrameType.KEEPALIVE));
+    assertThat(frameType(sent))
+        .describedAs("Unexpected frame sent.")
+        .isEqualTo(FrameType.KEEPALIVE);
     /*Keep alive ack must not have respond flag else, it will result in infinite ping-pong of keep alive frames.*/
-    assertThat(
-        "Unexpected keep-alive frame respond flag.",
-        KeepAliveFrameCodec.respondFlag(sent),
-        is(false));
+    assertThat(KeepAliveFrameCodec.respondFlag(sent))
+        .describedAs("Unexpected keep-alive frame respond flag.")
+        .isEqualTo(false);
   }
 
   @Test
@@ -149,10 +146,9 @@ public Mono<Payload> requestResponse(Payload payload) {
         });
     rule.sendRequest(streamId, FrameType.REQUEST_RESPONSE);
     testPublisher.complete();
-    assertThat(
-        "Unexpected frame sent.",
-        frameType(rule.connection.awaitFrame()),
-        anyOf(is(FrameType.COMPLETE), is(FrameType.NEXT_COMPLETE)));
+    assertThat(frameType(rule.connection.awaitFrame()))
+        .describedAs("Unexpected frame sent.")
+        .isIn(FrameType.COMPLETE, FrameType.NEXT_COMPLETE);
     testPublisher.assertWasNotCancelled();
   }
 
@@ -162,8 +158,9 @@ public void testHandlerEmitsError() {
     final int streamId = 4;
     rule.prefetch = 1;
     rule.sendRequest(streamId, FrameType.REQUEST_STREAM);
-    assertThat(
-        "Unexpected frame sent.", frameType(rule.connection.awaitFrame()), is(FrameType.ERROR));
+    assertThat(frameType(rule.connection.awaitFrame()))
+        .describedAs("Unexpected frame sent.")
+        .isEqualTo(FrameType.ERROR);
   }
 
   @Test
@@ -182,12 +179,12 @@ public Mono<Payload> requestResponse(Payload payload) {
         });
     rule.sendRequest(streamId, FrameType.REQUEST_RESPONSE);
 
-    assertThat("Unexpected frame sent.", rule.connection.getSent(), is(empty()));
+    assertThat(rule.connection.getSent()).describedAs("Unexpected frame sent.").isEmpty();
 
     rule.connection.addToReceivedBuffer(CancelFrameCodec.encode(allocator, streamId));
 
-    assertThat("Unexpected frame sent.", rule.connection.getSent(), is(empty()));
-    assertThat("Subscription not cancelled.", cancelled.get(), is(true));
+    assertThat(rule.connection.getSent()).describedAs("Unexpected frame sent.").isEmpty();
+    assertThat(cancelled.get()).describedAs("Subscription not cancelled.").isTrue();
     rule.assertHasNoLeaks();
   }
 
@@ -243,7 +240,7 @@ protected void hookOnSubscribe(Subscription subscription) {
     for (Runnable runnable : runnables) {
       rule.connection.clearSendReceiveBuffers();
       runnable.run();
-      Assertions.assertThat(rule.connection.getSent())
+      assertThat(rule.connection.getSent())
           .hasSize(1)
           .first()
           .matches(bb -> FrameHeaderCodec.frameType(bb) == FrameType.ERROR)
@@ -253,7 +250,7 @@ protected void hookOnSubscribe(Subscription subscription) {
                       .contains(String.format(INVALID_PAYLOAD_ERROR_MESSAGE, maxFrameLength)))
           .matches(ReferenceCounted::release);
 
-      assertThat("Subscription not cancelled.", cancelled.get(), is(true));
+      assertThat(cancelled.get()).describedAs("Subscription not cancelled.").isTrue();
     }
 
     rule.assertHasNoLeaks();
@@ -308,9 +305,9 @@ public Flux<Payload> requestChannel(Publisher<Payload> payloads) {
             sink.tryEmitEmpty();
           });
 
-      Assertions.assertThat(assertSubscriber.values()).allMatch(ReferenceCounted::release);
+      assertThat(assertSubscriber.values()).allMatch(ReferenceCounted::release);
 
-      Assertions.assertThat(rule.connection.getSent()).allMatch(ReferenceCounted::release);
+      assertThat(rule.connection.getSent()).allMatch(ReferenceCounted::release);
 
       rule.assertHasNoLeaks();
       testRequestInterceptor.expectOnStart(1, REQUEST_CHANNEL).expectOnComplete(1).expectNothing();
@@ -353,7 +350,7 @@ public Flux<Payload> requestChannel(Publisher<Payload> payloads) {
             sink.complete();
           });
 
-      Assertions.assertThat(rule.connection.getSent()).allMatch(ReferenceCounted::release);
+      assertThat(rule.connection.getSent()).allMatch(ReferenceCounted::release);
 
       rule.assertHasNoLeaks();
       testRequestInterceptor.expectOnStart(1, REQUEST_CHANNEL).expectOnCancel(1).expectNothing();
@@ -398,7 +395,7 @@ public Flux<Payload> requestChannel(Publisher<Payload> payloads) {
             sink.complete();
           });
 
-      Assertions.assertThat(rule.connection.getSent()).allMatch(ReferenceCounted::release);
+      assertThat(rule.connection.getSent()).allMatch(ReferenceCounted::release);
       testRequestInterceptor.expectOnStart(1, REQUEST_CHANNEL).expectOnCancel(1).expectNothing();
       rule.assertHasNoLeaks();
     }
@@ -483,13 +480,13 @@ public Flux<Payload> requestChannel(Publisher<Payload> payloads) {
             sink.error(new RuntimeException());
           });
 
-      Assertions.assertThat(rule.connection.getSent()).allMatch(ReferenceCounted::release);
+      assertThat(rule.connection.getSent()).allMatch(ReferenceCounted::release);
 
       assertSubscriber
           .assertTerminated()
           .assertError(CancellationException.class)
           .assertErrorMessage("Outbound has terminated with an error");
-      Assertions.assertThat(assertSubscriber.values())
+      assertThat(assertSubscriber.values())
           .allMatch(
               msg -> {
                 ReferenceCountUtil.safeRelease(msg);
@@ -531,7 +528,7 @@ public Flux<Payload> requestStream(Payload payload) {
             sink.next(ByteBufPayload.create("d3", "m3"));
           });
 
-      Assertions.assertThat(rule.connection.getSent()).allMatch(ReferenceCounted::release);
+      assertThat(rule.connection.getSent()).allMatch(ReferenceCounted::release);
 
       rule.assertHasNoLeaks();
 
@@ -573,15 +570,15 @@ public void subscribe(CoreSubscriber<? super Payload> actual) {
             sources[0].complete(ByteBufPayload.create("d1", "m1"));
           });
 
-      Assertions.assertThat(rule.connection.getSent()).allMatch(ReferenceCounted::release);
+      assertThat(rule.connection.getSent()).allMatch(ReferenceCounted::release);
 
       rule.assertHasNoLeaks();
 
       testRequestInterceptor
           .expectOnStart(1, REQUEST_RESPONSE)
           .assertNext(
               e ->
-                  Assertions.assertThat(e.eventType)
+                  assertThat(e.eventType)
                       .isIn(
                           TestRequestInterceptor.EventType.ON_COMPLETE,
                           TestRequestInterceptor.EventType.ON_CANCEL))
@@ -614,7 +611,7 @@ public Flux<Payload> requestStream(Payload payload) {
     sink.next(ByteBufPayload.create("d3", "m3"));
     rule.connection.addToReceivedBuffer(cancelFrame);
 
-    Assertions.assertThat(rule.connection.getSent()).allMatch(ReferenceCounted::release);
+    assertThat(rule.connection.getSent()).allMatch(ReferenceCounted::release);
 
     rule.assertHasNoLeaks();
   }
@@ -660,7 +657,7 @@ public Flux<Payload> requestChannel(Publisher<Payload> payloads) {
 
     rule.connection.addToReceivedBuffer(cancelFrame);
 
-    Assertions.assertThat(rule.connection.getSent()).allMatch(ReferenceCounted::release);
+    assertThat(rule.connection.getSent()).allMatch(ReferenceCounted::release);
 
     rule.assertHasNoLeaks();
   }
@@ -730,17 +727,15 @@ public Flux<Payload> requestChannel(Publisher<Payload> payloads) {
     }
 
     if (responsesCnt > 0) {
-      Assertions.assertThat(
-              rule.connection.getSent().stream().filter(bb -> frameType(bb) != REQUEST_N))
+      assertThat(rule.connection.getSent().stream().filter(bb -> frameType(bb) != REQUEST_N))
           .describedAs(
               "Interaction Type :[%s]. Expected to observe %s frames sent", frameType, responsesCnt)
           .hasSize(responsesCnt)
           .allMatch(bb -> !FrameHeaderCodec.hasMetadata(bb));
     }
 
     if (framesCnt > 1) {
-      Assertions.assertThat(
-              rule.connection.getSent().stream().filter(bb -> frameType(bb) == REQUEST_N))
+      assertThat(rule.connection.getSent().stream().filter(bb -> frameType(bb) == REQUEST_N))
           .describedAs(
               "Interaction Type :[%s]. Expected to observe single RequestN(%s) frame",
               frameType, framesCnt - 1)
@@ -749,9 +744,9 @@ public Flux<Payload> requestChannel(Publisher<Payload> payloads) {
           .matches(bb -> RequestNFrameCodec.requestN(bb) == (framesCnt - 1));
     }
 
-    Assertions.assertThat(rule.connection.getSent()).allMatch(ReferenceCounted::release);
+    assertThat(rule.connection.getSent()).allMatch(ReferenceCounted::release);
 
-    Assertions.assertThat(assertSubscriber.awaitAndAssertNextValueCount(framesCnt).values())
+    assertThat(assertSubscriber.awaitAndAssertNextValueCount(framesCnt).values())
         .hasSize(framesCnt)
         .allMatch(p -> !p.hasMetadata())
         .allMatch(ReferenceCounted::release);
@@ -796,7 +791,7 @@ public Flux<Payload> requestChannel(Publisher<Payload> payloads) {
 
     rule.sendRequest(1, frameType);
 
-    Assertions.assertThat(rule.connection.getSent())
+    assertThat(rule.connection.getSent())
         .hasSize(1)
         .first()
         .matches(
@@ -837,13 +832,13 @@ public Flux<Payload> requestChannel(Publisher<Payload> payloads) {
     rule.connection.addToReceivedBuffer(
         ErrorFrameCodec.encode(rule.alloc(), 1, new RuntimeException("test")));
 
-    Assertions.assertThat(rule.connection.getSent())
+    assertThat(rule.connection.getSent())
         .hasSize(1)
         .first()
         .matches(bb -> FrameHeaderCodec.frameType(bb) == REQUEST_N)
         .matches(ReferenceCounted::release);
 
-    Assertions.assertThat(rule.socket.isDisposed()).isFalse();
+    assertThat(rule.socket.isDisposed()).isFalse();
     testPublisher.assertWasCancelled();
 
     rule.assertHasNoLeaks();

rsocket-core/src/test/java/io/rsocket/core/RSocketResponderTest.java

@@ -16,8 +16,7 @@
 
 package io.rsocket.test.util;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import io.rsocket.Payload;
 import io.rsocket.RSocket;
@@ -116,6 +115,8 @@ public void assertMetadataPushCount(int expected) {
   }
 
   private static void assertCount(int expected, String type, AtomicInteger counter) {
-    assertThat("Unexpected invocations for " + type + '.', counter.get(), is(expected));
+    assertThat(counter.get())
+        .describedAs("Unexpected invocations for " + type + '.')
+        .isEqualTo(expected);
   }
 }

rsocket-core/src/test/java/io/rsocket/test/util/MockRSocket.java

@@ -34,7 +34,6 @@ dependencies {
     testImplementation 'org.assertj:assertj-core'
     testImplementation 'io.projectreactor:reactor-test'
 
-    testImplementation 'org.hamcrest:hamcrest-library'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
 }
 

rsocket-examples/build.gradle

@@ -32,7 +32,6 @@ dependencies {
     testImplementation 'org.assertj:assertj-core'
     testImplementation 'io.projectreactor:reactor-test'
 
-    testImplementation 'org.hamcrest:hamcrest-library'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
     testRuntimeOnly 'ch.qos.logback:logback-classic'
 }

rsocket-load-balancer/build.gradle

@@ -16,14 +16,13 @@
 
 package io.rsocket.client;
 
-import static org.hamcrest.Matchers.instanceOf;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import io.rsocket.Payload;
 import io.rsocket.RSocket;
 import io.rsocket.client.filter.RSockets;
 import io.rsocket.util.EmptyPayload;
 import java.time.Duration;
-import org.hamcrest.MatcherAssert;
 import org.junit.jupiter.api.Test;
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
@@ -50,8 +49,9 @@ public void onNext(Payload payload) {
 
               @Override
               public void onError(Throwable t) {
-                MatcherAssert.assertThat(
-                    "Unexpected exception in onError", t, instanceOf(TimeoutException.class));
+                assertThat(t)
+                    .describedAs("Unexpected exception in onError")
+                    .isInstanceOf(TimeoutException.class);
               }
 
               @Override