[Commonizer] Finalize tests for ^KT-48455
This commit is contained in:
sebastian.sellmair
committed by
Space
Space
parent
60ccdf23ea
commit
e7e3cedf69
+1
-1
@@ -84,7 +84,7 @@ abstract class AbstractInlineSourcesCommonizationTest : KtInlineSourceCommonizer
|
||||
|
||||
@InlineSourcesCommonizationTestDsl
|
||||
fun registerDependency(vararg targets: String, builder: InlineSourceBuilder.ModuleBuilder.() -> Unit) {
|
||||
registerDependency(targets = targets.map(::parseCommonizerTarget).toTypedArray(), builder)
|
||||
registerDependency(targets = targets.map(::parseCommonizerTarget).withAllLeaves().toTypedArray(), builder)
|
||||
}
|
||||
|
||||
@InlineSourcesCommonizationTestDsl
|
||||
|
||||
-165
@@ -1,165 +0,0 @@
|
||||
/*
|
||||
* Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
|
||||
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
|
||||
*/
|
||||
|
||||
package org.jetbrains.kotlin.commonizer.hierarchical
|
||||
|
||||
import org.jetbrains.kotlin.commonizer.AbstractInlineSourcesCommonizationTest
|
||||
import org.jetbrains.kotlin.commonizer.assertCommonized
|
||||
import org.jetbrains.kotlin.commonizer.utils.InlineSourceBuilder
|
||||
|
||||
class AliasedNumberTypeCommonizationTest : AbstractInlineSourcesCommonizationTest() {
|
||||
|
||||
fun `test Int and Long - typealias`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)")
|
||||
simpleSingleSourceTarget("a", "typealias X = Int")
|
||||
simpleSingleSourceTarget("b", "typealias X = Long")
|
||||
}
|
||||
|
||||
result.assertCommonized("(a, b)", "typealias X = Long")
|
||||
}
|
||||
|
||||
fun `test UInt and ULong - typealias`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)")
|
||||
registerDependency("a", "b", "(a, b)") { unsignedIntegers() }
|
||||
simpleSingleSourceTarget("a", "typealias X = UInt")
|
||||
simpleSingleSourceTarget("b", "typealias X = ULong")
|
||||
}
|
||||
|
||||
result.assertCommonized("(a, b)", "typealias X = ULong")
|
||||
}
|
||||
|
||||
|
||||
fun `test int and long - chain - typealias`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)")
|
||||
|
||||
simpleSingleSourceTarget(
|
||||
"a", """
|
||||
typealias A = Int
|
||||
typealias B = A
|
||||
typealias C = B
|
||||
typealias X = C
|
||||
""".trimIndent()
|
||||
)
|
||||
|
||||
simpleSingleSourceTarget(
|
||||
"b", """
|
||||
typealias A = Long
|
||||
typealias B = A
|
||||
typealias X = B
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
|
||||
result.assertCommonized(
|
||||
"(a, b)", """
|
||||
typealias A = Long
|
||||
typealias B = A
|
||||
typealias X = Long
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
|
||||
fun `test function with pure number types parameter`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)")
|
||||
simpleSingleSourceTarget("a", "fun x(p: Int)")
|
||||
simpleSingleSourceTarget("b", "fun x(p: Long)")
|
||||
}
|
||||
|
||||
/*
|
||||
Only functions that use a TA in their signature are supposed to be
|
||||
commonized using our number's commonization hack.
|
||||
|
||||
This is a hard requirement. It would also be reasonable if we would add
|
||||
support for this case, since there would be reasonable code that people
|
||||
could write with this!
|
||||
*/
|
||||
result.assertCommonized("(a, b)", "")
|
||||
}
|
||||
|
||||
fun `test function with aliased number value parameter`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)")
|
||||
simpleSingleSourceTarget(
|
||||
"a", """
|
||||
typealias A = Int
|
||||
typealias X = A
|
||||
fun x(p: X)
|
||||
""".trimIndent()
|
||||
)
|
||||
simpleSingleSourceTarget(
|
||||
"b", """
|
||||
typealias B = Long
|
||||
typealias X = B
|
||||
fun x(p: X)
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
|
||||
result.assertCommonized(
|
||||
"(a, b)", """
|
||||
typealias X = Long
|
||||
expect fun x(p: X)
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
|
||||
fun `test property with pure number return type`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)")
|
||||
registerDependency("a", "b", "(a, b)") { unsignedIntegers() }
|
||||
simpleSingleSourceTarget("a", "val x: UInt")
|
||||
simpleSingleSourceTarget("b", "val x: ULong")
|
||||
}
|
||||
|
||||
/*
|
||||
Only commonize return types that were specified using a type-alias.
|
||||
As with function value parameters, this is not a hard requirement.
|
||||
It would also be reasonable to support this case.
|
||||
*/
|
||||
result.assertCommonized("(a, b)", "")
|
||||
}
|
||||
|
||||
fun `test property with aliased number return type`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)")
|
||||
registerDependency("a", "b", "(a, b)") { unsignedIntegers() }
|
||||
simpleSingleSourceTarget(
|
||||
"a", """
|
||||
typealias X = UShort
|
||||
val x: X = TODO()
|
||||
""".trimIndent()
|
||||
)
|
||||
simpleSingleSourceTarget(
|
||||
"b", """
|
||||
typealias X = ULong
|
||||
val x: X = TODO()
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
|
||||
result.assertCommonized(
|
||||
"(a, b)", """
|
||||
typealias X = ULong
|
||||
expect val x: X
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
private fun InlineSourceBuilder.ModuleBuilder.unsignedIntegers() {
|
||||
source(
|
||||
"""
|
||||
package kotlin
|
||||
class UByte
|
||||
class UShort
|
||||
class UInt
|
||||
class ULong
|
||||
""".trimIndent(), "unsigned.kt"
|
||||
)
|
||||
}
|
||||
+9
-2
@@ -523,6 +523,9 @@ class HierarchicalClassAndTypeAliasCommonizationTest : AbstractInlineSourcesComm
|
||||
fun `test typealias to numbers`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)", "(c, d)", "(a, b, c, d)")
|
||||
registerDependency("(a, b)", "(c, d)", "(a, b, c, d)") {
|
||||
unsafeNumberAnnotationSource()
|
||||
}
|
||||
|
||||
simpleSingleSourceTarget(
|
||||
"a", """
|
||||
@@ -567,7 +570,9 @@ class HierarchicalClassAndTypeAliasCommonizationTest : AbstractInlineSourcesComm
|
||||
|
||||
result.assertCommonized(
|
||||
"(c, d)", """
|
||||
typealias Proxy = Int
|
||||
@UnsafeNumber(["c: kotlin/Int", "d: kotlin/Short"])
|
||||
typealias Proxy = Short
|
||||
@UnsafeNumber(["c: kotlin/Int", "d: kotlin/Short"])
|
||||
typealias X = Proxy
|
||||
expect val x: X
|
||||
""".trimIndent()
|
||||
@@ -575,7 +580,9 @@ class HierarchicalClassAndTypeAliasCommonizationTest : AbstractInlineSourcesComm
|
||||
|
||||
result.assertCommonized(
|
||||
"(a, b, c, d)", """
|
||||
typealias Proxy = Long
|
||||
@UnsafeNumber(["a: kotlin/Long", "b: kotlin/Long", "c: kotlin/Int", "d: kotlin/Short"])
|
||||
typealias Proxy = Short
|
||||
@UnsafeNumber(["a: kotlin/Long", "b: kotlin/Long", "c: kotlin/Int", "d: kotlin/Short"])
|
||||
typealias X = Proxy
|
||||
expect val x: X
|
||||
""".trimIndent()
|
||||
|
||||
+827
@@ -0,0 +1,827 @@
|
||||
/*
|
||||
* Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
|
||||
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
|
||||
*/
|
||||
|
||||
package org.jetbrains.kotlin.commonizer.hierarchical
|
||||
|
||||
import org.jetbrains.kotlin.commonizer.AbstractInlineSourcesCommonizationTest
|
||||
import org.jetbrains.kotlin.commonizer.AbstractInlineSourcesCommonizationTest.ParametersBuilder
|
||||
import org.jetbrains.kotlin.commonizer.assertCommonized
|
||||
import org.jetbrains.kotlin.commonizer.parseCommonizerTarget
|
||||
import org.jetbrains.kotlin.commonizer.utils.InlineSourceBuilder
|
||||
import org.jetbrains.kotlin.commonizer.withAllLeaves
|
||||
|
||||
class HierarchicalOptimisticNumbersTypeCommonizerTest : AbstractInlineSourcesCommonizationTest() {
|
||||
|
||||
fun `test Byte and Byte - typealias`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)")
|
||||
registerFakeStdlibDependency("(a, b)")
|
||||
simpleSingleSourceTarget("a", "typealias X = Byte")
|
||||
simpleSingleSourceTarget("b", "typealias X = Byte")
|
||||
}
|
||||
|
||||
result.assertCommonized(
|
||||
"(a, b)",
|
||||
"""
|
||||
typealias X = Byte
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
|
||||
fun `test Byte and Short - typealias`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)")
|
||||
registerFakeStdlibDependency("(a, b)")
|
||||
simpleSingleSourceTarget("a", "typealias X = Byte")
|
||||
simpleSingleSourceTarget("b", "typealias X = Short")
|
||||
}
|
||||
|
||||
result.assertCommonized(
|
||||
"(a, b)",
|
||||
"""
|
||||
@UnsafeNumber(["a: kotlin/Byte", "b: kotlin/Short"])
|
||||
typealias X = Byte
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
|
||||
fun `test Byte and Int - typealias`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)")
|
||||
registerFakeStdlibDependency("(a, b)")
|
||||
simpleSingleSourceTarget("a", "typealias X = Byte")
|
||||
simpleSingleSourceTarget("b", "typealias X = Int")
|
||||
}
|
||||
|
||||
result.assertCommonized(
|
||||
"(a, b)",
|
||||
"""
|
||||
@UnsafeNumber(["a: kotlin/Byte", "b: kotlin/Int"])
|
||||
typealias X = Byte
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
|
||||
fun `test Byte and Long - typealias`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)")
|
||||
registerFakeStdlibDependency("(a, b)")
|
||||
simpleSingleSourceTarget("a", "typealias X = Byte")
|
||||
simpleSingleSourceTarget("b", "typealias X = Long")
|
||||
}
|
||||
|
||||
result.assertCommonized(
|
||||
"(a, b)",
|
||||
"""
|
||||
@UnsafeNumber(["a: kotlin/Byte", "b: kotlin/Long"])
|
||||
typealias X = Byte
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
|
||||
fun `test Short and Byte - typealias`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)")
|
||||
registerFakeStdlibDependency("(a, b)")
|
||||
simpleSingleSourceTarget("a", "typealias X = Short")
|
||||
simpleSingleSourceTarget("b", "typealias X = Byte")
|
||||
}
|
||||
|
||||
result.assertCommonized(
|
||||
"(a, b)",
|
||||
"""
|
||||
@UnsafeNumber(["a: kotlin/Short", "b: kotlin/Byte"])
|
||||
typealias X = Byte
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
|
||||
fun `test Short and Short - typealias`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)")
|
||||
registerFakeStdlibDependency("(a, b)")
|
||||
simpleSingleSourceTarget("a", "typealias X = Short")
|
||||
simpleSingleSourceTarget("b", "typealias X = Short")
|
||||
}
|
||||
|
||||
result.assertCommonized(
|
||||
"(a, b)",
|
||||
"""
|
||||
typealias X = Short
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
|
||||
fun `test Short and Int - typealias`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)")
|
||||
registerFakeStdlibDependency("(a, b)")
|
||||
simpleSingleSourceTarget("a", "typealias X = Short")
|
||||
simpleSingleSourceTarget("b", "typealias X = Int")
|
||||
}
|
||||
|
||||
result.assertCommonized(
|
||||
"(a, b)",
|
||||
"""
|
||||
@UnsafeNumber(["a: kotlin/Short", "b: kotlin/Int"])
|
||||
typealias X = Short
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
|
||||
fun `test Short and Long - typealias`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)")
|
||||
registerFakeStdlibDependency("(a, b)")
|
||||
simpleSingleSourceTarget("a", "typealias X = Short")
|
||||
simpleSingleSourceTarget("b", "typealias X = Long")
|
||||
}
|
||||
|
||||
result.assertCommonized(
|
||||
"(a, b)",
|
||||
"""
|
||||
@UnsafeNumber(["a: kotlin/Short", "b: kotlin/Long"])
|
||||
typealias X = Short
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
|
||||
fun `test Int and Byte - typealias`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)")
|
||||
registerFakeStdlibDependency("(a, b)")
|
||||
simpleSingleSourceTarget("a", "typealias X = Int")
|
||||
simpleSingleSourceTarget("b", "typealias X = Byte")
|
||||
}
|
||||
|
||||
result.assertCommonized(
|
||||
"(a, b)",
|
||||
"""
|
||||
@UnsafeNumber(["a: kotlin/Int", "b: kotlin/Byte"])
|
||||
typealias X = Byte
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
|
||||
fun `test Int and Short - typealias`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)")
|
||||
registerFakeStdlibDependency("(a, b)")
|
||||
simpleSingleSourceTarget("a", "typealias X = Int")
|
||||
simpleSingleSourceTarget("b", "typealias X = Short")
|
||||
}
|
||||
|
||||
result.assertCommonized(
|
||||
"(a, b)",
|
||||
"""
|
||||
@UnsafeNumber(["a: kotlin/Int", "b: kotlin/Short"])
|
||||
typealias X = Short
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
|
||||
fun `test Int and Int - typealias`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)")
|
||||
registerFakeStdlibDependency("(a, b)")
|
||||
simpleSingleSourceTarget("a", "typealias X = Int")
|
||||
simpleSingleSourceTarget("b", "typealias X = Int")
|
||||
}
|
||||
|
||||
result.assertCommonized(
|
||||
"(a, b)",
|
||||
"""
|
||||
typealias X = Int
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
|
||||
fun `test Int and Long - typealias`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)")
|
||||
registerFakeStdlibDependency("(a, b)")
|
||||
simpleSingleSourceTarget("a", "typealias X = Int")
|
||||
simpleSingleSourceTarget("b", "typealias X = Long")
|
||||
}
|
||||
|
||||
result.assertCommonized(
|
||||
"(a, b)",
|
||||
"""
|
||||
@UnsafeNumber(["a: kotlin/Int", "b: kotlin/Long"])
|
||||
typealias X = Int
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
|
||||
fun `test Long and Byte - typealias`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)")
|
||||
registerFakeStdlibDependency("(a, b)")
|
||||
simpleSingleSourceTarget("a", "typealias X = Long")
|
||||
simpleSingleSourceTarget("b", "typealias X = Byte")
|
||||
}
|
||||
|
||||
result.assertCommonized(
|
||||
"(a, b)",
|
||||
"""
|
||||
@UnsafeNumber(["a: kotlin/Long", "b: kotlin/Byte"])
|
||||
typealias X = Byte
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
|
||||
fun `test Long and Short - typealias`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)")
|
||||
registerFakeStdlibDependency("(a, b)")
|
||||
simpleSingleSourceTarget("a", "typealias X = Long")
|
||||
simpleSingleSourceTarget("b", "typealias X = Short")
|
||||
}
|
||||
|
||||
result.assertCommonized(
|
||||
"(a, b)",
|
||||
"""
|
||||
@UnsafeNumber(["a: kotlin/Long", "b: kotlin/Short"])
|
||||
typealias X = Short
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
|
||||
fun `test Long and Int - typealias`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)")
|
||||
registerFakeStdlibDependency("(a, b)")
|
||||
simpleSingleSourceTarget("a", "typealias X = Long")
|
||||
simpleSingleSourceTarget("b", "typealias X = Int")
|
||||
}
|
||||
|
||||
result.assertCommonized(
|
||||
"(a, b)",
|
||||
"""
|
||||
@UnsafeNumber(["a: kotlin/Long", "b: kotlin/Int"])
|
||||
typealias X = Int
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
|
||||
fun `test Long and Long - typealias`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)")
|
||||
registerFakeStdlibDependency("(a, b)")
|
||||
simpleSingleSourceTarget("a", "typealias X = Long")
|
||||
simpleSingleSourceTarget("b", "typealias X = Long")
|
||||
}
|
||||
|
||||
result.assertCommonized(
|
||||
"(a, b)",
|
||||
"""
|
||||
typealias X = Long
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
|
||||
fun `test UByte and UByte - typealias`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)")
|
||||
registerFakeStdlibDependency("(a, b)")
|
||||
simpleSingleSourceTarget("a", "typealias X = UByte")
|
||||
simpleSingleSourceTarget("b", "typealias X = UByte")
|
||||
}
|
||||
|
||||
result.assertCommonized(
|
||||
"(a, b)",
|
||||
"""
|
||||
typealias X = UByte
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
|
||||
fun `test UByte and UShort - typealias`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)")
|
||||
registerFakeStdlibDependency("(a, b)")
|
||||
simpleSingleSourceTarget("a", "typealias X = UByte")
|
||||
simpleSingleSourceTarget("b", "typealias X = UShort")
|
||||
}
|
||||
|
||||
result.assertCommonized(
|
||||
"(a, b)",
|
||||
"""
|
||||
@UnsafeNumber(["a: kotlin/UByte", "b: kotlin/UShort"])
|
||||
typealias X = UByte
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
|
||||
fun `test UByte and UInt - typealias`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)")
|
||||
registerFakeStdlibDependency("(a, b)")
|
||||
simpleSingleSourceTarget("a", "typealias X = UByte")
|
||||
simpleSingleSourceTarget("b", "typealias X = UInt")
|
||||
}
|
||||
|
||||
result.assertCommonized(
|
||||
"(a, b)",
|
||||
"""
|
||||
@UnsafeNumber(["a: kotlin/UByte", "b: kotlin/UInt"])
|
||||
typealias X = UByte
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
|
||||
fun `test UByte and ULong - typealias`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)")
|
||||
registerFakeStdlibDependency("(a, b)")
|
||||
simpleSingleSourceTarget("a", "typealias X = UByte")
|
||||
simpleSingleSourceTarget("b", "typealias X = ULong")
|
||||
}
|
||||
|
||||
result.assertCommonized(
|
||||
"(a, b)",
|
||||
"""
|
||||
@UnsafeNumber(["a: kotlin/UByte", "b: kotlin/ULong"])
|
||||
typealias X = UByte
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
|
||||
fun `test UShort and UByte - typealias`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)")
|
||||
registerFakeStdlibDependency("(a, b)")
|
||||
simpleSingleSourceTarget("a", "typealias X = UShort")
|
||||
simpleSingleSourceTarget("b", "typealias X = UByte")
|
||||
}
|
||||
|
||||
result.assertCommonized(
|
||||
"(a, b)",
|
||||
"""
|
||||
@UnsafeNumber(["a: kotlin/UShort", "b: kotlin/UByte"])
|
||||
typealias X = UByte
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
|
||||
fun `test UShort and UShort - typealias`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)")
|
||||
registerFakeStdlibDependency("(a, b)")
|
||||
simpleSingleSourceTarget("a", "typealias X = UShort")
|
||||
simpleSingleSourceTarget("b", "typealias X = UShort")
|
||||
}
|
||||
|
||||
result.assertCommonized(
|
||||
"(a, b)",
|
||||
"""
|
||||
typealias X = UShort
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
|
||||
fun `test UShort and UInt - typealias`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)")
|
||||
registerFakeStdlibDependency("(a, b)")
|
||||
simpleSingleSourceTarget("a", "typealias X = UShort")
|
||||
simpleSingleSourceTarget("b", "typealias X = UInt")
|
||||
}
|
||||
|
||||
result.assertCommonized(
|
||||
"(a, b)",
|
||||
"""
|
||||
@UnsafeNumber(["a: kotlin/UShort", "b: kotlin/UInt"])
|
||||
typealias X = UShort
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
|
||||
fun `test UShort and ULong - typealias`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)")
|
||||
registerFakeStdlibDependency("(a, b)")
|
||||
simpleSingleSourceTarget("a", "typealias X = UShort")
|
||||
simpleSingleSourceTarget("b", "typealias X = ULong")
|
||||
}
|
||||
|
||||
result.assertCommonized(
|
||||
"(a, b)",
|
||||
"""
|
||||
@UnsafeNumber(["a: kotlin/UShort", "b: kotlin/ULong"])
|
||||
typealias X = UShort
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
|
||||
fun `test UInt and UByte - typealias`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)")
|
||||
registerFakeStdlibDependency("(a, b)")
|
||||
simpleSingleSourceTarget("a", "typealias X = UInt")
|
||||
simpleSingleSourceTarget("b", "typealias X = UByte")
|
||||
}
|
||||
|
||||
result.assertCommonized(
|
||||
"(a, b)",
|
||||
"""
|
||||
@UnsafeNumber(["a: kotlin/UInt", "b: kotlin/UByte"])
|
||||
typealias X = UByte
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
|
||||
fun `test UInt and UShort - typealias`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)")
|
||||
registerFakeStdlibDependency("(a, b)")
|
||||
simpleSingleSourceTarget("a", "typealias X = UInt")
|
||||
simpleSingleSourceTarget("b", "typealias X = UShort")
|
||||
}
|
||||
|
||||
result.assertCommonized(
|
||||
"(a, b)",
|
||||
"""
|
||||
@UnsafeNumber(["a: kotlin/UInt", "b: kotlin/UShort"])
|
||||
typealias X = UShort
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
|
||||
fun `test UInt and UInt - typealias`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)")
|
||||
registerFakeStdlibDependency("(a, b)")
|
||||
simpleSingleSourceTarget("a", "typealias X = UInt")
|
||||
simpleSingleSourceTarget("b", "typealias X = UInt")
|
||||
}
|
||||
|
||||
result.assertCommonized(
|
||||
"(a, b)",
|
||||
"""
|
||||
typealias X = UInt
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
|
||||
fun `test UInt and ULong - typealias`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)")
|
||||
registerFakeStdlibDependency("(a, b)")
|
||||
simpleSingleSourceTarget("a", "typealias X = UInt")
|
||||
simpleSingleSourceTarget("b", "typealias X = ULong")
|
||||
}
|
||||
|
||||
result.assertCommonized(
|
||||
"(a, b)",
|
||||
"""
|
||||
@UnsafeNumber(["a: kotlin/UInt", "b: kotlin/ULong"])
|
||||
typealias X = UInt
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
|
||||
fun `test ULong and UByte - typealias`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)")
|
||||
registerFakeStdlibDependency("(a, b)")
|
||||
simpleSingleSourceTarget("a", "typealias X = ULong")
|
||||
simpleSingleSourceTarget("b", "typealias X = UByte")
|
||||
}
|
||||
|
||||
result.assertCommonized(
|
||||
"(a, b)",
|
||||
"""
|
||||
@UnsafeNumber(["a: kotlin/ULong", "b: kotlin/UByte"])
|
||||
typealias X = UByte
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
|
||||
fun `test ULong and UShort - typealias`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)")
|
||||
registerFakeStdlibDependency("(a, b)")
|
||||
simpleSingleSourceTarget("a", "typealias X = ULong")
|
||||
simpleSingleSourceTarget("b", "typealias X = UShort")
|
||||
}
|
||||
|
||||
result.assertCommonized(
|
||||
"(a, b)",
|
||||
"""
|
||||
@UnsafeNumber(["a: kotlin/ULong", "b: kotlin/UShort"])
|
||||
typealias X = UShort
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
|
||||
fun `test ULong and UInt - typealias`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)")
|
||||
registerFakeStdlibDependency("(a, b)")
|
||||
simpleSingleSourceTarget("a", "typealias X = ULong")
|
||||
simpleSingleSourceTarget("b", "typealias X = UInt")
|
||||
}
|
||||
|
||||
result.assertCommonized(
|
||||
"(a, b)",
|
||||
"""
|
||||
@UnsafeNumber(["a: kotlin/ULong", "b: kotlin/UInt"])
|
||||
typealias X = UInt
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
|
||||
fun `test ULong and ULong - typealias`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)")
|
||||
registerFakeStdlibDependency("(a, b)")
|
||||
simpleSingleSourceTarget("a", "typealias X = ULong")
|
||||
simpleSingleSourceTarget("b", "typealias X = ULong")
|
||||
}
|
||||
|
||||
result.assertCommonized("(a, b)", "typealias X = ULong")
|
||||
}
|
||||
|
||||
fun `test UInt and Long - typealias`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)")
|
||||
registerFakeStdlibDependency("(a, b)")
|
||||
simpleSingleSourceTarget("a", "typealias X = UInt")
|
||||
simpleSingleSourceTarget("b", "typealias X = Long")
|
||||
}
|
||||
|
||||
result.assertCommonized("(a, b)", "expect class X")
|
||||
}
|
||||
|
||||
fun `test UIntVarOf and ULongVarOf - typealias`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)")
|
||||
registerFakeStdlibDependency("(a, b)")
|
||||
simpleSingleSourceTarget("a", "typealias X = kotlinx.cinterop.UIntVarOf")
|
||||
simpleSingleSourceTarget("b", "typealias X = kotlinx.cinterop.ULongVarOf")
|
||||
}
|
||||
|
||||
result.assertCommonized(
|
||||
"(a, b)", """
|
||||
@UnsafeNumber(["a: kotlinx/cinterop/UIntVarOf", "b: kotlinx/cinterop/ULongVarOf"])
|
||||
typealias X = kotlinx.cinterop.UIntVarOf
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
|
||||
fun `test IntVarOf and LongVarOf - typealias`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)")
|
||||
registerFakeStdlibDependency("(a, b)")
|
||||
simpleSingleSourceTarget("a", "typealias X = kotlinx.cinterop.IntVarOf")
|
||||
simpleSingleSourceTarget("b", "typealias X = kotlinx.cinterop.LongVarOf")
|
||||
}
|
||||
|
||||
result.assertCommonized(
|
||||
"(a, b)", """
|
||||
@UnsafeNumber(["a: kotlinx/cinterop/IntVarOf", "b: kotlinx/cinterop/LongVarOf"])
|
||||
typealias X = kotlinx.cinterop.IntVarOf
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
|
||||
fun `test Int and Long - typealias chain`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)")
|
||||
registerFakeStdlibDependency("(a, b)")
|
||||
|
||||
simpleSingleSourceTarget(
|
||||
"a", """
|
||||
typealias A = Int
|
||||
typealias B = A
|
||||
typealias C = B
|
||||
typealias X = C
|
||||
""".trimIndent()
|
||||
)
|
||||
|
||||
simpleSingleSourceTarget(
|
||||
"b", """
|
||||
typealias A = Long
|
||||
typealias B = A
|
||||
typealias X = B
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
|
||||
result.assertCommonized(
|
||||
"(a, b)", """
|
||||
@UnsafeNumber(["a: kotlin/Int", "b: kotlin/Long"])
|
||||
typealias A = Int
|
||||
@UnsafeNumber(["a: kotlin/Int", "b: kotlin/Long"])
|
||||
typealias B = A
|
||||
@UnsafeNumber(["a: kotlin/Int", "b: kotlin/Long"])
|
||||
typealias X = Int
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
|
||||
fun `test function with pure number types parameter`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)")
|
||||
simpleSingleSourceTarget("a", "fun x(p: Int)")
|
||||
simpleSingleSourceTarget("b", "fun x(p: Long)")
|
||||
}
|
||||
|
||||
/*
|
||||
Only functions that use a TA in their signature are supposed to be
|
||||
commonized using our number's commonization hack.
|
||||
|
||||
This is a hard requirement. It would also be reasonable if we would add
|
||||
support for this case, since there would be reasonable code that people
|
||||
could write with this!
|
||||
*/
|
||||
result.assertCommonized("(a, b)", "")
|
||||
}
|
||||
|
||||
fun `test function with aliased number value parameter`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)")
|
||||
registerFakeStdlibDependency("(a, b)")
|
||||
simpleSingleSourceTarget(
|
||||
"a", """
|
||||
typealias A = Int
|
||||
typealias X = A
|
||||
fun x(p: X)
|
||||
""".trimIndent()
|
||||
)
|
||||
simpleSingleSourceTarget(
|
||||
"b", """
|
||||
typealias B = Long
|
||||
typealias X = B
|
||||
fun x(p: X)
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
|
||||
result.assertCommonized(
|
||||
"(a, b)", """
|
||||
@UnsafeNumber(["a: kotlin/Int", "b: kotlin/Long"])
|
||||
typealias X = Int
|
||||
expect fun x(p: X)
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
|
||||
fun `test property with pure number return type`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)")
|
||||
registerDependency("a", "b", "(a, b)") { unsignedIntegers() }
|
||||
simpleSingleSourceTarget("a", "val x: UInt = TODO()")
|
||||
simpleSingleSourceTarget("b", "val x: ULong = TODO()")
|
||||
}
|
||||
|
||||
/*
|
||||
Only commonize return types that were specified using a type-alias.
|
||||
As with function value parameters, this is not a hard requirement.
|
||||
It would also be reasonable to support this case.
|
||||
*/
|
||||
result.assertCommonized("(a, b)", "")
|
||||
}
|
||||
|
||||
fun `test property with aliased number return type`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)")
|
||||
registerFakeStdlibDependency("(a, b)")
|
||||
simpleSingleSourceTarget(
|
||||
"a", """
|
||||
typealias X = UShort
|
||||
val x: X = TODO()
|
||||
""".trimIndent()
|
||||
)
|
||||
simpleSingleSourceTarget(
|
||||
"b", """
|
||||
typealias X = ULong
|
||||
val x: X = TODO()
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
|
||||
result.assertCommonized(
|
||||
"(a, b)", """
|
||||
@UnsafeNumber(["a: kotlin/UShort", "b: kotlin/ULong"])
|
||||
typealias X = UShort
|
||||
expect val x: X
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
|
||||
fun `test multilevel hierarchy`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)", "(c, d)", "(e, f)", "(c, d, e, f)", "(a, b, c, d, e, f)")
|
||||
registerFakeStdlibDependency("(a, b)", "(c, d)", "(e, f)", "(c, d, e, f)", "(a, b, c, d, e, f)")
|
||||
simpleSingleSourceTarget("a", "typealias X = Short")
|
||||
simpleSingleSourceTarget("b", "typealias X = Int")
|
||||
simpleSingleSourceTarget("c", "typealias X = Int")
|
||||
simpleSingleSourceTarget("d", "typealias X = Int")
|
||||
simpleSingleSourceTarget("e", "typealias X = Long")
|
||||
simpleSingleSourceTarget("f", "typealias X = Int")
|
||||
}
|
||||
|
||||
result.assertCommonized(
|
||||
"(a, b)", """
|
||||
@UnsafeNumber(["a: kotlin/Short", "b: kotlin/Int"])
|
||||
typealias X = Short
|
||||
""".trimIndent()
|
||||
)
|
||||
|
||||
result.assertCommonized(
|
||||
"(c, d)", """
|
||||
typealias X = Int
|
||||
""".trimIndent()
|
||||
)
|
||||
|
||||
result.assertCommonized(
|
||||
"(e, f)", """
|
||||
@UnsafeNumber(["e: kotlin/Long", "f: kotlin/Int"])
|
||||
typealias X = Int
|
||||
""".trimIndent()
|
||||
)
|
||||
|
||||
result.assertCommonized(
|
||||
"(c, d, e, f)", """
|
||||
@UnsafeNumber(["c: kotlin/Int", "d: kotlin/Int", "e: kotlin/Long", "f: kotlin/Int"])
|
||||
typealias X = Int
|
||||
""".trimIndent()
|
||||
)
|
||||
|
||||
result.assertCommonized(
|
||||
"(a, b, c, d, e, f)", """
|
||||
@UnsafeNumber(["a: kotlin/Short", "b: kotlin/Int" ,"c: kotlin/Int", "d: kotlin/Int","e: kotlin/Long", "f: kotlin/Int"])
|
||||
typealias X = Short
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
private fun ParametersBuilder.registerFakeStdlibDependency(vararg outputTarget: String) {
|
||||
val allTargets = outputTarget.map { parseCommonizerTarget(it) }.withAllLeaves()
|
||||
registerDependency(*allTargets.toTypedArray()) {
|
||||
unsignedIntegers()
|
||||
unsingedVarIntegers()
|
||||
singedVarIntegers()
|
||||
unsafeNumberAnnotationSource()
|
||||
}
|
||||
}
|
||||
|
||||
private fun InlineSourceBuilder.ModuleBuilder.unsignedIntegers() {
|
||||
source(
|
||||
"""
|
||||
package kotlin
|
||||
class UByte
|
||||
class UShort
|
||||
class UInt
|
||||
class ULong
|
||||
""".trimIndent(), "unsigned.kt"
|
||||
)
|
||||
}
|
||||
|
||||
private fun InlineSourceBuilder.ModuleBuilder.unsingedVarIntegers() {
|
||||
source(
|
||||
"""
|
||||
package kotlinx.cinterop
|
||||
class UByteVarOf
|
||||
class UShortVarOf
|
||||
class UIntVarOf
|
||||
class ULongVarOf
|
||||
""".trimIndent(), "UnsignedVarOf.kt"
|
||||
)
|
||||
}
|
||||
|
||||
private fun InlineSourceBuilder.ModuleBuilder.singedVarIntegers() {
|
||||
source(
|
||||
"""
|
||||
package kotlinx.cinterop
|
||||
class ByteVarOf
|
||||
class ShortVarOf
|
||||
class IntVarOf
|
||||
class LongVarOf
|
||||
""".trimIndent(), "SignedVarOf.kt"
|
||||
)
|
||||
}
|
||||
|
||||
internal fun InlineSourceBuilder.ModuleBuilder.unsafeNumberAnnotationSource() {
|
||||
source(
|
||||
"""
|
||||
package kotlinx.cinterop
|
||||
@Target(AnnotationTarget.TYPEALIAS)
|
||||
@Retention(AnnotationRetention.BINARY)
|
||||
annotation class UnsafeNumber(val actualPlatformTypes: Array<String>)
|
||||
""".trimIndent(),
|
||||
"UnsafeNumberAnnotation.kt"
|
||||
)
|
||||
|
||||
source(
|
||||
"""
|
||||
typealias UnsafeNumber = kotlinx.cinterop.UnsafeNumber
|
||||
""".trimIndent(),
|
||||
"UnsafeNumberTypeAlias.kt"
|
||||
)
|
||||
}
|
||||
-59
@@ -1,59 +0,0 @@
|
||||
/*
|
||||
* Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
|
||||
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
|
||||
*/
|
||||
|
||||
package org.jetbrains.kotlin.commonizer.hierarchical
|
||||
|
||||
import org.jetbrains.kotlin.commonizer.AbstractInlineSourcesCommonizationTest
|
||||
import org.jetbrains.kotlin.commonizer.assertCommonized
|
||||
import org.jetbrains.kotlin.commonizer.utils.InlineSourceBuilder
|
||||
|
||||
class HierarchicalUnsafeNumberAnnotationCommonizationTest : AbstractInlineSourcesCommonizationTest() {
|
||||
|
||||
fun `test multiple targets`() {
|
||||
val result = commonize {
|
||||
outputTarget("(a, b)", "(c, d)", "(a, b, c, d)")
|
||||
registerDependency("a", "b", "c", "d", "(a, b)", "(c, d)", "(a, b, c, d)") { unsafeNumberAnnotationSource() }
|
||||
simpleSingleSourceTarget("a", "typealias X = Short")
|
||||
simpleSingleSourceTarget("b", "typealias X = Int")
|
||||
simpleSingleSourceTarget("c", "typealias X = Int")
|
||||
simpleSingleSourceTarget("d", "typealias X = Long")
|
||||
}
|
||||
|
||||
result.assertCommonized(
|
||||
"(a, b)", """
|
||||
@kotlinx.cinterop.UnsafeNumber(["a: kotlin/Short", "b: kotlin/Int"])
|
||||
typealias X = Int
|
||||
""".trimIndent()
|
||||
)
|
||||
|
||||
result.assertCommonized(
|
||||
"(c, d)", """
|
||||
import kotlinx.cinterop.*
|
||||
@UnsafeNumber(["c: kotlin/Int", "d: kotlin/Long"])
|
||||
typealias X = Long
|
||||
""".trimIndent()
|
||||
)
|
||||
|
||||
result.assertCommonized(
|
||||
"(a, b, c, d)", """
|
||||
import kotlinx.cinterop.*
|
||||
@UnsafeNumber(["a: kotlin/Short", "b: kotlin/Int", "c: kotlin/Int", "d: kotlin/Long"])
|
||||
typealias X = Long
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
private fun InlineSourceBuilder.ModuleBuilder.unsafeNumberAnnotationSource() {
|
||||
source(
|
||||
"""
|
||||
package kotlinx.cinterop
|
||||
@Target(AnnotationTarget.TYPEALIAS)
|
||||
@Retention(AnnotationRetention.BINARY)
|
||||
annotation class UnsafeNumber(val actualPlatformTypes: Array<String>)
|
||||
""".trimIndent(),
|
||||
"UnsafeNumberAnnotation.kt"
|
||||
)
|
||||
}
|
||||
Reference in New Issue
Block a user