From 70b95f31465e41fb5e10c894ef03f23ef7c729ac Mon Sep 17 00:00:00 2001 From: lipian <lipian@cs.washington.edu> Date: Mon, 11 May 2020 23:58:19 -0400 Subject: [PATCH] Hopefully improving test feedback --- src/tests/gitlab/SearcherTests.java | 11 ++++++----- src/tests/gitlab/TestingInputs.java | 7 ------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/tests/gitlab/SearcherTests.java b/src/tests/gitlab/SearcherTests.java index 956cdb5..70ac2b2 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 dc04a50..4975100 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[]{ -- GitLab