From 7cd78a2d3a4a81a433ce4835c67b1261a2f31f2d Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Fri, 5 Dec 2014 17:57:38 +0300 Subject: [PATCH] AndroidBytecodeShapeTest renamed --- .../kotlin/generators/tests/GenerateTests.kt | 6 +++--- .../AndroidManifest.xml | 0 .../fqNameInAttr/fqNameInAttr.kt | 0 .../fqNameInAttr/res/layout/layout.xml | 0 .../fqNameInTag/fqNameInTag.kt | 0 .../fqNameInTag/res/layout/layout.xml | 0 .../multiFile/multiFile.kt | 0 .../multiFile/res/layout/layout.xml | 0 .../multiFile/res/layout/layout1.xml | 0 .../simple/res/layout/layout.xml | 0 .../simple/simple.kt | 0 ...st.kt => AbstractAndroidBytecodeShapeTest.kt} | 2 +- ...va => AndroidBytecodeShapeTestGenerated.java} | 16 ++++++++-------- 13 files changed, 12 insertions(+), 12 deletions(-) rename plugins/android-compiler-plugin/testData/codegen/{androidPersistence => bytecodeShape}/AndroidManifest.xml (100%) rename plugins/android-compiler-plugin/testData/codegen/{androidPersistence => bytecodeShape}/fqNameInAttr/fqNameInAttr.kt (100%) rename plugins/android-compiler-plugin/testData/codegen/{androidPersistence => bytecodeShape}/fqNameInAttr/res/layout/layout.xml (100%) rename plugins/android-compiler-plugin/testData/codegen/{androidPersistence => bytecodeShape}/fqNameInTag/fqNameInTag.kt (100%) rename plugins/android-compiler-plugin/testData/codegen/{androidPersistence => bytecodeShape}/fqNameInTag/res/layout/layout.xml (100%) rename plugins/android-compiler-plugin/testData/codegen/{androidPersistence => bytecodeShape}/multiFile/multiFile.kt (100%) rename plugins/android-compiler-plugin/testData/codegen/{androidPersistence => bytecodeShape}/multiFile/res/layout/layout.xml (100%) rename plugins/android-compiler-plugin/testData/codegen/{androidPersistence => bytecodeShape}/multiFile/res/layout/layout1.xml (100%) rename plugins/android-compiler-plugin/testData/codegen/{androidPersistence => bytecodeShape}/simple/res/layout/layout.xml (100%) rename plugins/android-compiler-plugin/testData/codegen/{androidPersistence => bytecodeShape}/simple/simple.kt (100%) rename plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/{AbstractAndroidBytecodePersistenceTest.kt => AbstractAndroidBytecodeShapeTest.kt} (96%) rename plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/{AndroidBytecodePersistenceTestGenerated.java => AndroidBytecodeShapeTestGenerated.java} (78%) diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index dc786e2fd64..e796ef63f5f 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -150,7 +150,7 @@ import org.jetbrains.jet.android.AbstractAndroidGotoTest import org.jetbrains.jet.jps.build.android.AbstractAndroidJpsTestCase import org.jetbrains.jet.android.AbstractAndroidRenameTest import org.jetbrains.jet.android.AbstractAndroidFindUsagesTest -import org.jetbrains.jet.lang.resolve.android.AbstractAndroidBytecodePersistenceTest +import org.jetbrains.jet.lang.resolve.android.AbstractAndroidBytecodeShapeTest fun main(args: Array) { System.setProperty("java.awt.headless", "true") @@ -746,8 +746,8 @@ fun main(args: Array) { model("codegen/android", recursive = false, extension = null, testMethod = "doFakeInvocationTest", testClassName = "Invoke") } - testClass(javaClass()) { - model("codegen/androidPersistence", recursive = false, extension = null) + testClass(javaClass()) { + model("codegen/bytecodeShape", recursive = false, extension = null) } } diff --git a/plugins/android-compiler-plugin/testData/codegen/androidPersistence/AndroidManifest.xml b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/AndroidManifest.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/androidPersistence/AndroidManifest.xml rename to plugins/android-compiler-plugin/testData/codegen/bytecodeShape/AndroidManifest.xml diff --git a/plugins/android-compiler-plugin/testData/codegen/androidPersistence/fqNameInAttr/fqNameInAttr.kt b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInAttr/fqNameInAttr.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/androidPersistence/fqNameInAttr/fqNameInAttr.kt rename to plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInAttr/fqNameInAttr.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/androidPersistence/fqNameInAttr/res/layout/layout.xml b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInAttr/res/layout/layout.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/androidPersistence/fqNameInAttr/res/layout/layout.xml rename to plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInAttr/res/layout/layout.xml diff --git a/plugins/android-compiler-plugin/testData/codegen/androidPersistence/fqNameInTag/fqNameInTag.kt b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInTag/fqNameInTag.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/androidPersistence/fqNameInTag/fqNameInTag.kt rename to plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInTag/fqNameInTag.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/androidPersistence/fqNameInTag/res/layout/layout.xml b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInTag/res/layout/layout.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/androidPersistence/fqNameInTag/res/layout/layout.xml rename to plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInTag/res/layout/layout.xml diff --git a/plugins/android-compiler-plugin/testData/codegen/androidPersistence/multiFile/multiFile.kt b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/multiFile/multiFile.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/androidPersistence/multiFile/multiFile.kt rename to plugins/android-compiler-plugin/testData/codegen/bytecodeShape/multiFile/multiFile.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/androidPersistence/multiFile/res/layout/layout.xml b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/multiFile/res/layout/layout.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/androidPersistence/multiFile/res/layout/layout.xml rename to plugins/android-compiler-plugin/testData/codegen/bytecodeShape/multiFile/res/layout/layout.xml diff --git a/plugins/android-compiler-plugin/testData/codegen/androidPersistence/multiFile/res/layout/layout1.xml b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/multiFile/res/layout/layout1.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/androidPersistence/multiFile/res/layout/layout1.xml rename to plugins/android-compiler-plugin/testData/codegen/bytecodeShape/multiFile/res/layout/layout1.xml diff --git a/plugins/android-compiler-plugin/testData/codegen/androidPersistence/simple/res/layout/layout.xml b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simple/res/layout/layout.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/androidPersistence/simple/res/layout/layout.xml rename to plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simple/res/layout/layout.xml diff --git a/plugins/android-compiler-plugin/testData/codegen/androidPersistence/simple/simple.kt b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simple/simple.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/androidPersistence/simple/simple.kt rename to plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simple/simple.kt diff --git a/plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/AbstractAndroidBytecodePersistenceTest.kt b/plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/AbstractAndroidBytecodeShapeTest.kt similarity index 96% rename from plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/AbstractAndroidBytecodePersistenceTest.kt rename to plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/AbstractAndroidBytecodeShapeTest.kt index a9dcf7e75f6..d1ec3992f04 100644 --- a/plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/AbstractAndroidBytecodePersistenceTest.kt +++ b/plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/AbstractAndroidBytecodeShapeTest.kt @@ -29,7 +29,7 @@ import org.jetbrains.jet.codegen.extensions.ExpressionCodegenExtension import org.jetbrains.kotlin.android.AndroidExpressionCodegen import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles -public abstract class AbstractAndroidBytecodePersistenceTest : AbstractBytecodeTextTest() { +public abstract class AbstractAndroidBytecodeShapeTest : AbstractBytecodeTextTest() { private fun createAndroidAPIEnvironment(path: String) { return createEnvironmentForConfiguration(JetTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.ANDROID_API), path) diff --git a/plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/AndroidBytecodePersistenceTestGenerated.java b/plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/AndroidBytecodeShapeTestGenerated.java similarity index 78% rename from plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/AndroidBytecodePersistenceTestGenerated.java rename to plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/AndroidBytecodeShapeTestGenerated.java index b97c1dfdd38..6f56a861057 100644 --- a/plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/AndroidBytecodePersistenceTestGenerated.java +++ b/plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/AndroidBytecodeShapeTestGenerated.java @@ -28,35 +28,35 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("plugins/android-compiler-plugin/testData/codegen/androidPersistence") +@TestMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) -public class AndroidBytecodePersistenceTestGenerated extends AbstractAndroidBytecodePersistenceTest { - public void testAllFilesPresentInAndroidPersistence() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-compiler-plugin/testData/codegen/androidPersistence"), Pattern.compile("^([^\\.]+)$"), false); +public class AndroidBytecodeShapeTestGenerated extends AbstractAndroidBytecodeShapeTest { + public void testAllFilesPresentInBytecodeShape() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-compiler-plugin/testData/codegen/bytecodeShape"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("fqNameInAttr") public void testFqNameInAttr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/androidPersistence/fqNameInAttr/"); + String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInAttr/"); doTest(fileName); } @TestMetadata("fqNameInTag") public void testFqNameInTag() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/androidPersistence/fqNameInTag/"); + String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInTag/"); doTest(fileName); } @TestMetadata("multiFile") public void testMultiFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/androidPersistence/multiFile/"); + String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/multiFile/"); doTest(fileName); } @TestMetadata("simple") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/androidPersistence/simple/"); + String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simple/"); doTest(fileName); } }