Remove leftovers of platformName and platformStatic in test data

Drop unnecessary imports, rename some tests
2016-03-02 16:47:04 +03:00
parent beb11e7ac1
commit 8e77e16bbd
55 changed files with 168 additions and 191 deletions
@@ -508,6 +508,57 @@ public class DiagnosticsTestWithStdLibGenerated extends AbstractDiagnosticsTestW
            }
        }

+        @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class JvmStatic extends AbstractDiagnosticsTestWithStdLib {
+            public void testAllFilesPresentInJvmStatic() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic"), Pattern.compile("^(.+)\\.kt$"), true);
+            }
+
+            @TestMetadata("constOrJvmFieldProperty.kt")
+            public void testConstOrJvmFieldProperty() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/constOrJvmFieldProperty.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("constructorProperty.kt")
+            public void testConstructorProperty() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/constructorProperty.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("constructors.kt")
+            public void testConstructors() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/constructors.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("finalAndAbstract.kt")
+            public void testFinalAndAbstract() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/finalAndAbstract.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("functions.kt")
+            public void testFunctions() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/functions.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("localFun.kt")
+            public void testLocalFun() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/localFun.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("property.kt")
+            public void testProperty() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/property.kt");
+                doTest(fileName);
+            }
+        }
+
        @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/kClass")
        @TestDataPath("$PROJECT_ROOT")
        @RunWith(JUnit3RunnerWithInners.class)
@@ -559,57 +610,6 @@ public class DiagnosticsTestWithStdLibGenerated extends AbstractDiagnosticsTestW
            }
        }

-        @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class PlatformStatic extends AbstractDiagnosticsTestWithStdLib {
-            public void testAllFilesPresentInPlatformStatic() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic"), Pattern.compile("^(.+)\\.kt$"), true);
-            }
-
-            @TestMetadata("constOrJvmFieldProperty.kt")
-            public void testConstOrJvmFieldProperty() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/constOrJvmFieldProperty.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("constructorProperty.kt")
-            public void testConstructorProperty() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/constructorProperty.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("constructors.kt")
-            public void testConstructors() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/constructors.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("finalAndAbstract.kt")
-            public void testFinalAndAbstract() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/finalAndAbstract.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("functions.kt")
-            public void testFunctions() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/functions.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("localFun.kt")
-            public void testLocalFun() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/localFun.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("property.kt")
-            public void testProperty() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/property.kt");
-                doTest(fileName);
-            }
-        }
-
        @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument")
        @TestDataPath("$PROJECT_ROOT")
        @RunWith(JUnit3RunnerWithInners.class)
@@ -691,33 +691,33 @@ public class DiagnosticsTestWithStdLibGenerated extends AbstractDiagnosticsTestW
            doTest(fileName);
        }

+        @TestMetadata("jvmNames.kt")
+        public void testJvmNames() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmNames.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("jvmNamesDuplicate.kt")
+        public void testJvmNamesDuplicate() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmNamesDuplicate.kt");
+            doTest(fileName);
+        }
+
        @TestMetadata("jvmOverloads.kt")
        public void testJvmOverloads() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmOverloads.kt");
            doTest(fileName);
        }

-        @TestMetadata("platformNames.kt")
-        public void testPlatformNames() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNames.kt");
+        @TestMetadata("jvmStaticInClassObject.kt")
+        public void testJvmStaticInClassObject() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInClassObject.kt");
            doTest(fileName);
        }

-        @TestMetadata("platformNamesDuplicate.kt")
-        public void testPlatformNamesDuplicate() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNamesDuplicate.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("platformStaticInClassObject.kt")
-        public void testPlatformStaticInClassObject() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInClassObject.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("platformStaticInObject.kt")
-        public void testPlatformStaticInObject() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInObject.kt");
+        @TestMetadata("jvmStaticInObject.kt")
+        public void testJvmStaticInObject() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInObject.kt");
            doTest(fileName);
        }

@@ -3324,6 +3324,18 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
                doTestWithStdlib(fileName);
            }

+            @TestMetadata("jvmStatic.kt")
+            public void testJvmStatic() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/jvmStatic.kt");
+                doTestWithStdlib(fileName);
+            }
+
+            @TestMetadata("jvmStaticInObjectIncorrectReceiver.kt")
+            public void testJvmStaticInObjectIncorrectReceiver() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/jvmStaticInObjectIncorrectReceiver.kt");
+                doTestWithStdlib(fileName);
+            }
+
            @TestMetadata("localClassMember.kt")
            public void testLocalClassMember() throws Exception {
                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/localClassMember.kt");
@@ -3336,18 +3348,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
                doTestWithStdlib(fileName);
            }

-            @TestMetadata("platformStatic.kt")
-            public void testPlatformStatic() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/platformStatic.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("platformStaticInObjectIncorrectReceiver.kt")
-            public void testPlatformStaticInObjectIncorrectReceiver() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/platformStaticInObjectIncorrectReceiver.kt");
-                doTestWithStdlib(fileName);
-            }
-
            @TestMetadata("privateProperty.kt")
            public void testPrivateProperty() throws Exception {
                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/privateProperty.kt");
@@ -3405,6 +3405,12 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
                doTestWithStdlib(fileName);
            }

