Invoke GenerateInRangeExpressionTestData and
GeneratePrimitiveVsObjectEqualityTestData during :compiler:generateTests.
This commit is contained in:
committed by
max-kammerer
parent
3c775c598c
commit
1738c2d4f6
@@ -1,3 +1,4 @@
|
||||
// KJS_WITH_FULL_RUNTIME
|
||||
// Auto-generated by GenerateInRangeExpressionTestData. Do not edit!
|
||||
// WITH_RUNTIME
|
||||
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
// KJS_WITH_FULL_RUNTIME
|
||||
// Auto-generated by GenerateInRangeExpressionTestData. Do not edit!
|
||||
// WITH_RUNTIME
|
||||
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
// KJS_WITH_FULL_RUNTIME
|
||||
// Auto-generated by GenerateInRangeExpressionTestData. Do not edit!
|
||||
// WITH_RUNTIME
|
||||
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
// KJS_WITH_FULL_RUNTIME
|
||||
// Auto-generated by GenerateInRangeExpressionTestData. Do not edit!
|
||||
// WITH_RUNTIME
|
||||
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
// KJS_WITH_FULL_RUNTIME
|
||||
// Auto-generated by GenerateInRangeExpressionTestData. Do not edit!
|
||||
// WITH_RUNTIME
|
||||
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
// KJS_WITH_FULL_RUNTIME
|
||||
// Auto-generated by GenerateInRangeExpressionTestData. Do not edit!
|
||||
// WITH_RUNTIME
|
||||
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
// KJS_WITH_FULL_RUNTIME
|
||||
// Auto-generated by GenerateInRangeExpressionTestData. Do not edit!
|
||||
// WITH_RUNTIME
|
||||
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
// KJS_WITH_FULL_RUNTIME
|
||||
// Auto-generated by GenerateInRangeExpressionTestData. Do not edit!
|
||||
// WITH_RUNTIME
|
||||
|
||||
|
||||
@@ -53,8 +53,8 @@ import org.jetbrains.kotlin.resolve.constraintSystem.AbstractConstraintSystemTes
|
||||
import org.jetbrains.kotlin.serialization.AbstractLocalClassProtoTest
|
||||
import org.jetbrains.kotlin.test.TargetBackend
|
||||
import org.jetbrains.kotlin.types.AbstractTypeBindingTest
|
||||
import org.jetbrains.kotlin.visualizer.psi.AbstractPsiVisualizer
|
||||
import org.jetbrains.kotlin.visualizer.fir.AbstractFirVisualizer
|
||||
import org.jetbrains.kotlin.visualizer.psi.AbstractPsiVisualizer
|
||||
|
||||
fun main(args: Array<String>) {
|
||||
System.setProperty("java.awt.headless", "true")
|
||||
@@ -152,6 +152,8 @@ fun main(args: Array<String>) {
|
||||
}
|
||||
|
||||
GenerateRangesCodegenTestData.main(emptyArray<String>())
|
||||
GenerateInRangeExpressionTestData.main(emptyArray<String>())
|
||||
GeneratePrimitiveVsObjectEqualityTestData.main(emptyArray<String>())
|
||||
|
||||
testClass<AbstractBlackBoxCodegenTest> {
|
||||
model("codegen/box", targetBackend = TargetBackend.JVM)
|
||||
@@ -238,7 +240,12 @@ fun main(args: Array<String>) {
|
||||
model("loadJava/compiledKotlin", testMethod = "doTestCompiledKotlin")
|
||||
model("loadJava/compiledKotlinWithStdlib", testMethod = "doTestCompiledKotlinWithStdlib")
|
||||
model("loadJava/javaAgainstKotlin", extension = "txt", testMethod = "doTestJavaAgainstKotlin")
|
||||
model("loadJava/kotlinAgainstCompiledJavaWithKotlin", extension = "kt", testMethod = "doTestKotlinAgainstCompiledJavaWithKotlin", recursive = false)
|
||||
model(
|
||||
"loadJava/kotlinAgainstCompiledJavaWithKotlin",
|
||||
extension = "kt",
|
||||
testMethod = "doTestKotlinAgainstCompiledJavaWithKotlin",
|
||||
recursive = false
|
||||
)
|
||||
model("loadJava/sourceJava", extension = "java", testMethod = "doTestSourceJava")
|
||||
}
|
||||
|
||||
@@ -249,7 +256,12 @@ fun main(args: Array<String>) {
|
||||
model("loadJava/compiledKotlin", testMethod = "doTestCompiledKotlin")
|
||||
model("loadJava/compiledKotlinWithStdlib", testMethod = "doTestCompiledKotlinWithStdlib")
|
||||
model("loadJava/javaAgainstKotlin", extension = "txt", testMethod = "doTestJavaAgainstKotlin")
|
||||
model("loadJava/kotlinAgainstCompiledJavaWithKotlin", extension = "kt", testMethod = "doTestKotlinAgainstCompiledJavaWithKotlin", recursive = false)
|
||||
model(
|
||||
"loadJava/kotlinAgainstCompiledJavaWithKotlin",
|
||||
extension = "kt",
|
||||
testMethod = "doTestKotlinAgainstCompiledJavaWithKotlin",
|
||||
recursive = false
|
||||
)
|
||||
model("loadJava/sourceJava", extension = "java", testMethod = "doTestSourceJava")
|
||||
}
|
||||
|
||||
@@ -262,8 +274,18 @@ fun main(args: Array<String>) {
|
||||
}
|
||||
|
||||
testClass<AbstractCompileJavaAgainstKotlinTest> {
|
||||
model("compileJavaAgainstKotlin", testClassName = "WithoutJavac", testMethod = "doTestWithoutJavac", targetBackend = TargetBackend.JVM)
|
||||
model("compileJavaAgainstKotlin", testClassName = "WithJavac", testMethod = "doTestWithJavac", targetBackend = TargetBackend.JVM)
|
||||
model(
|
||||
"compileJavaAgainstKotlin",
|
||||
testClassName = "WithoutJavac",
|
||||
testMethod = "doTestWithoutJavac",
|
||||
targetBackend = TargetBackend.JVM
|
||||
)
|
||||
model(
|
||||
"compileJavaAgainstKotlin",
|
||||
testClassName = "WithJavac",
|
||||
testMethod = "doTestWithJavac",
|
||||
targetBackend = TargetBackend.JVM
|
||||
)
|
||||
}
|
||||
|
||||
testClass<AbstractCompileKotlinAgainstJavaTest> {
|
||||
@@ -376,7 +398,12 @@ fun main(args: Array<String>) {
|
||||
}
|
||||
|
||||
testClass<AbstractIrCompileJavaAgainstKotlinTest> {
|
||||
model("compileJavaAgainstKotlin", testClassName = "WithoutJavac", testMethod = "doTestWithoutJavac", targetBackend = TargetBackend.JVM_IR)
|
||||
model(
|
||||
"compileJavaAgainstKotlin",
|
||||
testClassName = "WithoutJavac",
|
||||
testMethod = "doTestWithoutJavac",
|
||||
targetBackend = TargetBackend.JVM_IR
|
||||
)
|
||||
//model("compileJavaAgainstKotlin", testClassName = "WithJavac", testMethod = "doTestWithJavac", targetBackend = TargetBackend.JVM_IR)
|
||||
}
|
||||
|
||||
|
||||
+116
-60
@@ -1,23 +1,12 @@
|
||||
/*
|
||||
* Copyright 2010-2017 JetBrains s.r.o.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
* Copyright 2010-2019 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.generators.tests
|
||||
|
||||
import java.io.File
|
||||
import com.intellij.openapi.util.io.FileUtil
|
||||
import java.io.File
|
||||
import java.io.PrintWriter
|
||||
import java.io.StringWriter
|
||||
|
||||
@@ -28,10 +17,10 @@ object GenerateInRangeExpressionTestData {
|
||||
private val PREAMBLE_MESSAGE = "Auto-generated by ${GenerateInRangeExpressionTestData::class.java.simpleName}. Do not edit!"
|
||||
|
||||
private fun generateMatrixTestCase(
|
||||
fileName: String,
|
||||
rangeExpressions: List<String>,
|
||||
elementExpressions: List<String>,
|
||||
header: String = ""
|
||||
fileName: String,
|
||||
rangeExpressions: List<String>,
|
||||
elementExpressions: List<String>,
|
||||
header: String = ""
|
||||
) {
|
||||
PrintWriter(File(GENERATED_DIR, fileName)).use {
|
||||
it.generateTestCaseBody(header, rangeExpressions, elementExpressions)
|
||||
@@ -39,6 +28,7 @@ object GenerateInRangeExpressionTestData {
|
||||
}
|
||||
|
||||
private fun PrintWriter.generateTestCaseBody(header: String, rangeExpressions: List<String>, elementExpressions: List<String>) {
|
||||
println("// KJS_WITH_FULL_RUNTIME")
|
||||
println("// $PREAMBLE_MESSAGE")
|
||||
println("// WITH_RUNTIME")
|
||||
println()
|
||||
@@ -76,11 +66,11 @@ object GenerateInRangeExpressionTestData {
|
||||
}
|
||||
|
||||
private fun PrintWriter.generateTestCaseFunction(
|
||||
functionName: String,
|
||||
rangeValName: String,
|
||||
rangeExpression: String,
|
||||
elementValName: String,
|
||||
elementExpression: String
|
||||
functionName: String,
|
||||
rangeValName: String,
|
||||
rangeExpression: String,
|
||||
elementValName: String,
|
||||
elementExpression: String
|
||||
) {
|
||||
println("fun $functionName() {")
|
||||
println(" // with possible local optimizations")
|
||||
@@ -98,19 +88,19 @@ object GenerateInRangeExpressionTestData {
|
||||
}
|
||||
|
||||
private fun generateRangeOperatorTestCase(
|
||||
name: String,
|
||||
aExpression: String,
|
||||
op: String,
|
||||
bExpression: String,
|
||||
elementExpressions: List<String>
|
||||
name: String,
|
||||
aExpression: String,
|
||||
op: String,
|
||||
bExpression: String,
|
||||
elementExpressions: List<String>
|
||||
) {
|
||||
generateMatrixTestCase(
|
||||
name,
|
||||
listOf(
|
||||
"$aExpression $op $bExpression",
|
||||
"$bExpression $op $aExpression"
|
||||
),
|
||||
elementExpressions
|
||||
name,
|
||||
listOf(
|
||||
"$aExpression $op $bExpression",
|
||||
"$bExpression $op $aExpression"
|
||||
),
|
||||
elementExpressions
|
||||
)
|
||||
}
|
||||
|
||||
@@ -124,31 +114,97 @@ object GenerateInRangeExpressionTestData {
|
||||
val charLiterals = listOf("'0'", "'1'", "'2'", "'3'", "'4'")
|
||||
|
||||
val numericLiterals =
|
||||
listOf("(-1)", "0", "1", "2", "3", "4").flatMap {
|
||||
listOf("$it.toByte()", "$it.toShort()", it, "$it.toLong()", "$it.toFloat()", "$it.toDouble()")
|
||||
}
|
||||
listOf("(-1)", "0", "1", "2", "3", "4").flatMap {
|
||||
listOf("$it.toByte()", "$it.toShort()", it, "$it.toLong()", "$it.toFloat()", "$it.toDouble()")
|
||||
}
|
||||
|
||||
generateRangeOperatorTestCase("charRangeLiteral.kt", "'1'", "..", "'3'", charLiterals)
|
||||
generateRangeOperatorTestCase("charUntil.kt", "'1'", "until", "'3'", charLiterals)
|
||||
generateRangeOperatorTestCase("charDownTo.kt", "'3'", "downTo", "'1'", charLiterals)
|
||||
generateRangeOperatorTestCase(
|
||||
"charRangeLiteral.kt",
|
||||
"'1'",
|
||||
"..",
|
||||
"'3'",
|
||||
charLiterals
|
||||
)
|
||||
generateRangeOperatorTestCase(
|
||||
"charUntil.kt",
|
||||
"'1'",
|
||||
"until",
|
||||
"'3'",
|
||||
charLiterals
|
||||
)
|
||||
generateRangeOperatorTestCase(
|
||||
"charDownTo.kt",
|
||||
"'3'",
|
||||
"downTo",
|
||||
"'1'",
|
||||
charLiterals
|
||||
)
|
||||
|
||||
generateRangeOperatorTestCase("intRangeLiteral.kt", "1", "..", "3", numericLiterals)
|
||||
generateRangeOperatorTestCase("intUntil.kt", "1", "until", "3", numericLiterals)
|
||||
generateRangeOperatorTestCase("intDownTo.kt", "3", "downTo", "1", listOf("1"))
|
||||
generateRangeOperatorTestCase(
|
||||
"intRangeLiteral.kt",
|
||||
"1",
|
||||
"..",
|
||||
"3",
|
||||
numericLiterals
|
||||
)
|
||||
generateRangeOperatorTestCase(
|
||||
"intUntil.kt",
|
||||
"1",
|
||||
"until",
|
||||
"3",
|
||||
numericLiterals
|
||||
)
|
||||
generateRangeOperatorTestCase(
|
||||
"intDownTo.kt",
|
||||
"3",
|
||||
"downTo",
|
||||
"1",
|
||||
listOf("1")
|
||||
)
|
||||
|
||||
generateRangeOperatorTestCase("longRangeLiteral.kt", "1L", "..", "3L", numericLiterals)
|
||||
generateRangeOperatorTestCase("longUntil.kt", "1L", "until", "3L", numericLiterals)
|
||||
generateRangeOperatorTestCase("longDownTo.kt", "3L", "downTo", "1L", listOf("1L"))
|
||||
generateRangeOperatorTestCase(
|
||||
"longRangeLiteral.kt",
|
||||
"1L",
|
||||
"..",
|
||||
"3L",
|
||||
numericLiterals
|
||||
)
|
||||
generateRangeOperatorTestCase(
|
||||
"longUntil.kt",
|
||||
"1L",
|
||||
"until",
|
||||
"3L",
|
||||
numericLiterals
|
||||
)
|
||||
generateRangeOperatorTestCase(
|
||||
"longDownTo.kt",
|
||||
"3L",
|
||||
"downTo",
|
||||
"1L",
|
||||
listOf("1L")
|
||||
)
|
||||
|
||||
generateRangeOperatorTestCase("floatRangeLiteral.kt", "1.0F", "..", "3.0F", numericLiterals)
|
||||
generateRangeOperatorTestCase(
|
||||
"floatRangeLiteral.kt",
|
||||
"1.0F",
|
||||
"..",
|
||||
"3.0F",
|
||||
numericLiterals
|
||||
)
|
||||
|
||||
generateRangeOperatorTestCase("doubleRangeLiteral.kt", "1.0", "..", "3.0", numericLiterals)
|
||||
generateRangeOperatorTestCase(
|
||||
"doubleRangeLiteral.kt",
|
||||
"1.0",
|
||||
"..",
|
||||
"3.0",
|
||||
numericLiterals
|
||||
)
|
||||
|
||||
generateMatrixTestCase(
|
||||
"arrayIndices.kt",
|
||||
listOf("intArray.indices", "objectArray.indices", "emptyIntArray.indices", "emptyObjectArray.indices"),
|
||||
numericLiterals,
|
||||
"""val intArray = intArrayOf(1, 2, 3)
|
||||
"arrayIndices.kt",
|
||||
listOf("intArray.indices", "objectArray.indices", "emptyIntArray.indices", "emptyObjectArray.indices"),
|
||||
numericLiterals,
|
||||
"""val intArray = intArrayOf(1, 2, 3)
|
||||
|val objectArray = arrayOf(1, 2, 3)
|
||||
|val emptyIntArray = intArrayOf()
|
||||
|val emptyObjectArray = arrayOf<Any>()
|
||||
@@ -156,19 +212,19 @@ object GenerateInRangeExpressionTestData {
|
||||
)
|
||||
|
||||
generateMatrixTestCase(
|
||||
"collectionIndices.kt",
|
||||
listOf("collection.indices", "emptyCollection.indices"),
|
||||
numericLiterals,
|
||||
"""val collection = listOf(1, 2, 3)
|
||||
"collectionIndices.kt",
|
||||
listOf("collection.indices", "emptyCollection.indices"),
|
||||
numericLiterals,
|
||||
"""val collection = listOf(1, 2, 3)
|
||||
|val emptyCollection = listOf<Any>()
|
||||
""".trimMargin()
|
||||
)
|
||||
|
||||
generateMatrixTestCase(
|
||||
"charSequenceIndices.kt",
|
||||
listOf("charSequence.indices", "emptyCharSequence.indices"),
|
||||
numericLiterals,
|
||||
"""val charSequence: CharSequence = "123"
|
||||
"charSequenceIndices.kt",
|
||||
listOf("charSequence.indices", "emptyCharSequence.indices"),
|
||||
numericLiterals,
|
||||
"""val charSequence: CharSequence = "123"
|
||||
|val emptyCharSequence: CharSequence = ""
|
||||
""".trimMargin()
|
||||
)
|
||||
+131
-75
@@ -1,17 +1,6 @@
|
||||
/*
|
||||
* Copyright 2010-2017 JetBrains s.r.o.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
* Copyright 2010-2019 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.generators.tests
|
||||
@@ -44,16 +33,20 @@ object GeneratePrimitiveVsObjectEqualityTestData {
|
||||
println(" return when {")
|
||||
|
||||
generateFailureClauses(
|
||||
*failuresForEqualAndUnequalLeft("nx", x, y),
|
||||
*failuresForEqualAndUnequalLeft("nx", "x", "y"),
|
||||
*failuresForUnequalLeft("nn", x),
|
||||
*failuresForUnequalLeft("nn", "x"),
|
||||
*failuresForEqualAndUnequalLeft("ax", x, y),
|
||||
*failuresForEqualAndUnequalLeft("ax", "x", "y"),
|
||||
*failuresForEqualAndUnequalLeft("ax", "bx", "by"),
|
||||
*failuresForUnequalLeft("an", x),
|
||||
*failuresForUnequalLeft("an", "x"),
|
||||
*failuresForUnequalLeft("an", "bx")
|
||||
*failuresForEqualAndUnequalLeft("nx", x, y),
|
||||
*failuresForEqualAndUnequalLeft("nx", "x", "y"),
|
||||
*failuresForUnequalLeft("nn", x),
|
||||
*failuresForUnequalLeft("nn", "x"),
|
||||
*failuresForEqualAndUnequalLeft("ax", x, y),
|
||||
*failuresForEqualAndUnequalLeft("ax", "x", "y"),
|
||||
*failuresForEqualAndUnequalLeft(
|
||||
"ax",
|
||||
"bx",
|
||||
"by"
|
||||
),
|
||||
*failuresForUnequalLeft("an", x),
|
||||
*failuresForUnequalLeft("an", "x"),
|
||||
*failuresForUnequalLeft("an", "bx")
|
||||
)
|
||||
|
||||
println(" else -> \"OK\"")
|
||||
@@ -62,18 +55,18 @@ object GeneratePrimitiveVsObjectEqualityTestData {
|
||||
}
|
||||
|
||||
private fun failuresForEqualAndUnequalLeft(lhs: String, equalRhs: String, unequalRhs: String) =
|
||||
arrayOf(
|
||||
"$lhs != $equalRhs",
|
||||
"$lhs == $unequalRhs",
|
||||
"!($lhs == $equalRhs)",
|
||||
"!($lhs != $unequalRhs)"
|
||||
)
|
||||
arrayOf(
|
||||
"$lhs != $equalRhs",
|
||||
"$lhs == $unequalRhs",
|
||||
"!($lhs == $equalRhs)",
|
||||
"!($lhs != $unequalRhs)"
|
||||
)
|
||||
|
||||
private fun failuresForUnequalLeft(lhs: String, unequalRhs: String) =
|
||||
arrayOf(
|
||||
"$lhs == $unequalRhs",
|
||||
"!($lhs != $unequalRhs)"
|
||||
)
|
||||
arrayOf(
|
||||
"$lhs == $unequalRhs",
|
||||
"!($lhs != $unequalRhs)"
|
||||
)
|
||||
|
||||
private fun PrintWriter.generateLocalVals(type: String, x: String, y: String, boxedType: String = "$type?") {
|
||||
println(" val ax: $boxedType = $x")
|
||||
@@ -114,16 +107,28 @@ object GeneratePrimitiveVsObjectEqualityTestData {
|
||||
println(" return when {")
|
||||
|
||||
generateFailureClauses(
|
||||
*failuresForEqualAndUnequalRight(x, y, "nx"),
|
||||
*failuresForEqualAndUnequalRight("x", "y", "nx"),
|
||||
*failuresForUnequalRight(x, "nn"),
|
||||
*failuresForUnequalRight("x", "nn"),
|
||||
*failuresForEqualAndUnequalRight(x, y, "ax"),
|
||||
*failuresForEqualAndUnequalRight("x", "y", "ax"),
|
||||
*failuresForEqualAndUnequalRight("bx", "by", "ax"),
|
||||
*failuresForUnequalRight(x, "an"),
|
||||
*failuresForUnequalRight("x", "an"),
|
||||
*failuresForUnequalRight("bx", "an")
|
||||
*failuresForEqualAndUnequalRight(x, y, "nx"),
|
||||
*failuresForEqualAndUnequalRight(
|
||||
"x",
|
||||
"y",
|
||||
"nx"
|
||||
),
|
||||
*failuresForUnequalRight(x, "nn"),
|
||||
*failuresForUnequalRight("x", "nn"),
|
||||
*failuresForEqualAndUnequalRight(x, y, "ax"),
|
||||
*failuresForEqualAndUnequalRight(
|
||||
"x",
|
||||
"y",
|
||||
"ax"
|
||||
),
|
||||
*failuresForEqualAndUnequalRight(
|
||||
"bx",
|
||||
"by",
|
||||
"ax"
|
||||
),
|
||||
*failuresForUnequalRight(x, "an"),
|
||||
*failuresForUnequalRight("x", "an"),
|
||||
*failuresForUnequalRight("bx", "an")
|
||||
)
|
||||
|
||||
println(" else -> \"OK\"")
|
||||
@@ -131,9 +136,8 @@ object GeneratePrimitiveVsObjectEqualityTestData {
|
||||
println("}")
|
||||
}
|
||||
|
||||
private fun generatePrimitiveVsObjectTest(type: String, x: String, y: String, header: String = "") {
|
||||
private fun generatePrimitiveVsObjectTest(type: String, x: String, y: String) {
|
||||
PrintWriter(File(GENERATED_DIR, "primitiveEqObject$type.kt")).use {
|
||||
if (header.isNotBlank()) it.println(header)
|
||||
it.generatePrimitiveVsObjectTestBody(type, x, y)
|
||||
}
|
||||
}
|
||||
@@ -151,16 +155,28 @@ object GeneratePrimitiveVsObjectEqualityTestData {
|
||||
println(" return when {")
|
||||
|
||||
generateFailureClauses(
|
||||
*failuresForEqualAndUnequalRight(x, y, "nx"),
|
||||
*failuresForEqualAndUnequalRight("x", "y", "nx"),
|
||||
*failuresForUnequalRight(x, "nn"),
|
||||
*failuresForUnequalRight("x", "nn"),
|
||||
*failuresForEqualAndUnequalRight(x, y, "ax"),
|
||||
*failuresForEqualAndUnequalRight("x", "y", "ax"),
|
||||
*failuresForEqualAndUnequalRight("bx", "by", "ax"),
|
||||
*failuresForUnequalRight(x, "an"),
|
||||
*failuresForUnequalRight("x", "an"),
|
||||
*failuresForUnequalRight("bx", "an")
|
||||
*failuresForEqualAndUnequalRight(x, y, "nx"),
|
||||
*failuresForEqualAndUnequalRight(
|
||||
"x",
|
||||
"y",
|
||||
"nx"
|
||||
),
|
||||
*failuresForUnequalRight(x, "nn"),
|
||||
*failuresForUnequalRight("x", "nn"),
|
||||
*failuresForEqualAndUnequalRight(x, y, "ax"),
|
||||
*failuresForEqualAndUnequalRight(
|
||||
"x",
|
||||
"y",
|
||||
"ax"
|
||||
),
|
||||
*failuresForEqualAndUnequalRight(
|
||||
"bx",
|
||||
"by",
|
||||
"ax"
|
||||
),
|
||||
*failuresForUnequalRight(x, "an"),
|
||||
*failuresForUnequalRight("x", "an"),
|
||||
*failuresForUnequalRight("bx", "an")
|
||||
)
|
||||
|
||||
println(" else -> \"OK\"")
|
||||
@@ -169,18 +185,18 @@ object GeneratePrimitiveVsObjectEqualityTestData {
|
||||
}
|
||||
|
||||
private fun failuresForEqualAndUnequalRight(equalLhs: String, unequalLhs: String, rhs: String) =
|
||||
arrayOf(
|
||||
"$equalLhs != $rhs",
|
||||
"$unequalLhs == $rhs",
|
||||
"!($equalLhs == $rhs)",
|
||||
"!($unequalLhs != $rhs)"
|
||||
)
|
||||
arrayOf(
|
||||
"$equalLhs != $rhs",
|
||||
"$unequalLhs == $rhs",
|
||||
"!($equalLhs == $rhs)",
|
||||
"!($unequalLhs != $rhs)"
|
||||
)
|
||||
|
||||
private fun failuresForUnequalRight(unequalLhs: String, rhs: String) =
|
||||
arrayOf(
|
||||
"$unequalLhs == $rhs",
|
||||
"!($unequalLhs != $rhs)"
|
||||
)
|
||||
arrayOf(
|
||||
"$unequalLhs == $rhs",
|
||||
"!($unequalLhs != $rhs)"
|
||||
)
|
||||
|
||||
|
||||
@JvmStatic
|
||||
@@ -190,24 +206,64 @@ object GeneratePrimitiveVsObjectEqualityTestData {
|
||||
FileUtil.delete(GENERATED_DIR)
|
||||
GENERATED_DIR.mkdirs()
|
||||
|
||||
generateBoxedVsPrimitiveTest("Boolean", "true", "false")
|
||||
generateBoxedVsPrimitiveTest(
|
||||
"Boolean",
|
||||
"true",
|
||||
"false"
|
||||
)
|
||||
generateBoxedVsPrimitiveTest("Char", "'0'", "'1'")
|
||||
generateBoxedVsPrimitiveTest("Byte", "0.toByte()", "1.toByte()")
|
||||
generateBoxedVsPrimitiveTest("Short", "0.toShort()", "1.toShort()")
|
||||
generateBoxedVsPrimitiveTest(
|
||||
"Byte",
|
||||
"0.toByte()",
|
||||
"1.toByte()"
|
||||
)
|
||||
generateBoxedVsPrimitiveTest(
|
||||
"Short",
|
||||
"0.toShort()",
|
||||
"1.toShort()"
|
||||
)
|
||||
generateBoxedVsPrimitiveTest("Int", "0", "1")
|
||||
generateBoxedVsPrimitiveTest("Long", "0L", "1L")
|
||||
|
||||
generatePrimitiveVsBoxedTest("Boolean", "true", "false")
|
||||
generatePrimitiveVsBoxedTest(
|
||||
"Boolean",
|
||||
"true",
|
||||
"false"
|
||||
)
|
||||
generatePrimitiveVsBoxedTest("Char", "'0'", "'1'")
|
||||
generatePrimitiveVsBoxedTest("Byte", "0.toByte()", "1.toByte()")
|
||||
generatePrimitiveVsBoxedTest("Short", "0.toShort()", "1.toShort()")
|
||||
generatePrimitiveVsBoxedTest(
|
||||
"Byte",
|
||||
"0.toByte()",
|
||||
"1.toByte()"
|
||||
)
|
||||
generatePrimitiveVsBoxedTest(
|
||||
"Short",
|
||||
"0.toShort()",
|
||||
"1.toShort()"
|
||||
)
|
||||
generatePrimitiveVsBoxedTest("Int", "0", "1")
|
||||
generatePrimitiveVsBoxedTest("Long", "0L", "1L")
|
||||
|
||||
generatePrimitiveVsObjectTest("Boolean", "true", "false")
|
||||
generatePrimitiveVsObjectTest("Char", "'0'", "'1'", header = "// IGNORE_BACKEND: JS") // KT-19081
|
||||
generatePrimitiveVsObjectTest("Byte", "0.toByte()", "1.toByte()")
|
||||
generatePrimitiveVsObjectTest("Short", "0.toShort()", "1.toShort()")
|
||||
generatePrimitiveVsObjectTest(
|
||||
"Boolean",
|
||||
"true",
|
||||
"false"
|
||||
)
|
||||
generatePrimitiveVsObjectTest(
|
||||
"Char",
|
||||
"'0'",
|
||||
"'1'"
|
||||
) // KT-19081
|
||||
generatePrimitiveVsObjectTest(
|
||||
"Byte",
|
||||
"0.toByte()",
|
||||
"1.toByte()"
|
||||
)
|
||||
generatePrimitiveVsObjectTest(
|
||||
"Short",
|
||||
"0.toShort()",
|
||||
"1.toShort()"
|
||||
)
|
||||
generatePrimitiveVsObjectTest("Int", "0", "1")
|
||||
generatePrimitiveVsObjectTest("Long", "0L", "1L")
|
||||
}
|
||||
Reference in New Issue
Block a user