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

[IC] Add tests for sealed classes (KT-45474)

Browse Source
This commit is contained in:
Andrey Uskov
2022-06-10 16:52:38 +03:00
committed by teamcity
parent 21e762458e
commit 318d955d64
34 changed files with 232 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalFirICLightTreeJvmCompilerRunnerTestGenerated.java
Generated
+13 -3
View File
@@ -597,6 +597,11 @@ public class IncrementalFirICLightTreeJvmCompilerRunnerTestGenerated extends Abs
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/");
}
@TestMetadata("sealedClassesAddIndirectInheritor")
public void testSealedClassesAddIndirectInheritor() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddIndirectInheritor/");
}
@TestMetadata("sealedClassesAddInheritor")
public void testSealedClassesAddInheritor() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/");
@@ -612,9 +617,14 @@ public class IncrementalFirICLightTreeJvmCompilerRunnerTestGenerated extends Abs
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/");
}
@TestMetadata("sealedClassesUseSwitch")
public void testSealedClassesUseSwitch() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/");
@TestMetadata("sealedClassesWhenExpression")
public void testSealedClassesWhenExpression() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/");
}
@TestMetadata("sealedClassesWithExpectActual")
public void testSealedClassesWithExpectActual() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/");
}
@TestMetadata("secondaryConstructorInlined")
compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalFirJvmCompilerRunnerTestGenerated.java
Generated
+13 -3
View File
@@ -597,6 +597,11 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/");
}
@TestMetadata("sealedClassesAddIndirectInheritor")
public void testSealedClassesAddIndirectInheritor() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddIndirectInheritor/");
}
@TestMetadata("sealedClassesAddInheritor")
public void testSealedClassesAddInheritor() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/");
@@ -612,9 +617,14 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/");
}
@TestMetadata("sealedClassesUseSwitch")
public void testSealedClassesUseSwitch() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/");
@TestMetadata("sealedClassesWhenExpression")
public void testSealedClassesWhenExpression() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/");
}
@TestMetadata("sealedClassesWithExpectActual")
public void testSealedClassesWithExpectActual() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/");
}
@TestMetadata("secondaryConstructorInlined")
compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalFirLightTreeJvmCompilerRunnerTestGenerated.java
Generated
+13 -3
View File
@@ -597,6 +597,11 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/");
}
@TestMetadata("sealedClassesAddIndirectInheritor")
public void testSealedClassesAddIndirectInheritor() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddIndirectInheritor/");
}
@TestMetadata("sealedClassesAddInheritor")
public void testSealedClassesAddInheritor() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/");
@@ -612,9 +617,14 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/");
}
@TestMetadata("sealedClassesUseSwitch")
public void testSealedClassesUseSwitch() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/");
@TestMetadata("sealedClassesWhenExpression")
public void testSealedClassesWhenExpression() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/");
}
@TestMetadata("sealedClassesWithExpectActual")
public void testSealedClassesWithExpectActual() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/");
}
@TestMetadata("secondaryConstructorInlined")
compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunnerTestGenerated.java
Generated
+13 -3
View File
@@ -596,6 +596,11 @@ public class IncrementalJsCompilerRunnerTestGenerated extends AbstractIncrementa
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/");
}
@TestMetadata("sealedClassesAddIndirectInheritor")
public void testSealedClassesAddIndirectInheritor() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddIndirectInheritor/");
}
@TestMetadata("sealedClassesAddInheritor")
public void testSealedClassesAddInheritor() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/");
@@ -611,9 +616,14 @@ public class IncrementalJsCompilerRunnerTestGenerated extends AbstractIncrementa
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/");
}
@TestMetadata("sealedClassesUseSwitch")
public void testSealedClassesUseSwitch() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/");
@TestMetadata("sealedClassesWhenExpression")
public void testSealedClassesWhenExpression() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/");
}
@TestMetadata("sealedClassesWithExpectActual")
public void testSealedClassesWithExpectActual() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/");
}
@TestMetadata("secondaryConstructorInlined")
compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunnerWithMetadataOnlyTestGenerated.java
Generated
+13 -3
View File
@@ -596,6 +596,11 @@ public class IncrementalJsCompilerRunnerWithMetadataOnlyTestGenerated extends Ab
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/");
}
@TestMetadata("sealedClassesAddIndirectInheritor")
public void testSealedClassesAddIndirectInheritor() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddIndirectInheritor/");
}
@TestMetadata("sealedClassesAddInheritor")
public void testSealedClassesAddInheritor() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/");
@@ -611,9 +616,14 @@ public class IncrementalJsCompilerRunnerWithMetadataOnlyTestGenerated extends Ab
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/");
}
@TestMetadata("sealedClassesUseSwitch")
public void testSealedClassesUseSwitch() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/");
@TestMetadata("sealedClassesWhenExpression")
public void testSealedClassesWhenExpression() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/");
}
@TestMetadata("sealedClassesWithExpectActual")
public void testSealedClassesWithExpectActual() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/");
}
@TestMetadata("secondaryConstructorInlined")
compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunnerTestGenerated.java
Generated
+13 -3
View File
@@ -597,6 +597,11 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/");
}
@TestMetadata("sealedClassesAddIndirectInheritor")
public void testSealedClassesAddIndirectInheritor() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddIndirectInheritor/");
}
@TestMetadata("sealedClassesAddInheritor")
public void testSealedClassesAddInheritor() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/");
@@ -612,9 +617,14 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/");
}
@TestMetadata("sealedClassesUseSwitch")
public void testSealedClassesUseSwitch() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/");
@TestMetadata("sealedClassesWhenExpression")
public void testSealedClassesWhenExpression() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/");
}
@TestMetadata("sealedClassesWithExpectActual")
public void testSealedClassesWithExpectActual() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/");
}
@TestMetadata("secondaryConstructorInlined")
compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJvmOldBackendCompilerRunnerTestGenerated.java
Generated
+13 -3
View File
@@ -597,6 +597,11 @@ public class IncrementalJvmOldBackendCompilerRunnerTestGenerated extends Abstrac
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/");
}
@TestMetadata("sealedClassesAddIndirectInheritor")
public void testSealedClassesAddIndirectInheritor() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddIndirectInheritor/");
}
@TestMetadata("sealedClassesAddInheritor")
public void testSealedClassesAddInheritor() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/");
@@ -612,9 +617,14 @@ public class IncrementalJvmOldBackendCompilerRunnerTestGenerated extends Abstrac
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/");
}
@TestMetadata("sealedClassesUseSwitch")
public void testSealedClassesUseSwitch() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/");
@TestMetadata("sealedClassesWhenExpression")
public void testSealedClassesWhenExpression() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/");
}
@TestMetadata("sealedClassesWithExpectActual")
public void testSealedClassesWithExpectActual() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/");
}
@TestMetadata("secondaryConstructorInlined")
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java
Generated
+13 -3
View File
@@ -1266,6 +1266,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/");
}
@TestMetadata("sealedClassesAddIndirectInheritor")
public void testSealedClassesAddIndirectInheritor() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddIndirectInheritor/");
}
@TestMetadata("sealedClassesAddInheritor")
public void testSealedClassesAddInheritor() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/");
@@ -1281,9 +1286,14 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/");
}
@TestMetadata("sealedClassesUseSwitch")
public void testSealedClassesUseSwitch() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/");
@TestMetadata("sealedClassesWhenExpression")
public void testSealedClassesWhenExpression() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/");
}
@TestMetadata("sealedClassesWithExpectActual")
public void testSealedClassesWithExpectActual() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/");
}
@TestMetadata("secondaryConstructorInlined")
jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/A.kt → jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddIndirectInheritor/A.kt
Vendored
View File
jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/B.kt → jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddIndirectInheritor/B.kt
Vendored
View File
jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/Base.kt → jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddIndirectInheritor/Base.kt
Vendored
View File
jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddIndirectInheritor/C.kt
Vendored
+3
View File
@@ -0,0 +1,3 @@
package test
open class C : Any()
jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddIndirectInheritor/C.kt.new
Vendored
+3
View File
@@ -0,0 +1,3 @@
package test
open class C : Base
jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/E.kt → jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddIndirectInheritor/D.kt
Vendored
+1 -2
View File
@@ -1,4 +1,3 @@
package test
class E {
}
class D : C()
jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/args.txt → jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddIndirectInheritor/args.txt
Vendored
View File
jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/build.log → jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddIndirectInheritor/build.log
Vendored
+2 -10
View File
@@ -8,6 +8,7 @@ Marked as dirty by Kotlin:
src/B.kt
src/Base.kt
src/C.kt
src/D.kt
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
@@ -16,22 +17,13 @@ Cleaning output files:
out/production/module/test/B.class
out/production/module/test/Base.class
out/production/module/test/C.class
out/production/module/test/D.class
End of files
Compiling files:
src/A.kt
src/B.kt
src/Base.kt
src/C.kt
End of files
Marked as dirty by Kotlin:
src/D.kt
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/test/D.class
End of files
Compiling files:
src/D.kt
End of files
Exit code: OK
jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/C.kt.new
Vendored
-3
View File
@@ -1,3 +0,0 @@
package test
interface C : Base
jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/D.kt
Vendored
-5
View File
@@ -1,5 +0,0 @@
package test
class D {
lateinit var x: Base
}
jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/A.kt
Vendored
+3
View File
@@ -0,0 +1,3 @@
package test
interface A : Base
jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/B.kt
Vendored
+3
View File
@@ -0,0 +1,3 @@
package test
interface B : Base
jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/Base.kt
Vendored
+3
View File
@@ -0,0 +1,3 @@
package test
sealed interface Base
jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/Base.kt.new
Vendored
+7
View File
@@ -0,0 +1,7 @@
package test
sealed interface Base {
fun doSmth() = "doSmth"
}
jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/Usage.kt
Vendored
+12
View File
@@ -0,0 +1,12 @@
package test
//sealed interface Base
class Usage {
fun doSmth(x: Base) =
when (x) {
is A -> "A"
is B -> "B"
}
}
jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/args.txt
Vendored
+1
View File
@@ -0,0 +1 @@
-XXLanguage:+FreedomForSealedClasses -XXLanguage:+SealedInterfaces
jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/build.log
Vendored
+25
View File
@@ -0,0 +1,25 @@
================ Step #1 =================
Compiling files:
src/Base.kt
End of files
Marked as dirty by Kotlin:
src/A.kt
src/B.kt
src/Base.kt
src/Usage.kt
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/test/A.class
out/production/module/test/B.class
out/production/module/test/Base.class
End of files
Compiling files:
src/A.kt
src/B.kt
src/Base.kt
End of files
Exit code: OK
------------------------------------------
jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/A.kt
Vendored
+3
View File
@@ -0,0 +1,3 @@
package test
open class A: Base
jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/Actual.kt
Vendored
+9
View File
@@ -0,0 +1,9 @@
package test
actual class ExpectClass {
actual fun doSmth() = ""
}
expect class ExpectClass2 {
fun doSmth(): String
}
jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/Actual2.kt
Vendored
+5
View File
@@ -0,0 +1,5 @@
package test
actual class ExpectClass2 {
actual fun doSmth() = ""
}
jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/B.kt
Vendored
+9
View File
@@ -0,0 +1,9 @@
package test
class B : Base {
}
expect class ExpectClass {
fun doSmth(): String
}
jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/Base.kt
Vendored
+3
View File
@@ -0,0 +1,3 @@
package test
sealed interface Base
jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/C.kt.new
Vendored
+3
View File
@@ -0,0 +1,3 @@
package test
class C : A()
jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/Unrelated.kt
Vendored
+3
View File
@@ -0,0 +1,3 @@
package test
class Unrelated {}
jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/args.txt
Vendored
+1
View File
@@ -0,0 +1 @@
-XXLanguage:+FreedomForSealedClasses -XXLanguage:+SealedInterfaces -Xmulti-platform
jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/build.log
Vendored
+29
View File
@@ -0,0 +1,29 @@
================ Step #1 =================
Compiling files:
src/C.kt
End of files
Marked as dirty by Kotlin:
src/Actual.kt
src/B.kt
src/Base.kt
src/C.kt
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/test/Actual.class
out/production/module/test/B.class
out/production/module/test/Base.class
out/production/module/test/C.class
End of files
Compiling files:
src/Actual.kt
src/Actual2.kt
src/Base.kt
src/A.kt
src/B.kt
src/C.kt
End of files
Exit code: OK
------------------------------------------