jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-03-19 00:21:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Gradle, JS] Add union test with fixed issue in union method

Browse Source 
^KT-41054 fixed
This commit is contained in:
Ilya Goncharov
2020-08-06 18:12:47 +03:00
parent 7aaa1cf556
commit bd01ac52af
2 changed files with 56 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmRange.kt
View File

@@ -58,7 +58,7 @@ infix fun NpmRange.union(other: NpmRange): List<NpmRange> {
startVersion = startVersion,
startInclusive = if (startVersion == other.startVersion) other.startInclusive else this.startInclusive,
endVersion = endVersion,
endInclusive = if (startVersion == other.startVersion) other.startInclusive else this.startInclusive
endInclusive = if (endVersion == other.endVersion) other.endInclusive else this.endInclusive
).toListOrEmpty()
}

55
libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmRangeTest.kt
View File

@@ -10,6 +10,61 @@ import kotlin.test.assertTrue
class NpmRangeTest {
@Test
fun unionTest() {
fun assertUnion(range1: NpmRange, range2: NpmRange, expected: List<NpmRange>) {
val union = range1 union range2
assertTrue("Range $range1 and $range2 expected to have union $expected, but actual is $union") {
union == expected
}
val symUnion = range1 union range2
assertTrue("Range $range2 and $range1 expected to have union $expected, but actual is $symUnion") {
symUnion == expected
}
}
val range1 = npmRange(startMajor = 1, endMajor = 2)
val range2 = npmRange(startMajor = 3, endMajor = 4)
assertUnion(range1, range2, listOf(range1, range2))
assertUnion(
npmRange(startMajor = 1, endMajor = 3),
npmRange(startMajor = 2, endMajor = 4),
listOf(
npmRange(
startMajor = 1,
endMajor = 4
)
)
)
assertUnion(
npmRange(startMajor = 1, endMajor = 3),
npmRange(startMajor = 2, endMajor = 4, startInclusive = true, endInclusive = true),
listOf(
npmRange(
startMajor = 1,
endMajor = 4,
endInclusive = true
)
)
)
assertUnion(
npmRange(startMajor = 1, endMajor = 3, startInclusive = true, endInclusive = true),
npmRange(startMajor = 2, endMajor = 4, startInclusive = true, endInclusive = true),
listOf(
npmRange(
startMajor = 1,
endMajor = 4,
startInclusive = true,
endInclusive = true
)
)
)
}
@Test
fun rangeInvertTest() {
fun assertInvert(invertible: NpmRange, expected: List<NpmRange>) {