Fix FootballMatchReportsTest (exercism#2014)

jmrunkle · web-flow · commit d00ba4b6b04e · 2021-09-13T19:55:16.000-07:00
Tests needed to use AssertJ properly. Also switched to the assertThrows method. Fixes exercism#2013
diff --git a/exercises/concept/football-match-reports/src/test/java/FootballMatchReportsTest.java b/exercises/concept/football-match-reports/src/test/java/FootballMatchReportsTest.java
@@ -1,69 +1,74 @@
 import org.junit.Ignore;
 import org.junit.Test;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertThrows;
 
 public class FootballMatchReportsTest {
 
     @Test
     public void test_goal() {
-        assertThat(FootballMatchReports.onField(1).contentEquals("goalie"));
+        assertThat(FootballMatchReports.onField(1)).isEqualTo("goalie");
     }
 
     @Test
     @Ignore("Remove to run test")
     public void test_left_back() {
-        assertThat(FootballMatchReports.onField(2).contentEquals("left back"));
+        assertThat(FootballMatchReports.onField(2)).isEqualTo("left back");
     }
 
     @Test
     @Ignore("Remove to run test")
     public void test_right_back() {
-        assertThat(FootballMatchReports.onField(5).contentEquals("right back"));
+        assertThat(FootballMatchReports.onField(5)).isEqualTo("right back");
     }
 
     @Test
     @Ignore("Remove to run test")
     public void test_center_back() {
-        assertThat(FootballMatchReports.onField(3).contentEquals("center back"));
-        assertThat(FootballMatchReports.onField(4).contentEquals("center back"));
+        assertThat(FootballMatchReports.onField(3)).isEqualTo("center back");
+        assertThat(FootballMatchReports.onField(4)).isEqualTo("center back");
     }
 
     @Test
     @Ignore("Remove to run test")
     public void test_midfielder() {
-        assertThat(FootballMatchReports.onField(6).contentEquals("midfielder"));
-        assertThat(FootballMatchReports.onField(7).contentEquals("midfielder"));
-        assertThat(FootballMatchReports.onField(8).contentEquals("midfielder"));
+        assertThat(FootballMatchReports.onField(6)).isEqualTo("midfielder");
+        assertThat(FootballMatchReports.onField(7)).isEqualTo("midfielder");
+        assertThat(FootballMatchReports.onField(8)).isEqualTo("midfielder");
     }
 
     @Test
     @Ignore("Remove to run test")
     public void test_left_wing() {
-        assertThat(FootballMatchReports.onField(9).contentEquals("left wing"));
+        assertThat(FootballMatchReports.onField(9)).isEqualTo("left wing");
     }
 
     @Test
     @Ignore("Remove to run test")
     public void test_striker() {
-        assertThat(FootballMatchReports.onField(10).contentEquals("striker"));
+        assertThat(FootballMatchReports.onField(10)).isEqualTo("striker");
     }
 
     @Test
     @Ignore("Remove to run test")
     public void test_right_wing() {
-        assertThat(FootballMatchReports.onField(11).contentEquals("right wing"));
+        assertThat(FootballMatchReports.onField(11)).isEqualTo("right wing");
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     @Ignore("Remove to run test")
     public void test_exception() {
-        FootballMatchReports.onField(13);
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> FootballMatchReports.onField(13));
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     @Ignore("Remove to run test")
     public void test_exception_negative_number() {
-        FootballMatchReports.onField(-1);
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> FootballMatchReports.onField(-1));
     }
 }
