Migrate to JUnit5

thread-pool/pom.xml

@@ -34,8 +34,13 @@
   <artifactId>thread-pool</artifactId>
   <dependencies>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

thread-pool/src/test/java/com/iluwatar/threadpool/AppTest.java

@@ -22,7 +22,7 @@
  */
 package com.iluwatar.threadpool;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Application test

thread-pool/src/test/java/com/iluwatar/threadpool/TaskTest.java

@@ -22,8 +22,7 @@
  */
 package com.iluwatar.threadpool;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -33,11 +32,13 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
-import java.util.function.Function;
 import java.util.function.IntFunction;
-import java.util.function.ToIntFunction;
 import java.util.stream.Collectors;
-import org.junit.Test;
+
+import static java.time.Duration.ofMillis;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTimeout;
 
 /**
  * Date: 12/30/15 - 18:22 PM
@@ -82,30 +83,31 @@ public abstract class TaskTest<T extends Task> {
    * Verify if the generated id is unique for each task, even if the tasks are created in separate
    * threads
    */
-  @Test(timeout = 10000)
+  @Test
   public void testIdGeneration() throws Exception {
-    final ExecutorService service = Executors.newFixedThreadPool(THREAD_COUNT);
+    assertTimeout(ofMillis(10000), () -> {
+      final ExecutorService service = Executors.newFixedThreadPool(THREAD_COUNT);
 
-    final List<Callable<Integer>> tasks = new ArrayList<>();
-    for (int i = 0; i < TASK_COUNT; i++) {
-      tasks.add(() -> factory.apply(1).getId());
-    }
+      final List<Callable<Integer>> tasks = new ArrayList<>();
+      for (int i = 0; i < TASK_COUNT; i++) {
+        tasks.add(() -> factory.apply(1).getId());
+      }
 
-    final List<Integer> ids = service.invokeAll(tasks)
-        .stream()
-        .map(TaskTest::get)
-        .filter(Objects::nonNull)
-        .collect(Collectors.toList());
+      final List<Integer> ids = service.invokeAll(tasks)
+          .stream()
+          .map(TaskTest::get)
+          .filter(Objects::nonNull)
+          .collect(Collectors.toList());
 
-    service.shutdownNow();
+      service.shutdownNow();
 
-    final long uniqueIdCount = ids.stream()
-        .distinct()
-        .count();
-
-    assertEquals(TASK_COUNT, ids.size());
-    assertEquals(TASK_COUNT, uniqueIdCount);
+      final long uniqueIdCount = ids.stream()
+          .distinct()
+          .count();
 
+      assertEquals(TASK_COUNT, ids.size());
+      assertEquals(TASK_COUNT, uniqueIdCount);
+    });
   }
 
   /**

thread-pool/src/test/java/com/iluwatar/threadpool/WorkerTest.java

@@ -22,7 +22,7 @@
  */
 package com.iluwatar.threadpool;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;