From bbf4c56c067c100ff462e775ba3bab37f5d16624 Mon Sep 17 00:00:00 2001 From: Mikhail Zarechenskiy Date: Fri, 15 Sep 2017 11:47:16 +0300 Subject: [PATCH] Update generated tests --- .../CompilerLightClassTestGenerated.java | 47 +++++++++++-------- .../IdeCompiledLightClassTestGenerated.java | 33 ++++++++++--- .../resolve/IdeLightClassTestGenerated.java | 37 +++++++++++---- 3 files changed, 84 insertions(+), 33 deletions(-) diff --git a/compiler/tests/org/jetbrains/kotlin/asJava/CompilerLightClassTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/asJava/CompilerLightClassTestGenerated.java index cab1938a04c..d6992108432 100644 --- a/compiler/tests/org/jetbrains/kotlin/asJava/CompilerLightClassTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/asJava/CompilerLightClassTestGenerated.java @@ -33,7 +33,7 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class CompilerLightClassTestGenerated extends AbstractCompilerLightClassTest { public void testAllFilesPresentInLightClasses() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true, "local", "ideRegression"); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), TargetBackend.ANY, true, "local", "ideRegression"); } @TestMetadata("AnnotationClass.kt") @@ -161,7 +161,7 @@ public class CompilerLightClassTestGenerated extends AbstractCompilerLightClassT @RunWith(JUnit3RunnerWithInners.class) public static class CompilationErrors extends AbstractCompilerLightClassTest { public void testAllFilesPresentInCompilationErrors() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/compilationErrors"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/compilationErrors"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), TargetBackend.ANY, true); } @TestMetadata("AnnotationModifiers.kt") @@ -212,7 +212,7 @@ public class CompilerLightClassTestGenerated extends AbstractCompilerLightClassT @RunWith(JUnit3RunnerWithInners.class) public static class Delegation extends AbstractCompilerLightClassTest { public void testAllFilesPresentInDelegation() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/delegation"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/delegation"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), TargetBackend.ANY, true); } @TestMetadata("Function.kt") @@ -226,12 +226,6 @@ public class CompilerLightClassTestGenerated extends AbstractCompilerLightClassT String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/delegation/Property.kt"); doTest(fileName); } - - @TestMetadata("WithPlatformTypes.NoCompile.kt") - public void testWithPlatformTypes_NoCompile() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/delegation/WithPlatformTypes.NoCompile.kt"); - doTest(fileName); - } } @TestMetadata("compiler/testData/asJava/lightClasses/facades") @@ -239,13 +233,7 @@ public class CompilerLightClassTestGenerated extends AbstractCompilerLightClassT @RunWith(JUnit3RunnerWithInners.class) public static class Facades extends AbstractCompilerLightClassTest { public void testAllFilesPresentInFacades() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/facades"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); - } - - @TestMetadata("EmptyFile.NoCompile.kt") - public void testEmptyFile_NoCompile() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/facades/EmptyFile.NoCompile.kt"); - doTest(fileName); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/facades"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), TargetBackend.ANY, true); } @TestMetadata("MultiFile.kt") @@ -272,7 +260,7 @@ public class CompilerLightClassTestGenerated extends AbstractCompilerLightClassT @RunWith(JUnit3RunnerWithInners.class) public static class NullabilityAnnotations extends AbstractCompilerLightClassTest { public void testAllFilesPresentInNullabilityAnnotations() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/nullabilityAnnotations"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/nullabilityAnnotations"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), TargetBackend.ANY, true); } @TestMetadata("Class.kt") @@ -389,7 +377,7 @@ public class CompilerLightClassTestGenerated extends AbstractCompilerLightClassT @RunWith(JUnit3RunnerWithInners.class) public static class Object extends AbstractCompilerLightClassTest { public void testAllFilesPresentInObject() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/object"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/object"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), TargetBackend.ANY, true); } @TestMetadata("SimpleObject.kt") @@ -404,7 +392,7 @@ public class CompilerLightClassTestGenerated extends AbstractCompilerLightClassT @RunWith(JUnit3RunnerWithInners.class) public static class PublicField extends AbstractCompilerLightClassTest { public void testAllFilesPresentInPublicField() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/publicField"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/publicField"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), TargetBackend.ANY, true); } @TestMetadata("CompanionObject.kt") @@ -419,4 +407,25 @@ public class CompilerLightClassTestGenerated extends AbstractCompilerLightClassT doTest(fileName); } } + + @TestMetadata("compiler/testData/asJava/lightClasses/script") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class Script extends AbstractCompilerLightClassTest { + public void testAllFilesPresentInScript() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/script"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), TargetBackend.ANY, true); + } + + @TestMetadata("HelloWorld.kts") + public void testHelloWorld() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/script/HelloWorld.kts"); + doTest(fileName); + } + + @TestMetadata("InnerClasses.kts") + public void testInnerClasses() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/script/InnerClasses.kts"); + doTest(fileName); + } + } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeCompiledLightClassTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeCompiledLightClassTestGenerated.java index cadfcabdf8e..fc0d2b63c2d 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeCompiledLightClassTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeCompiledLightClassTestGenerated.java @@ -33,7 +33,7 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class IdeCompiledLightClassTestGenerated extends AbstractIdeCompiledLightClassTest { public void testAllFilesPresentInLightClasses() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses"), Pattern.compile("^([^.]+)\\.kt$"), TargetBackend.ANY, true, "local", "compilationErrors", "ideRegression"); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), TargetBackend.ANY, true, "local", "compilationErrors", "ideRegression"); } @TestMetadata("AnnotationClass.kt") @@ -161,7 +161,7 @@ public class IdeCompiledLightClassTestGenerated extends AbstractIdeCompiledLight @RunWith(JUnit3RunnerWithInners.class) public static class Delegation extends AbstractIdeCompiledLightClassTest { public void testAllFilesPresentInDelegation() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/delegation"), Pattern.compile("^([^.]+)\\.kt$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/delegation"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), TargetBackend.ANY, true); } @TestMetadata("Function.kt") @@ -182,7 +182,7 @@ public class IdeCompiledLightClassTestGenerated extends AbstractIdeCompiledLight @RunWith(JUnit3RunnerWithInners.class) public static class Facades extends AbstractIdeCompiledLightClassTest { public void testAllFilesPresentInFacades() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/facades"), Pattern.compile("^([^.]+)\\.kt$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/facades"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), TargetBackend.ANY, true); } @TestMetadata("MultiFile.kt") @@ -209,7 +209,7 @@ public class IdeCompiledLightClassTestGenerated extends AbstractIdeCompiledLight @RunWith(JUnit3RunnerWithInners.class) public static class NullabilityAnnotations extends AbstractIdeCompiledLightClassTest { public void testAllFilesPresentInNullabilityAnnotations() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/nullabilityAnnotations"), Pattern.compile("^([^.]+)\\.kt$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/nullabilityAnnotations"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), TargetBackend.ANY, true); } @TestMetadata("Class.kt") @@ -326,7 +326,7 @@ public class IdeCompiledLightClassTestGenerated extends AbstractIdeCompiledLight @RunWith(JUnit3RunnerWithInners.class) public static class Object extends AbstractIdeCompiledLightClassTest { public void testAllFilesPresentInObject() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/object"), Pattern.compile("^([^.]+)\\.kt$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/object"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), TargetBackend.ANY, true); } @TestMetadata("SimpleObject.kt") @@ -341,7 +341,7 @@ public class IdeCompiledLightClassTestGenerated extends AbstractIdeCompiledLight @RunWith(JUnit3RunnerWithInners.class) public static class PublicField extends AbstractIdeCompiledLightClassTest { public void testAllFilesPresentInPublicField() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/publicField"), Pattern.compile("^([^.]+)\\.kt$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/publicField"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), TargetBackend.ANY, true); } @TestMetadata("CompanionObject.kt") @@ -356,4 +356,25 @@ public class IdeCompiledLightClassTestGenerated extends AbstractIdeCompiledLight doTest(fileName); } } + + @TestMetadata("compiler/testData/asJava/lightClasses/script") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class Script extends AbstractIdeCompiledLightClassTest { + public void testAllFilesPresentInScript() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/script"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), TargetBackend.ANY, true); + } + + @TestMetadata("HelloWorld.kts") + public void testHelloWorld() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/script/HelloWorld.kts"); + doTest(fileName); + } + + @TestMetadata("InnerClasses.kts") + public void testInnerClasses() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/script/InnerClasses.kts"); + doTest(fileName); + } + } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeLightClassTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeLightClassTestGenerated.java index 75c845fefdc..f3ccf19ce7f 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeLightClassTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeLightClassTestGenerated.java @@ -33,7 +33,7 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class IdeLightClassTestGenerated extends AbstractIdeLightClassTest { public void testAllFilesPresentInLightClasses() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses"), Pattern.compile("^([^.]+)\\.kt$"), TargetBackend.ANY, true, "delegation"); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), TargetBackend.ANY, true, "delegation"); } @TestMetadata("AnnotationClass.kt") @@ -161,7 +161,7 @@ public class IdeLightClassTestGenerated extends AbstractIdeLightClassTest { @RunWith(JUnit3RunnerWithInners.class) public static class CompilationErrors extends AbstractIdeLightClassTest { public void testAllFilesPresentInCompilationErrors() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/compilationErrors"), Pattern.compile("^([^.]+)\\.kt$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/compilationErrors"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), TargetBackend.ANY, true); } @TestMetadata("AnnotationModifiers.kt") @@ -212,7 +212,7 @@ public class IdeLightClassTestGenerated extends AbstractIdeLightClassTest { @RunWith(JUnit3RunnerWithInners.class) public static class Facades extends AbstractIdeLightClassTest { public void testAllFilesPresentInFacades() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/facades"), Pattern.compile("^([^.]+)\\.kt$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/facades"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), TargetBackend.ANY, true); } @TestMetadata("MultiFile.kt") @@ -239,7 +239,7 @@ public class IdeLightClassTestGenerated extends AbstractIdeLightClassTest { @RunWith(JUnit3RunnerWithInners.class) public static class IdeRegression extends AbstractIdeLightClassTest { public void testAllFilesPresentInIdeRegression() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/ideRegression"), Pattern.compile("^([^.]+)\\.kt$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/ideRegression"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), TargetBackend.ANY, true); } @TestMetadata("AllOpenAnnotatedClasses.kt") @@ -296,7 +296,7 @@ public class IdeLightClassTestGenerated extends AbstractIdeLightClassTest { @RunWith(JUnit3RunnerWithInners.class) public static class Local extends AbstractIdeLightClassTest { public void testAllFilesPresentInLocal() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/local"), Pattern.compile("^([^.]+)\\.kt$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/local"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), TargetBackend.ANY, true); } @TestMetadata("DollarsInNameLocal.kt") @@ -311,7 +311,7 @@ public class IdeLightClassTestGenerated extends AbstractIdeLightClassTest { @RunWith(JUnit3RunnerWithInners.class) public static class NullabilityAnnotations extends AbstractIdeLightClassTest { public void testAllFilesPresentInNullabilityAnnotations() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/nullabilityAnnotations"), Pattern.compile("^([^.]+)\\.kt$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/nullabilityAnnotations"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), TargetBackend.ANY, true); } @TestMetadata("Class.kt") @@ -428,7 +428,7 @@ public class IdeLightClassTestGenerated extends AbstractIdeLightClassTest { @RunWith(JUnit3RunnerWithInners.class) public static class Object extends AbstractIdeLightClassTest { public void testAllFilesPresentInObject() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/object"), Pattern.compile("^([^.]+)\\.kt$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/object"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), TargetBackend.ANY, true); } @TestMetadata("SimpleObject.kt") @@ -443,7 +443,7 @@ public class IdeLightClassTestGenerated extends AbstractIdeLightClassTest { @RunWith(JUnit3RunnerWithInners.class) public static class PublicField extends AbstractIdeLightClassTest { public void testAllFilesPresentInPublicField() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/publicField"), Pattern.compile("^([^.]+)\\.kt$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/publicField"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), TargetBackend.ANY, true); } @TestMetadata("CompanionObject.kt") @@ -458,4 +458,25 @@ public class IdeLightClassTestGenerated extends AbstractIdeLightClassTest { doTest(fileName); } } + + @TestMetadata("compiler/testData/asJava/lightClasses/script") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class Script extends AbstractIdeLightClassTest { + public void testAllFilesPresentInScript() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/script"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), TargetBackend.ANY, true); + } + + @TestMetadata("HelloWorld.kts") + public void testHelloWorld() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/script/HelloWorld.kts"); + doTest(fileName); + } + + @TestMetadata("InnerClasses.kts") + public void testInnerClasses() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/script/InnerClasses.kts"); + doTest(fileName); + } + } }