From 626d84eea33e3adb1aa8708ac7f85f82d1a1c7af Mon Sep 17 00:00:00 2001 From: Koitharu Date: Sun, 20 Mar 2022 17:27:48 +0200 Subject: [PATCH] Fix VersionId test --- app/build.gradle | 2 +- .../kotatsu/core/github/VersionIdTest.kt | 36 ++++++++++++------- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 98082c6d4..3dfb0d13f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,7 +15,7 @@ android { minSdkVersion 21 targetSdkVersion 31 versionCode 399 - versionName '3.0-a0' + versionName '3.0-alpha1' generatedDensities = [] testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/test/java/org/koitharu/kotatsu/core/github/VersionIdTest.kt b/app/src/test/java/org/koitharu/kotatsu/core/github/VersionIdTest.kt index 943d3c91d..9f83e85a6 100644 --- a/app/src/test/java/org/koitharu/kotatsu/core/github/VersionIdTest.kt +++ b/app/src/test/java/org/koitharu/kotatsu/core/github/VersionIdTest.kt @@ -1,40 +1,50 @@ package org.koitharu.kotatsu.core.github -import com.google.common.truth.Truth import org.junit.Test +import org.koitharu.kotatsu.BuildConfig +import kotlin.test.assertEquals +import kotlin.test.assertTrue class VersionIdTest { @Test fun testVersionIdParse() { val version = VersionId.parse("2.0") - Truth.assertThat(version.major).isEqualTo(2) - Truth.assertThat(version.minor).isEqualTo(0) - Truth.assertThat(version.build).isEqualTo(0) - Truth.assertThat(version.variantType).isEmpty() - Truth.assertThat(version.variantNumber).isEqualTo(0) + assertEquals(version.major, 2) + assertEquals(version.minor,0) + assertEquals(version.build,0) + assertEquals(version.variantType, "") + assertEquals(version.variantNumber,0) } @Test fun testVersionIdVariantParse() { val version = VersionId.parse("2.0.1-b1") - Truth.assertThat(version.major).isEqualTo(2) - Truth.assertThat(version.minor).isEqualTo(0) - Truth.assertThat(version.build).isEqualTo(1) - Truth.assertThat(version.variantType).isEqualTo("b") - Truth.assertThat(version.variantNumber).isEqualTo(1) + assertEquals(version.major, 2) + assertEquals(version.minor, 0) + assertEquals(version.build, 1) + assertEquals(version.variantType, "b") + assertEquals(version.variantNumber, 1) } @Test fun testVersionIdCompare() { val version1 = VersionId.parse("1.99.99") val version2 = VersionId.parse("2.0.0") - Truth.assertThat(version1 < version2).isTrue() + assertTrue(version1 < version2) } + @Test fun testVersionIdVariantCompare() { val version1 = VersionId.parse("2.0.1-a2") val version2 = VersionId.parse("2.0.1-b1") - Truth.assertThat(version1 < version2).isTrue() + assertTrue(version1 < version2) + } + + @Test + fun testCurrentVersion() { + val version1 = VersionId.parse("2.4.6") + val version2 = VersionId.parse(BuildConfig.VERSION_NAME) + assertTrue(version1 < version2) } } \ No newline at end of file