azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[K/N][build] Define meta versions order and comparing

Browse Source 
Move isAtLeast() from compiler downloader and test
to CompilerVersion.kt
This commit is contained in:
Pavel Punegov
2022-02-17 18:57:33 +03:00
parent 4644562e7f
commit 3d17d476e0
5 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/util-io/test/org/jetbrains/kotlin/native/NativeCompilerVersionTest.kt
+14 -18
View File
@@ -5,10 +5,7 @@
package org.jetbrains.kotlin.native
import org.jetbrains.kotlin.konan.CompilerVersion
import org.jetbrains.kotlin.konan.CompilerVersionImpl
import org.jetbrains.kotlin.konan.MetaVersion
import org.jetbrains.kotlin.konan.parseCompilerVersion
import org.jetbrains.kotlin.konan.*
import org.junit.Assert.assertEquals
import org.junit.Test
import kotlin.test.*
@@ -62,20 +59,6 @@ class NativeCompilerVersionTest {
assertEquals(MetaVersion.DEV, meta)
assertEquals(1, build)
}
"1.6.10-M1-3".parseCompilerVersion().apply {
assertEquals(1, major)
assertEquals(6, minor)
assertEquals(10, maintenance)
assertEquals(MetaVersion.M1, meta)
assertEquals(3, build)
}
"1.6.20-M2".parseCompilerVersion().apply {
assertEquals(1, major)
assertEquals(6, minor)
assertEquals(20, maintenance)
assertEquals(MetaVersion.M2, meta)
assertEquals(-1, build)
}
"1.6.10-RC".parseCompilerVersion().apply {
assertEquals(1, major)
assertEquals(6, minor)
@@ -161,4 +144,17 @@ class NativeCompilerVersionTest {
assertEquals(-1, build)
}
}
@Test
fun metaVersionOrder() {
assertTrue("1.7.0-RC2".parseCompilerVersion().isAtLeast("1.7.0-RC".parseCompilerVersion()))
assertTrue("1.7.0-RC".parseCompilerVersion().isAtLeast("1.7.0-BETA".parseCompilerVersion()))
assertTrue("1.7.0-RC".parseCompilerVersion().isAtLeast("1.7.0-BETA2".parseCompilerVersion()))
assertTrue("1.7.0-RC2".parseCompilerVersion().isAtLeast("1.7.0-BETA3".parseCompilerVersion()))
assertTrue("1.7.0-release".parseCompilerVersion().isAtLeast("1.7.0-RC".parseCompilerVersion()))
assertTrue("1.7.0-release".parseCompilerVersion().isAtLeast("1.7.0-RC3".parseCompilerVersion()))
assertTrue("1.7.0-release".parseCompilerVersion().isAtLeast("1.7.0-dev-1234".parseCompilerVersion()))
assertTrue("1.7.0-eap1".parseCompilerVersion().isAtLeast("1.7.0-eap".parseCompilerVersion()))
assertTrue("1.7.0-eap1".parseCompilerVersion().isAtLeast("1.7.0-eap-134".parseCompilerVersion()))
}
}