diff --git a/plugins/android-idea-plugin/android-idea-plugin.iml b/plugins/android-idea-plugin/android-idea-plugin.iml index 47604f6a9d7..b314ef3dd9b 100644 --- a/plugins/android-idea-plugin/android-idea-plugin.iml +++ b/plugins/android-idea-plugin/android-idea-plugin.iml @@ -4,6 +4,7 @@ + @@ -13,6 +14,7 @@ + + - - + \ No newline at end of file diff --git a/idea/testData/android/AndroidManifest.xml b/plugins/android-idea-plugin/testData/android/AndroidManifest.xml similarity index 100% rename from idea/testData/android/AndroidManifest.xml rename to plugins/android-idea-plugin/testData/android/AndroidManifest.xml diff --git a/idea/testData/android/completion/fqNameInAttr/fqNameInAttr.kt b/plugins/android-idea-plugin/testData/android/completion/fqNameInAttr/fqNameInAttr.kt similarity index 100% rename from idea/testData/android/completion/fqNameInAttr/fqNameInAttr.kt rename to plugins/android-idea-plugin/testData/android/completion/fqNameInAttr/fqNameInAttr.kt diff --git a/idea/testData/android/completion/fqNameInAttr/res/layout/layout.xml b/plugins/android-idea-plugin/testData/android/completion/fqNameInAttr/res/layout/layout.xml similarity index 100% rename from idea/testData/android/completion/fqNameInAttr/res/layout/layout.xml rename to plugins/android-idea-plugin/testData/android/completion/fqNameInAttr/res/layout/layout.xml diff --git a/idea/testData/android/completion/fqNameInTag/fqNameInTag.kt b/plugins/android-idea-plugin/testData/android/completion/fqNameInTag/fqNameInTag.kt similarity index 100% rename from idea/testData/android/completion/fqNameInTag/fqNameInTag.kt rename to plugins/android-idea-plugin/testData/android/completion/fqNameInTag/fqNameInTag.kt diff --git a/idea/testData/android/completion/fqNameInTag/res/layout/layout.xml b/plugins/android-idea-plugin/testData/android/completion/fqNameInTag/res/layout/layout.xml similarity index 100% rename from idea/testData/android/completion/fqNameInTag/res/layout/layout.xml rename to plugins/android-idea-plugin/testData/android/completion/fqNameInTag/res/layout/layout.xml diff --git a/idea/testData/android/completion/multiFile/multiFile.kt b/plugins/android-idea-plugin/testData/android/completion/multiFile/multiFile.kt similarity index 100% rename from idea/testData/android/completion/multiFile/multiFile.kt rename to plugins/android-idea-plugin/testData/android/completion/multiFile/multiFile.kt diff --git a/idea/testData/android/completion/multiFile/res/layout/layout.xml b/plugins/android-idea-plugin/testData/android/completion/multiFile/res/layout/layout.xml similarity index 100% rename from idea/testData/android/completion/multiFile/res/layout/layout.xml rename to plugins/android-idea-plugin/testData/android/completion/multiFile/res/layout/layout.xml diff --git a/idea/testData/android/completion/multiFile/res/layout/layout1.xml b/plugins/android-idea-plugin/testData/android/completion/multiFile/res/layout/layout1.xml similarity index 100% rename from idea/testData/android/completion/multiFile/res/layout/layout1.xml rename to plugins/android-idea-plugin/testData/android/completion/multiFile/res/layout/layout1.xml diff --git a/idea/testData/android/completion/propertiesSimple/propertiesSimple.kt b/plugins/android-idea-plugin/testData/android/completion/propertiesSimple/propertiesSimple.kt similarity index 100% rename from idea/testData/android/completion/propertiesSimple/propertiesSimple.kt rename to plugins/android-idea-plugin/testData/android/completion/propertiesSimple/propertiesSimple.kt diff --git a/idea/testData/android/completion/propertiesSimple/res/layout/layout.xml b/plugins/android-idea-plugin/testData/android/completion/propertiesSimple/res/layout/layout.xml similarity index 100% rename from idea/testData/android/completion/propertiesSimple/res/layout/layout.xml rename to plugins/android-idea-plugin/testData/android/completion/propertiesSimple/res/layout/layout.xml diff --git a/idea/testData/android/crossParser/AndroidManifest.xml b/plugins/android-idea-plugin/testData/android/crossParser/AndroidManifest.xml similarity index 100% rename from idea/testData/android/crossParser/AndroidManifest.xml rename to plugins/android-idea-plugin/testData/android/crossParser/AndroidManifest.xml diff --git a/idea/testData/android/crossParser/fqNameInAttr/res/layout/layout.xml b/plugins/android-idea-plugin/testData/android/crossParser/fqNameInAttr/res/layout/layout.xml similarity index 100% rename from idea/testData/android/crossParser/fqNameInAttr/res/layout/layout.xml rename to plugins/android-idea-plugin/testData/android/crossParser/fqNameInAttr/res/layout/layout.xml diff --git a/idea/testData/android/crossParser/fqNameInTag/res/layout/layout.xml b/plugins/android-idea-plugin/testData/android/crossParser/fqNameInTag/res/layout/layout.xml similarity index 100% rename from idea/testData/android/crossParser/fqNameInTag/res/layout/layout.xml rename to plugins/android-idea-plugin/testData/android/crossParser/fqNameInTag/res/layout/layout.xml diff --git a/idea/testData/android/crossParser/multiFile/res/layout/layout.xml b/plugins/android-idea-plugin/testData/android/crossParser/multiFile/res/layout/layout.xml similarity index 100% rename from idea/testData/android/crossParser/multiFile/res/layout/layout.xml rename to plugins/android-idea-plugin/testData/android/crossParser/multiFile/res/layout/layout.xml diff --git a/idea/testData/android/crossParser/multiFile/res/layout/layout1.xml b/plugins/android-idea-plugin/testData/android/crossParser/multiFile/res/layout/layout1.xml similarity index 100% rename from idea/testData/android/crossParser/multiFile/res/layout/layout1.xml rename to plugins/android-idea-plugin/testData/android/crossParser/multiFile/res/layout/layout1.xml diff --git a/idea/testData/android/crossParser/noIds/res/layout/layout.xml b/plugins/android-idea-plugin/testData/android/crossParser/noIds/res/layout/layout.xml similarity index 100% rename from idea/testData/android/crossParser/noIds/res/layout/layout.xml rename to plugins/android-idea-plugin/testData/android/crossParser/noIds/res/layout/layout.xml diff --git a/idea/testData/android/crossParser/singleFile/res/layout/layout.xml b/plugins/android-idea-plugin/testData/android/crossParser/singleFile/res/layout/layout.xml similarity index 100% rename from idea/testData/android/crossParser/singleFile/res/layout/layout.xml rename to plugins/android-idea-plugin/testData/android/crossParser/singleFile/res/layout/layout.xml diff --git a/idea/testData/android/findUsages/fqNameInAttr/fqNameInAttr.kt b/plugins/android-idea-plugin/testData/android/findUsages/fqNameInAttr/fqNameInAttr.kt similarity index 100% rename from idea/testData/android/findUsages/fqNameInAttr/fqNameInAttr.kt rename to plugins/android-idea-plugin/testData/android/findUsages/fqNameInAttr/fqNameInAttr.kt diff --git a/idea/testData/android/findUsages/fqNameInAttr/res/layout/layout.xml b/plugins/android-idea-plugin/testData/android/findUsages/fqNameInAttr/res/layout/layout.xml similarity index 100% rename from idea/testData/android/findUsages/fqNameInAttr/res/layout/layout.xml rename to plugins/android-idea-plugin/testData/android/findUsages/fqNameInAttr/res/layout/layout.xml diff --git a/idea/testData/android/findUsages/fqNameInTag/fqNameInTag.kt b/plugins/android-idea-plugin/testData/android/findUsages/fqNameInTag/fqNameInTag.kt similarity index 100% rename from idea/testData/android/findUsages/fqNameInTag/fqNameInTag.kt rename to plugins/android-idea-plugin/testData/android/findUsages/fqNameInTag/fqNameInTag.kt diff --git a/idea/testData/android/findUsages/fqNameInTag/res/layout/layout.xml b/plugins/android-idea-plugin/testData/android/findUsages/fqNameInTag/res/layout/layout.xml similarity index 100% rename from idea/testData/android/findUsages/fqNameInTag/res/layout/layout.xml rename to plugins/android-idea-plugin/testData/android/findUsages/fqNameInTag/res/layout/layout.xml diff --git a/idea/testData/android/findUsages/multiFile/multiFile.kt b/plugins/android-idea-plugin/testData/android/findUsages/multiFile/multiFile.kt similarity index 100% rename from idea/testData/android/findUsages/multiFile/multiFile.kt rename to plugins/android-idea-plugin/testData/android/findUsages/multiFile/multiFile.kt diff --git a/idea/testData/android/findUsages/multiFile/res/layout/layout.xml b/plugins/android-idea-plugin/testData/android/findUsages/multiFile/res/layout/layout.xml similarity index 100% rename from idea/testData/android/findUsages/multiFile/res/layout/layout.xml rename to plugins/android-idea-plugin/testData/android/findUsages/multiFile/res/layout/layout.xml diff --git a/idea/testData/android/findUsages/multiFile/res/layout/layout1.xml b/plugins/android-idea-plugin/testData/android/findUsages/multiFile/res/layout/layout1.xml similarity index 100% rename from idea/testData/android/findUsages/multiFile/res/layout/layout1.xml rename to plugins/android-idea-plugin/testData/android/findUsages/multiFile/res/layout/layout1.xml diff --git a/idea/testData/android/findUsages/simple/res/layout/layout.xml b/plugins/android-idea-plugin/testData/android/findUsages/simple/res/layout/layout.xml similarity index 100% rename from idea/testData/android/findUsages/simple/res/layout/layout.xml rename to plugins/android-idea-plugin/testData/android/findUsages/simple/res/layout/layout.xml diff --git a/idea/testData/android/findUsages/simple/simple.kt b/plugins/android-idea-plugin/testData/android/findUsages/simple/simple.kt similarity index 100% rename from idea/testData/android/findUsages/simple/simple.kt rename to plugins/android-idea-plugin/testData/android/findUsages/simple/simple.kt diff --git a/idea/testData/android/goto/fqNameInAttr/fqNameInAttr.kt b/plugins/android-idea-plugin/testData/android/goto/fqNameInAttr/fqNameInAttr.kt similarity index 100% rename from idea/testData/android/goto/fqNameInAttr/fqNameInAttr.kt rename to plugins/android-idea-plugin/testData/android/goto/fqNameInAttr/fqNameInAttr.kt diff --git a/idea/testData/android/goto/fqNameInAttr/res/layout/layout.xml b/plugins/android-idea-plugin/testData/android/goto/fqNameInAttr/res/layout/layout.xml similarity index 100% rename from idea/testData/android/goto/fqNameInAttr/res/layout/layout.xml rename to plugins/android-idea-plugin/testData/android/goto/fqNameInAttr/res/layout/layout.xml diff --git a/idea/testData/android/goto/fqNameInTag/fqNameInTag.kt b/plugins/android-idea-plugin/testData/android/goto/fqNameInTag/fqNameInTag.kt similarity index 100% rename from idea/testData/android/goto/fqNameInTag/fqNameInTag.kt rename to plugins/android-idea-plugin/testData/android/goto/fqNameInTag/fqNameInTag.kt diff --git a/idea/testData/android/goto/fqNameInTag/res/layout/layout.xml b/plugins/android-idea-plugin/testData/android/goto/fqNameInTag/res/layout/layout.xml similarity index 100% rename from idea/testData/android/goto/fqNameInTag/res/layout/layout.xml rename to plugins/android-idea-plugin/testData/android/goto/fqNameInTag/res/layout/layout.xml diff --git a/idea/testData/android/goto/multiFile/multiFile.kt b/plugins/android-idea-plugin/testData/android/goto/multiFile/multiFile.kt similarity index 100% rename from idea/testData/android/goto/multiFile/multiFile.kt rename to plugins/android-idea-plugin/testData/android/goto/multiFile/multiFile.kt diff --git a/idea/testData/android/goto/multiFile/res/layout/layout.xml b/plugins/android-idea-plugin/testData/android/goto/multiFile/res/layout/layout.xml similarity index 100% rename from idea/testData/android/goto/multiFile/res/layout/layout.xml rename to plugins/android-idea-plugin/testData/android/goto/multiFile/res/layout/layout.xml diff --git a/idea/testData/android/goto/multiFile/res/layout/layout1.xml b/plugins/android-idea-plugin/testData/android/goto/multiFile/res/layout/layout1.xml similarity index 100% rename from idea/testData/android/goto/multiFile/res/layout/layout1.xml rename to plugins/android-idea-plugin/testData/android/goto/multiFile/res/layout/layout1.xml diff --git a/idea/testData/android/goto/simple/res/layout/layout.xml b/plugins/android-idea-plugin/testData/android/goto/simple/res/layout/layout.xml similarity index 100% rename from idea/testData/android/goto/simple/res/layout/layout.xml rename to plugins/android-idea-plugin/testData/android/goto/simple/res/layout/layout.xml diff --git a/idea/testData/android/goto/simple/simple.kt b/plugins/android-idea-plugin/testData/android/goto/simple/simple.kt similarity index 100% rename from idea/testData/android/goto/simple/simple.kt rename to plugins/android-idea-plugin/testData/android/goto/simple/simple.kt diff --git a/idea/testData/android/rename/fqNameInAttr/fqNameInAttr.kt b/plugins/android-idea-plugin/testData/android/rename/fqNameInAttr/fqNameInAttr.kt similarity index 100% rename from idea/testData/android/rename/fqNameInAttr/fqNameInAttr.kt rename to plugins/android-idea-plugin/testData/android/rename/fqNameInAttr/fqNameInAttr.kt diff --git a/idea/testData/android/rename/fqNameInAttr/res/layout/layout.xml b/plugins/android-idea-plugin/testData/android/rename/fqNameInAttr/res/layout/layout.xml similarity index 100% rename from idea/testData/android/rename/fqNameInAttr/res/layout/layout.xml rename to plugins/android-idea-plugin/testData/android/rename/fqNameInAttr/res/layout/layout.xml diff --git a/idea/testData/android/rename/fqNameInTag/fqNameInTag.kt b/plugins/android-idea-plugin/testData/android/rename/fqNameInTag/fqNameInTag.kt similarity index 100% rename from idea/testData/android/rename/fqNameInTag/fqNameInTag.kt rename to plugins/android-idea-plugin/testData/android/rename/fqNameInTag/fqNameInTag.kt diff --git a/idea/testData/android/rename/fqNameInTag/res/layout/layout.xml b/plugins/android-idea-plugin/testData/android/rename/fqNameInTag/res/layout/layout.xml similarity index 100% rename from idea/testData/android/rename/fqNameInTag/res/layout/layout.xml rename to plugins/android-idea-plugin/testData/android/rename/fqNameInTag/res/layout/layout.xml diff --git a/idea/testData/android/rename/multiFile/multiFile.kt b/plugins/android-idea-plugin/testData/android/rename/multiFile/multiFile.kt similarity index 100% rename from idea/testData/android/rename/multiFile/multiFile.kt rename to plugins/android-idea-plugin/testData/android/rename/multiFile/multiFile.kt diff --git a/idea/testData/android/rename/multiFile/res/layout/layout.xml b/plugins/android-idea-plugin/testData/android/rename/multiFile/res/layout/layout.xml similarity index 100% rename from idea/testData/android/rename/multiFile/res/layout/layout.xml rename to plugins/android-idea-plugin/testData/android/rename/multiFile/res/layout/layout.xml diff --git a/idea/testData/android/rename/multiFile/res/layout/layout1.xml b/plugins/android-idea-plugin/testData/android/rename/multiFile/res/layout/layout1.xml similarity index 100% rename from idea/testData/android/rename/multiFile/res/layout/layout1.xml rename to plugins/android-idea-plugin/testData/android/rename/multiFile/res/layout/layout1.xml diff --git a/idea/testData/android/rename/simple/res/layout/layout.xml b/plugins/android-idea-plugin/testData/android/rename/simple/res/layout/layout.xml similarity index 100% rename from idea/testData/android/rename/simple/res/layout/layout.xml rename to plugins/android-idea-plugin/testData/android/rename/simple/res/layout/layout.xml diff --git a/idea/testData/android/rename/simple/simple.kt b/plugins/android-idea-plugin/testData/android/rename/simple/simple.kt similarity index 100% rename from idea/testData/android/rename/simple/simple.kt rename to plugins/android-idea-plugin/testData/android/rename/simple/simple.kt diff --git a/idea/tests/org/jetbrains/jet/android/AbstractAndroidCompletionTest.kt b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidCompletionTest.kt similarity index 96% rename from idea/tests/org/jetbrains/jet/android/AbstractAndroidCompletionTest.kt rename to plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidCompletionTest.kt index 62112cae999..14a429abe37 100644 --- a/idea/tests/org/jetbrains/jet/android/AbstractAndroidCompletionTest.kt +++ b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidCompletionTest.kt @@ -69,7 +69,7 @@ public abstract class AbstractAndroidCompletionTest : KotlinAndroidTestCase() { override fun getTestDataPath(): String { - return PluginTestCaseBase.getTestDataPathBase() + "/android/completion/" + getTestName(true) + "/" + return KotlinAndroidTestCaseBase.getPluginTestDataPathBase() + "/completion/" + getTestName(true) + "/" } } diff --git a/idea/tests/org/jetbrains/jet/android/AbstractAndroidFindUsagesTest.kt b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidFindUsagesTest.kt similarity index 91% rename from idea/tests/org/jetbrains/jet/android/AbstractAndroidFindUsagesTest.kt rename to plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidFindUsagesTest.kt index ac832029a90..db0d60e53ab 100644 --- a/idea/tests/org/jetbrains/jet/android/AbstractAndroidFindUsagesTest.kt +++ b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidFindUsagesTest.kt @@ -23,7 +23,7 @@ import com.intellij.codeInsight.navigation.actions.GotoDeclarationAction public abstract class AbstractAndroidFindUsagesTest : KotlinAndroidTestCase() { - override fun getTestDataPath() = PluginTestCaseBase.getTestDataPathBase() + "/android/findUsages/" + getTestName(true) + "/" + override fun getTestDataPath() = KotlinAndroidTestCaseBase.getPluginTestDataPathBase() + "/findUsages/" + getTestName(true) + "/" public fun doTest(path: String) { val f = myFixture!! diff --git a/idea/tests/org/jetbrains/jet/android/AbstractAndroidGotoTest.kt b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidGotoTest.kt similarity index 93% rename from idea/tests/org/jetbrains/jet/android/AbstractAndroidGotoTest.kt rename to plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidGotoTest.kt index 740494c9978..1d0ba9dbba6 100644 --- a/idea/tests/org/jetbrains/jet/android/AbstractAndroidGotoTest.kt +++ b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidGotoTest.kt @@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.psi.JetProperty public abstract class AbstractAndroidGotoTest : KotlinAndroidTestCase() { override fun getTestDataPath(): String { - return PluginTestCaseBase.getTestDataPathBase() + "/android/goto/" + getTestName(true) + "/" + return KotlinAndroidTestCaseBase.getPluginTestDataPathBase() + "/goto/" + getTestName(true) + "/" } public fun doTest(path: String) { diff --git a/idea/tests/org/jetbrains/jet/android/AbstractAndroidRenameTest.kt b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidRenameTest.kt similarity index 95% rename from idea/tests/org/jetbrains/jet/android/AbstractAndroidRenameTest.kt rename to plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidRenameTest.kt index 91edeb36ea7..9f0bf443445 100644 --- a/idea/tests/org/jetbrains/jet/android/AbstractAndroidRenameTest.kt +++ b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidRenameTest.kt @@ -63,7 +63,7 @@ public abstract class AbstractAndroidRenameTest : KotlinAndroidTestCase() { }.execute().throwException() } - override fun getTestDataPath() = PluginTestCaseBase.getTestDataPathBase() + "/android/rename/" + getTestName(true) + "/" + override fun getTestDataPath() = KotlinAndroidTestCaseBase.getPluginTestDataPathBase() + "/rename/" + getTestName(true) + "/" } diff --git a/idea/tests/org/jetbrains/jet/android/AbstractCrossParserTest.kt b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractCrossParserTest.kt similarity index 95% rename from idea/tests/org/jetbrains/jet/android/AbstractCrossParserTest.kt rename to plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractCrossParserTest.kt index 1730475a4b1..d137143b068 100644 --- a/idea/tests/org/jetbrains/jet/android/AbstractCrossParserTest.kt +++ b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractCrossParserTest.kt @@ -50,6 +50,6 @@ public abstract class AbstractCrossParserTest : KotlinAndroidTestCase() { } override fun getTestDataPath(): String? { - return PluginTestCaseBase.getTestDataPathBase() + "/android/crossParser/" + getTestName(true) + "/" + return KotlinAndroidTestCaseBase.getPluginTestDataPathBase() + "/crossParser/" + getTestName(true) + "/" } } \ No newline at end of file diff --git a/idea/tests/org/jetbrains/jet/android/AndroidCompletionTestGenerated.java b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AndroidCompletionTestGenerated.java similarity index 67% rename from idea/tests/org/jetbrains/jet/android/AndroidCompletionTestGenerated.java rename to plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AndroidCompletionTestGenerated.java index f84163738ac..48fe0c098cd 100644 --- a/idea/tests/org/jetbrains/jet/android/AndroidCompletionTestGenerated.java +++ b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AndroidCompletionTestGenerated.java @@ -17,46 +17,46 @@ package org.jetbrains.jet.android; import com.intellij.testFramework.TestDataPath; -import junit.framework.Test; -import junit.framework.TestSuite; +import org.jetbrains.jet.JUnit3RunnerWithInners; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.junit.runner.RunWith; import java.io.File; import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("idea/testData/android/completion") +@TestMetadata("plugins/android-idea-plugin/testData/android/completion") @TestDataPath("$PROJECT_ROOT") +@RunWith(JUnit3RunnerWithInners.class) public class AndroidCompletionTestGenerated extends AbstractAndroidCompletionTest { public void testAllFilesPresentInCompletion() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/android/completion"), Pattern.compile("^([^\\.]+)$"), false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-idea-plugin/testData/android/completion"), Pattern.compile("^([^\\.]+)$"), false); } - + @TestMetadata("fqNameInAttr") public void testFqNameInAttr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/android/completion/fqNameInAttr/"); + String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/completion/fqNameInAttr/"); doTest(fileName); } - + @TestMetadata("fqNameInTag") public void testFqNameInTag() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/android/completion/fqNameInTag/"); + String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/completion/fqNameInTag/"); doTest(fileName); } - + @TestMetadata("multiFile") public void testMultiFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/android/completion/multiFile/"); + String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/completion/multiFile/"); doTest(fileName); } - + @TestMetadata("propertiesSimple") public void testPropertiesSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/android/completion/propertiesSimple/"); + String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/completion/propertiesSimple/"); doTest(fileName); } - } diff --git a/idea/tests/org/jetbrains/jet/android/AndroidFindUsagesTestGenerated.java b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AndroidFindUsagesTestGenerated.java similarity index 67% rename from idea/tests/org/jetbrains/jet/android/AndroidFindUsagesTestGenerated.java rename to plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AndroidFindUsagesTestGenerated.java index 0c54f02eb69..88859603a7b 100644 --- a/idea/tests/org/jetbrains/jet/android/AndroidFindUsagesTestGenerated.java +++ b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AndroidFindUsagesTestGenerated.java @@ -17,46 +17,46 @@ package org.jetbrains.jet.android; import com.intellij.testFramework.TestDataPath; -import junit.framework.Test; -import junit.framework.TestSuite; +import org.jetbrains.jet.JUnit3RunnerWithInners; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.junit.runner.RunWith; import java.io.File; import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("idea/testData/android/findUsages") +@TestMetadata("plugins/android-idea-plugin/testData/android/findUsages") @TestDataPath("$PROJECT_ROOT") +@RunWith(JUnit3RunnerWithInners.class) public class AndroidFindUsagesTestGenerated extends AbstractAndroidFindUsagesTest { public void testAllFilesPresentInFindUsages() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/android/findUsages"), Pattern.compile("^([^\\.]+)$"), false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-idea-plugin/testData/android/findUsages"), Pattern.compile("^([^\\.]+)$"), false); } - + @TestMetadata("fqNameInAttr") public void testFqNameInAttr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/android/findUsages/fqNameInAttr/"); + String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/findUsages/fqNameInAttr/"); doTest(fileName); } - + @TestMetadata("fqNameInTag") public void testFqNameInTag() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/android/findUsages/fqNameInTag/"); + String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/findUsages/fqNameInTag/"); doTest(fileName); } - + @TestMetadata("multiFile") public void testMultiFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/android/findUsages/multiFile/"); + String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/findUsages/multiFile/"); doTest(fileName); } - + @TestMetadata("simple") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/android/findUsages/simple/"); + String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/findUsages/simple/"); doTest(fileName); } - } diff --git a/idea/tests/org/jetbrains/jet/android/AndroidGotoTestGenerated.java b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AndroidGotoTestGenerated.java similarity index 68% rename from idea/tests/org/jetbrains/jet/android/AndroidGotoTestGenerated.java rename to plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AndroidGotoTestGenerated.java index a052bdcc656..c2cbf7df56b 100644 --- a/idea/tests/org/jetbrains/jet/android/AndroidGotoTestGenerated.java +++ b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AndroidGotoTestGenerated.java @@ -17,46 +17,46 @@ package org.jetbrains.jet.android; import com.intellij.testFramework.TestDataPath; -import junit.framework.Test; -import junit.framework.TestSuite; +import org.jetbrains.jet.JUnit3RunnerWithInners; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.junit.runner.RunWith; import java.io.File; import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("idea/testData/android/goto") +@TestMetadata("plugins/android-idea-plugin/testData/android/goto") @TestDataPath("$PROJECT_ROOT") +@RunWith(JUnit3RunnerWithInners.class) public class AndroidGotoTestGenerated extends AbstractAndroidGotoTest { public void testAllFilesPresentInGoto() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/android/goto"), Pattern.compile("^([^\\.]+)$"), false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-idea-plugin/testData/android/goto"), Pattern.compile("^([^\\.]+)$"), false); } - + @TestMetadata("fqNameInAttr") public void testFqNameInAttr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/android/goto/fqNameInAttr/"); + String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/goto/fqNameInAttr/"); doTest(fileName); } - + @TestMetadata("fqNameInTag") public void testFqNameInTag() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/android/goto/fqNameInTag/"); + String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/goto/fqNameInTag/"); doTest(fileName); } - + @TestMetadata("multiFile") public void testMultiFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/android/goto/multiFile/"); + String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/goto/multiFile/"); doTest(fileName); } - + @TestMetadata("simple") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/android/goto/simple/"); + String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/goto/simple/"); doTest(fileName); } - } diff --git a/idea/tests/org/jetbrains/jet/android/AndroidRenameTestGenerated.java b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AndroidRenameTestGenerated.java similarity index 68% rename from idea/tests/org/jetbrains/jet/android/AndroidRenameTestGenerated.java rename to plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AndroidRenameTestGenerated.java index bd47cb7cc3b..e292aeac497 100644 --- a/idea/tests/org/jetbrains/jet/android/AndroidRenameTestGenerated.java +++ b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AndroidRenameTestGenerated.java @@ -17,46 +17,46 @@ package org.jetbrains.jet.android; import com.intellij.testFramework.TestDataPath; -import junit.framework.Test; -import junit.framework.TestSuite; +import org.jetbrains.jet.JUnit3RunnerWithInners; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.junit.runner.RunWith; import java.io.File; import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("idea/testData/android/rename") +@TestMetadata("plugins/android-idea-plugin/testData/android/rename") @TestDataPath("$PROJECT_ROOT") +@RunWith(JUnit3RunnerWithInners.class) public class AndroidRenameTestGenerated extends AbstractAndroidRenameTest { public void testAllFilesPresentInRename() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/android/rename"), Pattern.compile("^([^\\.]+)$"), false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-idea-plugin/testData/android/rename"), Pattern.compile("^([^\\.]+)$"), false); } - + @TestMetadata("fqNameInAttr") public void testFqNameInAttr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/android/rename/fqNameInAttr/"); + String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/rename/fqNameInAttr/"); doTest(fileName); } - + @TestMetadata("fqNameInTag") public void testFqNameInTag() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/android/rename/fqNameInTag/"); + String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/rename/fqNameInTag/"); doTest(fileName); } - + @TestMetadata("multiFile") public void testMultiFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/android/rename/multiFile/"); + String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/rename/multiFile/"); doTest(fileName); } - + @TestMetadata("simple") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/android/rename/simple/"); + String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/rename/simple/"); doTest(fileName); } - } diff --git a/idea/tests/org/jetbrains/jet/android/CrossParserTestGenerated.java b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/CrossParserTestGenerated.java similarity index 65% rename from idea/tests/org/jetbrains/jet/android/CrossParserTestGenerated.java rename to plugins/android-idea-plugin/tests/org/jetbrains/jet/android/CrossParserTestGenerated.java index 7bcbaff521c..336aba250c5 100644 --- a/idea/tests/org/jetbrains/jet/android/CrossParserTestGenerated.java +++ b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/CrossParserTestGenerated.java @@ -17,52 +17,52 @@ package org.jetbrains.jet.android; import com.intellij.testFramework.TestDataPath; -import junit.framework.Test; -import junit.framework.TestSuite; +import org.jetbrains.jet.JUnit3RunnerWithInners; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.junit.runner.RunWith; import java.io.File; import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("idea/testData/android/crossParser") +@TestMetadata("plugins/android-idea-plugin/testData/android/crossParser") @TestDataPath("$PROJECT_ROOT") +@RunWith(JUnit3RunnerWithInners.class) public class CrossParserTestGenerated extends AbstractCrossParserTest { public void testAllFilesPresentInCrossParser() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/android/crossParser"), Pattern.compile("^([^\\.]+)$"), false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-idea-plugin/testData/android/crossParser"), Pattern.compile("^([^\\.]+)$"), false); } - + @TestMetadata("fqNameInAttr") public void testFqNameInAttr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/android/crossParser/fqNameInAttr/"); + String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/crossParser/fqNameInAttr/"); doTest(fileName); } - + @TestMetadata("fqNameInTag") public void testFqNameInTag() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/android/crossParser/fqNameInTag/"); + String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/crossParser/fqNameInTag/"); doTest(fileName); } - + @TestMetadata("multiFile") public void testMultiFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/android/crossParser/multiFile/"); + String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/crossParser/multiFile/"); doTest(fileName); } - + @TestMetadata("noIds") public void testNoIds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/android/crossParser/noIds/"); + String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/crossParser/noIds/"); doTest(fileName); } - + @TestMetadata("singleFile") public void testSingleFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/android/crossParser/singleFile/"); + String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/crossParser/singleFile/"); doTest(fileName); } - } diff --git a/idea/tests/org/jetbrains/jet/android/KotlinAndroidTestCase.java b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/KotlinAndroidTestCase.java similarity index 98% rename from idea/tests/org/jetbrains/jet/android/KotlinAndroidTestCase.java rename to plugins/android-idea-plugin/tests/org/jetbrains/jet/android/KotlinAndroidTestCase.java index 14f2458c462..6dd9784aaf1 100644 --- a/idea/tests/org/jetbrains/jet/android/KotlinAndroidTestCase.java +++ b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/KotlinAndroidTestCase.java @@ -209,7 +209,7 @@ public abstract class KotlinAndroidTestCase extends KotlinAndroidTestCaseBase { } protected void createManifest() throws IOException { - myFixture.copyFileToProject("idea/testData/android/AndroidManifest.xml", SdkConstants.FN_ANDROID_MANIFEST_XML); + myFixture.copyFileToProject("plugins/android-idea-plugin/testData/android/AndroidManifest.xml", SdkConstants.FN_ANDROID_MANIFEST_XML); // myFixture.copyFileToProject(SdkConstants.FN_ANDROID_MANIFEST_XML, SdkConstants.FN_ANDROID_MANIFEST_XML); } diff --git a/idea/tests/org/jetbrains/jet/android/KotlinAndroidTestCaseBase.java b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/KotlinAndroidTestCaseBase.java similarity index 97% rename from idea/tests/org/jetbrains/jet/android/KotlinAndroidTestCaseBase.java rename to plugins/android-idea-plugin/tests/org/jetbrains/jet/android/KotlinAndroidTestCaseBase.java index 820062484a9..e41290f2594 100644 --- a/idea/tests/org/jetbrains/jet/android/KotlinAndroidTestCaseBase.java +++ b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/KotlinAndroidTestCaseBase.java @@ -43,6 +43,7 @@ import org.jetbrains.android.dom.wrappers.LazyValueResourceElementWrapper; import org.jetbrains.android.sdk.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.plugin.PluginTestCaseBase; import java.io.File; @@ -60,6 +61,8 @@ public abstract class KotlinAndroidTestCaseBase extends UsefulTestCase { protected Sdk androidSdk; protected VirtualFile androidJar; + private static final String TEST_DATA_PROJECT_RELATIVE = "/plugins/android-idea-plugin/testData/android"; + protected KotlinAndroidTestCaseBase() { IdeaTestCase.initPlatformPrefix(); } @@ -79,8 +82,12 @@ public abstract class KotlinAndroidTestCaseBase extends UsefulTestCase { return path; } + public static String getPluginTestDataPathBase() { + return JetTestCaseBuilder.getHomeDirectory() + TEST_DATA_PROJECT_RELATIVE; + } + public String getTestDataPath() { - return PluginTestCaseBase.getTestDataPathBase(); + return getPluginTestDataPathBase(); } public static String getAndroidPluginHome() {