Move Android compiler plugin tests to android-compiler-plugin module

2014-11-06 15:20:20 +03:00
parent efff642635
commit fa62d3bcec
63 changed files with 70 additions and 79 deletions
@@ -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" />
@@ -14,6 +15,8 @@
    <orderEntry type="module" module-name="util" />
    <orderEntry type="module" module-name="backend" scope="PROVIDED" />
    <orderEntry type="module" module-name="jet.as.java.psi" exported="" scope="PROVIDED" />
+    <orderEntry type="library" scope="TEST" name="idea-full" level="project" />
+    <orderEntry type="library" scope="TEST" name="jps-test" level="project" />
+    <orderEntry type="module" module-name="compiler-tests" scope="TEST" />
  </component>
-</module>
-
+</module>
@@ -17,11 +17,11 @@
 package org.jetbrains.jet.lang.resolve.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;
@@ -29,89 +29,83 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@InnerTestClasses({AndroidBoxTestGenerated.Android.class, AndroidBoxTestGenerated.Invoke.class})
+@RunWith(JUnit3RunnerWithInners.class)
 public class AndroidBoxTestGenerated extends AbstractAndroidBoxTest {
-    @TestMetadata("compiler/testData/codegen/android")
+    @TestMetadata("plugins/android-compiler-plugin/testData/codegen/android")
    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
    public static class Android extends AbstractAndroidBoxTest {
        public void testAllFilesPresentInAndroid() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/android"), Pattern.compile("^([^\\.]+)$"), false);
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-compiler-plugin/testData/codegen/android"), Pattern.compile("^([^\\.]+)$"), false);
        }
-        
+
        @TestMetadata("fqNameInAttr")
        public void testFqNameInAttr() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/android/fqNameInAttr/");
+            String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/fqNameInAttr/");
            doCompileAgainstAndroidSdkTest(fileName);
        }
-        
+
        @TestMetadata("fqNameInTag")
        public void testFqNameInTag() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/android/fqNameInTag/");
+            String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/fqNameInTag/");
            doCompileAgainstAndroidSdkTest(fileName);
        }
-        
+
        @TestMetadata("manyWidgets")
        public void testManyWidgets() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/android/manyWidgets/");
+            String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/manyWidgets/");
            doCompileAgainstAndroidSdkTest(fileName);
        }
-        
+
        @TestMetadata("multiFile")
        public void testMultiFile() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/android/multiFile/");
+            String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/multiFile/");
            doCompileAgainstAndroidSdkTest(fileName);
        }
-        
+
        @TestMetadata("singleFile")
        public void testSingleFile() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/android/singleFile/");
+            String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/singleFile/");
            doCompileAgainstAndroidSdkTest(fileName);
        }
-        
    }
-    
-    @TestMetadata("compiler/testData/codegen/android")
+
+    @TestMetadata("plugins/android-compiler-plugin/testData/codegen/android")
    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
    public static class Invoke extends AbstractAndroidBoxTest {
        public void testAllFilesPresentInInvoke() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/android"), Pattern.compile("^([^\\.]+)$"), false);
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-compiler-plugin/testData/codegen/android"), Pattern.compile("^([^\\.]+)$"), false);
        }
-        
+
        @TestMetadata("fqNameInAttr")
        public void testFqNameInAttr() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/android/fqNameInAttr/");
+            String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/fqNameInAttr/");
            doFakeInvocationTest(fileName);
        }
-        
+
        @TestMetadata("fqNameInTag")
        public void testFqNameInTag() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/android/fqNameInTag/");
+            String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/fqNameInTag/");
            doFakeInvocationTest(fileName);
        }
-        
+
        @TestMetadata("manyWidgets")
        public void testManyWidgets() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/android/manyWidgets/");
+            String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/manyWidgets/");
            doFakeInvocationTest(fileName);
        }
-        
+
        @TestMetadata("multiFile")
        public void testMultiFile() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/android/multiFile/");
+            String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/multiFile/");
            doFakeInvocationTest(fileName);
        }
-        
+
        @TestMetadata("singleFile")
        public void testSingleFile() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/android/singleFile/");
+            String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/singleFile/");
            doFakeInvocationTest(fileName);
        }
-        
-    }
-    
-    public static Test suite() {
-        TestSuite suite = new TestSuite("AndroidBoxTestGenerated");
-        suite.addTestSuite(Android.class);
-        suite.addTestSuite(Invoke.class);
-        return suite;
    }
 }
