From 4a182ac6e215c0b923066195ea8c9af40a68cddf Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Thu, 5 Nov 2015 13:05:35 +0300 Subject: [PATCH] Fixing class names after rebase --- .../test/JSBasicCompletionTestGenerated.java | 16 ++++++++-------- .../test/JvmBasicCompletionTestGenerated.java | 16 ++++++++-------- ...MultiFileJvmBasicCompletionTestGenerated.java | 2 +- .../BasicCompletionHandlerTestGenerated.java | 10 +++++----- .../BasicCompletionWeigherTestGenerated.java | 2 +- .../kotlin/annotation/AnnotationListParseTest.kt | 2 +- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JSBasicCompletionTestGenerated.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JSBasicCompletionTestGenerated.java index 785ab521082..00676404cfb 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JSBasicCompletionTestGenerated.java +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JSBasicCompletionTestGenerated.java @@ -2100,48 +2100,48 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes @RunWith(JUnit3RunnerWithInners.class) public static class StaticMembers extends AbstractJSBasicCompletionTest { public void testAllFilesPresentInStaticMembers() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/staticMembers"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/staticMembers"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ImportsFromObjectNoDuplicates.kt") public void testImportsFromObjectNoDuplicates() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/staticMembers/ImportsFromObjectNoDuplicates.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/staticMembers/ImportsFromObjectNoDuplicates.kt"); doTest(fileName); } @TestMetadata("JavaStaticFields.kt") public void testJavaStaticFields() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/staticMembers/JavaStaticFields.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/staticMembers/JavaStaticFields.kt"); doTest(fileName); } @TestMetadata("JavaStaticFieldsFromImports.kt") public void testJavaStaticFieldsFromImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/staticMembers/JavaStaticFieldsFromImports.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/staticMembers/JavaStaticFieldsFromImports.kt"); doTest(fileName); } @TestMetadata("JavaStaticMethods.kt") public void testJavaStaticMethods() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/staticMembers/JavaStaticMethods.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/staticMembers/JavaStaticMethods.kt"); doTest(fileName); } @TestMetadata("JavaStaticMethodsFromImports.kt") public void testJavaStaticMethodsFromImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/staticMembers/JavaStaticMethodsFromImports.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/staticMembers/JavaStaticMethodsFromImports.kt"); doTest(fileName); } @TestMetadata("JavaStaticMethodsNoDuplicates.kt") public void testJavaStaticMethodsNoDuplicates() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/staticMembers/JavaStaticMethodsNoDuplicates.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/staticMembers/JavaStaticMethodsNoDuplicates.kt"); doTest(fileName); } @TestMetadata("JavaStaticMethodsNoDuplicatesFromBases.kt") public void testJavaStaticMethodsNoDuplicatesFromBases() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/staticMembers/JavaStaticMethodsNoDuplicatesFromBases.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/staticMembers/JavaStaticMethodsNoDuplicatesFromBases.kt"); doTest(fileName); } } diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmBasicCompletionTestGenerated.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmBasicCompletionTestGenerated.java index 14887ff65c0..717f1f80ec9 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmBasicCompletionTestGenerated.java +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmBasicCompletionTestGenerated.java @@ -2100,48 +2100,48 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT @RunWith(JUnit3RunnerWithInners.class) public static class StaticMembers extends AbstractJvmBasicCompletionTest { public void testAllFilesPresentInStaticMembers() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/staticMembers"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/staticMembers"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ImportsFromObjectNoDuplicates.kt") public void testImportsFromObjectNoDuplicates() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/staticMembers/ImportsFromObjectNoDuplicates.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/staticMembers/ImportsFromObjectNoDuplicates.kt"); doTest(fileName); } @TestMetadata("JavaStaticFields.kt") public void testJavaStaticFields() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/staticMembers/JavaStaticFields.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/staticMembers/JavaStaticFields.kt"); doTest(fileName); } @TestMetadata("JavaStaticFieldsFromImports.kt") public void testJavaStaticFieldsFromImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/staticMembers/JavaStaticFieldsFromImports.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/staticMembers/JavaStaticFieldsFromImports.kt"); doTest(fileName); } @TestMetadata("JavaStaticMethods.kt") public void testJavaStaticMethods() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/staticMembers/JavaStaticMethods.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/staticMembers/JavaStaticMethods.kt"); doTest(fileName); } @TestMetadata("JavaStaticMethodsFromImports.kt") public void testJavaStaticMethodsFromImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/staticMembers/JavaStaticMethodsFromImports.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/staticMembers/JavaStaticMethodsFromImports.kt"); doTest(fileName); } @TestMetadata("JavaStaticMethodsNoDuplicates.kt") public void testJavaStaticMethodsNoDuplicates() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/staticMembers/JavaStaticMethodsNoDuplicates.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/staticMembers/JavaStaticMethodsNoDuplicates.kt"); doTest(fileName); } @TestMetadata("JavaStaticMethodsNoDuplicatesFromBases.kt") public void testJavaStaticMethodsNoDuplicatesFromBases() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/staticMembers/JavaStaticMethodsNoDuplicatesFromBases.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/staticMembers/JavaStaticMethodsNoDuplicatesFromBases.kt"); doTest(fileName); } } diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/MultiFileJvmBasicCompletionTestGenerated.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/MultiFileJvmBasicCompletionTestGenerated.java index efadc0584a9..2f33152a18c 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/MultiFileJvmBasicCompletionTestGenerated.java +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/MultiFileJvmBasicCompletionTestGenerated.java @@ -283,7 +283,7 @@ public class MultiFileJvmBasicCompletionTestGenerated extends AbstractMultiFileJ @TestMetadata("ObjectMembers") public void testObjectMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ObjectMembers/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ObjectMembers/"); doTest(fileName); } diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/BasicCompletionHandlerTestGenerated.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/BasicCompletionHandlerTestGenerated.java index 60f9b471547..8e1518e4347 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/BasicCompletionHandlerTestGenerated.java +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/BasicCompletionHandlerTestGenerated.java @@ -535,30 +535,30 @@ public class BasicCompletionHandlerTestGenerated extends AbstractBasicCompletion @RunWith(JUnit3RunnerWithInners.class) public static class StaticMembers extends AbstractBasicCompletionHandlerTest { public void testAllFilesPresentInStaticMembers() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/basic/staticMembers"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/basic/staticMembers"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("classObjectMethod.kt") public void testClassObjectMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/staticMembers/classObjectMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/staticMembers/classObjectMethod.kt"); doTest(fileName); } @TestMetadata("ImportFromCompanionObject.kt") public void testImportFromCompanionObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/staticMembers/ImportFromCompanionObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/staticMembers/ImportFromCompanionObject.kt"); doTest(fileName); } @TestMetadata("ImportJavaStaticMethod.kt") public void testImportJavaStaticMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/staticMembers/ImportJavaStaticMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/staticMembers/ImportJavaStaticMethod.kt"); doTest(fileName); } @TestMetadata("JavaStaticMethod.kt") public void testJavaStaticMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/staticMembers/JavaStaticMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/staticMembers/JavaStaticMethod.kt"); doTest(fileName); } } diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/weighers/BasicCompletionWeigherTestGenerated.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/weighers/BasicCompletionWeigherTestGenerated.java index 387f2b2e64d..154cd2226b4 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/weighers/BasicCompletionWeigherTestGenerated.java +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/weighers/BasicCompletionWeigherTestGenerated.java @@ -157,7 +157,7 @@ public class BasicCompletionWeigherTestGenerated extends AbstractBasicCompletion @TestMetadata("StaticMembers.kt") public void testStaticMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/StaticMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/StaticMembers.kt"); doTest(fileName); } diff --git a/libraries/tools/kotlin-annotation-processing/src/test/kotlin/org/jetbrains/kotlin/annotation/AnnotationListParseTest.kt b/libraries/tools/kotlin-annotation-processing/src/test/kotlin/org/jetbrains/kotlin/annotation/AnnotationListParseTest.kt index d1e25afc77f..2fc1763e460 100644 --- a/libraries/tools/kotlin-annotation-processing/src/test/kotlin/org/jetbrains/kotlin/annotation/AnnotationListParseTest.kt +++ b/libraries/tools/kotlin-annotation-processing/src/test/kotlin/org/jetbrains/kotlin/annotation/AnnotationListParseTest.kt @@ -81,7 +81,7 @@ public class AnnotationListParseTest { assertEqualsToFile(expectedFile, fileContents) } - // JetTestUtils.assertEqualsToFile() is not reachable from here + // KotlinTestUtils.assertEqualsToFile() is not reachable from here public fun assertEqualsToFile(expectedFile: File, actual: String) { val lineSeparator = System.getProperty("line.separator") val actualText = actual.replace(lineSeparator, "\n").trim('\n', ' ', '\t')