Parcelize: Add tests for deprecated (kotlinx.android.parcel) annotations

plugins/parcelize/parcelize-compiler/testData/box/customParcelableDeprecated.kt

@@ -0,0 +1,38 @@
+// IGNORE_BACKEND: JVM
+// See KT-38105
+// Throws IllegalAccessError, since the code tries to access the private companion field directly from the generated User$Creator class.
+// WITH_RUNTIME
+
+@file:JvmName("TestKt")
+package test
+
+import kotlinx.android.parcel.*
+import android.os.Parcel
+import android.os.Parcelable
+
+data class User(val name: String, val age: Int)
+
+@Parcelize
+data class UserParcelable(val user: User) : Parcelable {
+    private companion object : Parceler<UserParcelable> {
+        override fun UserParcelable.write(parcel: Parcel, flags: Int) {
+            parcel.writeString(user.name)
+        }
+
+        override fun create(parcel: Parcel) = UserParcelable(User(parcel.readString(), 0))
+    }
+}
+
+fun box() = parcelTest { parcel ->
+    val userParcelable = UserParcelable(User("John", 20))
+    userParcelable.writeToParcel(parcel, 0)
+
+    val bytes = parcel.marshall()
+    parcel.unmarshall(bytes, 0, bytes.size)
+    parcel.setDataPosition(0)
+
+    val userParcelable2 = readFromParcel<UserParcelable>(parcel)
+
+    assert(userParcelable.user.name == userParcelable2.user.name)
+    assert(userParcelable2.user.age == 0)
+}

plugins/parcelize/parcelize-compiler/testData/box/customSerializerSimpleDeprecated.kt

@@ -0,0 +1,49 @@
+// WITH_RUNTIME
+
+@file:JvmName("TestKt")
+package test
+
+import kotlinx.android.parcel.*
+import android.os.Parcel
+import android.os.Parcelable
+
+object Parceler1 : Parceler<String> {
+    override fun create(parcel: Parcel) = parcel.readInt().toString()
+
+    override fun String.write(parcel: Parcel, flags: Int) {
+        parcel.writeInt(length)
+    }
+}
+
+typealias Parceler2 = Parceler1
+
+object Parceler3 : Parceler<String> {
+    override fun create(parcel: Parcel) = parcel.readString().toUpperCase()
+
+    override fun String.write(parcel: Parcel, flags: Int) {
+        parcel.writeString(this)
+    }
+}
+
+@Parcelize
+@TypeParceler<String, Parceler2>
+data class Test(
+        val a: String,
+        @TypeParceler<String, Parceler1> val b: String,
+        @TypeParceler<String, Parceler3> val c: CharSequence,
+        val d: @WriteWith<Parceler3> String
+) : Parcelable
+
+fun box() = parcelTest { parcel ->
+    val test = Test("Abc", "Abc", "Abc", "Abc")
+    test.writeToParcel(parcel, 0)
+
+    val bytes = parcel.marshall()
+    parcel.unmarshall(bytes, 0, bytes.size)
+    parcel.setDataPosition(0)
+
+    val test2 = readFromParcel<Test>(parcel)
+
+    assert(test.a == "Abc" && test.b == "Abc" && test.c == "Abc" && test.d == "Abc")
+    assert(test2.a == "3" && test2.b == "3" && test2.c == "Abc" && test2.d == "ABC")
+}

plugins/parcelize/parcelize-compiler/testData/box/customSerializerWriteWithDeprecated.kt

