AndroidBytecodeShapeTest renamed

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<String>) {
     System.setProperty("java.awt.headless", "true")
@@ -746,8 +746,8 @@ fun main(args: Array<String>) {
             model("codegen/android", recursive = false, extension = null, testMethod = "doFakeInvocationTest", testClassName = "Invoke")
         }
 
-        testClass(javaClass<AbstractAndroidBytecodePersistenceTest>()) {
+        testClass(javaClass<AbstractAndroidBytecodeShapeTest>()) {
-            model("codegen/androidPersistence", recursive = false, extension = null)
+            model("codegen/bytecodeShape", recursive = false, extension = null)
         }
     }
 

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)

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 class AndroidBytecodeShapeTestGenerated extends AbstractAndroidBytecodeShapeTest {
-    public void testAllFilesPresentInAndroidPersistence() throws Exception {
+    public void testAllFilesPresentInBytecodeShape() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-compiler-plugin/testData/codegen/androidPersistence"), Pattern.compile("^([^\\.]+)$"), false);
+        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);
     }
 }