From c3ccd6da5745f185dfddd6c45504586e71c4b521 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Thu, 13 Aug 2015 21:22:18 +0300 Subject: [PATCH] Renamed test data folder --- .../kotlin/generators/tests/GenerateTests.kt | 2 +- .../{custom => withLib}/NamedArgumentsJava.kt | 0 .../NamedArgumentsJavaSrc/JavaClass.java | 0 .../NamedArgumentsKotlin.kt | 0 .../NamedArgumentsKotlinSrc/KotlinClass.kt | 0 .../basic/{custom => withLib}/SamAdapter.kt | 0 .../SamAdapterAndGenerics.kt | 0 .../JavaInterface.java | 0 .../SamAdapterAndGenericsSrc/Task.java | 0 .../SamAdapterSrc/JavaClass.java | 0 .../TopLevelNonImportedExtFun.kt | 0 .../TopLevelNonImportedExtFunSrc/source.kt | 0 .../TopLevelNonImportedExtProp.kt | 0 .../TopLevelNonImportedExtPropSrc/source.kt | 0 .../TopLevelNonImportedFun.kt | 0 .../TopLevelNonImportedFunSrc/source.kt | 0 .../TopLevelNonImportedProperty.kt | 0 .../TopLevelNonImportedPropertySrc/source.kt | 0 .../AbstractJvmWithLibBasicCompletionTest.kt | 2 +- ...vmWithLibBasicCompletionTestGenerated.java | 22 +++++++++---------- 20 files changed, 13 insertions(+), 13 deletions(-) rename idea/idea-completion/testData/basic/{custom => withLib}/NamedArgumentsJava.kt (100%) rename idea/idea-completion/testData/basic/{custom => withLib}/NamedArgumentsJavaSrc/JavaClass.java (100%) rename idea/idea-completion/testData/basic/{custom => withLib}/NamedArgumentsKotlin.kt (100%) rename idea/idea-completion/testData/basic/{custom => withLib}/NamedArgumentsKotlinSrc/KotlinClass.kt (100%) rename idea/idea-completion/testData/basic/{custom => withLib}/SamAdapter.kt (100%) rename idea/idea-completion/testData/basic/{custom => withLib}/SamAdapterAndGenerics.kt (100%) rename idea/idea-completion/testData/basic/{custom => withLib}/SamAdapterAndGenericsSrc/JavaInterface.java (100%) rename idea/idea-completion/testData/basic/{custom => withLib}/SamAdapterAndGenericsSrc/Task.java (100%) rename idea/idea-completion/testData/basic/{custom => withLib}/SamAdapterSrc/JavaClass.java (100%) rename idea/idea-completion/testData/basic/{custom => withLib}/TopLevelNonImportedExtFun.kt (100%) rename idea/idea-completion/testData/basic/{custom => withLib}/TopLevelNonImportedExtFunSrc/source.kt (100%) rename idea/idea-completion/testData/basic/{custom => withLib}/TopLevelNonImportedExtProp.kt (100%) rename idea/idea-completion/testData/basic/{custom => withLib}/TopLevelNonImportedExtPropSrc/source.kt (100%) rename idea/idea-completion/testData/basic/{custom => withLib}/TopLevelNonImportedFun.kt (100%) rename idea/idea-completion/testData/basic/{custom => withLib}/TopLevelNonImportedFunSrc/source.kt (100%) rename idea/idea-completion/testData/basic/{custom => withLib}/TopLevelNonImportedProperty.kt (100%) rename idea/idea-completion/testData/basic/{custom => withLib}/TopLevelNonImportedPropertySrc/source.kt (100%) diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index 91fde35147e..5d4633626f3 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -732,7 +732,7 @@ fun main(args: Array) { } testClass(javaClass()) { - model("basic/custom", recursive = false) + model("basic/withLib", recursive = false) } testClass(javaClass()) { diff --git a/idea/idea-completion/testData/basic/custom/NamedArgumentsJava.kt b/idea/idea-completion/testData/basic/withLib/NamedArgumentsJava.kt similarity index 100% rename from idea/idea-completion/testData/basic/custom/NamedArgumentsJava.kt rename to idea/idea-completion/testData/basic/withLib/NamedArgumentsJava.kt diff --git a/idea/idea-completion/testData/basic/custom/NamedArgumentsJavaSrc/JavaClass.java b/idea/idea-completion/testData/basic/withLib/NamedArgumentsJavaSrc/JavaClass.java similarity index 100% rename from idea/idea-completion/testData/basic/custom/NamedArgumentsJavaSrc/JavaClass.java rename to idea/idea-completion/testData/basic/withLib/NamedArgumentsJavaSrc/JavaClass.java diff --git a/idea/idea-completion/testData/basic/custom/NamedArgumentsKotlin.kt b/idea/idea-completion/testData/basic/withLib/NamedArgumentsKotlin.kt similarity index 100% rename from idea/idea-completion/testData/basic/custom/NamedArgumentsKotlin.kt rename to idea/idea-completion/testData/basic/withLib/NamedArgumentsKotlin.kt diff --git a/idea/idea-completion/testData/basic/custom/NamedArgumentsKotlinSrc/KotlinClass.kt b/idea/idea-completion/testData/basic/withLib/NamedArgumentsKotlinSrc/KotlinClass.kt similarity index 100% rename from idea/idea-completion/testData/basic/custom/NamedArgumentsKotlinSrc/KotlinClass.kt rename to idea/idea-completion/testData/basic/withLib/NamedArgumentsKotlinSrc/KotlinClass.kt diff --git a/idea/idea-completion/testData/basic/custom/SamAdapter.kt b/idea/idea-completion/testData/basic/withLib/SamAdapter.kt similarity index 100% rename from idea/idea-completion/testData/basic/custom/SamAdapter.kt rename to idea/idea-completion/testData/basic/withLib/SamAdapter.kt diff --git a/idea/idea-completion/testData/basic/custom/SamAdapterAndGenerics.kt b/idea/idea-completion/testData/basic/withLib/SamAdapterAndGenerics.kt similarity index 100% rename from idea/idea-completion/testData/basic/custom/SamAdapterAndGenerics.kt rename to idea/idea-completion/testData/basic/withLib/SamAdapterAndGenerics.kt diff --git a/idea/idea-completion/testData/basic/custom/SamAdapterAndGenericsSrc/JavaInterface.java b/idea/idea-completion/testData/basic/withLib/SamAdapterAndGenericsSrc/JavaInterface.java similarity index 100% rename from idea/idea-completion/testData/basic/custom/SamAdapterAndGenericsSrc/JavaInterface.java rename to idea/idea-completion/testData/basic/withLib/SamAdapterAndGenericsSrc/JavaInterface.java diff --git a/idea/idea-completion/testData/basic/custom/SamAdapterAndGenericsSrc/Task.java b/idea/idea-completion/testData/basic/withLib/SamAdapterAndGenericsSrc/Task.java similarity index 100% rename from idea/idea-completion/testData/basic/custom/SamAdapterAndGenericsSrc/Task.java rename to idea/idea-completion/testData/basic/withLib/SamAdapterAndGenericsSrc/Task.java diff --git a/idea/idea-completion/testData/basic/custom/SamAdapterSrc/JavaClass.java b/idea/idea-completion/testData/basic/withLib/SamAdapterSrc/JavaClass.java similarity index 100% rename from idea/idea-completion/testData/basic/custom/SamAdapterSrc/JavaClass.java rename to idea/idea-completion/testData/basic/withLib/SamAdapterSrc/JavaClass.java diff --git a/idea/idea-completion/testData/basic/custom/TopLevelNonImportedExtFun.kt b/idea/idea-completion/testData/basic/withLib/TopLevelNonImportedExtFun.kt similarity index 100% rename from idea/idea-completion/testData/basic/custom/TopLevelNonImportedExtFun.kt rename to idea/idea-completion/testData/basic/withLib/TopLevelNonImportedExtFun.kt diff --git a/idea/idea-completion/testData/basic/custom/TopLevelNonImportedExtFunSrc/source.kt b/idea/idea-completion/testData/basic/withLib/TopLevelNonImportedExtFunSrc/source.kt similarity index 100% rename from idea/idea-completion/testData/basic/custom/TopLevelNonImportedExtFunSrc/source.kt rename to idea/idea-completion/testData/basic/withLib/TopLevelNonImportedExtFunSrc/source.kt diff --git a/idea/idea-completion/testData/basic/custom/TopLevelNonImportedExtProp.kt b/idea/idea-completion/testData/basic/withLib/TopLevelNonImportedExtProp.kt similarity index 100% rename from idea/idea-completion/testData/basic/custom/TopLevelNonImportedExtProp.kt rename to idea/idea-completion/testData/basic/withLib/TopLevelNonImportedExtProp.kt diff --git a/idea/idea-completion/testData/basic/custom/TopLevelNonImportedExtPropSrc/source.kt b/idea/idea-completion/testData/basic/withLib/TopLevelNonImportedExtPropSrc/source.kt similarity index 100% rename from idea/idea-completion/testData/basic/custom/TopLevelNonImportedExtPropSrc/source.kt rename to idea/idea-completion/testData/basic/withLib/TopLevelNonImportedExtPropSrc/source.kt diff --git a/idea/idea-completion/testData/basic/custom/TopLevelNonImportedFun.kt b/idea/idea-completion/testData/basic/withLib/TopLevelNonImportedFun.kt similarity index 100% rename from idea/idea-completion/testData/basic/custom/TopLevelNonImportedFun.kt rename to idea/idea-completion/testData/basic/withLib/TopLevelNonImportedFun.kt diff --git a/idea/idea-completion/testData/basic/custom/TopLevelNonImportedFunSrc/source.kt b/idea/idea-completion/testData/basic/withLib/TopLevelNonImportedFunSrc/source.kt similarity index 100% rename from idea/idea-completion/testData/basic/custom/TopLevelNonImportedFunSrc/source.kt rename to idea/idea-completion/testData/basic/withLib/TopLevelNonImportedFunSrc/source.kt diff --git a/idea/idea-completion/testData/basic/custom/TopLevelNonImportedProperty.kt b/idea/idea-completion/testData/basic/withLib/TopLevelNonImportedProperty.kt similarity index 100% rename from idea/idea-completion/testData/basic/custom/TopLevelNonImportedProperty.kt rename to idea/idea-completion/testData/basic/withLib/TopLevelNonImportedProperty.kt diff --git a/idea/idea-completion/testData/basic/custom/TopLevelNonImportedPropertySrc/source.kt b/idea/idea-completion/testData/basic/withLib/TopLevelNonImportedPropertySrc/source.kt similarity index 100% rename from idea/idea-completion/testData/basic/custom/TopLevelNonImportedPropertySrc/source.kt rename to idea/idea-completion/testData/basic/withLib/TopLevelNonImportedPropertySrc/source.kt diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJvmWithLibBasicCompletionTest.kt b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJvmWithLibBasicCompletionTest.kt index bf995970bfe..0928c5faa70 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJvmWithLibBasicCompletionTest.kt +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJvmWithLibBasicCompletionTest.kt @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform public abstract class AbstractJvmWithLibBasicCompletionTest : JetFixtureCompletionBaseTestCase() { - private val TEST_PATH = COMPLETION_TEST_DATA_BASE_PATH + "/basic/custom" + private val TEST_PATH = COMPLETION_TEST_DATA_BASE_PATH + "/basic/withLib" override fun getProjectDescriptor(): LightProjectDescriptor { if (PluginTestCaseBase.isAllFilesPresentTest(getTestName(true))) { diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmWithLibBasicCompletionTestGenerated.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmWithLibBasicCompletionTestGenerated.java index 5196de058a1..eac10725bd9 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmWithLibBasicCompletionTestGenerated.java +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmWithLibBasicCompletionTestGenerated.java @@ -27,59 +27,59 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("idea/idea-completion/testData/basic/custom") +@TestMetadata("idea/idea-completion/testData/basic/withLib") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public class JvmWithLibBasicCompletionTestGenerated extends AbstractJvmWithLibBasicCompletionTest { - public void testAllFilesPresentInCustom() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/custom"), Pattern.compile("^(.+)\\.kt$"), false); + public void testAllFilesPresentInWithLib() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/withLib"), Pattern.compile("^(.+)\\.kt$"), false); } @TestMetadata("NamedArgumentsJava.kt") public void testNamedArgumentsJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/custom/NamedArgumentsJava.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/NamedArgumentsJava.kt"); doTest(fileName); } @TestMetadata("NamedArgumentsKotlin.kt") public void testNamedArgumentsKotlin() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/custom/NamedArgumentsKotlin.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/NamedArgumentsKotlin.kt"); doTest(fileName); } @TestMetadata("SamAdapter.kt") public void testSamAdapter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/custom/SamAdapter.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/SamAdapter.kt"); doTest(fileName); } @TestMetadata("SamAdapterAndGenerics.kt") public void testSamAdapterAndGenerics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/custom/SamAdapterAndGenerics.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/SamAdapterAndGenerics.kt"); doTest(fileName); } @TestMetadata("TopLevelNonImportedExtFun.kt") public void testTopLevelNonImportedExtFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/custom/TopLevelNonImportedExtFun.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/TopLevelNonImportedExtFun.kt"); doTest(fileName); } @TestMetadata("TopLevelNonImportedExtProp.kt") public void testTopLevelNonImportedExtProp() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/custom/TopLevelNonImportedExtProp.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/TopLevelNonImportedExtProp.kt"); doTest(fileName); } @TestMetadata("TopLevelNonImportedFun.kt") public void testTopLevelNonImportedFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/custom/TopLevelNonImportedFun.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/TopLevelNonImportedFun.kt"); doTest(fileName); } @TestMetadata("TopLevelNonImportedProperty.kt") public void testTopLevelNonImportedProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/custom/TopLevelNonImportedProperty.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/TopLevelNonImportedProperty.kt"); doTest(fileName); } }