@@ -0,0 +1,55 @@
+// IGNORE_BACKEND: JVM
+// See KT-38107
+// The JVM backend is missing support for custom parcelers in List<String>
+// WITH_RUNTIME
+
+@file:JvmName("TestKt")
+package test
+
+import kotlinx.android.parcel.*
+import android.os.Parcel
+import android.os.Parcelable
+
+object Parceler1 : Parceler<String> {
+    override fun create(parcel: Parcel) = parcel.readInt().toString()
+
+    override fun String.write(parcel: Parcel, flags: Int) {
+        parcel.writeInt(length)
+    }
+}
+
+object Parceler2 : Parceler<List<String>> {
+    override fun create(parcel: Parcel) = listOf(parcel.readString())
+
+    override fun List<String>.write(parcel: Parcel, flags: Int) {
+        parcel.writeString(this.joinToString(","))
+    }
+}
+
+@Parcelize
+data class Test(
+        val a: String,
+        val b: @WriteWith<Parceler1> String,
+        val c: List<@WriteWith<Parceler1> String>,
+        val d: @WriteWith<Parceler2> List<String>,
+        val e: @WriteWith<Parceler2> List<@WriteWith<Parceler1> String>
+) : Parcelable
+
+fun box() = parcelTest { parcel ->
+    val test = Test("Abc", "Abc", listOf("A", "bc"), listOf("A", "bc"), listOf("A", "bc"))
+    test.writeToParcel(parcel, 0)
+
+    val bytes = parcel.marshall()
+    parcel.unmarshall(bytes, 0, bytes.size)
+    parcel.setDataPosition(0)
+
+    val test2 = readFromParcel<Test>(parcel)
+
+    with (test) {
+        assert(a == "Abc" && b == "Abc" && c == listOf("A", "bc") && d == listOf("A", "bc") && e == listOf("A", "bc"))
+    }
+
+    with (test2) {
+        assert(a == "Abc" && b == "3" && c == listOf("1", "2") && d == listOf("A,bc") && e == listOf("A,bc"))
+    }
+}

plugins/parcelize/parcelize-compiler/testData/box/kt19747Deprecated.kt

@@ -0,0 +1,35 @@
+// WITH_RUNTIME
+
+@file:JvmName("TestKt")
+package test
+
+import kotlinx.android.parcel.*
+import android.os.Parcel
+import android.os.Parcelable
+import java.io.Serializable
+
+class JHelp(var j1: String) {
+    val j2 = 9
+}
+
+@Parcelize
+class J(val j: @RawValue JHelp) : Parcelable
+
+fun box() = parcelTest { parcel ->
+    val test = J(JHelp("A"))
+
+    var exceptionCaught = false
+    try {
+        test.writeToParcel(parcel, 0)
+    } catch (e: RuntimeException) {
+        if (e.message!!.contains("Parcel: unable to marshal value test.JHelp")) {
+            exceptionCaught = true
+        } else {
+            throw e
+        }
+    }
+
+    if (!exceptionCaught) {
+        error("Exception should be thrown")
+    }
+}

plugins/parcelize/parcelize-compiler/testData/box/simpleDeprecated.kt

@@ -0,0 +1,25 @@
+// WITH_RUNTIME
+
+@file:JvmName("TestKt")
+package test
+
+import kotlinx.android.parcel.*
+import android.os.Parcel
+import android.os.Parcelable
+
+annotation class SerializableLike
+
+@Parcelize @SerializableLike
+data class User(val firstName: String, val secondName: String, val age: Int) : Parcelable
+
+fun box() = parcelTest { parcel ->
+    val user = User("John", "Smith", 20)
+    user.writeToParcel(parcel, 0)
+
+    val bytes = parcel.marshall()
+    parcel.unmarshall(bytes, 0, bytes.size)
+    parcel.setDataPosition(0)
+
+    val user2 = readFromParcel<User>(parcel)
+    assert(user == user2)
+}

plugins/parcelize/parcelize-compiler/testData/codegen/customSimpleDeprecated.ir.txt

