Merge pull request #208 from FridaTveit/MakeAnagramTestsUseJUnit

Issue #193: Changed assertions in AnagramTest to use junit instead of…

(resolves #193)

exercises/anagram/build.gradle

@@ -8,7 +8,6 @@ repositories {
 
 dependencies {
   testCompile "junit:junit:4.12"
-  testCompile "org.assertj:assertj-core:3.2.0"
 }
 test {
   testLogging {

exercises/anagram/src/test/java/AnagramTest.java

@@ -1,9 +1,11 @@
-import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.Ignore;
+import org.junit.Test;
 
 import java.util.Arrays;
 import java.util.List;
-import org.junit.Test;
-import org.junit.Ignore;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
 
 public class AnagramTest {
 
@@ -11,7 +13,7 @@ public class AnagramTest {
     @Test
     public void testNoMatches() {
         Anagram detector = new Anagram("diaper");
-        assertThat(detector.match(Arrays.asList("hello", "world", "zombies", "pants"))).isEmpty();
+        assertTrue(detector.match(Arrays.asList("hello", "world", "zombies", "pants")).isEmpty());
     }
 
     @Ignore
@@ -19,7 +21,8 @@ public class AnagramTest {
     public void testSimpleAnagram() {
         Anagram detector = new Anagram("ant");
         List<String> anagram = detector.match(Arrays.asList("tan", "stand", "at"));
-        assertThat(anagram).containsExactly("tan");
+        assertThat(anagram, hasItem("tan"));
+        assertThat(anagram.size(), is(1));
     }
 
     @Ignore
@@ -27,7 +30,7 @@ public class AnagramTest {
     public void testDetectMultipleAnagrams() {
         Anagram detector = new Anagram("master");
         List<String> anagrams = detector.match(Arrays.asList("stream", "pigeon", "maters"));
-        assertThat(anagrams).contains("maters", "stream");
+        assertThat(anagrams, allOf(hasItem("maters"), hasItem("stream")));
     }
 
     @Ignore
@@ -35,7 +38,7 @@ public class AnagramTest {
     public void testDoesNotConfuseDifferentDuplicates() {
         Anagram detector = new Anagram("galea");
         List<String> anagrams = detector.match(Arrays.asList("eagle"));
-        assertThat(anagrams).isEmpty();
+        assertTrue(anagrams.isEmpty());
     }
 
     @Ignore
@@ -43,21 +46,22 @@ public class AnagramTest {
     public void testIdenticalWordIsNotAnagram() {
         Anagram detector = new Anagram("corn");
         List<String> anagrams = detector.match(Arrays.asList("corn", "dark", "Corn", "rank", "CORN", "cron", "park"));
-        assertThat(anagrams).containsExactly("cron");
+        assertThat(anagrams, hasItem("cron"));
+        assertThat(anagrams.size(), is(1));
     }
 
     @Ignore
     @Test
     public void testEliminateAnagramsWithSameChecksum() {
         Anagram detector = new Anagram("mass");
-        assertThat(detector.match(Arrays.asList("last")).isEmpty());
+        assertTrue(detector.match(Arrays.asList("last")).isEmpty());
     }
 
     @Ignore
     @Test
     public void testEliminateAnagramSubsets() {
         Anagram detector = new Anagram("good");
-        assertThat(detector.match(Arrays.asList("dog", "goody"))).isEmpty();
+        assertTrue(detector.match(Arrays.asList("dog", "goody")).isEmpty());
     }
 
     @Ignore
@@ -65,7 +69,7 @@ public class AnagramTest {
     public void testDetectAnagrams() {
         Anagram detector = new Anagram("listen");
         List<String> anagrams = detector.match(Arrays.asList("enlists", "google", "inlets", "banana"));
-        assertThat(anagrams).contains("inlets");
+        assertThat(anagrams, hasItem("inlets"));
     }
 
     @Ignore
@@ -73,7 +77,7 @@ public class AnagramTest {
     public void testMultipleAnagrams() {
         Anagram detector = new Anagram("allergy");
         List<String> anagrams = detector.match(Arrays.asList("gallery", "ballerina", "regally", "clergy", "largely", "leading"));
-        assertThat(anagrams).contains("gallery", "largely", "regally");
+        assertThat(anagrams, allOf(hasItem("gallery"), hasItem("largely"), hasItem("regally")));
     }
 
     @Ignore
@@ -81,7 +85,7 @@ public class AnagramTest {
     public void testAnagramsAreCaseInsensitive() {
         Anagram detector = new Anagram("Orchestra");
         List<String> anagrams = detector.match(Arrays.asList("cashregister", "Carthorse", "radishes"));
-        assertThat(anagrams).contains("Carthorse");
+        assertThat(anagrams, hasItem("Carthorse"));
     }
 
 }