diff --git a/src/tests/gitlab/SearcherTests.java b/src/tests/gitlab/SearcherTests.java index 956cdb598aa2fcf0870f01993fc6aebba8a98322..70ac2b2950c2bae84b6f39bd56d72500e1e5f20b 100644 --- a/src/tests/gitlab/SearcherTests.java +++ b/src/tests/gitlab/SearcherTests.java @@ -1,14 +1,15 @@ package tests.gitlab; +import java.util.Arrays; + import chess.board.ArrayBoard; import chess.board.ArrayMove; import chess.game.SimpleEvaluator; -import cse332.chess.interfaces.Move; -import cse332.chess.interfaces.Searcher; -import static org.junit.Assert.*; +import cse332.chess.interfaces.Searcher; -import java.util.Arrays; +import static org.hamcrest.CoreMatchers.hasItem; +import static org.junit.Assert.assertThat; public abstract class SearcherTests { protected static Searcher<ArrayMove, ArrayBoard> STUDENT; @@ -22,7 +23,7 @@ public abstract class SearcherTests { protected void checkResult(String fen, String[] valid, Searcher<ArrayMove, ArrayBoard> searcher, int depth, int cutoff) { ArrayMove result = getBestMove(fen, searcher, depth, cutoff); - assertTrue(Arrays.asList(valid).contains(result.toString())); + assertThat(Arrays.asList(valid), hasItem(result.toString())); } protected void depth(int d, int c) { diff --git a/src/tests/gitlab/TestingInputs.java b/src/tests/gitlab/TestingInputs.java index dc04a50f55fb0a5d6951d9035173c5cd810a7bfc..4975100c56d98cc86a46908015812f64fd6650fc 100644 --- a/src/tests/gitlab/TestingInputs.java +++ b/src/tests/gitlab/TestingInputs.java @@ -1,12 +1,5 @@ package tests.gitlab; -import java.io.File; -import java.io.FileNotFoundException; -import java.util.Random; -import java.util.Scanner; - -import tests.exceptions.InformativeException; - public class TestingInputs { public static Object[][] FENS_TO_TEST = new Object[][] { new Object[]{