migrate 17 test to use Junit5

fishercoder1534 · fishercoder1534 · commit 2354d10f48c8 · 2024-01-30T08:14:13.000-08:00
diff --git a/src/test/java/com/fishercoder/_17Test.java b/src/test/java/com/fishercoder/_17Test.java
@@ -1,14 +1,14 @@
 package com.fishercoder;
 
 import com.fishercoder.solutions._17;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _17Test {
     private static _17.Solution1 solution1;
@@ -17,8 +17,8 @@ public class _17Test {
     private static String digits;
     private static List<String> expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _17.Solution1();
         solution2 = new _17.Solution2();
         solution3 = new _17.Solution3();
@@ -28,17 +28,17 @@ public static void setup() {
     public void test1() {
         digits = "2";
         expected = new ArrayList<>(Arrays.asList("a", "b", "c"));
-        assertThat(expected).hasSameElementsAs(solution1.letterCombinations(digits));
-        assertThat(expected).hasSameElementsAs(solution2.letterCombinations(digits));
-        assertThat(expected).hasSameElementsAs(solution3.letterCombinations(digits));
+        assertEquals(expected, solution1.letterCombinations(digits));
+        assertEquals(expected, solution2.letterCombinations(digits));
+        assertEquals(expected, solution3.letterCombinations(digits));
     }
 
     @Test
     public void test2() {
         digits = "23";
         expected = new ArrayList<>(Arrays.asList("ad", "ae", "af", "bd", "be", "bf", "cd", "ce", "cf"));
-        assertThat(expected).hasSameElementsAs(solution1.letterCombinations(digits));
-        assertThat(expected).hasSameElementsAs(solution2.letterCombinations(digits));
-        assertThat(expected).hasSameElementsAs(solution3.letterCombinations(digits));
+        assertEquals(expected, solution1.letterCombinations(digits));
+        assertEquals(expected, solution2.letterCombinations(digits));
+        assertEquals(expected, solution3.letterCombinations(digits));
     }
 }
