diff --git a/plugins/android-compiler-plugin/android-compiler-plugin.iml b/plugins/android-compiler-plugin/android-compiler-plugin.iml index 94014e1b492..6955ef54ef5 100644 --- a/plugins/android-compiler-plugin/android-compiler-plugin.iml +++ b/plugins/android-compiler-plugin/android-compiler-plugin.iml @@ -4,6 +4,7 @@ + @@ -14,6 +15,8 @@ + + + - - + \ No newline at end of file diff --git a/compiler/testData/android/converter/exceptions/noManifest/layout/layout.xml b/plugins/android-compiler-plugin/testData/android/converter/exceptions/noManifest/layout/layout.xml similarity index 100% rename from compiler/testData/android/converter/exceptions/noManifest/layout/layout.xml rename to plugins/android-compiler-plugin/testData/android/converter/exceptions/noManifest/layout/layout.xml diff --git a/compiler/testData/android/converter/simple/fqNameInAttr/AndroidManifest.xml b/plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInAttr/AndroidManifest.xml similarity index 100% rename from compiler/testData/android/converter/simple/fqNameInAttr/AndroidManifest.xml rename to plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInAttr/AndroidManifest.xml diff --git a/compiler/testData/android/converter/simple/fqNameInAttr/layout.kt b/plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInAttr/layout.kt similarity index 100% rename from compiler/testData/android/converter/simple/fqNameInAttr/layout.kt rename to plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInAttr/layout.kt diff --git a/compiler/testData/android/converter/simple/fqNameInAttr/layout/layout.xml b/plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInAttr/layout/layout.xml similarity index 100% rename from compiler/testData/android/converter/simple/fqNameInAttr/layout/layout.xml rename to plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInAttr/layout/layout.xml diff --git a/compiler/testData/android/converter/simple/fqNameInTag/AndroidManifest.xml b/plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInTag/AndroidManifest.xml similarity index 100% rename from compiler/testData/android/converter/simple/fqNameInTag/AndroidManifest.xml rename to plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInTag/AndroidManifest.xml diff --git a/compiler/testData/android/converter/simple/fqNameInTag/layout.kt b/plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInTag/layout.kt similarity index 100% rename from compiler/testData/android/converter/simple/fqNameInTag/layout.kt rename to plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInTag/layout.kt diff --git a/compiler/testData/android/converter/simple/fqNameInTag/layout/layout.xml b/plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInTag/layout/layout.xml similarity index 100% rename from compiler/testData/android/converter/simple/fqNameInTag/layout/layout.xml rename to plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInTag/layout/layout.xml diff --git a/compiler/testData/android/converter/simple/multiFile/AndroidManifest.xml b/plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/AndroidManifest.xml similarity index 100% rename from compiler/testData/android/converter/simple/multiFile/AndroidManifest.xml rename to plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/AndroidManifest.xml diff --git a/compiler/testData/android/converter/simple/multiFile/layout.kt b/plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/layout.kt similarity index 100% rename from compiler/testData/android/converter/simple/multiFile/layout.kt rename to plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/layout.kt diff --git a/compiler/testData/android/converter/simple/multiFile/layout/layout.xml b/plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/layout/layout.xml similarity index 100% rename from compiler/testData/android/converter/simple/multiFile/layout/layout.xml rename to plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/layout/layout.xml diff --git a/compiler/testData/android/converter/simple/multiFile/layout/layout1.xml b/plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/layout/layout1.xml similarity index 100% rename from compiler/testData/android/converter/simple/multiFile/layout/layout1.xml rename to plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/layout/layout1.xml diff --git a/compiler/testData/android/converter/simple/noIds/AndroidManifest.xml b/plugins/android-compiler-plugin/testData/android/converter/simple/noIds/AndroidManifest.xml similarity index 100% rename from compiler/testData/android/converter/simple/noIds/AndroidManifest.xml rename to plugins/android-compiler-plugin/testData/android/converter/simple/noIds/AndroidManifest.xml diff --git a/compiler/testData/android/converter/simple/noIds/layout.kt b/plugins/android-compiler-plugin/testData/android/converter/simple/noIds/layout.kt similarity index 100% rename from compiler/testData/android/converter/simple/noIds/layout.kt rename to plugins/android-compiler-plugin/testData/android/converter/simple/noIds/layout.kt diff --git a/compiler/testData/android/converter/simple/noIds/layout/layout.xml b/plugins/android-compiler-plugin/testData/android/converter/simple/noIds/layout/layout.xml similarity index 100% rename from compiler/testData/android/converter/simple/noIds/layout/layout.xml rename to plugins/android-compiler-plugin/testData/android/converter/simple/noIds/layout/layout.xml diff --git a/compiler/testData/android/converter/simple/singleFile/AndroidManifest.xml b/plugins/android-compiler-plugin/testData/android/converter/simple/singleFile/AndroidManifest.xml similarity index 100% rename from compiler/testData/android/converter/simple/singleFile/AndroidManifest.xml rename to plugins/android-compiler-plugin/testData/android/converter/simple/singleFile/AndroidManifest.xml diff --git a/compiler/testData/android/converter/simple/singleFile/layout.kt b/plugins/android-compiler-plugin/testData/android/converter/simple/singleFile/layout.kt similarity index 100% rename from compiler/testData/android/converter/simple/singleFile/layout.kt rename to plugins/android-compiler-plugin/testData/android/converter/simple/singleFile/layout.kt diff --git a/compiler/testData/android/converter/simple/singleFile/layout/layout.xml b/plugins/android-compiler-plugin/testData/android/converter/simple/singleFile/layout/layout.xml similarity index 100% rename from compiler/testData/android/converter/simple/singleFile/layout/layout.xml rename to plugins/android-compiler-plugin/testData/android/converter/simple/singleFile/layout/layout.xml diff --git a/compiler/testData/android/fakeHelpers/Activity.kt b/plugins/android-compiler-plugin/testData/android/fakeHelpers/Activity.kt similarity index 100% rename from compiler/testData/android/fakeHelpers/Activity.kt rename to plugins/android-compiler-plugin/testData/android/fakeHelpers/Activity.kt diff --git a/compiler/testData/android/fakeHelpers/View.kt b/plugins/android-compiler-plugin/testData/android/fakeHelpers/View.kt similarity index 100% rename from compiler/testData/android/fakeHelpers/View.kt rename to plugins/android-compiler-plugin/testData/android/fakeHelpers/View.kt diff --git a/compiler/testData/android/fakeHelpers/Widgets.kt b/plugins/android-compiler-plugin/testData/android/fakeHelpers/Widgets.kt similarity index 100% rename from compiler/testData/android/fakeHelpers/Widgets.kt rename to plugins/android-compiler-plugin/testData/android/fakeHelpers/Widgets.kt diff --git a/compiler/testData/codegen/android/FakeActivity.kt b/plugins/android-compiler-plugin/testData/codegen/android/FakeActivity.kt similarity index 100% rename from compiler/testData/codegen/android/FakeActivity.kt rename to plugins/android-compiler-plugin/testData/codegen/android/FakeActivity.kt diff --git a/compiler/testData/codegen/android/FakeContext.kt b/plugins/android-compiler-plugin/testData/codegen/android/FakeContext.kt similarity index 100% rename from compiler/testData/codegen/android/FakeContext.kt rename to plugins/android-compiler-plugin/testData/codegen/android/FakeContext.kt diff --git a/compiler/testData/codegen/android/FakeView.kt b/plugins/android-compiler-plugin/testData/codegen/android/FakeView.kt similarity index 100% rename from compiler/testData/codegen/android/FakeView.kt rename to plugins/android-compiler-plugin/testData/codegen/android/FakeView.kt diff --git a/compiler/testData/codegen/android/FakeWidgets.kt b/plugins/android-compiler-plugin/testData/codegen/android/FakeWidgets.kt similarity index 100% rename from compiler/testData/codegen/android/FakeWidgets.kt rename to plugins/android-compiler-plugin/testData/codegen/android/FakeWidgets.kt diff --git a/compiler/testData/codegen/android/fqNameInAttr/0.kt b/plugins/android-compiler-plugin/testData/codegen/android/fqNameInAttr/0.kt similarity index 100% rename from compiler/testData/codegen/android/fqNameInAttr/0.kt rename to plugins/android-compiler-plugin/testData/codegen/android/fqNameInAttr/0.kt diff --git a/compiler/testData/codegen/android/fqNameInAttr/1.kt b/plugins/android-compiler-plugin/testData/codegen/android/fqNameInAttr/1.kt similarity index 100% rename from compiler/testData/codegen/android/fqNameInAttr/1.kt rename to plugins/android-compiler-plugin/testData/codegen/android/fqNameInAttr/1.kt diff --git a/compiler/testData/codegen/android/fqNameInAttr/AndroidManifest.xml b/plugins/android-compiler-plugin/testData/codegen/android/fqNameInAttr/AndroidManifest.xml similarity index 100% rename from compiler/testData/codegen/android/fqNameInAttr/AndroidManifest.xml rename to plugins/android-compiler-plugin/testData/codegen/android/fqNameInAttr/AndroidManifest.xml diff --git a/compiler/testData/codegen/android/fqNameInAttr/CustomWidgets.kt b/plugins/android-compiler-plugin/testData/codegen/android/fqNameInAttr/CustomWidgets.kt similarity index 100% rename from compiler/testData/codegen/android/fqNameInAttr/CustomWidgets.kt rename to plugins/android-compiler-plugin/testData/codegen/android/fqNameInAttr/CustomWidgets.kt diff --git a/compiler/testData/codegen/android/fqNameInAttr/layout/layout.xml b/plugins/android-compiler-plugin/testData/codegen/android/fqNameInAttr/layout/layout.xml similarity index 100% rename from compiler/testData/codegen/android/fqNameInAttr/layout/layout.xml rename to plugins/android-compiler-plugin/testData/codegen/android/fqNameInAttr/layout/layout.xml diff --git a/compiler/testData/codegen/android/fqNameInTag/0.kt b/plugins/android-compiler-plugin/testData/codegen/android/fqNameInTag/0.kt similarity index 100% rename from compiler/testData/codegen/android/fqNameInTag/0.kt rename to plugins/android-compiler-plugin/testData/codegen/android/fqNameInTag/0.kt diff --git a/compiler/testData/codegen/android/fqNameInTag/1.kt b/plugins/android-compiler-plugin/testData/codegen/android/fqNameInTag/1.kt similarity index 100% rename from compiler/testData/codegen/android/fqNameInTag/1.kt rename to plugins/android-compiler-plugin/testData/codegen/android/fqNameInTag/1.kt diff --git a/compiler/testData/codegen/android/fqNameInTag/AndroidManifest.xml b/plugins/android-compiler-plugin/testData/codegen/android/fqNameInTag/AndroidManifest.xml similarity index 100% rename from compiler/testData/codegen/android/fqNameInTag/AndroidManifest.xml rename to plugins/android-compiler-plugin/testData/codegen/android/fqNameInTag/AndroidManifest.xml diff --git a/compiler/testData/codegen/android/fqNameInTag/CustomWidgets.kt b/plugins/android-compiler-plugin/testData/codegen/android/fqNameInTag/CustomWidgets.kt similarity index 100% rename from compiler/testData/codegen/android/fqNameInTag/CustomWidgets.kt rename to plugins/android-compiler-plugin/testData/codegen/android/fqNameInTag/CustomWidgets.kt diff --git a/compiler/testData/codegen/android/fqNameInTag/layout/layout.xml b/plugins/android-compiler-plugin/testData/codegen/android/fqNameInTag/layout/layout.xml similarity index 100% rename from compiler/testData/codegen/android/fqNameInTag/layout/layout.xml rename to plugins/android-compiler-plugin/testData/codegen/android/fqNameInTag/layout/layout.xml diff --git a/compiler/testData/codegen/android/manyWidgets/1.kt b/plugins/android-compiler-plugin/testData/codegen/android/manyWidgets/1.kt similarity index 100% rename from compiler/testData/codegen/android/manyWidgets/1.kt rename to plugins/android-compiler-plugin/testData/codegen/android/manyWidgets/1.kt diff --git a/compiler/testData/codegen/android/manyWidgets/AndroidManifest.xml b/plugins/android-compiler-plugin/testData/codegen/android/manyWidgets/AndroidManifest.xml similarity index 100% rename from compiler/testData/codegen/android/manyWidgets/AndroidManifest.xml rename to plugins/android-compiler-plugin/testData/codegen/android/manyWidgets/AndroidManifest.xml diff --git a/compiler/testData/codegen/android/manyWidgets/layout/layout.xml b/plugins/android-compiler-plugin/testData/codegen/android/manyWidgets/layout/layout.xml similarity index 100% rename from compiler/testData/codegen/android/manyWidgets/layout/layout.xml rename to plugins/android-compiler-plugin/testData/codegen/android/manyWidgets/layout/layout.xml diff --git a/compiler/testData/codegen/android/multiFile/0.kt b/plugins/android-compiler-plugin/testData/codegen/android/multiFile/0.kt similarity index 100% rename from compiler/testData/codegen/android/multiFile/0.kt rename to plugins/android-compiler-plugin/testData/codegen/android/multiFile/0.kt diff --git a/compiler/testData/codegen/android/multiFile/1.kt b/plugins/android-compiler-plugin/testData/codegen/android/multiFile/1.kt similarity index 100% rename from compiler/testData/codegen/android/multiFile/1.kt rename to plugins/android-compiler-plugin/testData/codegen/android/multiFile/1.kt diff --git a/compiler/testData/codegen/android/multiFile/AndroidManifest.xml b/plugins/android-compiler-plugin/testData/codegen/android/multiFile/AndroidManifest.xml similarity index 100% rename from compiler/testData/codegen/android/multiFile/AndroidManifest.xml rename to plugins/android-compiler-plugin/testData/codegen/android/multiFile/AndroidManifest.xml diff --git a/compiler/testData/codegen/android/multiFile/layout/layout.xml b/plugins/android-compiler-plugin/testData/codegen/android/multiFile/layout/layout.xml similarity index 100% rename from compiler/testData/codegen/android/multiFile/layout/layout.xml rename to plugins/android-compiler-plugin/testData/codegen/android/multiFile/layout/layout.xml diff --git a/compiler/testData/codegen/android/multiFile/layout/layout1.xml b/plugins/android-compiler-plugin/testData/codegen/android/multiFile/layout/layout1.xml similarity index 100% rename from compiler/testData/codegen/android/multiFile/layout/layout1.xml rename to plugins/android-compiler-plugin/testData/codegen/android/multiFile/layout/layout1.xml diff --git a/compiler/testData/codegen/android/singleFile/0.kt b/plugins/android-compiler-plugin/testData/codegen/android/singleFile/0.kt similarity index 100% rename from compiler/testData/codegen/android/singleFile/0.kt rename to plugins/android-compiler-plugin/testData/codegen/android/singleFile/0.kt diff --git a/compiler/testData/codegen/android/singleFile/1.kt b/plugins/android-compiler-plugin/testData/codegen/android/singleFile/1.kt similarity index 100% rename from compiler/testData/codegen/android/singleFile/1.kt rename to plugins/android-compiler-plugin/testData/codegen/android/singleFile/1.kt diff --git a/compiler/testData/codegen/android/singleFile/AndroidManifest.xml b/plugins/android-compiler-plugin/testData/codegen/android/singleFile/AndroidManifest.xml similarity index 100% rename from compiler/testData/codegen/android/singleFile/AndroidManifest.xml rename to plugins/android-compiler-plugin/testData/codegen/android/singleFile/AndroidManifest.xml diff --git a/compiler/testData/codegen/android/singleFile/layout/layout.xml b/plugins/android-compiler-plugin/testData/codegen/android/singleFile/layout/layout.xml similarity index 100% rename from compiler/testData/codegen/android/singleFile/layout/layout.xml rename to plugins/android-compiler-plugin/testData/codegen/android/singleFile/layout/layout.xml diff --git a/compiler/testData/codegen/androidPersistence/AndroidManifest.xml b/plugins/android-compiler-plugin/testData/codegen/androidPersistence/AndroidManifest.xml similarity index 100% rename from compiler/testData/codegen/androidPersistence/AndroidManifest.xml rename to plugins/android-compiler-plugin/testData/codegen/androidPersistence/AndroidManifest.xml diff --git a/compiler/testData/codegen/androidPersistence/fqNameInAttr/fqNameInAttr.kt b/plugins/android-compiler-plugin/testData/codegen/androidPersistence/fqNameInAttr/fqNameInAttr.kt similarity index 100% rename from compiler/testData/codegen/androidPersistence/fqNameInAttr/fqNameInAttr.kt rename to plugins/android-compiler-plugin/testData/codegen/androidPersistence/fqNameInAttr/fqNameInAttr.kt diff --git a/compiler/testData/codegen/androidPersistence/fqNameInAttr/res/layout/layout.xml b/plugins/android-compiler-plugin/testData/codegen/androidPersistence/fqNameInAttr/res/layout/layout.xml similarity index 100% rename from compiler/testData/codegen/androidPersistence/fqNameInAttr/res/layout/layout.xml rename to plugins/android-compiler-plugin/testData/codegen/androidPersistence/fqNameInAttr/res/layout/layout.xml diff --git a/compiler/testData/codegen/androidPersistence/fqNameInTag/fqNameInTag.kt b/plugins/android-compiler-plugin/testData/codegen/androidPersistence/fqNameInTag/fqNameInTag.kt similarity index 100% rename from compiler/testData/codegen/androidPersistence/fqNameInTag/fqNameInTag.kt rename to plugins/android-compiler-plugin/testData/codegen/androidPersistence/fqNameInTag/fqNameInTag.kt diff --git a/compiler/testData/codegen/androidPersistence/fqNameInTag/res/layout/layout.xml b/plugins/android-compiler-plugin/testData/codegen/androidPersistence/fqNameInTag/res/layout/layout.xml similarity index 100% rename from compiler/testData/codegen/androidPersistence/fqNameInTag/res/layout/layout.xml rename to plugins/android-compiler-plugin/testData/codegen/androidPersistence/fqNameInTag/res/layout/layout.xml diff --git a/compiler/testData/codegen/androidPersistence/multiFile/multiFile.kt b/plugins/android-compiler-plugin/testData/codegen/androidPersistence/multiFile/multiFile.kt similarity index 100% rename from compiler/testData/codegen/androidPersistence/multiFile/multiFile.kt rename to plugins/android-compiler-plugin/testData/codegen/androidPersistence/multiFile/multiFile.kt diff --git a/compiler/testData/codegen/androidPersistence/multiFile/res/layout/layout.xml b/plugins/android-compiler-plugin/testData/codegen/androidPersistence/multiFile/res/layout/layout.xml similarity index 100% rename from compiler/testData/codegen/androidPersistence/multiFile/res/layout/layout.xml rename to plugins/android-compiler-plugin/testData/codegen/androidPersistence/multiFile/res/layout/layout.xml diff --git a/compiler/testData/codegen/androidPersistence/multiFile/res/layout/layout1.xml b/plugins/android-compiler-plugin/testData/codegen/androidPersistence/multiFile/res/layout/layout1.xml similarity index 100% rename from compiler/testData/codegen/androidPersistence/multiFile/res/layout/layout1.xml rename to plugins/android-compiler-plugin/testData/codegen/androidPersistence/multiFile/res/layout/layout1.xml diff --git a/compiler/testData/codegen/androidPersistence/simple/res/layout/layout.xml b/plugins/android-compiler-plugin/testData/codegen/androidPersistence/simple/res/layout/layout.xml similarity index 100% rename from compiler/testData/codegen/androidPersistence/simple/res/layout/layout.xml rename to plugins/android-compiler-plugin/testData/codegen/androidPersistence/simple/res/layout/layout.xml diff --git a/compiler/testData/codegen/androidPersistence/simple/simple.kt b/plugins/android-compiler-plugin/testData/codegen/androidPersistence/simple/simple.kt similarity index 100% rename from compiler/testData/codegen/androidPersistence/simple/simple.kt rename to plugins/android-compiler-plugin/testData/codegen/androidPersistence/simple/simple.kt diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/android/AbstractAndroidBoxTest.kt b/plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/AbstractAndroidBoxTest.kt similarity index 100% rename from compiler/tests/org/jetbrains/jet/lang/resolve/android/AbstractAndroidBoxTest.kt rename to plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/AbstractAndroidBoxTest.kt diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/android/AbstractAndroidBytecodePersistenceTest.kt b/plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/AbstractAndroidBytecodePersistenceTest.kt similarity index 100% rename from compiler/tests/org/jetbrains/jet/lang/resolve/android/AbstractAndroidBytecodePersistenceTest.kt rename to plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/AbstractAndroidBytecodePersistenceTest.kt diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/android/AbstractAndroidXml2KConversionTest.kt b/plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/AbstractAndroidXml2KConversionTest.kt similarity index 100% rename from compiler/tests/org/jetbrains/jet/lang/resolve/android/AbstractAndroidXml2KConversionTest.kt rename to plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/AbstractAndroidXml2KConversionTest.kt diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/android/AndroidBoxTestGenerated.java b/plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/AndroidBoxTestGenerated.java similarity index 61% rename from compiler/tests/org/jetbrains/jet/lang/resolve/android/AndroidBoxTestGenerated.java rename to plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/AndroidBoxTestGenerated.java index 73fa75e8472..29cf9a315be 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/android/AndroidBoxTestGenerated.java +++ b/plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/AndroidBoxTestGenerated.java @@ -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; } } diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/android/AndroidBytecodePersistenceTestGenerated.java b/plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/AndroidBytecodePersistenceTestGenerated.java similarity index 66% rename from compiler/tests/org/jetbrains/jet/lang/resolve/android/AndroidBytecodePersistenceTestGenerated.java rename to plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/AndroidBytecodePersistenceTestGenerated.java index d57b1ada3ef..b97c1dfdd38 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/android/AndroidBytecodePersistenceTestGenerated.java +++ b/plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/AndroidBytecodePersistenceTestGenerated.java @@ -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); } - } diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/android/AndroidXml2KConversionTestGenerated.java b/plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/AndroidXml2KConversionTestGenerated.java similarity index 62% rename from compiler/tests/org/jetbrains/jet/lang/resolve/android/AndroidXml2KConversionTestGenerated.java rename to plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/AndroidXml2KConversionTestGenerated.java index 0888d0e0ca9..086340c47ff 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/android/AndroidXml2KConversionTestGenerated.java +++ b/plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/AndroidXml2KConversionTestGenerated.java @@ -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; } }