Replace hamcrest with assertj. ChaptersSubject now uses only one observeOn.

app/src/test/java/eu/kanade/mangafeed/ChapterRecognitionTest.java

@@ -7,8 +7,8 @@ import eu.kanade.mangafeed.data.database.models.Chapter;
 import eu.kanade.mangafeed.data.database.models.Manga;
 import eu.kanade.mangafeed.util.ChapterRecognition;
 
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
+
 
 public class ChapterRecognitionTest {
 
@@ -30,49 +30,49 @@ public class ChapterRecognitionTest {
     public void testWithOneDigit() {
         Chapter c = createChapter("Ch.3: Self-proclaimed Genius");
         ChapterRecognition.parseChapterNumber(c, randomManga);
-        assertThat(c.chapter_number, is(3f));
+        assertThat(c.chapter_number).isEqualTo(3f);
     }
 
     @Test
     public void testWithVolumeBefore() {
         Chapter c = createChapter("Vol.1 Ch.4: Misrepresentation");
         ChapterRecognition.parseChapterNumber(c, randomManga);
-        assertThat(c.chapter_number, is(4f));
+        assertThat(c.chapter_number).isEqualTo(4f);
     }
 
     @Test
     public void testWithVolumeAndVersionNumber() {
         Chapter c = createChapter("Vol.1 Ch.3 (v2) Read Online");
         ChapterRecognition.parseChapterNumber(c, randomManga);
-        assertThat(c.chapter_number, is(3f));
+        assertThat(c.chapter_number).isEqualTo(3f);
     }
 
     @Test
     public void testWithVolumeAndNumberInTitle() {
         Chapter c = createChapter("Vol.15 Ch.90: Here Blooms the Daylily, Part 4");
         ChapterRecognition.parseChapterNumber(c, randomManga);
-        assertThat(c.chapter_number, is(90f));
+        assertThat(c.chapter_number).isEqualTo(90f);
     }
 
     @Test
     public void testWithVolumeAndSpecialChapter() {
         Chapter c = createChapter("Vol.10 Ch.42.5: Homecoming (Beginning)");
         ChapterRecognition.parseChapterNumber(c, randomManga);
-        assertThat(c.chapter_number, is(42.5f));
+        assertThat(c.chapter_number).isEqualTo(42.5f);
     }
 
     @Test
     public void testWithJustANumber() {
         Chapter c = createChapter("Homecoming (Beginning) 42");
         ChapterRecognition.parseChapterNumber(c, randomManga);
-        assertThat(c.chapter_number, is(42f));
+        assertThat(c.chapter_number).isEqualTo(42f);
     }
 
     @Test
     public void testWithJustASpecialChapter() {
         Chapter c = createChapter("Homecoming (Beginning) 42.5");
         ChapterRecognition.parseChapterNumber(c, randomManga);
-        assertThat(c.chapter_number, is(42.5f));
+        assertThat(c.chapter_number).isEqualTo(42.5f);
     }
 
     @Test
@@ -81,28 +81,28 @@ public class ChapterRecognitionTest {
         Manga m = new Manga();
         m.title = "3x3 Eyes";
         ChapterRecognition.parseChapterNumber(c, m);
-        assertThat(c.chapter_number, is(96f));
+        assertThat(c.chapter_number).isEqualTo(96f);
     }
 
     @Test
     public void testWithColonAtTheEnd() {
         Chapter c = createChapter("Chapter 5: 365 days");
         ChapterRecognition.parseChapterNumber(c, randomManga);
-        assertThat(c.chapter_number, is(5f));
+        assertThat(c.chapter_number).isEqualTo(5f);
     }
 
     @Test
     public void testWithZeros() {
         Chapter c = createChapter("Vol.001 Ch.003: Kaguya Doesn't Know Much");
         ChapterRecognition.parseChapterNumber(c, randomManga);
-        assertThat(c.chapter_number, is(3f));
+        assertThat(c.chapter_number).isEqualTo(3f);
     }
 
     @Test
     public void testRange() {
         Chapter c = createChapter("Ch.191-200 Read Online");
         ChapterRecognition.parseChapterNumber(c, randomManga);
-        assertThat(c.chapter_number, is(191f));
+        assertThat(c.chapter_number).isEqualTo(191f);
     }
 
     @Test
@@ -110,7 +110,7 @@ public class ChapterRecognitionTest {
         // It should be 567, not 67 (ch is a keyword to get the chapter number)
         Chapter c = createChapter("Bleach 567: Down With Snowwhite");
         ChapterRecognition.parseChapterNumber(c, randomManga);
-        assertThat(c.chapter_number, is(567f));
+        assertThat(c.chapter_number).isEqualTo(567f);
     }
 
     @Test
@@ -118,7 +118,7 @@ public class ChapterRecognitionTest {
         // It should be 84, not 2084
         Chapter c = createChapter("Onepunch-Man Punch Ver002 084 : Creeping Darkness");
         ChapterRecognition.parseChapterNumber(c, randomManga);
-        assertThat(c.chapter_number, is(84f));
+        assertThat(c.chapter_number).isEqualTo(84f);
     }
 
 }