Use AssertJ instead of Hamcrest

And get rid of JUnit 4.

Author: acogoluegnes

pom.xml

@@ -63,8 +63,7 @@
     <jetty.version>9.4.19.v20190610</jetty.version>
     <junit.jupiter.version>5.5.1</junit.jupiter.version>
     <mockito.version>3.0.0</mockito.version>
-    <hamcrest.version>2.0.0.0</hamcrest.version>
-    <assertj.version>3.12.2</assertj.version>
+    <assertj.version>3.13.2</assertj.version>
     <commons-lang3.version>3.9</commons-lang3.version>
     <jmh.version>1.21</jmh.version>
 
@@ -169,27 +168,6 @@
       <version>${junit.jupiter.version}</version>
       <scope>test</scope>
     </dependency>
-    <!-- To avoid compiler warnings about @API annotations in JUnit code -->
-    <dependency>
-      <groupId>org.apiguardian</groupId>
-      <artifactId>apiguardian-api</artifactId>
-      <version>1.0.0</version>
-      <scope>test</scope>
-    </dependency>
-
-    <!-- to support JUnit 4 rules -->
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-migrationsupport</artifactId>
-      <version>${junit.jupiter.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.hamcrest</groupId>
-          <artifactId>hamcrest-core</artifactId>
-        </exclusion>
-      </exclusions>
-      <scope>test</scope>
-    </dependency>
 
     <!-- for parameterized tests -->
     <dependency>
@@ -206,13 +184,6 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-junit</artifactId>
-      <version>${hamcrest.version}</version>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>

src/test/java/com/rabbitmq/perf/CachingRoutingKeyGeneratorTest.java

@@ -23,25 +23,24 @@
 import java.util.function.Supplier;
 import java.util.stream.IntStream;
 
-import static org.hamcrest.Matchers.hasSize;
-import static org.hamcrest.junit.MatcherAssert.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class CachingRoutingKeyGeneratorTest {
 
     Supplier<String> generator;
 
     @ParameterizedTest
-    @ValueSource(ints = { 1, 10, 100 })
+    @ValueSource(ints = {1, 10, 100})
     public void cacheValues(int cacheSize) {
         generator = new Producer.CachingRoutingKeyGenerator(cacheSize);
         Set<String> keys = new HashSet<>();
         IntStream.range(0, 1000).forEach(i -> keys.add(generator.get()));
-        assertThat(keys, hasSize(cacheSize));
+        assertThat(keys).hasSize(cacheSize);
     }
 
     @ParameterizedTest
-    @ValueSource(ints = { 0, -1, -10 })
+    @ValueSource(ints = {0, -1, -10})
     public void cacheSizeMustBeGreaterThanZero(int size) {
         assertThrows(IllegalArgumentException.class, () -> new Producer.CachingRoutingKeyGenerator(size));
     }

src/test/java/com/rabbitmq/perf/CliTest.java

@@ -27,9 +27,7 @@
 
 import static com.rabbitmq.perf.PerfTest.getOptions;
 import static com.rabbitmq.perf.PerfTest.getParser;
-import static org.hamcrest.Matchers.hasItems;
-import static org.hamcrest.Matchers.hasSize;
-import static org.hamcrest.junit.MatcherAssert.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class CliTest {
@@ -94,10 +92,10 @@ public void lstArg(String commandLine, String expectedAsString) throws ParseExce
         String[] expectedValues = expectedAsString.split(" ");
         if (expectedValues.length > 0 && !expectedValues[0].isEmpty()) {
             for (String expectedValue : expectedValues) {
-                assertThat(value, hasItems(expectedValue));
+                assertThat(value).contains(expectedValue);
             }
         } else {
-            assertThat(value, hasSize(0));
+            assertThat(value).hasSize(0);
         }
     }
 

src/test/java/com/rabbitmq/perf/LocalFilesMessageBodySourceTest.java

@@ -15,10 +15,8 @@
 
 package com.rabbitmq.perf;
 
-import org.junit.Rule;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.migrationsupport.rules.EnableRuleMigrationSupport;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.io.TempDir;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -29,15 +27,22 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
 
-@EnableRuleMigrationSupport
 public class LocalFilesMessageBodySourceTest {
 
-    @Rule
-    public TemporaryFolder folder = new TemporaryFolder();
+    @TempDir
+    File folder;
+
+    private static void write(File file, String content) throws Exception {
+        FileWriter writer = new FileWriter(file);
+        writer.append(content);
+        writer.flush();
+        writer.close();
+    }
 
     @Test
     public void createOneFileThatExists() throws Exception {
-        File file = folder.newFile("content.txt");
+        File file = new File(folder, "content.txt");
+        file.createNewFile();
         String content = "dummy content";
         write(file, content);
         MessageBodySource creator = new LocalFilesMessageBodySource(asList(file.getAbsolutePath()));
@@ -47,10 +52,12 @@ public void createOneFileThatExists() throws Exception {
         assertEquals(content, new String(body2, "UTF-8"));
     }
 
-    @Test public void createSeveralFileThatExists() throws Exception {
+    @Test
+    public void createSeveralFileThatExists() throws Exception {
         List<String> files = new ArrayList<String>();
-        for(int i = 0; i < 3 ; i++) {
-            File file = folder.newFile("content" + i +".txt");
+        for (int i = 0; i < 3; i++) {
+            File file = new File(folder, "content" + i + ".txt");
+            file.createNewFile();
             String content = "content" + i;
             write(file, content);
             files.add(file.getAbsolutePath());
@@ -67,8 +74,9 @@ public void createOneFileThatExists() throws Exception {
         assertEquals("content0", new String(body4, "UTF-8"));
     }
 
-    @Test public void createFileDoesNotExist() throws Exception {
-        File file = new File(folder.getRoot(), "dummy.txt");
+    @Test
+    public void createFileDoesNotExist() throws Exception {
+        File file = new File(folder, "dummy.txt");
         try {
             new LocalFilesMessageBodySource(asList(file.getAbsolutePath()));
             fail("File does not exist, exception should have thrown");
@@ -77,11 +85,4 @@ public void createOneFileThatExists() throws Exception {
         }
     }
 
-    private static void write(File file, String content) throws Exception {
-        FileWriter writer = new FileWriter(file);
-        writer.append(content);
-        writer.flush();
-        writer.close();
-    }
-
 }