Restore move from FEST Assert to AssertJ

anagram/build.gradle

@@ -8,4 +8,5 @@ repositories {
 
 dependencies {
   testCompile "junit:junit:4.10"
+  testCompile "org.assertj:assertj-core:3.2.0"
 }

anagram/src/test/java/AnagramTest.java

@@ -1,77 +1,76 @@
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.matchers.JUnitMatchers.*;
-import static org.junit.Assert.*;
+import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.*;
-import org.junit.*;
+import java.util.Arrays;
+import java.util.List;
+import org.junit.Test;
 
 public class AnagramTest {
 
     @Test
     public void testNoMatches() {
         Anagram detector = new Anagram("diaper");
-        assertTrue(detector.match(Arrays.asList("hello", "world", "zombies", "pants")).isEmpty());
+        assertThat(detector.match(Arrays.asList("hello", "world", "zombies", "pants"))).isEmpty();
     }
 
     @Test
     public void testSimpleAnagram() {
         Anagram detector = new Anagram("ant");
         List<String> anagram = detector.match(Arrays.asList("tan", "stand", "at"));
-        assertThat(anagram, hasItems("tan"));
+        assertThat(anagram).containsExactly("tan");
     }
 
     @Test
     public void testDetectMultipleAnagrams() {
         Anagram detector = new Anagram("master");
         List<String> anagrams = detector.match(Arrays.asList("stream", "pigeon", "maters"));
-        assertThat(anagrams, hasItems("maters", "stream"));
+        assertThat(anagrams).contains("maters", "stream");
     }
 
     @Test
     public void testDoesNotConfuseDifferentDuplicates() {
         Anagram detector = new Anagram("galea");
         List<String> anagrams = detector.match(Arrays.asList("eagle"));
-        assertTrue(anagrams.isEmpty());
+        assertThat(anagrams).isEmpty();
     }
 
     @Test
     public void testIdenticalWordIsNotAnagram() {
         Anagram detector = new Anagram("corn");
         List<String> anagrams = detector.match(Arrays.asList("corn", "dark", "Corn", "rank", "CORN", "cron", "park"));
-        assertEquals(anagrams, Arrays.asList("cron"));
+        assertThat(anagrams).containsExactly("cron");
     }
 
     @Test
     public void testEliminateAnagramsWithSameChecksum() {
         Anagram detector = new Anagram("mass");
-        assertTrue(detector.match(Arrays.asList("last")).isEmpty());
+        assertThat(detector.match(Arrays.asList("last")).isEmpty());
     }
 
     @Test
     public void testEliminateAnagramSubsets() {
         Anagram detector = new Anagram("good");
-        assertTrue(detector.match(Arrays.asList("dog", "goody")).isEmpty());
+        assertThat(detector.match(Arrays.asList("dog", "goody"))).isEmpty();
     }
 
     @Test
     public void testDetectAnagrams() {
         Anagram detector = new Anagram("listen");
         List<String> anagrams = detector.match(Arrays.asList("enlists", "google", "inlets", "banana"));
-        assertThat(anagrams, hasItems("inlets"));
+        assertThat(anagrams).contains("inlets");
     }
 
     @Test
     public void testMultipleAnagrams() {
         Anagram detector = new Anagram("allergy");
         List<String> anagrams = detector.match(Arrays.asList("gallery", "ballerina", "regally", "clergy", "largely", "leading"));
-        assertThat(anagrams, hasItems("gallery", "largely", "regally"));
+        assertThat(anagrams).contains("gallery", "largely", "regally");
     }
 
     @Test
     public void testAnagramsAreCaseInsensitive() {
         Anagram detector = new Anagram("Orchestra");
         List<String> anagrams = detector.match(Arrays.asList("cashregister", "Carthorse", "radishes"));
-        assertThat(anagrams, hasItems("Carthorse"));
+        assertThat(anagrams).contains("Carthorse");
     }
 
 }

etl/build.gradle

@@ -8,6 +8,6 @@ repositories {
 
 dependencies {
   testCompile "junit:junit:4.10"
-  testCompile "org.easytesting:fest-assert-core:2.0M10"
+  testCompile "org.assertj:assertj-core:3.2.0"
   testCompile "com.google.guava:guava:16+"
 }

grade-school/build.gradle

@@ -8,6 +8,6 @@ repositories {
 
 dependencies {
   testCompile "junit:junit:4.10"
-  testCompile "org.easytesting:fest-assert-core:2.0M10"
+  testCompile "org.assertj:assertj-core:3.2.0"
 }
 

meetup/build.gradle

@@ -9,5 +9,5 @@ repositories {
 dependencies {
   compile "joda-time:joda-time:2.3+"
   testCompile "junit:junit:4.10"
-  testCompile "org.easytesting:fest-assert-core:2.0M10"
+  testCompile "org.assertj:assertj-core:3.2.0"
 }

nucleotide-count/build.gradle

@@ -8,6 +8,6 @@ repositories {
 
 dependencies {
   testCompile "junit:junit:4.10"
-  testCompile "org.easytesting:fest-assert-core:2.0M10"
+  testCompile "org.assertj:assertj-core:3.2.0"
 }