From 100a4c9d35d6b91c9213635d7a3383a68b3d150b Mon Sep 17 00:00:00 2001 From: Aria Moradi Date: Mon, 1 Nov 2021 18:02:06 +0330 Subject: [PATCH] refactor --- server/src/test/kotlin/suwayomi/tachidesk/ApplicationTest.kt | 2 +- .../test/kotlin/{masstest => suwayomi/tachidesk}/TestUtils.kt | 0 .../tachidesk/manga/controller/CategoryControllerTest.kt | 2 +- .../kotlin/suwayomi/tachidesk/manga/impl/CategoryMangaTest.kt | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename server/src/test/kotlin/{masstest => suwayomi/tachidesk}/TestUtils.kt (100%) diff --git a/server/src/test/kotlin/suwayomi/tachidesk/ApplicationTest.kt b/server/src/test/kotlin/suwayomi/tachidesk/ApplicationTest.kt index a663a220..8ca52c70 100644 --- a/server/src/test/kotlin/suwayomi/tachidesk/ApplicationTest.kt +++ b/server/src/test/kotlin/suwayomi/tachidesk/ApplicationTest.kt @@ -9,6 +9,7 @@ package suwayomi.tachidesk import eu.kanade.tachiyomi.App import eu.kanade.tachiyomi.source.local.LocalSource +import masstest.BASE_PATH import mu.KotlinLogging import org.jetbrains.exposed.sql.Database import org.junit.jupiter.api.BeforeAll @@ -16,7 +17,6 @@ import org.kodein.di.DI import org.kodein.di.bind import org.kodein.di.conf.global import org.kodein.di.singleton -import masstest.BASE_PATH import suwayomi.tachidesk.server.ApplicationDirs import suwayomi.tachidesk.server.JavalinSetup import suwayomi.tachidesk.server.ServerConfig diff --git a/server/src/test/kotlin/masstest/TestUtils.kt b/server/src/test/kotlin/suwayomi/tachidesk/TestUtils.kt similarity index 100% rename from server/src/test/kotlin/masstest/TestUtils.kt rename to server/src/test/kotlin/suwayomi/tachidesk/TestUtils.kt diff --git a/server/src/test/kotlin/suwayomi/tachidesk/manga/controller/CategoryControllerTest.kt b/server/src/test/kotlin/suwayomi/tachidesk/manga/controller/CategoryControllerTest.kt index a1bde400..f5378f47 100644 --- a/server/src/test/kotlin/suwayomi/tachidesk/manga/controller/CategoryControllerTest.kt +++ b/server/src/test/kotlin/suwayomi/tachidesk/manga/controller/CategoryControllerTest.kt @@ -12,9 +12,9 @@ import org.jetbrains.exposed.sql.transactions.transaction import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test +import suwayomi.tachidesk.ApplicationTest import suwayomi.tachidesk.manga.impl.Category import suwayomi.tachidesk.manga.model.table.CategoryTable -import suwayomi.tachidesk.ApplicationTest internal class CategoryControllerTest : ApplicationTest() { @Test diff --git a/server/src/test/kotlin/suwayomi/tachidesk/manga/impl/CategoryMangaTest.kt b/server/src/test/kotlin/suwayomi/tachidesk/manga/impl/CategoryMangaTest.kt index c0c24c22..93647271 100644 --- a/server/src/test/kotlin/suwayomi/tachidesk/manga/impl/CategoryMangaTest.kt +++ b/server/src/test/kotlin/suwayomi/tachidesk/manga/impl/CategoryMangaTest.kt @@ -15,6 +15,7 @@ import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test import org.junit.jupiter.api.TestInstance +import suwayomi.tachidesk.ApplicationTest import suwayomi.tachidesk.manga.impl.Category.DEFAULT_CATEGORY_ID import suwayomi.tachidesk.manga.model.table.CategoryMangaTable import suwayomi.tachidesk.manga.model.table.CategoryTable @@ -25,7 +26,6 @@ import suwayomi.tachidesk.manga.model.table.ChapterTable.name import suwayomi.tachidesk.manga.model.table.ChapterTable.sourceOrder import suwayomi.tachidesk.manga.model.table.ChapterTable.url import suwayomi.tachidesk.manga.model.table.MangaTable -import suwayomi.tachidesk.ApplicationTest @TestInstance(TestInstance.Lifecycle.PER_CLASS) class CategoryMangaTest : ApplicationTest() {