Refactoring: utilities for checking build and classifier numbers

This commit is contained in:
Nikolay Krasko
2022-09-07 11:48:08 +02:00
committed by Space
parent 1df9882aed
commit a47377e214
@@ -183,65 +183,65 @@ class KotlinToolingVersionTest {
@Test @Test
fun buildNumber() { fun buildNumber() {
assertEquals(510, KotlinToolingVersion("1.6.20-510").buildNumber) assertBuildNumber(510, "1.6.20-510")
assertEquals(510, KotlinToolingVersion("1.6.20-release-510").buildNumber) assertBuildNumber(510, "1.6.20-release-510")
assertEquals(510, KotlinToolingVersion("1.6.20-rc1-510").buildNumber) assertBuildNumber(510, "1.6.20-rc1-510")
assertEquals(510, KotlinToolingVersion("1.6.20-beta1-510").buildNumber) assertBuildNumber(510, "1.6.20-beta1-510")
assertEquals(510, KotlinToolingVersion("1.6.20-alpha1-510").buildNumber) assertBuildNumber(510, "1.6.20-alpha1-510")
assertEquals(510, KotlinToolingVersion("1.6.20-m1-510").buildNumber) assertBuildNumber(510, "1.6.20-m1-510")
assertEquals(510, KotlinToolingVersion("1.6.20-m1-release-510").buildNumber) assertBuildNumber(510, "1.6.20-m1-release-510")
assertEquals(510, KotlinToolingVersion("1.6.20-rc1-release-510").buildNumber) assertBuildNumber(510, "1.6.20-rc1-release-510")
assertEquals(510, KotlinToolingVersion("1.6.20-beta1-release-510").buildNumber) assertBuildNumber(510, "1.6.20-beta1-release-510")
assertEquals(510, KotlinToolingVersion("1.6.20-alpha1-release-510").buildNumber) assertBuildNumber(510, "1.6.20-alpha1-release-510")
/* dev */ /* dev */
assertEquals(510, KotlinToolingVersion("1.6.20-dev-510").buildNumber) assertBuildNumber(510, "1.6.20-dev-510")
assertEquals(510, KotlinToolingVersion("1.6.20-pub-510").buildNumber) assertBuildNumber(510, "1.6.20-pub-510")
assertEquals(510, KotlinToolingVersion("1.6.20-dev-myWildcard-510").buildNumber) assertBuildNumber(510, "1.6.20-dev-myWildcard-510")
assertEquals(510, KotlinToolingVersion("1.6.20-pub-myWildcard-510").buildNumber) assertBuildNumber(510, "1.6.20-pub-myWildcard-510")
assertEquals(510, KotlinToolingVersion("1.6.20-dev-myWildcard1-510").buildNumber) assertBuildNumber(510, "1.6.20-dev-myWildcard1-510")
assertEquals(510, KotlinToolingVersion("1.6.20-pub-myWildcard1-510").buildNumber) assertBuildNumber(510, "1.6.20-pub-myWildcard1-510")
assertNull(KotlinToolingVersion("1.6.20-dev-myWildcard510").buildNumber) assertBuildNumber(null,"1.6.20-dev-myWildcard510")
/* dev with - in wildcards */ /* dev with - in wildcards */
assertEquals(510, KotlinToolingVersion("1.6.20-dev-google-pr-510").buildNumber) assertBuildNumber(510, "1.6.20-dev-google-pr-510")
assertEquals(510, KotlinToolingVersion("1.6.20-dev-google-pr-510").buildNumber) assertBuildNumber(510, "1.6.20-dev-google-pr-510")
assertEquals(510, KotlinToolingVersion("1.6.20-dev-google-pr210-510").buildNumber) assertBuildNumber(510, "1.6.20-dev-google-pr210-510")
assertNull(KotlinToolingVersion("1.6.20-dev-google-pr").buildNumber) assertBuildNumber(null, "1.6.20-dev-google-pr")
assertNull(KotlinToolingVersion("1.6.20-dev-google-pr510").buildNumber) assertBuildNumber(null, "1.6.20-dev-google-pr510")
} }
@Test @Test
fun classifierNumber() { fun classifierNumber() {
assertEquals(2, KotlinToolingVersion("1.6.20-rc2-510").classifierNumber) assertClassifierNumber(2, "1.6.20-rc2-510")
assertEquals(2, KotlinToolingVersion("1.6.20-beta2-510").classifierNumber) assertClassifierNumber(2, "1.6.20-beta2-510")
assertEquals(2, KotlinToolingVersion("1.6.20-alpha2-510").classifierNumber) assertClassifierNumber(2, "1.6.20-alpha2-510")
assertEquals(2, KotlinToolingVersion("1.6.20-m2-510").classifierNumber) assertClassifierNumber(2, "1.6.20-m2-510")
assertEquals(2, KotlinToolingVersion("1.6.20-rc2").classifierNumber) assertClassifierNumber(2, "1.6.20-rc2")
assertEquals(2, KotlinToolingVersion("1.6.20-beta2").classifierNumber) assertClassifierNumber(2, "1.6.20-beta2")
assertEquals(2, KotlinToolingVersion("1.6.20-alpha2").classifierNumber) assertClassifierNumber(2, "1.6.20-alpha2")
assertEquals(2, KotlinToolingVersion("1.6.20-m2").classifierNumber) assertClassifierNumber(2, "1.6.20-m2")
assertEquals(2, KotlinToolingVersion("1.6.20-rc2-release").classifierNumber) assertClassifierNumber(2, "1.6.20-rc2-release")
assertEquals(2, KotlinToolingVersion("1.6.20-rc2-release-510").classifierNumber) assertClassifierNumber(2, "1.6.20-rc2-release-510")
assertEquals(2, KotlinToolingVersion("1.6.20-beta2-release").classifierNumber) assertClassifierNumber(2, "1.6.20-beta2-release")
assertEquals(2, KotlinToolingVersion("1.6.20-beta2-release-510").classifierNumber) assertClassifierNumber(2, "1.6.20-beta2-release-510")
assertEquals(2, KotlinToolingVersion("1.6.20-alpha2").classifierNumber) assertClassifierNumber(2, "1.6.20-alpha2")
assertEquals(2, KotlinToolingVersion("1.6.20-alpha2-release").classifierNumber) assertClassifierNumber(2, "1.6.20-alpha2-release")
assertEquals(2, KotlinToolingVersion("1.6.20-alpha2-release-510").classifierNumber) assertClassifierNumber(2, "1.6.20-alpha2-release-510")
assertEquals(2, KotlinToolingVersion("1.6.20-m2").classifierNumber) assertClassifierNumber(2, "1.6.20-m2")
assertEquals(2, KotlinToolingVersion("1.6.20-m2-release").classifierNumber) assertClassifierNumber(2, "1.6.20-m2-release")
assertEquals(2, KotlinToolingVersion("1.6.20-m2-release-510").classifierNumber) assertClassifierNumber(2, "1.6.20-m2-release-510")
assertNull(KotlinToolingVersion("1.6.20-dev-510").classifierNumber) assertClassifierNumber(null, "1.6.20-dev-510")
assertNull(KotlinToolingVersion("1.6.20-pub-510").classifierNumber) assertClassifierNumber(null, "1.6.20-pub-510")
assertNull(KotlinToolingVersion("1.6.20-dev-myWildcard-510").classifierNumber) assertClassifierNumber(null, "1.6.20-dev-myWildcard-510")
assertNull(KotlinToolingVersion("1.6.20-pub-myWildcard-510").classifierNumber) assertClassifierNumber(null, "1.6.20-pub-myWildcard-510")
assertNull(KotlinToolingVersion("1.6.20-dev-myWildcard1-510").classifierNumber) assertClassifierNumber(null, "1.6.20-dev-myWildcard1-510")
assertNull(KotlinToolingVersion("1.6.20-pub-myWildcard1-510").classifierNumber) assertClassifierNumber(null, "1.6.20-pub-myWildcard1-510")
assertNull(KotlinToolingVersion("1.6.20-dev-myWildcard510").classifierNumber) assertClassifierNumber(null, "1.6.20-dev-myWildcard510")
assertNull(KotlinToolingVersion("1.6.20-dev-google-pr510").classifierNumber) assertClassifierNumber(null, "1.6.20-dev-google-pr510")
} }
@Test @Test
@@ -297,6 +297,14 @@ class KotlinToolingVersionTest {
assertNull(KotlinToolingVersionOrNull("1.6.20.1")) assertNull(KotlinToolingVersionOrNull("1.6.20.1"))
} }
private fun assertBuildNumber(buildNumber: Int?, version: String, message: String? = null) {
assertEquals(buildNumber, KotlinToolingVersion(version).buildNumber, message)
}
private fun assertClassifierNumber(classifierNumber: Int?, version: String, message: String? = null) {
assertEquals(classifierNumber, KotlinToolingVersion(version).classifierNumber, message)
}
private fun assertMaturity(maturity: KotlinToolingVersion.Maturity?, version: String) { private fun assertMaturity(maturity: KotlinToolingVersion.Maturity?, version: String) {
assertEquals(maturity, KotlinToolingVersion(version).maturity) assertEquals(maturity, KotlinToolingVersion(version).maturity)
} }