diff --git a/CHANGELOG.md b/CHANGELOG.md index 0863ab864d..4a1f2af29d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,3 +26,4 @@ - Added Unit Test for version checker - Migrated from Coil2 to Coil3 +- Migrated from JUnit4 to JUnit5 diff --git a/app/src/test/java/eu/kanade/tachiyomi/data/updater/AppUpdateCheckerTest.kt b/app/src/test/java/eu/kanade/tachiyomi/data/updater/AppUpdateCheckerTest.kt index 3aea8b012e..9d1c359ee5 100644 --- a/app/src/test/java/eu/kanade/tachiyomi/data/updater/AppUpdateCheckerTest.kt +++ b/app/src/test/java/eu/kanade/tachiyomi/data/updater/AppUpdateCheckerTest.kt @@ -4,15 +4,14 @@ import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.network.NetworkHelper import io.mockk.mockk import kotlinx.serialization.json.Json -import org.junit.Assert.assertFalse -import org.junit.Assert.assertTrue -import org.junit.Before -import org.junit.Test +import org.junit.jupiter.api.Assertions.* +import org.junit.jupiter.api.BeforeEach +import org.junit.jupiter.api.Test class AppUpdateCheckerTest { - lateinit var appUpdateChecker: AppUpdateChecker + private lateinit var appUpdateChecker: AppUpdateChecker - @Before + @BeforeEach fun setup() { val json = mockk() val network = mockk() diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f4224f0ce8..ef40aa0913 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,6 +6,7 @@ fast_adapter = "5.6.0" nucleus = "3.0.0" okhttp = "5.0.0-alpha.11" shizuku = "12.1.0" +junit = "5.8.2" [libraries] accompanist-webview = { module = "com.google.accompanist:accompanist-webview", version = "0.30.1" } @@ -69,7 +70,8 @@ firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics-ktx" unifile = { module = "com.github.tachiyomiorg:unifile", version = "17bec43" } viewstatepageradapter = { module = "com.nightlynexus.viewstatepageradapter:viewstatepageradapter", version = "1.1.0" } viewtooltip = { module = "com.github.florent37:viewtooltip", version = "1.2.2" } -junit = { module = "junit:junit", version = "4.13.2" } +junit-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" } +junit-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" } junit-android = { module = "androidx.test.ext:junit", version = "1.1.5" } mockk = { module = "io.mockk:mockk", version = "1.13.11" } @@ -79,4 +81,4 @@ gradle-versions = { id = "com.github.ben-manes.versions", version = "0.42.0" } [bundles] coil = [ "coil3", "coil3-svg", "coil3-gif", "coil3-okhttp" ] -test = [ "junit", "mockk" ] +test = [ "junit-api", "junit-engine", "mockk" ]