From 7523634d83801f34c958e1ece14858ae4b0949a6 Mon Sep 17 00:00:00 2001 From: John Mercier Date: Sun, 24 Feb 2019 15:05:35 -0500 Subject: [PATCH] switching isEmpty tests to use hamcrest Fixing import. fixing import --- exercises/anagram/build.gradle | 1 + .../anagram/src/test/java/AnagramTest.java | 22 ++++++++++++------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/exercises/anagram/build.gradle b/exercises/anagram/build.gradle index 019e5f323..0bf3a7b94 100644 --- a/exercises/anagram/build.gradle +++ b/exercises/anagram/build.gradle @@ -8,6 +8,7 @@ repositories { dependencies { testCompile "junit:junit:4.12" + testCompile "org.hamcrest:hamcrest-all:1.3" } test { diff --git a/exercises/anagram/src/test/java/AnagramTest.java b/exercises/anagram/src/test/java/AnagramTest.java index f983a23de..4f67ef759 100644 --- a/exercises/anagram/src/test/java/AnagramTest.java +++ b/exercises/anagram/src/test/java/AnagramTest.java @@ -5,8 +5,8 @@ import java.util.Collections; import java.util.List; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; +import static org.hamcrest.Matchers.*; +import static org.hamcrest.MatcherAssert.assertThat; public class AnagramTest { @@ -14,7 +14,8 @@ public class AnagramTest { @Test public void testNoMatches() { Anagram detector = new Anagram("diaper"); - assertTrue(detector.match(Arrays.asList("hello", "world", "zombies", "pants")).isEmpty()); + List anagrams = detector.match(Arrays.asList("hello", "world", "zombies", "pants")); + assertThat(anagrams, empty()); } @Ignore("Remove to run test") @@ -29,7 +30,8 @@ public void testDetectMultipleAnagrams() { @Test public void testEliminateAnagramSubsets() { Anagram detector = new Anagram("good"); - assertTrue(detector.match(Arrays.asList("dog", "goody")).isEmpty()); + List anagrams = detector.match(Arrays.asList("dog", "goody")); + assertThat(anagrams, empty()); } @Ignore("Remove to run test") @@ -54,7 +56,8 @@ public void testDetectMultipleAnagramsForLongerWord() { @Test public void testEliminateAnagramsWithSameChecksum() { Anagram detector = new Anagram("mass"); - assertTrue(detector.match(Collections.singletonList("last")).isEmpty()); + List anagrams = detector.match(Collections.singletonList("last")); + assertThat(anagrams, empty()); } @Ignore("Remove to run test") @@ -85,21 +88,24 @@ public void testCaseInsensitiveWhenAnagramStartsWithUpperCaseLetter() { @Test public void testIdenticalWordRepeatedIsNotAnagram() { Anagram detector = new Anagram("go"); - assertTrue(detector.match(Collections.singletonList("go Go GO")).isEmpty()); + List anagrams = detector.match(Collections.singletonList("go Go GO")); + assertThat(anagrams, empty()); } @Ignore("Remove to run test") @Test public void testAnagramMustUseAllLettersExactlyOnce() { Anagram detector = new Anagram("tapper"); - assertTrue(detector.match(Collections.singletonList("patter")).isEmpty()); + List anagrams = detector.match(Collections.singletonList("patter")); + assertThat(anagrams, empty()); } @Ignore("Remove to run test") @Test public void testCapitalWordIsNotOwnAnagram() { Anagram detector = new Anagram("BANANA"); - assertTrue(detector.match(Collections.singletonList("Banana")).isEmpty()); + List anagrams = detector.match(Collections.singletonList("Banana")); + assertThat(anagrams, empty()); } }