@@ -17,46 +17,46 @@
 package org.jetbrains.jet.lang.resolve.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("compiler/testData/codegen/androidPersistence")
+@TestMetadata("plugins/android-compiler-plugin/testData/codegen/androidPersistence")
@TestDataPath("$PROJECT_ROOT")
+@RunWith(JUnit3RunnerWithInners.class)
 public class AndroidBytecodePersistenceTestGenerated extends AbstractAndroidBytecodePersistenceTest {
    public void testAllFilesPresentInAndroidPersistence() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/androidPersistence"), Pattern.compile("^([^\\.]+)$"), false);
+        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-compiler-plugin/testData/codegen/androidPersistence"), Pattern.compile("^([^\\.]+)$"), false);
    }
-    
+
    @TestMetadata("fqNameInAttr")
    public void testFqNameInAttr() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/androidPersistence/fqNameInAttr/");
+        String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/androidPersistence/fqNameInAttr/");
        doTest(fileName);
    }
-    
+
    @TestMetadata("fqNameInTag")
    public void testFqNameInTag() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/androidPersistence/fqNameInTag/");
+        String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/androidPersistence/fqNameInTag/");
        doTest(fileName);
    }
-    
+
    @TestMetadata("multiFile")
    public void testMultiFile() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/androidPersistence/multiFile/");
+        String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/androidPersistence/multiFile/");
        doTest(fileName);
    }
-    
+
    @TestMetadata("simple")
    public void testSimple() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/androidPersistence/simple/");
+        String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/androidPersistence/simple/");
        doTest(fileName);
    }
-    
 }
@@ -17,11 +17,11 @@
 package org.jetbrains.jet.lang.resolve.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;
@@ -29,65 +29,59 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@InnerTestClasses({AndroidXml2KConversionTestGenerated.Simple.class, AndroidXml2KConversionTestGenerated.Exceptions.class})
+@RunWith(JUnit3RunnerWithInners.class)
 public class AndroidXml2KConversionTestGenerated extends AbstractAndroidXml2KConversionTest {
-    @TestMetadata("compiler/testData/android/converter/simple")
+    @TestMetadata("plugins/android-compiler-plugin/testData/android/converter/simple")
    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
    public static class Simple extends AbstractAndroidXml2KConversionTest {
        public void testAllFilesPresentInSimple() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/android/converter/simple"), Pattern.compile("^([^\\.]+)$"), false);
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-compiler-plugin/testData/android/converter/simple"), Pattern.compile("^([^\\.]+)$"), false);
        }
-        
+
        @TestMetadata("fqNameInAttr")
        public void testFqNameInAttr() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/android/converter/simple/fqNameInAttr/");
+            String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInAttr/");
            doTest(fileName);
        }
-        
+
        @TestMetadata("fqNameInTag")
        public void testFqNameInTag() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/android/converter/simple/fqNameInTag/");
+            String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInTag/");
            doTest(fileName);
        }
-        
+
        @TestMetadata("multiFile")
        public void testMultiFile() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/android/converter/simple/multiFile/");
+            String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/");
            doTest(fileName);
        }
-        
+
        @TestMetadata("noIds")
        public void testNoIds() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/android/converter/simple/noIds/");
+            String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/android/converter/simple/noIds/");
            doTest(fileName);
        }
-        
+
        @TestMetadata("singleFile")
        public void testSingleFile() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/android/converter/simple/singleFile/");
+            String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/android/converter/simple/singleFile/");
            doTest(fileName);
        }
-        
    }
-    
-    @TestMetadata("compiler/testData/android/converter/exceptions")
+
+    @TestMetadata("plugins/android-compiler-plugin/testData/android/converter/exceptions")
    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
    public static class Exceptions extends AbstractAndroidXml2KConversionTest {
        public void testAllFilesPresentInExceptions() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/android/converter/exceptions"), Pattern.compile("^([^\\.]+)$"), false);
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-compiler-plugin/testData/android/converter/exceptions"), Pattern.compile("^([^\\.]+)$"), false);
        }
-        
+
        @TestMetadata("noManifest")
        public void testNoManifest() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/android/converter/exceptions/noManifest/");
+            String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/android/converter/exceptions/noManifest/");
            doNoManifestTest(fileName);
        }
-        
-    }
-    
-    public static Test suite() {
-        TestSuite suite = new TestSuite("AndroidXml2KConversionTestGenerated");
-        suite.addTestSuite(Simple.class);
-        suite.addTestSuite(Exceptions.class);
-        return suite;
    }
 }