prifak/Kotatsu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Parsers fixes

Browse Source
This commit is contained in:
Koitharu
2020-03-14 18:41:54 +02:00
parent 3fae457ec6
commit c765e03b28
9 changed files with 88 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/test/java/org/koitharu/kotatsu/parsers/RepositoryTestEnvironment.kt
View File

@@ -16,17 +16,14 @@ abstract class RepositoryTestEnvironment {
@BeforeClass
fun initialize(source: MangaSource) {
startKoin {
modules(listOf(
module {
factory {
OkHttpClient()
}
}, module {
single {
MangaLoaderContext()
}
module {
factory {
OkHttpClient()
}
))
single {
MangaLoaderContext()
}
}
}
val constructor = source.cls.getConstructor(MangaLoaderContext::class.java)
repository = constructor.newInstance(MangaLoaderContext())

16
app/src/test/java/org/koitharu/kotatsu/parsers/repository/MintMangaTest.kt
View File

@@ -8,7 +8,7 @@ import org.junit.runner.RunWith
import org.koitharu.kotatsu.core.model.MangaSource
import org.koitharu.kotatsu.parsers.MangaParserTest
import org.koitharu.kotatsu.parsers.RepositoryTestEnvironment
import org.koitharu.kotatsu.utils.TestUtil
import org.koitharu.kotatsu.utils.AssertX
import org.mockito.junit.MockitoJUnitRunner
@RunWith(MockitoJUnitRunner::class)
@@ -21,8 +21,8 @@ class MintMangaTest : MangaParserTest {
val item = list[40]
Assert.assertTrue(item.title.isNotEmpty())
Assert.assertTrue(item.rating in 0f..1f)
TestUtil.assertValidUrl(item.url)
TestUtil.assertValidUrl(item.coverUrl)
AssertX.assertValidUrl(item.url)
AssertX.assertValidUrl(item.coverUrl)
Assert.assertEquals(item.source, MangaSource.MINTMANGA)
}
@@ -30,11 +30,11 @@ class MintMangaTest : MangaParserTest {
override fun testMangaDetails() {
val manga = getMangaItem()
Assert.assertNotNull(manga.largeCoverUrl)
TestUtil.assertValidUrl(manga.largeCoverUrl!!)
AssertX.assertValidUrl(manga.largeCoverUrl!!)
Assert.assertNotNull(manga.chapters)
val chapter = manga.chapters!!.last()
Assert.assertEquals(chapter.source, MangaSource.MINTMANGA)
TestUtil.assertValidUrl(chapter.url)
AssertX.assertValidUrl(chapter.url)
}
@Test
@@ -43,8 +43,8 @@ class MintMangaTest : MangaParserTest {
val pages = runBlocking { repository.getPages(chapter) }
Assert.assertFalse(pages.isEmpty())
Assert.assertEquals(pages.first().source, MangaSource.MINTMANGA)
TestUtil.assertValidUrl(runBlocking { repository.getPageFullUrl(pages.first()) })
TestUtil.assertValidUrl(runBlocking { repository.getPageFullUrl(pages.last()) })
AssertX.assertValidUrl(runBlocking { repository.getPageFullUrl(pages.first()) })
AssertX.assertValidUrl(runBlocking { repository.getPageFullUrl(pages.last()) })
}
@Test
@@ -54,7 +54,7 @@ class MintMangaTest : MangaParserTest {
val tag = tags.first()
Assert.assertFalse(tag.title.isBlank())
Assert.assertEquals(tag.source, MangaSource.MINTMANGA)
TestUtil.assertValidUrl("https://mintmanga.live/list/genre/${tag.key}")
AssertX.assertValidUrl("https://mintmanga.live/list/genre/${tag.key}")
}
companion object : RepositoryTestEnvironment() {

16
app/src/test/java/org/koitharu/kotatsu/parsers/repository/ReadmangaRuTest.kt
View File

@@ -8,7 +8,7 @@ import org.junit.runner.RunWith
import org.koitharu.kotatsu.core.model.MangaSource
import org.koitharu.kotatsu.parsers.MangaParserTest
import org.koitharu.kotatsu.parsers.RepositoryTestEnvironment
import org.koitharu.kotatsu.utils.TestUtil
import org.koitharu.kotatsu.utils.AssertX
import org.mockito.junit.MockitoJUnitRunner
@RunWith(MockitoJUnitRunner::class)
@@ -21,8 +21,8 @@ class ReadmangaRuTest : MangaParserTest {
val item = list[40]
Assert.assertTrue(item.title.isNotEmpty())
Assert.assertTrue(item.rating in 0f..1f)
TestUtil.assertValidUrl(item.url)
TestUtil.assertValidUrl(item.coverUrl)
AssertX.assertValidUrl(item.url)
AssertX.assertValidUrl(item.coverUrl)
Assert.assertEquals(item.source, MangaSource.READMANGA_RU)
}
@@ -30,11 +30,11 @@ class ReadmangaRuTest : MangaParserTest {
override fun testMangaDetails() {
val manga = getMangaItem()
Assert.assertNotNull(manga.largeCoverUrl)
TestUtil.assertValidUrl(manga.largeCoverUrl!!)
AssertX.assertValidUrl(manga.largeCoverUrl!!)
Assert.assertNotNull(manga.chapters)
val chapter = manga.chapters!!.last()
Assert.assertEquals(chapter.source, MangaSource.READMANGA_RU)
TestUtil.assertValidUrl(chapter.url)
AssertX.assertValidUrl(chapter.url)
}
@Test
@@ -43,8 +43,8 @@ class ReadmangaRuTest : MangaParserTest {
val pages = runBlocking { repository.getPages(chapter) }
Assert.assertFalse(pages.isEmpty())
Assert.assertEquals(pages.first().source, MangaSource.READMANGA_RU)
TestUtil.assertValidUrl(runBlocking { repository.getPageFullUrl(pages.first()) })
TestUtil.assertValidUrl(runBlocking { repository.getPageFullUrl(pages.last()) })
AssertX.assertValidUrl(runBlocking { repository.getPageFullUrl(pages.first()) })
AssertX.assertValidUrl(runBlocking { repository.getPageFullUrl(pages.last()) })
}
@Test
@@ -54,7 +54,7 @@ class ReadmangaRuTest : MangaParserTest {
val tag = tags.first()
Assert.assertFalse(tag.title.isBlank())
Assert.assertEquals(tag.source, MangaSource.READMANGA_RU)
TestUtil.assertValidUrl("https://readmanga.me/list/genre/${tag.key}")
AssertX.assertValidUrl("https://readmanga.me/list/genre/${tag.key}")
}
companion object : RepositoryTestEnvironment() {

16
app/src/test/java/org/koitharu/kotatsu/parsers/repository/SelfMangaTest.kt
View File

@@ -8,7 +8,7 @@ import org.junit.runner.RunWith
import org.koitharu.kotatsu.core.model.MangaSource
import org.koitharu.kotatsu.parsers.MangaParserTest
import org.koitharu.kotatsu.parsers.RepositoryTestEnvironment
import org.koitharu.kotatsu.utils.TestUtil
import org.koitharu.kotatsu.utils.AssertX
import org.mockito.junit.MockitoJUnitRunner
@RunWith(MockitoJUnitRunner::class)
@@ -21,8 +21,8 @@ class SelfMangaTest : MangaParserTest {
val item = list[40]
Assert.assertTrue(item.title.isNotEmpty())
Assert.assertTrue(item.rating in 0f..1f)
TestUtil.assertValidUrl(item.url)
TestUtil.assertValidUrl(item.coverUrl)
AssertX.assertValidUrl(item.url)
AssertX.assertValidUrl(item.coverUrl)
Assert.assertEquals(item.source, MangaSource.SELFMANGA)
}
@@ -30,11 +30,11 @@ class SelfMangaTest : MangaParserTest {
override fun testMangaDetails() {
val manga = getMangaItem()
Assert.assertNotNull(manga.largeCoverUrl)
TestUtil.assertValidUrl(manga.largeCoverUrl!!)
AssertX.assertValidUrl(manga.largeCoverUrl!!)
Assert.assertNotNull(manga.chapters)
val chapter = manga.chapters!!.last()
Assert.assertEquals(chapter.source, MangaSource.SELFMANGA)
TestUtil.assertValidUrl(chapter.url)
AssertX.assertValidUrl(chapter.url)
}
@Test
@@ -43,8 +43,8 @@ class SelfMangaTest : MangaParserTest {
val pages = runBlocking { repository.getPages(chapter) }
Assert.assertFalse(pages.isEmpty())
Assert.assertEquals(pages.first().source, MangaSource.SELFMANGA)
TestUtil.assertValidUrl(runBlocking { repository.getPageFullUrl(pages.first()) })
TestUtil.assertValidUrl(runBlocking { repository.getPageFullUrl(pages.last()) })
AssertX.assertValidUrl(runBlocking { repository.getPageFullUrl(pages.first()) })
AssertX.assertValidUrl(runBlocking { repository.getPageFullUrl(pages.last()) })
}
@Test
@@ -54,7 +54,7 @@ class SelfMangaTest : MangaParserTest {
val tag = tags.first()
Assert.assertFalse(tag.title.isBlank())
Assert.assertEquals(tag.source, MangaSource.SELFMANGA)
TestUtil.assertValidUrl("https://selfmanga.ru/list/genre/${tag.key}")
AssertX.assertValidUrl("https://selfmanga.ru/list/genre/${tag.key}")
}
companion object : RepositoryTestEnvironment() {

2
app/src/test/java/org/koitharu/kotatsu/utils/TestUtil.kt → app/src/test/java/org/koitharu/kotatsu/utils/AssertX.kt
View File

@@ -4,7 +4,7 @@ import org.junit.Assert
import java.net.HttpURLConnection
import java.net.URL
object TestUtil {
object AssertX {
private val VALID_RESPONSE_CODES = arrayOf(
HttpURLConnection.HTTP_OK,