From d0fd74982db2c6668132411a89738716b219888d Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Mon, 4 Jun 2018 17:40:55 +0300 Subject: [PATCH] Parcelize, Minor: Fix tests (writeToParcel/describeContents are not final anymore) --- .../testData/parcel/codegen/IBinderIInterface.txt | 4 ++-- .../testData/parcel/codegen/customDescribeContents.txt | 2 +- .../parcel/codegen/customParcelablesDifferentModule.txt | 4 ++-- .../parcel/codegen/customParcelablesSameModule.txt | 4 ++-- .../testData/parcel/codegen/customSimple.txt | 4 ++-- .../testData/parcel/codegen/customSimpleWithNewArray.txt | 4 ++-- .../parcel/codegen/describeContentsFromSuperType.txt | 2 +- .../testData/parcel/codegen/duplicatingClinit.txt | 4 ++-- .../testData/parcel/codegen/listInsideList.txt | 4 ++-- .../testData/parcel/codegen/nullableNotNullSize.txt | 8 ++++---- .../testData/parcel/codegen/parcelable.txt | 4 ++-- .../testData/parcel/codegen/serializable.txt | 4 ++-- .../testData/parcel/codegen/simple.txt | 4 ++-- .../testData/parcel/codegen/simpleList.txt | 4 ++-- .../testData/parcel/codegen/size.txt | 8 ++++---- 15 files changed, 32 insertions(+), 32 deletions(-) diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/IBinderIInterface.txt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/IBinderIInterface.txt index 6cb98345b1d..6213b27977e 100644 --- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/IBinderIInterface.txt +++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/IBinderIInterface.txt @@ -66,7 +66,7 @@ public final class User : java/lang/Object, android/os/Parcelable { public void (android.os.IBinder p0, android.os.IBinder[] p1, java.util.List p2, java.util.ArrayList p3, android.os.IInterface p4) - public final int describeContents() + public int describeContents() public final android.os.IBinder getBinder() @@ -78,7 +78,7 @@ public final class User : java/lang/Object, android/os/Parcelable { public final android.os.IInterface getIntf() - public final void writeToParcel(android.os.Parcel p0, int p1) { + public void writeToParcel(android.os.Parcel p0, int p1) { LABEL (L0) ALOAD (1) LDC (parcel) diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customDescribeContents.txt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customDescribeContents.txt index 900f3bc4755..a5036e0f5bd 100644 --- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customDescribeContents.txt +++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customDescribeContents.txt @@ -37,5 +37,5 @@ public final class User : java/lang/Object, android/os/Parcelable { public final boolean isProUser() - public final void writeToParcel(android.os.Parcel p0, int p1) + public void writeToParcel(android.os.Parcel p0, int p1) } diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customParcelablesDifferentModule.txt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customParcelablesDifferentModule.txt index 63b8b5d0c76..fd2d77d94bd 100644 --- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customParcelablesDifferentModule.txt +++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customParcelablesDifferentModule.txt @@ -36,11 +36,11 @@ public final class test/Foo : java/lang/Object, android/os/Parcelable { public void (android.accounts.Account p0) - public final int describeContents() + public int describeContents() public final android.accounts.Account getKp() - public final void writeToParcel(android.os.Parcel p0, int p1) { + public void writeToParcel(android.os.Parcel p0, int p1) { LABEL (L0) ALOAD (1) LDC (parcel) diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customParcelablesSameModule.txt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customParcelablesSameModule.txt index 0e2875b515d..fa4fa5e1640 100644 --- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customParcelablesSameModule.txt +++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customParcelablesSameModule.txt @@ -139,11 +139,11 @@ public final class test/Foo : java/lang/Object, android/os/Parcelable { public void (k.KotlinParcelable p0) - public final int describeContents() + public int describeContents() public final k.KotlinParcelable getKp() - public final void writeToParcel(android.os.Parcel p0, int p1) { + public void writeToParcel(android.os.Parcel p0, int p1) { LABEL (L0) ALOAD (1) LDC (parcel) 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 225786ac51b..d7addbce59f 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 @@ -71,7 +71,7 @@ public final class User : java/lang/Object, android/os/Parcelable { public void (java.lang.String p0, java.lang.String p1, int p2) - public final int describeContents() + public int describeContents() public final int getAge() @@ -79,7 +79,7 @@ public final class User : java/lang/Object, android/os/Parcelable { public final java.lang.String getLastName() - public final void writeToParcel(android.os.Parcel p0, int p1) { + public void writeToParcel(android.os.Parcel p0, int p1) { LABEL (L0) ALOAD (1) LDC (parcel) 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 2a2b6cdea75..9041b956733 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 @@ -60,7 +60,7 @@ public final class User : java/lang/Object, android/os/Parcelable { public void (java.lang.String p0, java.lang.String p1, int p2) - public final int describeContents() + public int describeContents() public final int getAge() @@ -68,5 +68,5 @@ public final class User : java/lang/Object, android/os/Parcelable { public final java.lang.String getLastName() - public final void writeToParcel(android.os.Parcel p0, int p1) + public void writeToParcel(android.os.Parcel p0, int p1) } diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/describeContentsFromSuperType.txt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/describeContentsFromSuperType.txt index d5047e06731..ef6d3061be2 100644 --- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/describeContentsFromSuperType.txt +++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/describeContentsFromSuperType.txt @@ -41,5 +41,5 @@ public final class User : AbstractUser { public final boolean isProUser() - public final void writeToParcel(android.os.Parcel p0, int p1) + public void writeToParcel(android.os.Parcel p0, int p1) } 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 50cfd5dc452..c4fbf322e91 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 @@ -44,9 +44,9 @@ public final class User : java/lang/Object, android/os/Parcelable { public void (java.lang.String p0) - public final int describeContents() + public int describeContents() public final java.lang.String getFirstName() - public final void writeToParcel(android.os.Parcel p0, int p1) + public void writeToParcel(android.os.Parcel p0, int p1) } diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/listInsideList.txt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/listInsideList.txt index a3ded3d4d04..30bc05817e9 100644 --- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/listInsideList.txt +++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/listInsideList.txt @@ -15,11 +15,11 @@ public final class Test : java/lang/Object { public void (java.util.List p0) - public final int describeContents() + public int describeContents() public final java.util.List getNames() - public final void writeToParcel(android.os.Parcel p0, int p1) { + public void writeToParcel(android.os.Parcel p0, int p1) { LABEL (L0) ALOAD (1) LDC (parcel) diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/nullableNotNullSize.txt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/nullableNotNullSize.txt index 9154808b4b6..9f653338895 100644 --- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/nullableNotNullSize.txt +++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/nullableNotNullSize.txt @@ -15,11 +15,11 @@ public final class TestNotNull : java/lang/Object { public void (android.util.Size p0) - public final int describeContents() + public int describeContents() public final android.util.Size getA() - public final void writeToParcel(android.os.Parcel p0, int p1) { + public void writeToParcel(android.os.Parcel p0, int p1) { LABEL (L0) ALOAD (1) LDC (parcel) @@ -50,11 +50,11 @@ public final class TestNullable : java/lang/Object { public void (android.util.Size p0) - public final int describeContents() + public int describeContents() public final android.util.Size getA() - public final void writeToParcel(android.os.Parcel p0, int p1) { + public void writeToParcel(android.os.Parcel p0, int p1) { LABEL (L0) ALOAD (1) LDC (parcel) diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/parcelable.txt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/parcelable.txt index 87f1624224d..d06c2babbac 100644 --- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/parcelable.txt +++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/parcelable.txt @@ -35,11 +35,11 @@ public final class test/Foo : java/lang/Object, android/os/Parcelable { public void (android.os.Parcelable p0) - public final int describeContents() + public int describeContents() public final android.os.Parcelable getParcelable() - public final void writeToParcel(android.os.Parcel p0, int p1) { + public void writeToParcel(android.os.Parcel p0, int p1) { LABEL (L0) ALOAD (1) LDC (parcel) diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/serializable.txt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/serializable.txt index 95027105de8..ddbd4f0cd85 100644 --- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/serializable.txt +++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/serializable.txt @@ -51,13 +51,13 @@ public final class User : java/lang/Object, android/os/Parcelable { public void (SerializableSimple p0, SerializableSimple p1) - public final int describeContents() + public int describeContents() public final SerializableSimple getNotNull() public final SerializableSimple getNullable() - public final void writeToParcel(android.os.Parcel p0, int p1) { + public void writeToParcel(android.os.Parcel p0, int p1) { LABEL (L0) ALOAD (1) LDC (parcel) diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/simple.txt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/simple.txt index c65c48d6d0b..eb768f434e1 100644 --- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/simple.txt +++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/simple.txt @@ -56,7 +56,7 @@ public final class User : java/lang/Object, android/os/Parcelable { public void (java.lang.String p0, java.lang.String p1, int p2, boolean p3) - public final int describeContents() { + public int describeContents() { LABEL (L0) LDC (0) IRETURN @@ -74,7 +74,7 @@ public final class User : java/lang/Object, android/os/Parcelable { public final boolean isProUser() - public final void writeToParcel(android.os.Parcel p0, int p1) { + public void writeToParcel(android.os.Parcel p0, int p1) { LABEL (L0) ALOAD (1) LDC (parcel) diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/simpleList.txt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/simpleList.txt index 04f43789eae..98e40bcb999 100644 --- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/simpleList.txt +++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/simpleList.txt @@ -15,11 +15,11 @@ public final class Test : java/lang/Object { public void (java.util.List p0) - public final int describeContents() + public int describeContents() public final java.util.List getNames() - public final void writeToParcel(android.os.Parcel p0, int p1) { + public void writeToParcel(android.os.Parcel p0, int p1) { LABEL (L0) ALOAD (1) LDC (parcel) diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/size.txt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/size.txt index 3746b0e298d..c863d0e4a2e 100644 --- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/size.txt +++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/size.txt @@ -47,7 +47,7 @@ public final class Test : java/lang/Object, android/os/Parcelable { public static Test copy$default(Test p0, android.util.Size p1, android.util.Size p2, int p3, java.lang.Object p4) - public final int describeContents() + public int describeContents() public boolean equals(java.lang.Object p0) @@ -59,7 +59,7 @@ public final class Test : java/lang/Object, android/os/Parcelable { public java.lang.String toString() - public final void writeToParcel(android.os.Parcel p0, int p1) { + public void writeToParcel(android.os.Parcel p0, int p1) { LABEL (L0) ALOAD (1) LDC (parcel) @@ -137,7 +137,7 @@ public final class TestF : java/lang/Object, android/os/Parcelable { public static TestF copy$default(TestF p0, android.util.SizeF p1, android.util.SizeF p2, int p3, java.lang.Object p4) - public final int describeContents() + public int describeContents() public boolean equals(java.lang.Object p0) @@ -149,7 +149,7 @@ public final class TestF : java/lang/Object, android/os/Parcelable { public java.lang.String toString() - public final void writeToParcel(android.os.Parcel p0, int p1) { + public void writeToParcel(android.os.Parcel p0, int p1) { LABEL (L0) ALOAD (1) LDC (parcel)