+            @TestMetadata("jvmStaticInObject.kt")
+            public void testJvmStaticInObject() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/callBy/jvmStaticInObject.kt");
+                doTestWithStdlib(fileName);
+            }
+
            @TestMetadata("manyArgumentsOnlyOneDefault.kt")
            public void testManyArgumentsOnlyOneDefault() throws Exception {
                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/callBy/manyArgumentsOnlyOneDefault.kt");
@@ -3435,12 +3441,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
                doTestWithStdlib(fileName);
            }

-            @TestMetadata("platformStaticInObject.kt")
-            public void testPlatformStaticInObject() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/callBy/platformStaticInObject.kt");
-                doTestWithStdlib(fileName);
-            }
-
            @TestMetadata("primitiveDefaultValues.kt")
            public void testPrimitiveDefaultValues() throws Exception {
                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/callBy/primitiveDefaultValues.kt");
@@ -3981,23 +3981,23 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
                doTestWithStdlib(fileName);
            }

-            @TestMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/platformStatic")
+            @TestMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/jvmStatic")
            @TestDataPath("$PROJECT_ROOT")
            @RunWith(JUnit3RunnerWithInners.class)
-            public static class PlatformStatic extends AbstractBlackBoxCodegenTest {
-                public void testAllFilesPresentInPlatformStatic() throws Exception {
-                    KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/mapping/platformStatic"), Pattern.compile("^(.+)\\.kt$"), true);
+            public static class JvmStatic extends AbstractBlackBoxCodegenTest {
+                public void testAllFilesPresentInJvmStatic() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/mapping/jvmStatic"), Pattern.compile("^(.+)\\.kt$"), true);
                }

                @TestMetadata("companionObjectFunction.kt")
                public void testCompanionObjectFunction() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/platformStatic/companionObjectFunction.kt");
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/jvmStatic/companionObjectFunction.kt");
                    doTestWithStdlib(fileName);
                }

                @TestMetadata("objectFunction.kt")
                public void testObjectFunction() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/platformStatic/objectFunction.kt");
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/jvmStatic/objectFunction.kt");
                    doTestWithStdlib(fileName);
                }
            }
@@ -4326,9 +4326,9 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
                doTestWithStdlib(fileName);
            }

-            @TestMetadata("privatePlatformStaticVarInObject.kt")
-            public void testPrivatePlatformStaticVarInObject() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/privatePlatformStaticVarInObject.kt");
+            @TestMetadata("privateJvmStaticVarInObject.kt")
+            public void testPrivateJvmStaticVarInObject() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/privateJvmStaticVarInObject.kt");
                doTestWithStdlib(fileName);
            }

@@ -137,6 +137,39 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg
        }
    }

+    @TestMetadata("compiler/testData/compileJavaAgainstKotlin/jvmStatic")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class JvmStatic extends AbstractCompileJavaAgainstKotlinTest {
+        public void testAllFilesPresentInJvmStatic() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/jvmStatic"), Pattern.compile("^(.+)\\.kt$"), true);
+        }
+
+        @TestMetadata("simpleCompanionObject.kt")
+        public void testSimpleCompanionObject() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleCompanionObject.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("simpleCompanionObjectProperty.kt")
+        public void testSimpleCompanionObjectProperty() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleCompanionObjectProperty.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("simpleObject.kt")
+        public void testSimpleObject() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleObject.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("simpleObjectProperty.kt")
+        public void testSimpleObjectProperty() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleObjectProperty.kt");
+            doTest(fileName);
+        }
+    }
+
    @TestMetadata("compiler/testData/compileJavaAgainstKotlin/method")
    @TestDataPath("$PROJECT_ROOT")
    @RunWith(JUnit3RunnerWithInners.class)
@@ -425,39 +458,6 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg
        }
    }

-    @TestMetadata("compiler/testData/compileJavaAgainstKotlin/platformStatic")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class PlatformStatic extends AbstractCompileJavaAgainstKotlinTest {
-        public void testAllFilesPresentInPlatformStatic() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/platformStatic"), Pattern.compile("^(.+)\\.kt$"), true);
-        }
-
-        @TestMetadata("simpleClassObject.kt")
-        public void testSimpleClassObject() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleClassObject.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("simpleClassObjectProperty.kt")
-        public void testSimpleClassObjectProperty() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleClassObjectProperty.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("simpleObject.kt")
-        public void testSimpleObject() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleObject.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("simpleObjectProperty.kt")
-        public void testSimpleObjectProperty() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleObjectProperty.kt");
-            doTest(fileName);
-        }
-    }
-
    @TestMetadata("compiler/testData/compileJavaAgainstKotlin/property")
    @TestDataPath("$PROJECT_ROOT")
    @RunWith(JUnit3RunnerWithInners.class)