From ead7653f84a3257c0ea20d916bbaa5b5d180b51b Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Tue, 27 Mar 2018 20:15:51 +0300
Subject: [PATCH] Minor: Fix Parcelable test data

---
 .../android-extensions-compiler/build.gradle.kts          | 1 +
 .../testData/parcel/codegen/customSimple.txt              | 1 -
 .../testData/parcel/codegen/customSimpleWithNewArray.txt  | 1 -
 .../testData/parcel/codegen/duplicatingClinit.txt         | 8 --------
 4 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/plugins/android-extensions/android-extensions-compiler/build.gradle.kts b/plugins/android-extensions/android-extensions-compiler/build.gradle.kts
index 0cc877f477d..8a8f4f42e77 100644
--- a/plugins/android-extensions/android-extensions-compiler/build.gradle.kts
+++ b/plugins/android-extensions/android-extensions-compiler/build.gradle.kts
@@ -32,6 +32,7 @@ dependencies {
     testRuntime(intellijPluginDep("junit")) { includeJars("idea-junit", "resources_en") }
 
     robolectricClasspath(commonDep("org.robolectric", "robolectric"))
+    robolectricClasspath(project(":kotlin-android-extensions-runtime")) { isTransitive = false }
 
     embeddedComponents(project(":kotlin-android-extensions-runtime")) { isTransitive = false }
 }
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customSimple.txt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customSimple.txt
index 598b360c1b0..225786ac51b 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customSimple.txt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customSimple.txt
@@ -24,7 +24,6 @@ final class User$Companion : java/lang/Object, kotlinx/android/parcel/Parceler {
           ALOAD (0)
           ILOAD (1)
           INVOKEVIRTUAL (User$Companion, newArray, (I)[LUser;)
-          CHECKCAST
           ARETURN
     }
 
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customSimpleWithNewArray.txt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customSimpleWithNewArray.txt
index 029315ad9c4..2a2b6cdea75 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customSimpleWithNewArray.txt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customSimpleWithNewArray.txt
@@ -22,7 +22,6 @@ final class User$Companion : java/lang/Object, kotlinx/android/parcel/Parceler {
           ALOAD (0)
           ILOAD (1)
           INVOKEVIRTUAL (User$Companion, newArray, (I)[LUser;)
-          CHECKCAST
           ARETURN
     }
 
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/duplicatingClinit.txt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/duplicatingClinit.txt
index 2d01e7b4cca..50cfd5dc452 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/duplicatingClinit.txt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/duplicatingClinit.txt
@@ -3,10 +3,6 @@ public final class User$Companion : java/lang/Object {
 
     public void <init>(kotlin.jvm.internal.DefaultConstructorMarker p0)
 
-    public final static java.lang.StringBuilder access$getTest$p(User$Companion p0)
-
-    private final java.lang.StringBuilder getTest()
-
     private static void test$annotations()
 }
 
@@ -48,13 +44,9 @@ public final class User : java/lang/Object, android/os/Parcelable {
 
     public void <init>(java.lang.String p0)
 
-    public final static java.lang.StringBuilder access$getTest$cp()
-
     public final int describeContents()
 
     public final java.lang.String getFirstName()
 
-    private final static java.lang.StringBuilder getTest()
-
     public final void writeToParcel(android.os.Parcel p0, int p1)
 }