@@ -0,0 +1,116 @@
+final class User$Companion : java/lang/Object, kotlinx/android/parcel/Parceler {
+    private void <init>()
+
+    public void <init>(kotlin.jvm.internal.DefaultConstructorMarker $constructor_marker)
+
+    public User create(android.os.Parcel parcel)
+
+    public java.lang.Object create(android.os.Parcel parcel)
+
+    public User[] newArray(int size) {
+        LABEL (L0)
+        LINENUMBER (10)
+          ALOAD (0)
+          CHECKCAST
+          ILOAD (1)
+          INVOKESTATIC (kotlinx/android/parcel/Parceler$DefaultImpls, newArray, (Lkotlinx/android/parcel/Parceler;I)[Ljava/lang/Object;)
+          CHECKCAST
+          ARETURN
+        LABEL (L1)
+    }
+
+    public java.lang.Object[] newArray(int size) {
+        LABEL (L0)
+          ALOAD (0)
+          ILOAD (1)
+          INVOKEVIRTUAL (User$Companion, newArray, (I)[LUser;)
+          ARETURN
+        LABEL (L1)
+    }
+
+    public void write(User $this$write, android.os.Parcel parcel, int flags)
+
+    public void write(java.lang.Object $this$write, android.os.Parcel parcel, int flags)
+}
+
+public final class User$Creator : java/lang/Object, android/os/Parcelable$Creator {
+    public void <init>()
+
+    public final User createFromParcel(android.os.Parcel parcel) {
+        LABEL (L0)
+          ALOAD (1)
+          LDC (parcel)
+          INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
+          INVOKESTATIC (User, access$getCompanion$p$s2645995, ()LUser$Companion;)
+          ALOAD (1)
+          INVOKEVIRTUAL (User$Companion, create, (Landroid/os/Parcel;)LUser;)
+          ARETURN
+        LABEL (L1)
+    }
+
+    public java.lang.Object createFromParcel(android.os.Parcel source) {
+        LABEL (L0)
+          ALOAD (0)
+          ALOAD (1)
+          INVOKEVIRTUAL (User$Creator, createFromParcel, (Landroid/os/Parcel;)LUser;)
+          ARETURN
+        LABEL (L1)
+    }
+
+    public final User[] newArray(int size) {
+        LABEL (L0)
+          ILOAD (1)
+          ANEWARRAY
+          ARETURN
+        LABEL (L1)
+    }
+
+    public java.lang.Object[] newArray(int size) {
+        LABEL (L0)
+          ALOAD (0)
+          ILOAD (1)
+          INVOKEVIRTUAL (User$Creator, newArray, (I)[LUser;)
+          ARETURN
+        LABEL (L1)
+    }
+}
+
+public final class User : java/lang/Object, android/os/Parcelable {
+    public final static android.os.Parcelable$Creator CREATOR
+
+    private final static User$Companion Companion
+
+    private final int age
+
+    private final java.lang.String firstName
+
+    private final java.lang.String lastName
+
+    static void <clinit>()
+
+    public void <init>(java.lang.String firstName, java.lang.String lastName, int age)
+
+    public final static User$Companion access$getCompanion$p$s2645995()
+
+    public int describeContents()
+
+    public final int getAge()
+
+    public final java.lang.String getFirstName()
+
+    public final java.lang.String getLastName()
+
+    public void writeToParcel(android.os.Parcel out, int flags) {
+        LABEL (L0)
+          ALOAD (1)
+          LDC (out)
+          INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
+          GETSTATIC (Companion, LUser$Companion;)
+          ALOAD (0)
+          ALOAD (1)
+          ILOAD (2)
+          INVOKEVIRTUAL (User$Companion, write, (LUser;Landroid/os/Parcel;I)V)
+          RETURN
+        LABEL (L1)
+    }
+}

plugins/parcelize/parcelize-compiler/testData/codegen/customSimpleDeprecated.kt

@@ -0,0 +1,19 @@
+// CURIOUS_ABOUT writeToParcel, createFromParcel, newArray
+// WITH_RUNTIME
+
+import kotlinx.android.parcel.*
+import android.os.Parcel
+import android.os.Parcelable
+
+@Parcelize
+class User(val firstName: String, val lastName: String, val age: Int) : Parcelable {
+    private companion object : Parceler<User> {
+        override fun User.write(parcel: Parcel, flags: Int) {
+            parcel.writeString(firstName)
+            parcel.writeString(lastName)
+            parcel.writeInt(age)
+        }
+
+        override fun create(parcel: Parcel) = User(parcel.readString(), parcel.readString(), parcel.readInt())
+    }
+}

plugins/parcelize/parcelize-compiler/testData/codegen/customSimpleDeprecated.txt

@@ -0,0 +1,113 @@
+final class User$Companion : java/lang/Object, kotlinx/android/parcel/Parceler {
+    private void <init>()
+
+    public void <init>(kotlin.jvm.internal.DefaultConstructorMarker $constructor_marker)
+
+    public User create(android.os.Parcel parcel)
+
+    public java.lang.Object create(android.os.Parcel p0)
+
+    public User[] newArray(int size) {
+        LABEL (L0)
+        LINENUMBER (10)
+          ALOAD (0)
+          ILOAD (1)
+          INVOKESTATIC (kotlinx/android/parcel/Parceler$DefaultImpls, newArray, (Lkotlinx/android/parcel/Parceler;I)[Ljava/lang/Object;)
+          CHECKCAST
+          ARETURN
+        LABEL (L1)
+    }
+
+    public java.lang.Object[] newArray(int p0) {
+        LABEL (L0)
+        LINENUMBER (10)
+          ALOAD (0)
+          ILOAD (1)
+          INVOKEVIRTUAL (User$Companion, newArray, (I)[LUser;)
+          ARETURN
+    }
+
+    public void write(User $this$write, android.os.Parcel parcel, int flags)
+
+    public void write(java.lang.Object p0, android.os.Parcel p1, int p2)
+}
+
+public final class User$Creator : java/lang/Object, android/os/Parcelable$Creator {
+    public void <init>()
+
+    public final User createFromParcel(android.os.Parcel in) {
+        LABEL (L0)
+          ALOAD (1)
+          LDC (in)
+          INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
+          GETSTATIC (Companion, LUser$Companion;)
+          ALOAD (1)
+          INVOKEVIRTUAL (User$Companion, create, (Landroid/os/Parcel;)LUser;)
+          ARETURN
+        LABEL (L1)
+    }
+
+    public java.lang.Object createFromParcel(android.os.Parcel p0) {
+        LABEL (L0)
+        LINENUMBER (9)
+          ALOAD (0)
+          ALOAD (1)
+          INVOKEVIRTUAL (User$Creator, createFromParcel, (Landroid/os/Parcel;)LUser;)
+          ARETURN
+    }
+
+    public final User[] newArray(int size) {
+        LABEL (L0)
+          ILOAD (1)
+          ANEWARRAY
+          ARETURN
+        LABEL (L1)
+    }
+
+    public java.lang.Object[] newArray(int p0) {
+        LABEL (L0)
+        LINENUMBER (9)
+          ALOAD (0)
+          ILOAD (1)
+          INVOKEVIRTUAL (User$Creator, newArray, (I)[LUser;)
+          ARETURN
+    }
+}
+
+public final class User : java/lang/Object, android/os/Parcelable {
+    public final static android.os.Parcelable$Creator CREATOR
+
+    private final static User$Companion Companion
+
+    private final int age
+
+    private final java.lang.String firstName
+
+    private final java.lang.String lastName
+
+    static void <clinit>()
+
+    public void <init>(java.lang.String firstName, java.lang.String lastName, int age)
+
+    public int describeContents()
+
+    public final int getAge()
+
+    public final java.lang.String getFirstName()
+
+    public final java.lang.String getLastName()
+
+    public void writeToParcel(android.os.Parcel parcel, int flags) {
+        LABEL (L0)
+          ALOAD (1)
+          LDC (parcel)
+          INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
+          GETSTATIC (Companion, LUser$Companion;)
+          ALOAD (0)
+          ALOAD (1)
+          ILOAD (2)
+          INVOKEVIRTUAL (User$Companion, write, (LUser;Landroid/os/Parcel;I)V)
+          RETURN
+        LABEL (L1)
+    }
+}

plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/ParcelizeBoxTestGenerated.java

@@ -74,6 +74,11 @@ public class ParcelizeBoxTestGenerated extends AbstractParcelizeBoxTest {
         runTest("plugins/parcelize/parcelize-compiler/testData/box/customParcelable.kt");
     }
 
+    @TestMetadata("customParcelableDeprecated.kt")
+    public void testCustomParcelableDeprecated() throws Exception {
+        runTest("plugins/parcelize/parcelize-compiler/testData/box/customParcelableDeprecated.kt");
+    }
+
     @TestMetadata("customParcelerScoping.kt")
     public void testCustomParcelerScoping() throws Exception {
         runTest("plugins/parcelize/parcelize-compiler/testData/box/customParcelerScoping.kt");
@@ -89,11 +94,21 @@ public class ParcelizeBoxTestGenerated extends AbstractParcelizeBoxTest {
         runTest("plugins/parcelize/parcelize-compiler/testData/box/customSerializerSimple.kt");
     }
 
+    @TestMetadata("customSerializerSimpleDeprecated.kt")
+    public void testCustomSerializerSimpleDeprecated() throws Exception {
+        runTest("plugins/parcelize/parcelize-compiler/testData/box/customSerializerSimpleDeprecated.kt");
+    }
+
     @TestMetadata("customSerializerWriteWith.kt")
     public void testCustomSerializerWriteWith() throws Exception {
         runTest("plugins/parcelize/parcelize-compiler/testData/box/customSerializerWriteWith.kt");
     }
 
+    @TestMetadata("customSerializerWriteWithDeprecated.kt")
+    public void testCustomSerializerWriteWithDeprecated() throws Exception {
+        runTest("plugins/parcelize/parcelize-compiler/testData/box/customSerializerWriteWithDeprecated.kt");
+    }
+
     @TestMetadata("customSimple.kt")
     public void testCustomSimple() throws Exception {
         runTest("plugins/parcelize/parcelize-compiler/testData/box/customSimple.kt");
@@ -134,6 +149,11 @@ public class ParcelizeBoxTestGenerated extends AbstractParcelizeBoxTest {
         runTest("plugins/parcelize/parcelize-compiler/testData/box/kt19747.kt");
     }
 
+    @TestMetadata("kt19747Deprecated.kt")
+    public void testKt19747Deprecated() throws Exception {
+        runTest("plugins/parcelize/parcelize-compiler/testData/box/kt19747Deprecated.kt");
+    }
+
     @TestMetadata("kt19747_2.kt")
     public void testKt19747_2() throws Exception {
         runTest("plugins/parcelize/parcelize-compiler/testData/box/kt19747_2.kt");
@@ -279,6 +299,11 @@ public class ParcelizeBoxTestGenerated extends AbstractParcelizeBoxTest {
         runTest("plugins/parcelize/parcelize-compiler/testData/box/simple.kt");
     }
 
+    @TestMetadata("simpleDeprecated.kt")
+    public void testSimpleDeprecated() throws Exception {
+        runTest("plugins/parcelize/parcelize-compiler/testData/box/simpleDeprecated.kt");
+    }
+
     @TestMetadata("sparseArrays.kt")
     public void testSparseArrays() throws Exception {
         runTest("plugins/parcelize/parcelize-compiler/testData/box/sparseArrays.kt");

plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/ParcelizeBytecodeListingTestGenerated.java

@@ -49,6 +49,11 @@ public class ParcelizeBytecodeListingTestGenerated extends AbstractParcelizeByte
         runTest("plugins/parcelize/parcelize-compiler/testData/codegen/customSimple.kt");
     }
 
+    @TestMetadata("customSimpleDeprecated.kt")
+    public void testCustomSimpleDeprecated() throws Exception {
+        runTest("plugins/parcelize/parcelize-compiler/testData/codegen/customSimpleDeprecated.kt");
+    }
+
     @TestMetadata("customSimpleWithNewArray.kt")
     public void testCustomSimpleWithNewArray() throws Exception {
         runTest("plugins/parcelize/parcelize-compiler/testData/codegen/customSimpleWithNewArray.kt");

plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/ParcelizeIrBoxTestGenerated.java

@@ -74,6 +74,11 @@ public class ParcelizeIrBoxTestGenerated extends AbstractParcelizeIrBoxTest {
         runTest("plugins/parcelize/parcelize-compiler/testData/box/customParcelable.kt");
     }
 
+    @TestMetadata("customParcelableDeprecated.kt")
+    public void testCustomParcelableDeprecated() throws Exception {
+        runTest("plugins/parcelize/parcelize-compiler/testData/box/customParcelableDeprecated.kt");
+    }
+
     @TestMetadata("customParcelerScoping.kt")
     public void testCustomParcelerScoping() throws Exception {
         runTest("plugins/parcelize/parcelize-compiler/testData/box/customParcelerScoping.kt");
@@ -89,11 +94,21 @@ public class ParcelizeIrBoxTestGenerated extends AbstractParcelizeIrBoxTest {
         runTest("plugins/parcelize/parcelize-compiler/testData/box/customSerializerSimple.kt");
     }
 
+    @TestMetadata("customSerializerSimpleDeprecated.kt")
+    public void testCustomSerializerSimpleDeprecated() throws Exception {
+        runTest("plugins/parcelize/parcelize-compiler/testData/box/customSerializerSimpleDeprecated.kt");
+    }
+
     @TestMetadata("customSerializerWriteWith.kt")
     public void testCustomSerializerWriteWith() throws Exception {
         runTest("plugins/parcelize/parcelize-compiler/testData/box/customSerializerWriteWith.kt");
     }
 
+    @TestMetadata("customSerializerWriteWithDeprecated.kt")
+    public void testCustomSerializerWriteWithDeprecated() throws Exception {
+        runTest("plugins/parcelize/parcelize-compiler/testData/box/customSerializerWriteWithDeprecated.kt");
+    }
+
     @TestMetadata("customSimple.kt")
     public void testCustomSimple() throws Exception {
         runTest("plugins/parcelize/parcelize-compiler/testData/box/customSimple.kt");
@@ -134,6 +149,11 @@ public class ParcelizeIrBoxTestGenerated extends AbstractParcelizeIrBoxTest {
         runTest("plugins/parcelize/parcelize-compiler/testData/box/kt19747.kt");
     }
 
+    @TestMetadata("kt19747Deprecated.kt")
+    public void testKt19747Deprecated() throws Exception {
+        runTest("plugins/parcelize/parcelize-compiler/testData/box/kt19747Deprecated.kt");
+    }
+
     @TestMetadata("kt19747_2.kt")
     public void testKt19747_2() throws Exception {
         runTest("plugins/parcelize/parcelize-compiler/testData/box/kt19747_2.kt");
@@ -279,6 +299,11 @@ public class ParcelizeIrBoxTestGenerated extends AbstractParcelizeIrBoxTest {
         runTest("plugins/parcelize/parcelize-compiler/testData/box/simple.kt");
     }
 
+    @TestMetadata("simpleDeprecated.kt")
+    public void testSimpleDeprecated() throws Exception {
+        runTest("plugins/parcelize/parcelize-compiler/testData/box/simpleDeprecated.kt");
+    }
+
     @TestMetadata("sparseArrays.kt")
     public void testSparseArrays() throws Exception {
         runTest("plugins/parcelize/parcelize-compiler/testData/box/sparseArrays.kt");

plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/ParcelizeIrBytecodeListingTestGenerated.java

@@ -49,6 +49,11 @@ public class ParcelizeIrBytecodeListingTestGenerated extends AbstractParcelizeIr
         runTest("plugins/parcelize/parcelize-compiler/testData/codegen/customSimple.kt");
     }
 
+    @TestMetadata("customSimpleDeprecated.kt")
+    public void testCustomSimpleDeprecated() throws Exception {
+        runTest("plugins/parcelize/parcelize-compiler/testData/codegen/customSimpleDeprecated.kt");
+    }
+
     @TestMetadata("customSimpleWithNewArray.kt")
     public void testCustomSimpleWithNewArray() throws Exception {
         runTest("plugins/parcelize/parcelize-compiler/testData/codegen/customSimpleWithNewArray.kt");