Move Android IDEA plugin tests to android-idea-plugin module

plugins/android-idea-plugin/android-idea-plugin.iml

@@ -4,6 +4,7 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
@@ -13,6 +14,7 @@
     <orderEntry type="library" exported="" scope="TEST" name="android_tests" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="idea-full" level="project" />
     <orderEntry type="module" module-name="idea" scope="PROVIDED" />
+    <orderEntry type="module" module-name="compiler-tests" scope="TEST" />
+    <orderEntry type="module" module-name="cli" scope="TEST" />
   </component>
-</module>
+</module>
-

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) + "/"
     }
 
 }

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!!

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) {

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) + "/"
 }
 
 

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) + "/"
     }
 }

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 org.jetbrains.jet.JUnit3RunnerWithInners;
-import junit.framework.TestSuite;
 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);
     }
-    
 }

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 org.jetbrains.jet.JUnit3RunnerWithInners;
-import junit.framework.TestSuite;
 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);
     }
-    
 }

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 org.jetbrains.jet.JUnit3RunnerWithInners;
-import junit.framework.TestSuite;
 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);
     }
-    
 }

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 org.jetbrains.jet.JUnit3RunnerWithInners;
-import junit.framework.TestSuite;
 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);
     }
-    
 }

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 org.jetbrains.jet.JUnit3RunnerWithInners;
-import junit.framework.TestSuite;
 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);
     }
-    
 }

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);
     }
 

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() {