From 20b3361edc0c1c8abaf79d844932c469e4eb5462 Mon Sep 17 00:00:00 2001 From: Alexey Andreev Date: Thu, 11 Feb 2016 18:29:56 +0300 Subject: [PATCH] [KT-4124] Fix test compatibility between JS and Java backed for several tests --- .../classes/classObjectAsStaticInitializer.kt | 2 + .../box/classes/classObjectToString.kt | 2 + .../codegen/box/classes/delegationJava.kt | 3 + .../testData/codegen/box/classes/kt1120.kt | 4 + .../testData/codegen/box/classes/kt1134.kt | 2 + .../testData/codegen/box/classes/kt1535.kt | 2 + .../testData/codegen/box/classes/kt1759.kt | 2 + .../testData/codegen/box/classes/kt2288.kt | 2 + .../testData/codegen/box/classes/kt2395.kt | 2 + .../testData/codegen/box/classes/kt2417.kt | 2 + .../testData/codegen/box/classes/kt2607.kt | 2 + .../testData/codegen/box/classes/kt496.kt | 2 + .../testData/codegen/box/classes/kt500.kt | 3 +- .../testData/codegen/box/classes/kt501.kt | 3 +- .../testData/codegen/box/classes/kt504.kt | 3 + .../testData/codegen/box/classes/kt5347.kt | 2 + .../testData/codegen/box/classes/kt707.kt | 2 + .../testData/codegen/box/classes/kt8011a.kt | 3 + .../box/innerNested/dataLocalVariable.kt | 1 + .../kotlin/generators/tests/GenerateTests.kt | 8 - .../jetbrains/kotlin/js/test/BasicTest.java | 6 - .../test/semantics/ClassesTestGenerated.java | 192 +++++------ .../test/semantics/ClosuresTestGenerated.java | 325 ------------------ .../semantics/InnerNestedTestGenerated.java | 12 +- .../test/semantics/ObjectsTestGenerated.java | 289 ---------------- .../abstractClassesForGeneratedTests.kt | 4 - 26 files changed, 144 insertions(+), 736 deletions(-) delete mode 100644 js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ClosuresTestGenerated.java delete mode 100644 js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ObjectsTestGenerated.java diff --git a/compiler/testData/codegen/box/classes/classObjectAsStaticInitializer.kt b/compiler/testData/codegen/box/classes/classObjectAsStaticInitializer.kt index d9175424f8e..3b25a4fc056 100644 --- a/compiler/testData/codegen/box/classes/classObjectAsStaticInitializer.kt +++ b/compiler/testData/codegen/box/classes/classObjectAsStaticInitializer.kt @@ -1,3 +1,5 @@ +// Enable for JS when it supports initializer of companion objects. +// TARGET_BACKEND: JVM var global = 0; class C { diff --git a/compiler/testData/codegen/box/classes/classObjectToString.kt b/compiler/testData/codegen/box/classes/classObjectToString.kt index a1b66901895..6f860e64091 100644 --- a/compiler/testData/codegen/box/classes/classObjectToString.kt +++ b/compiler/testData/codegen/box/classes/classObjectToString.kt @@ -1,3 +1,5 @@ +// Enable for JS when it supports Java class library. +// TARGET_BACKEND: JVM class SomeClass { companion object } fun box() = diff --git a/compiler/testData/codegen/box/classes/delegationJava.kt b/compiler/testData/codegen/box/classes/delegationJava.kt index f7e209dc450..dca3477ca7f 100644 --- a/compiler/testData/codegen/box/classes/delegationJava.kt +++ b/compiler/testData/codegen/box/classes/delegationJava.kt @@ -1,3 +1,6 @@ +// Enable for JS when it supports Java class library. +// TARGET_BACKEND: JVM + class TestJava(r : Runnable) : Runnable by r {} class TestRunnable() : Runnable { public override fun run() = System.out.println("foobar") diff --git a/compiler/testData/codegen/box/classes/kt1120.kt b/compiler/testData/codegen/box/classes/kt1120.kt index 7b310d46fde..1cba12a26a7 100644 --- a/compiler/testData/codegen/box/classes/kt1120.kt +++ b/compiler/testData/codegen/box/classes/kt1120.kt @@ -1,3 +1,7 @@ +// Won't ever work with JS backend. Consider rewriting this test without using threads, since the issue +// is not about threads at all. +// TARGET_BACKEND: JVM + object RefreshQueue { val any = Any() val workerThread: Thread = Thread(object : Runnable { diff --git a/compiler/testData/codegen/box/classes/kt1134.kt b/compiler/testData/codegen/box/classes/kt1134.kt index b2fd2dc4022..6bf38c13bc7 100644 --- a/compiler/testData/codegen/box/classes/kt1134.kt +++ b/compiler/testData/codegen/box/classes/kt1134.kt @@ -1,3 +1,5 @@ +// Enable when JS backend supports Java class library +// TARGET_BACKEND: JVM public class SomeClass() : java.lang.Object() { } diff --git a/compiler/testData/codegen/box/classes/kt1535.kt b/compiler/testData/codegen/box/classes/kt1535.kt index 479c65122e6..fef4033a858 100644 --- a/compiler/testData/codegen/box/classes/kt1535.kt +++ b/compiler/testData/codegen/box/classes/kt1535.kt @@ -1,3 +1,5 @@ +// Enable when JS backend supports Java class library, since FunctionX are required for interoperation +// TARGET_BACKEND: JVM class Works() : Function0 { public override fun invoke():Any { return "Works" as Any diff --git a/compiler/testData/codegen/box/classes/kt1759.kt b/compiler/testData/codegen/box/classes/kt1759.kt index d9f20bb471e..75b9a673243 100644 --- a/compiler/testData/codegen/box/classes/kt1759.kt +++ b/compiler/testData/codegen/box/classes/kt1759.kt @@ -1,3 +1,5 @@ +// Enable when JS backend supports Java class library, or consider replacing System.out.println with kotlin.println +// TARGET_BACKEND: JVM class Greeter(var name : String) { fun greet() { name = name.plus("") diff --git a/compiler/testData/codegen/box/classes/kt2288.kt b/compiler/testData/codegen/box/classes/kt2288.kt index 5aa04a53b0a..5d0494033d8 100644 --- a/compiler/testData/codegen/box/classes/kt2288.kt +++ b/compiler/testData/codegen/box/classes/kt2288.kt @@ -1,3 +1,5 @@ +// Enable when JS backend supports Java class library +// TARGET_BACKEND: JVM public open class Test(): java.util.RandomAccess, Cloneable, java.io.Serializable { public override fun clone(): Test = Test() // Override 'clone()' with more precise type 'Test' diff --git a/compiler/testData/codegen/box/classes/kt2395.kt b/compiler/testData/codegen/box/classes/kt2395.kt index 40ee9b9495c..b2229371362 100644 --- a/compiler/testData/codegen/box/classes/kt2395.kt +++ b/compiler/testData/codegen/box/classes/kt2395.kt @@ -1,3 +1,5 @@ +// Enable when JS backend supports Java class library +// TARGET_BACKEND: JVM import java.util.AbstractList class MyList(): AbstractList() { diff --git a/compiler/testData/codegen/box/classes/kt2417.kt b/compiler/testData/codegen/box/classes/kt2417.kt index bf1fa375e2c..8703286c2af 100644 --- a/compiler/testData/codegen/box/classes/kt2417.kt +++ b/compiler/testData/codegen/box/classes/kt2417.kt @@ -1,3 +1,5 @@ +// Enable when bug with when ... !in expression gets fixed +// TARGET_BACKEND: JVM import java.util.HashSet fun box() : String{ diff --git a/compiler/testData/codegen/box/classes/kt2607.kt b/compiler/testData/codegen/box/classes/kt2607.kt index 10688476918..c7e2391dc02 100644 --- a/compiler/testData/codegen/box/classes/kt2607.kt +++ b/compiler/testData/codegen/box/classes/kt2607.kt @@ -1,3 +1,5 @@ +// Enable when JS backend supports local classes +// TARGET_BACKEND: JVM fun box() : String { val o = object { diff --git a/compiler/testData/codegen/box/classes/kt496.kt b/compiler/testData/codegen/box/classes/kt496.kt index b481604def0..13488b7e1db 100644 --- a/compiler/testData/codegen/box/classes/kt496.kt +++ b/compiler/testData/codegen/box/classes/kt496.kt @@ -1,3 +1,5 @@ +// Enable for JS when it supports Java class library. +// TARGET_BACKEND: JVM fun test1() : Boolean { try { return true diff --git a/compiler/testData/codegen/box/classes/kt500.kt b/compiler/testData/codegen/box/classes/kt500.kt index ce7c329c23f..61aae755ea1 100644 --- a/compiler/testData/codegen/box/classes/kt500.kt +++ b/compiler/testData/codegen/box/classes/kt500.kt @@ -21,7 +21,8 @@ val USER_ID_2 = fun getUserIdFromEnvironment() : Int = throw UnsupportedOperationException() fun box() : String { - System.out?.println("G: " + GUEST_USER_ID + " U1:" + USER_ID + " U2: " + USER_ID_2) + // Probably, it's an old debugging code. JS backend still does not support this + //System.out?.println("G: " + GUEST_USER_ID + " U1:" + USER_ID + " U2: " + USER_ID_2) if(USER_ID != 4) return "test0 failed" if(USER_ID_2 != 4) return "test2 failed" if(GUEST_USER_ID != 5) return "test3 failed" diff --git a/compiler/testData/codegen/box/classes/kt501.kt b/compiler/testData/codegen/box/classes/kt501.kt index e9015d8d69f..52260ba6d94 100644 --- a/compiler/testData/codegen/box/classes/kt501.kt +++ b/compiler/testData/codegen/box/classes/kt501.kt @@ -4,7 +4,8 @@ class Reluctant() { } } -fun p(o : Any?) = System.out?.println(o) +// Probably, it's an old debugging code. JS backend still does not support this +//fun p(o : Any?) = System.out?.println(o) fun test1() : String { try { diff --git a/compiler/testData/codegen/box/classes/kt504.kt b/compiler/testData/codegen/box/classes/kt504.kt index da261142cb7..0b1d0d8b09f 100644 --- a/compiler/testData/codegen/box/classes/kt504.kt +++ b/compiler/testData/codegen/box/classes/kt504.kt @@ -1,3 +1,6 @@ +// Enable for JS when it supports Java class library. +// TARGET_BACKEND: JVM +// BTW, this test does not seem relevant to real descsription of issue #KT-504 import java.util.HashMap import java.io.* diff --git a/compiler/testData/codegen/box/classes/kt5347.kt b/compiler/testData/codegen/box/classes/kt5347.kt index cca6a97b08e..360c1ec4d22 100644 --- a/compiler/testData/codegen/box/classes/kt5347.kt +++ b/compiler/testData/codegen/box/classes/kt5347.kt @@ -1,3 +1,5 @@ +// Enable when JS backend get support of local classes +// TARGET_BACKEND: JVM fun test1(str: String): String { data class A(val x: Int) { fun foo() = str diff --git a/compiler/testData/codegen/box/classes/kt707.kt b/compiler/testData/codegen/box/classes/kt707.kt index ce90660a3a8..0918036ba9d 100644 --- a/compiler/testData/codegen/box/classes/kt707.kt +++ b/compiler/testData/codegen/box/classes/kt707.kt @@ -1,3 +1,5 @@ +// Enable for JS when it supports Java class library. +// TARGET_BACKEND: JVM class List(val head: T, val tail: List? = null) fun List.mapHead(f: (T)-> T): List = List(f(head), null) diff --git a/compiler/testData/codegen/box/classes/kt8011a.kt b/compiler/testData/codegen/box/classes/kt8011a.kt index 9a8fa24c6d9..e011bb30341 100644 --- a/compiler/testData/codegen/box/classes/kt8011a.kt +++ b/compiler/testData/codegen/box/classes/kt8011a.kt @@ -1,3 +1,6 @@ +// Enable for JS when it supports local classes. +// TARGET_BACKEND: JVM + fun testFun1(str: String): String { val capture = str diff --git a/compiler/testData/codegen/box/innerNested/dataLocalVariable.kt b/compiler/testData/codegen/box/innerNested/dataLocalVariable.kt index 29d11470364..35be312cf63 100644 --- a/compiler/testData/codegen/box/innerNested/dataLocalVariable.kt +++ b/compiler/testData/codegen/box/innerNested/dataLocalVariable.kt @@ -1,3 +1,4 @@ +// TARGET_BACKEND: JVM fun ok(b: Boolean) = if (b) "OK" else "Fail" fun box(): String { diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index 853531fb78e..6fbf9a75680 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -1071,18 +1071,10 @@ fun main(args: Array) { model("codegen/box/classes/", targetBackend = TargetBackend.JS) } - testClass() { - model("codegen/box/closures/", targetBackend = TargetBackend.JS) - } - testClass() { model("codegen/box/innerNested/", targetBackend = TargetBackend.JS) } - testClass() { - model("codegen/box/objects/", targetBackend = TargetBackend.JS) - } - testClass() { model("codegen/box/super/", targetBackend = TargetBackend.JS) } diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicTest.java index 70e91760045..e2d689c4ac1 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicTest.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicTest.java @@ -31,16 +31,11 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport; import org.jetbrains.kotlin.cli.common.messages.MessageRenderer; -import org.jetbrains.kotlin.cli.common.messages.MessageSeverityCollector; import org.jetbrains.kotlin.cli.common.messages.PrintingMessageCollector; import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsKt; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; import org.jetbrains.kotlin.config.CompilerConfiguration; -import org.jetbrains.kotlin.diagnostics.Diagnostic; -import org.jetbrains.kotlin.diagnostics.DiagnosticUtils; -import org.jetbrains.kotlin.diagnostics.DiagnosticUtilsKt; -import org.jetbrains.kotlin.diagnostics.rendering.DiagnosticRendererUtilKt; import org.jetbrains.kotlin.idea.KotlinFileType; import org.jetbrains.kotlin.js.JavaScript; import org.jetbrains.kotlin.js.config.Config; @@ -55,7 +50,6 @@ import org.jetbrains.kotlin.js.test.utils.JsTestUtils; import org.jetbrains.kotlin.js.translate.context.Namer; import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.psi.KtPsiFactory; -import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics; import org.jetbrains.kotlin.resolve.lazy.KotlinTestWithEnvironment; import org.jetbrains.kotlin.test.KotlinTestUtils; diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ClassesTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ClassesTestGenerated.java index e62b8a74fd8..08dbb6c794b 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ClassesTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ClassesTestGenerated.java @@ -31,6 +31,102 @@ import java.util.regex.Pattern; @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public class ClassesTestGenerated extends AbstractClassesTest { + @TestMetadata("classObjectAsStaticInitializer.kt") + public void ignoredClassObjectAsStaticInitializer() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/classObjectAsStaticInitializer.kt"); + doTest(fileName); + } + + @TestMetadata("classObjectToString.kt") + public void ignoredClassObjectToString() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/classObjectToString.kt"); + doTest(fileName); + } + + @TestMetadata("delegationJava.kt") + public void ignoredDelegationJava() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/delegationJava.kt"); + doTest(fileName); + } + + @TestMetadata("kt1120.kt") + public void ignoredKt1120() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1120.kt"); + doTest(fileName); + } + + @TestMetadata("kt1134.kt") + public void ignoredKt1134() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1134.kt"); + doTest(fileName); + } + + @TestMetadata("kt1535.kt") + public void ignoredKt1535() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1535.kt"); + doTest(fileName); + } + + @TestMetadata("kt1759.kt") + public void ignoredKt1759() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1759.kt"); + doTest(fileName); + } + + @TestMetadata("kt2288.kt") + public void ignoredKt2288() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2288.kt"); + doTest(fileName); + } + + @TestMetadata("kt2395.kt") + public void ignoredKt2395() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2395.kt"); + doTest(fileName); + } + + @TestMetadata("kt2417.kt") + public void ignoredKt2417() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2417.kt"); + doTest(fileName); + } + + @TestMetadata("kt2607.kt") + public void ignoredKt2607() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2607.kt"); + doTest(fileName); + } + + @TestMetadata("kt496.kt") + public void ignoredKt496() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt496.kt"); + doTest(fileName); + } + + @TestMetadata("kt504.kt") + public void ignoredKt504() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt504.kt"); + doTest(fileName); + } + + @TestMetadata("kt5347.kt") + public void ignoredKt5347() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt5347.kt"); + doTest(fileName); + } + + @TestMetadata("kt707.kt") + public void ignoredKt707() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt707.kt"); + doTest(fileName); + } + + @TestMetadata("kt8011a.kt") + public void ignoredKt8011a() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt8011a.kt"); + doTest(fileName); + } + public void testAllFilesPresentInClasses() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/classes"), Pattern.compile("^(.+)\\.kt$"), true); } @@ -59,12 +155,6 @@ public class ClassesTestGenerated extends AbstractClassesTest { doTest(fileName); } - @TestMetadata("classObjectAsStaticInitializer.kt") - public void testClassObjectAsStaticInitializer() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/classObjectAsStaticInitializer.kt"); - doTest(fileName); - } - @TestMetadata("classObjectField.kt") public void testClassObjectField() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/classObjectField.kt"); @@ -83,12 +173,6 @@ public class ClassesTestGenerated extends AbstractClassesTest { doTest(fileName); } - @TestMetadata("classObjectToString.kt") - public void testClassObjectToString() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/classObjectToString.kt"); - doTest(fileName); - } - @TestMetadata("classObjectWithPrivateGenericMember.kt") public void testClassObjectWithPrivateGenericMember() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/classObjectWithPrivateGenericMember.kt"); @@ -143,12 +227,6 @@ public class ClassesTestGenerated extends AbstractClassesTest { doTest(fileName); } - @TestMetadata("delegationJava.kt") - public void testDelegationJava() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/delegationJava.kt"); - doTest(fileName); - } - @TestMetadata("delegationMethodsWithArgs.kt") public void testDelegationMethodsWithArgs() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/delegationMethodsWithArgs.kt"); @@ -221,18 +299,6 @@ public class ClassesTestGenerated extends AbstractClassesTest { doTest(fileName); } - @TestMetadata("kt1120.kt") - public void testKt1120() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1120.kt"); - doTest(fileName); - } - - @TestMetadata("kt1134.kt") - public void testKt1134() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1134.kt"); - doTest(fileName); - } - @TestMetadata("kt1157.kt") public void testKt1157() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1157.kt"); @@ -257,12 +323,6 @@ public class ClassesTestGenerated extends AbstractClassesTest { doTest(fileName); } - @TestMetadata("kt1535.kt") - public void testKt1535() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1535.kt"); - doTest(fileName); - } - @TestMetadata("kt1538.kt") public void testKt1538() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1538.kt"); @@ -293,12 +353,6 @@ public class ClassesTestGenerated extends AbstractClassesTest { doTest(fileName); } - @TestMetadata("kt1759.kt") - public void testKt1759() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1759.kt"); - doTest(fileName); - } - @TestMetadata("kt1891.kt") public void testKt1891() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1891.kt"); @@ -329,12 +383,6 @@ public class ClassesTestGenerated extends AbstractClassesTest { doTest(fileName); } - @TestMetadata("kt2288.kt") - public void testKt2288() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2288.kt"); - doTest(fileName); - } - @TestMetadata("kt2384.kt") public void testKt2384() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2384.kt"); @@ -353,18 +401,6 @@ public class ClassesTestGenerated extends AbstractClassesTest { doTest(fileName); } - @TestMetadata("kt2395.kt") - public void testKt2395() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2395.kt"); - doTest(fileName); - } - - @TestMetadata("kt2417.kt") - public void testKt2417() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2417.kt"); - doTest(fileName); - } - @TestMetadata("kt2477.kt") public void testKt2477() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2477.kt"); @@ -413,12 +449,6 @@ public class ClassesTestGenerated extends AbstractClassesTest { doTest(fileName); } - @TestMetadata("kt2607.kt") - public void testKt2607() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2607.kt"); - doTest(fileName); - } - @TestMetadata("kt2626.kt") public void testKt2626() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2626.kt"); @@ -485,12 +515,6 @@ public class ClassesTestGenerated extends AbstractClassesTest { doTest(fileName); } - @TestMetadata("kt496.kt") - public void testKt496() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt496.kt"); - doTest(fileName); - } - @TestMetadata("kt500.kt") public void testKt500() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt500.kt"); @@ -503,24 +527,12 @@ public class ClassesTestGenerated extends AbstractClassesTest { doTest(fileName); } - @TestMetadata("kt504.kt") - public void testKt504() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt504.kt"); - doTest(fileName); - } - @TestMetadata("kt508.kt") public void testKt508() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt508.kt"); doTest(fileName); } - @TestMetadata("kt5347.kt") - public void testKt5347() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt5347.kt"); - doTest(fileName); - } - @TestMetadata("kt6136.kt") public void testKt6136() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt6136.kt"); @@ -533,12 +545,6 @@ public class ClassesTestGenerated extends AbstractClassesTest { doTest(fileName); } - @TestMetadata("kt707.kt") - public void testKt707() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt707.kt"); - doTest(fileName); - } - @TestMetadata("kt723.kt") public void testKt723() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt723.kt"); @@ -551,12 +557,6 @@ public class ClassesTestGenerated extends AbstractClassesTest { doTest(fileName); } - @TestMetadata("kt8011a.kt") - public void testKt8011a() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt8011a.kt"); - doTest(fileName); - } - @TestMetadata("kt903.kt") public void testKt903() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt903.kt"); diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ClosuresTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ClosuresTestGenerated.java deleted file mode 100644 index 15737cee748..00000000000 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ClosuresTestGenerated.java +++ /dev/null @@ -1,325 +0,0 @@ -/* - * Copyright 2010-2015 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. - */ - -package org.jetbrains.kotlin.js.test.semantics; - -import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.KotlinTestUtils; -import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.runner.RunWith; - -import java.io.File; -import java.util.regex.Pattern; - -/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ -@SuppressWarnings("all") -@TestMetadata("compiler/testData/codegen/box/closures") -@TestDataPath("$PROJECT_ROOT") -@RunWith(JUnit3RunnerWithInners.class) -public class ClosuresTestGenerated extends AbstractClosuresTest { - public void testAllFilesPresentInClosures() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/closures"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("captureExtensionReceiver.kt") - public void testCaptureExtensionReceiver() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/captureExtensionReceiver.kt"); - doTest(fileName); - } - - @TestMetadata("capturedLocalGenericFun.kt") - public void testCapturedLocalGenericFun() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/capturedLocalGenericFun.kt"); - doTest(fileName); - } - - @TestMetadata("closureInsideConstrucor.kt") - public void testClosureInsideConstrucor() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/closureInsideConstrucor.kt"); - doTest(fileName); - } - - @TestMetadata("closureOnTopLevel1.kt") - public void testClosureOnTopLevel1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/closureOnTopLevel1.kt"); - doTest(fileName); - } - - @TestMetadata("closureOnTopLevel2.kt") - public void testClosureOnTopLevel2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/closureOnTopLevel2.kt"); - doTest(fileName); - } - - @TestMetadata("closureWithParameter.kt") - public void testClosureWithParameter() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/closureWithParameter.kt"); - doTest(fileName); - } - - @TestMetadata("closureWithParameterAndBoxing.kt") - public void testClosureWithParameterAndBoxing() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/closureWithParameterAndBoxing.kt"); - doTest(fileName); - } - - @TestMetadata("doubleEnclosedLocalVariable.kt") - public void testDoubleEnclosedLocalVariable() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/doubleEnclosedLocalVariable.kt"); - doTest(fileName); - } - - @TestMetadata("enclosingLocalVariable.kt") - public void testEnclosingLocalVariable() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/enclosingLocalVariable.kt"); - doTest(fileName); - } - - @TestMetadata("enclosingThis.kt") - public void testEnclosingThis() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/enclosingThis.kt"); - doTest(fileName); - } - - @TestMetadata("extensionClosure.kt") - public void testExtensionClosure() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/extensionClosure.kt"); - doTest(fileName); - } - - @TestMetadata("kt10044.kt") - public void testKt10044() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/kt10044.kt"); - doTest(fileName); - } - - @TestMetadata("kt2151.kt") - public void testKt2151() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/kt2151.kt"); - doTest(fileName); - } - - @TestMetadata("kt3152.kt") - public void testKt3152() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/kt3152.kt"); - doTest(fileName); - } - - @TestMetadata("kt3523.kt") - public void testKt3523() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/kt3523.kt"); - doTest(fileName); - } - - @TestMetadata("kt3738.kt") - public void testKt3738() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/kt3738.kt"); - doTest(fileName); - } - - @TestMetadata("kt3905.kt") - public void testKt3905() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/kt3905.kt"); - doTest(fileName); - } - - @TestMetadata("kt4106.kt") - public void testKt4106() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/kt4106.kt"); - doTest(fileName); - } - - @TestMetadata("kt4137.kt") - public void testKt4137() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/kt4137.kt"); - doTest(fileName); - } - - @TestMetadata("kt5589.kt") - public void testKt5589() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/kt5589.kt"); - doTest(fileName); - } - - @TestMetadata("localClassFunClosure.kt") - public void testLocalClassFunClosure() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/localClassFunClosure.kt"); - doTest(fileName); - } - - @TestMetadata("localClassLambdaClosure.kt") - public void testLocalClassLambdaClosure() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/localClassLambdaClosure.kt"); - doTest(fileName); - } - - @TestMetadata("localFunctionInFunction.kt") - public void testLocalFunctionInFunction() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/localFunctionInFunction.kt"); - doTest(fileName); - } - - @TestMetadata("localFunctionInInitializer.kt") - public void testLocalFunctionInInitializer() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/localFunctionInInitializer.kt"); - doTest(fileName); - } - - @TestMetadata("localGenericFun.kt") - public void testLocalGenericFun() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/localGenericFun.kt"); - doTest(fileName); - } - - @TestMetadata("localReturn.kt") - public void testLocalReturn() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/localReturn.kt"); - doTest(fileName); - } - - @TestMetadata("localReturnWithAutolabel.kt") - public void testLocalReturnWithAutolabel() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/localReturnWithAutolabel.kt"); - doTest(fileName); - } - - @TestMetadata("recursiveClosure.kt") - public void testRecursiveClosure() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/recursiveClosure.kt"); - doTest(fileName); - } - - @TestMetadata("simplestClosure.kt") - public void testSimplestClosure() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/simplestClosure.kt"); - doTest(fileName); - } - - @TestMetadata("simplestClosureAndBoxing.kt") - public void testSimplestClosureAndBoxing() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/simplestClosureAndBoxing.kt"); - doTest(fileName); - } - - @TestMetadata("subclosuresWithinInitializers.kt") - public void testSubclosuresWithinInitializers() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/subclosuresWithinInitializers.kt"); - doTest(fileName); - } - - @TestMetadata("compiler/testData/codegen/box/closures/captureOuterProperty") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class CaptureOuterProperty extends AbstractClosuresTest { - public void testAllFilesPresentInCaptureOuterProperty() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/closures/captureOuterProperty"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("captureFunctionInProperty.kt") - public void testCaptureFunctionInProperty() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/captureOuterProperty/captureFunctionInProperty.kt"); - doTest(fileName); - } - - @TestMetadata("inFunction.kt") - public void testInFunction() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/captureOuterProperty/inFunction.kt"); - doTest(fileName); - } - - @TestMetadata("inProperty.kt") - public void testInProperty() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/captureOuterProperty/inProperty.kt"); - doTest(fileName); - } - - @TestMetadata("inPropertyDeepObjectChain.kt") - public void testInPropertyDeepObjectChain() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/captureOuterProperty/inPropertyDeepObjectChain.kt"); - doTest(fileName); - } - - @TestMetadata("inPropertyFromSuperClass.kt") - public void testInPropertyFromSuperClass() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/captureOuterProperty/inPropertyFromSuperClass.kt"); - doTest(fileName); - } - - @TestMetadata("inPropertyFromSuperSuperClass.kt") - public void testInPropertyFromSuperSuperClass() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/captureOuterProperty/inPropertyFromSuperSuperClass.kt"); - doTest(fileName); - } - - @TestMetadata("kt4176.kt") - public void testKt4176() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/captureOuterProperty/kt4176.kt"); - doTest(fileName); - } - - @TestMetadata("kt4656.kt") - public void testKt4656() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/captureOuterProperty/kt4656.kt"); - doTest(fileName); - } - } - - @TestMetadata("compiler/testData/codegen/box/closures/closureInsideClosure") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class ClosureInsideClosure extends AbstractClosuresTest { - public void testAllFilesPresentInClosureInsideClosure() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/closures/closureInsideClosure"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("localFunInsideLocalFun.kt") - public void testLocalFunInsideLocalFun() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/closureInsideClosure/localFunInsideLocalFun.kt"); - doTest(fileName); - } - - @TestMetadata("localFunInsideLocalFunDifferentSignatures.kt") - public void testLocalFunInsideLocalFunDifferentSignatures() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/closureInsideClosure/localFunInsideLocalFunDifferentSignatures.kt"); - doTest(fileName); - } - - @TestMetadata("propertyAndFunctionNameClash.kt") - public void testPropertyAndFunctionNameClash() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/closureInsideClosure/propertyAndFunctionNameClash.kt"); - doTest(fileName); - } - - @TestMetadata("threeLevels.kt") - public void testThreeLevels() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/closureInsideClosure/threeLevels.kt"); - doTest(fileName); - } - - @TestMetadata("threeLevelsDifferentSignatures.kt") - public void testThreeLevelsDifferentSignatures() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/closureInsideClosure/threeLevelsDifferentSignatures.kt"); - doTest(fileName); - } - - @TestMetadata("varAsFunInsideLocalFun.kt") - public void testVarAsFunInsideLocalFun() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/closureInsideClosure/varAsFunInsideLocalFun.kt"); - doTest(fileName); - } - } -} diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InnerNestedTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InnerNestedTestGenerated.java index d6dc323885a..874adce44b7 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InnerNestedTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InnerNestedTestGenerated.java @@ -31,6 +31,12 @@ import java.util.regex.Pattern; @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public class InnerNestedTestGenerated extends AbstractInnerNestedTest { + @TestMetadata("dataLocalVariable.kt") + public void ignoredDataLocalVariable() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/dataLocalVariable.kt"); + doTest(fileName); + } + public void testAllFilesPresentInInnerNested() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/innerNested"), Pattern.compile("^(.+)\\.kt$"), true); } @@ -47,12 +53,6 @@ public class InnerNestedTestGenerated extends AbstractInnerNestedTest { doTest(fileName); } - @TestMetadata("dataLocalVariable.kt") - public void testDataLocalVariable() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/dataLocalVariable.kt"); - doTest(fileName); - } - @TestMetadata("extensionFun.kt") public void testExtensionFun() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/extensionFun.kt"); diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ObjectsTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ObjectsTestGenerated.java deleted file mode 100644 index 89d6b33991d..00000000000 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ObjectsTestGenerated.java +++ /dev/null @@ -1,289 +0,0 @@ -/* - * Copyright 2010-2015 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. - */ - -package org.jetbrains.kotlin.js.test.semantics; - -import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.KotlinTestUtils; -import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.runner.RunWith; - -import java.io.File; -import java.util.regex.Pattern; - -/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ -@SuppressWarnings("all") -@TestMetadata("compiler/testData/codegen/box/objects") -@TestDataPath("$PROJECT_ROOT") -@RunWith(JUnit3RunnerWithInners.class) -public class ObjectsTestGenerated extends AbstractObjectsTest { - public void testAllFilesPresentInObjects() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/objects"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("anonymousObjectPropertyInitialization.kt") - public void testAnonymousObjectPropertyInitialization() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/anonymousObjectPropertyInitialization.kt"); - doTest(fileName); - } - - @TestMetadata("classCallsProtectedInheritedByCompanion.kt") - public void testClassCallsProtectedInheritedByCompanion() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/classCallsProtectedInheritedByCompanion.kt"); - doTest(fileName); - } - - @TestMetadata("flist.kt") - public void testFlist() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/flist.kt"); - doTest(fileName); - } - - @TestMetadata("initializationOrder.kt") - public void testInitializationOrder() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/initializationOrder.kt"); - doTest(fileName); - } - - @TestMetadata("kt1047.kt") - public void testKt1047() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt1047.kt"); - doTest(fileName); - } - - @TestMetadata("kt1136.kt") - public void testKt1136() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt1136.kt"); - doTest(fileName); - } - - @TestMetadata("kt1186.kt") - public void testKt1186() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt1186.kt"); - doTest(fileName); - } - - @TestMetadata("kt1600.kt") - public void testKt1600() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt1600.kt"); - doTest(fileName); - } - - @TestMetadata("kt1737.kt") - public void testKt1737() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt1737.kt"); - doTest(fileName); - } - - @TestMetadata("kt2398.kt") - public void testKt2398() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt2398.kt"); - doTest(fileName); - } - - @TestMetadata("kt2663.kt") - public void testKt2663() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt2663.kt"); - doTest(fileName); - } - - @TestMetadata("kt2663_2.kt") - public void testKt2663_2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt2663_2.kt"); - doTest(fileName); - } - - @TestMetadata("kt2675.kt") - public void testKt2675() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt2675.kt"); - doTest(fileName); - } - - @TestMetadata("kt2719.kt") - public void testKt2719() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt2719.kt"); - doTest(fileName); - } - - @TestMetadata("kt2822.kt") - public void testKt2822() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt2822.kt"); - doTest(fileName); - } - - @TestMetadata("kt3238.kt") - public void testKt3238() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt3238.kt"); - doTest(fileName); - } - - @TestMetadata("kt3684.kt") - public void testKt3684() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt3684.kt"); - doTest(fileName); - } - - @TestMetadata("kt4086.kt") - public void testKt4086() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt4086.kt"); - doTest(fileName); - } - - @TestMetadata("kt535.kt") - public void testKt535() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt535.kt"); - doTest(fileName); - } - - @TestMetadata("kt560.kt") - public void testKt560() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt560.kt"); - doTest(fileName); - } - - @TestMetadata("kt694.kt") - public void testKt694() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt694.kt"); - doTest(fileName); - } - - @TestMetadata("localFunctionInObjectInitializer_kt4516.kt") - public void testLocalFunctionInObjectInitializer_kt4516() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/localFunctionInObjectInitializer_kt4516.kt"); - doTest(fileName); - } - - @TestMetadata("methodOnObject.kt") - public void testMethodOnObject() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/methodOnObject.kt"); - doTest(fileName); - } - - @TestMetadata("nestedDerivedClassCallsProtectedFromCompanion.kt") - public void testNestedDerivedClassCallsProtectedFromCompanion() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/nestedDerivedClassCallsProtectedFromCompanion.kt"); - doTest(fileName); - } - - @TestMetadata("nestedObjectWithSuperclass.kt") - public void testNestedObjectWithSuperclass() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/nestedObjectWithSuperclass.kt"); - doTest(fileName); - } - - @TestMetadata("objectExtendsInnerAndReferencesOuterMember.kt") - public void testObjectExtendsInnerAndReferencesOuterMember() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/objectExtendsInnerAndReferencesOuterMember.kt"); - doTest(fileName); - } - - @TestMetadata("objectInLocalAnonymousObject.kt") - public void testObjectInLocalAnonymousObject() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/objectInLocalAnonymousObject.kt"); - doTest(fileName); - } - - @TestMetadata("objectInitialization_kt5523.kt") - public void testObjectInitialization_kt5523() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/objectInitialization_kt5523.kt"); - doTest(fileName); - } - - @TestMetadata("objectLiteral.kt") - public void testObjectLiteral() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/objectLiteral.kt"); - doTest(fileName); - } - - @TestMetadata("objectLiteralInClosure.kt") - public void testObjectLiteralInClosure() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/objectLiteralInClosure.kt"); - doTest(fileName); - } - - @TestMetadata("objectVsClassInitialization_kt5291.kt") - public void testObjectVsClassInitialization_kt5291() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/objectVsClassInitialization_kt5291.kt"); - doTest(fileName); - } - - @TestMetadata("objectWithSuperclass.kt") - public void testObjectWithSuperclass() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/objectWithSuperclass.kt"); - doTest(fileName); - } - - @TestMetadata("objectWithSuperclassAndTrait.kt") - public void testObjectWithSuperclassAndTrait() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/objectWithSuperclassAndTrait.kt"); - doTest(fileName); - } - - @TestMetadata("privateExtensionFromInitializer_kt4543.kt") - public void testPrivateExtensionFromInitializer_kt4543() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/privateExtensionFromInitializer_kt4543.kt"); - doTest(fileName); - } - - @TestMetadata("privateFunctionFromClosureInInitializer_kt5582.kt") - public void testPrivateFunctionFromClosureInInitializer_kt5582() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/privateFunctionFromClosureInInitializer_kt5582.kt"); - doTest(fileName); - } - - @TestMetadata("receiverInConstructor.kt") - public void testReceiverInConstructor() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/receiverInConstructor.kt"); - doTest(fileName); - } - - @TestMetadata("safeAccess.kt") - public void testSafeAccess() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/safeAccess.kt"); - doTest(fileName); - } - - @TestMetadata("simpleObject.kt") - public void testSimpleObject() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/simpleObject.kt"); - doTest(fileName); - } - - @TestMetadata("thisInConstructor.kt") - public void testThisInConstructor() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/thisInConstructor.kt"); - doTest(fileName); - } - - @TestMetadata("useAnonymousObjectAsIterator.kt") - public void testUseAnonymousObjectAsIterator() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/useAnonymousObjectAsIterator.kt"); - doTest(fileName); - } - - @TestMetadata("useImportedMember.kt") - public void testUseImportedMember() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/useImportedMember.kt"); - doTest(fileName); - } - - @TestMetadata("useImportedMemberFromCompanion.kt") - public void testUseImportedMemberFromCompanion() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/useImportedMemberFromCompanion.kt"); - doTest(fileName); - } -} diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/abstractClassesForGeneratedTests.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/abstractClassesForGeneratedTests.kt index cd8ffcca4fc..6caeb820b9d 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/abstractClassesForGeneratedTests.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/abstractClassesForGeneratedTests.kt @@ -58,8 +58,4 @@ abstract class AbstractInnerNestedTest : AbstractBlackBoxTest("innerNested/") abstract class AbstractClassesTest : AbstractBlackBoxTest("classes/") -abstract class AbstractClosuresTest : AbstractBlackBoxTest("closures/") - -abstract class AbstractObjectsTest : AbstractBlackBoxTest("objects/") - abstract class AbstractSuperTest : AbstractBlackBoxTest("super/")