From 9b7a95b05c049481988ced1e8721429782d5f088 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Steven=20Sch=C3=A4fer?= <stevenschaefer@google.com>
Date: Wed, 13 May 2020 16:30:04 +0200
Subject: [PATCH] Parcelize: Fix test code

On Android, we would need to call `setDataPosition(0)` after
unmarshalling a parcel. The reason why the test code is currently
working is purely because the Robolectric test framework is more
permissive.
---
 .../testData/parcel/box/allPrimitiveTypes.kt                     | 1 +
 .../testData/parcel/box/arraySimple.kt                           | 1 +
 .../android-extensions-compiler/testData/parcel/box/arrays.kt    | 1 +
 .../android-extensions-compiler/testData/parcel/box/binder.kt    | 1 +
 .../testData/parcel/box/boxedTypes.kt                            | 1 +
 .../android-extensions-compiler/testData/parcel/box/bundle.kt    | 1 +
 .../testData/parcel/box/charSequence.kt                          | 1 +
 .../testData/parcel/box/customParcelable.kt                      | 1 +
 .../testData/parcel/box/customParcelerScoping.kt                 | 1 +
 .../testData/parcel/box/customSerializerBoxing.kt                | 1 +
 .../testData/parcel/box/customSerializerSimple.kt                | 1 +
 .../testData/parcel/box/customSerializerWriteWith.kt             | 1 +
 .../testData/parcel/box/customSimple.kt                          | 1 +
 .../testData/parcel/box/enumObject.kt                            | 1 +
 .../android-extensions-compiler/testData/parcel/box/enums.kt     | 1 +
 .../testData/parcel/box/exceptions.kt                            | 1 +
 .../android-extensions-compiler/testData/parcel/box/intArray.kt  | 1 +
 .../testData/parcel/box/javaInterop.kt                           | 1 +
 .../android-extensions-compiler/testData/parcel/box/kt19747_2.kt | 1 +
 .../android-extensions-compiler/testData/parcel/box/kt19749.kt   | 1 +
 .../android-extensions-compiler/testData/parcel/box/kt20002.kt   | 1 +
 .../android-extensions-compiler/testData/parcel/box/kt20021.kt   | 1 +
 .../android-extensions-compiler/testData/parcel/box/kt25839.kt   | 1 +
 .../android-extensions-compiler/testData/parcel/box/kt26221.kt   | 1 +
 .../android-extensions-compiler/testData/parcel/box/kt36658.kt   | 1 +
 .../android-extensions-compiler/testData/parcel/box/listKinds.kt | 1 +
 .../testData/parcel/box/listSimple.kt                            | 1 +
 .../android-extensions-compiler/testData/parcel/box/lists.kt     | 1 +
 .../android-extensions-compiler/testData/parcel/box/mapKinds.kt  | 1 +
 .../android-extensions-compiler/testData/parcel/box/mapSimple.kt | 1 +
 .../android-extensions-compiler/testData/parcel/box/maps.kt      | 1 +
 .../testData/parcel/box/nestedParcelable.kt                      | 1 +
 .../testData/parcel/box/nullableTypes.kt                         | 1 +
 .../testData/parcel/box/nullableTypesSimple.kt                   | 1 +
 .../android-extensions-compiler/testData/parcel/box/objects.kt   | 1 +
 .../testData/parcel/box/persistableBundle.kt                     | 1 +
 .../testData/parcel/box/primitiveTypes.kt                        | 1 +
 .../android-extensions-compiler/testData/parcel/box/simple.kt    | 1 +
 .../testData/parcel/box/sparseArrays.kt                          | 1 +
 .../testData/parcel/box/sparseBooleanArray.kt                    | 1 +
 40 files changed, 40 insertions(+)

diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/allPrimitiveTypes.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/allPrimitiveTypes.kt
index 467496e857c..19fd426cb16 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/allPrimitiveTypes.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/allPrimitiveTypes.kt
@@ -51,6 +51,7 @@ fun box() = parcelTest { parcel ->
 
     val bytes = parcel.marshall()
     parcel.unmarshall(bytes, 0, bytes.size)
+    parcel.setDataPosition(0)
 
     val first2 = readFromParcel<PrimitiveTypes>(parcel)
     val second2 = readFromParcel<PrimitiveTypes>(parcel)
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/arraySimple.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/arraySimple.kt
index 2e7e241def6..ccf7aebd72a 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/arraySimple.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/arraySimple.kt
@@ -31,6 +31,7 @@ fun box() = parcelTest { parcel ->
 
     val bytes = parcel.marshall()
     parcel.unmarshall(bytes, 0, bytes.size)
+    parcel.setDataPosition(0)
 
     val first2 = readFromParcel<Test>(parcel)
 
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/arrays.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/arrays.kt
index 37cda5c8a66..44a93b62577 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/arrays.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/arrays.kt
@@ -69,6 +69,7 @@ fun box() = parcelTest { parcel ->
 
     val bytes = parcel.marshall()
     parcel.unmarshall(bytes, 0, bytes.size)
+    parcel.setDataPosition(0)
 
     val first2 = readFromParcel<Test>(parcel)
 
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/binder.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/binder.kt
index 2c9020bca5e..fb0bbca7e4c 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/binder.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/binder.kt
@@ -35,6 +35,7 @@ fun box() = parcelTest { parcel ->
 
     val bytes = parcel.marshall()
     parcel.unmarshall(bytes, 0, bytes.size)
+    parcel.setDataPosition(0)
 
     val test2 = readFromParcel<ServiceContainer>(parcel)
 }
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/boxedTypes.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/boxedTypes.kt
index b6abdd3d632..32ee7b7a90a 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/boxedTypes.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/boxedTypes.kt
@@ -34,6 +34,7 @@ fun box() = parcelTest { parcel ->
 
     val bytes = parcel.marshall()
     parcel.unmarshall(bytes, 0, bytes.size)
+    parcel.setDataPosition(0)
 
     val first2 = readFromParcel<BoxedTypes>(parcel)
 
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/bundle.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/bundle.kt
index 3f5944be59d..54db0446f2b 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/bundle.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/bundle.kt
@@ -17,6 +17,7 @@ fun box() = parcelTest { parcel ->
 
     val bytes = parcel.marshall()
     parcel.unmarshall(bytes, 0, bytes.size)
+    parcel.setDataPosition(0)
 
     val test2 = readFromParcel<User>(parcel)
 
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/charSequence.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/charSequence.kt
index 7c607c8d8a5..ddec1599234 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/charSequence.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/charSequence.kt
@@ -17,6 +17,7 @@ fun box() = parcelTest { parcel ->
 
     val bytes = parcel.marshall()
     parcel.unmarshall(bytes, 0, bytes.size)
+    parcel.setDataPosition(0)
 
     val test2 = readFromParcel<Test>(parcel)
 
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/customParcelable.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/customParcelable.kt
index 86195ce0985..a96f3b1443b 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/customParcelable.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/customParcelable.kt
@@ -29,6 +29,7 @@ fun box() = parcelTest { parcel ->
 
     val bytes = parcel.marshall()
     parcel.unmarshall(bytes, 0, bytes.size)
+    parcel.setDataPosition(0)
 
     val userParcelable2 = readFromParcel<UserParcelable>(parcel)
 
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/customParcelerScoping.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/customParcelerScoping.kt
index bcca343c9dc..450c54debea 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/customParcelerScoping.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/customParcelerScoping.kt
@@ -34,6 +34,7 @@ fun box() = parcelTest { parcel ->
 
     val bytes = parcel.marshall()
     parcel.unmarshall(bytes, 0, bytes.size)
+    parcel.setDataPosition(0)
 
     val test2 = readFromParcel<Ints>(parcel)
 
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/customSerializerBoxing.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/customSerializerBoxing.kt
index afc8a135f8c..5fde2d95edf 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/customSerializerBoxing.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/customSerializerBoxing.kt
@@ -39,6 +39,7 @@ fun box() = parcelTest { parcel ->
 
     val bytes = parcel.marshall()
     parcel.unmarshall(bytes, 0, bytes.size)
+    parcel.setDataPosition(0)
 
     val test2 = readFromParcel<Test>(parcel)
 
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/customSerializerSimple.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/customSerializerSimple.kt
index 6368592ae64..67f39c82b5c 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/customSerializerSimple.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/customSerializerSimple.kt
@@ -40,6 +40,7 @@ fun box() = parcelTest { parcel ->
 
     val bytes = parcel.marshall()
     parcel.unmarshall(bytes, 0, bytes.size)
+    parcel.setDataPosition(0)
 
     val test2 = readFromParcel<Test>(parcel)
 
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/customSerializerWriteWith.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/customSerializerWriteWith.kt
index 7c0203593b9..6accaee5b0c 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/customSerializerWriteWith.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/customSerializerWriteWith.kt
@@ -41,6 +41,7 @@ fun box() = parcelTest { parcel ->
 
     val bytes = parcel.marshall()
     parcel.unmarshall(bytes, 0, bytes.size)
+    parcel.setDataPosition(0)
 
     val test2 = readFromParcel<Test>(parcel)
 
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/customSimple.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/customSimple.kt
index 94ead6a637a..28b6ff67438 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/customSimple.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/customSimple.kt
@@ -28,6 +28,7 @@ fun box() = parcelTest { parcel ->
 
     val bytes = parcel.marshall()
     parcel.unmarshall(bytes, 0, bytes.size)
+    parcel.setDataPosition(0)
 
     val user2 = readFromParcel<User>(parcel)
 
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/enumObject.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/enumObject.kt
index f4ede12e7d9..78fdbd88ca8 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/enumObject.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/enumObject.kt
@@ -25,6 +25,7 @@ fun box() = parcelTest { parcel ->
 
     val bytes = parcel.marshall()
     parcel.unmarshall(bytes, 0, bytes.size)
+    parcel.setDataPosition(0)
 
     val black2 = readFromParcel<Color>(parcel)
     val obj2 = readFromParcel<Obj>(parcel)
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/enums.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/enums.kt
index 09513e57808..8fde1f3db5d 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/enums.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/enums.kt
@@ -20,6 +20,7 @@ fun box() = parcelTest { parcel ->
 
     val bytes = parcel.marshall()
     parcel.unmarshall(bytes, 0, bytes.size)
+    parcel.setDataPosition(0)
 
     val test2 = readFromParcel<Test>(parcel)
     assert(test == test2)
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/exceptions.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/exceptions.kt
index 2f68e5aac0f..fa547ac8a88 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/exceptions.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/exceptions.kt
@@ -19,6 +19,7 @@ fun box() = parcelTest { parcel ->
 
     val bytes = parcel.marshall()
     parcel.unmarshall(bytes, 0, bytes.size)
+    parcel.setDataPosition(0)
 
     val test2 = readFromParcel<ExceptionContainer>(parcel)
 }
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/intArray.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/intArray.kt
index a1214e72ad3..57cd12a9177 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/intArray.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/intArray.kt
@@ -32,6 +32,7 @@ fun box() = parcelTest { parcel ->
 
     val bytes = parcel.marshall()
     parcel.unmarshall(bytes, 0, bytes.size)
+    parcel.setDataPosition(0)
 
     val film2 = readFromParcel<Film>(parcel)
     assert(film == film2)
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/javaInterop.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/javaInterop.kt
index 2993b4223f3..80e802706dd 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/javaInterop.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/javaInterop.kt
@@ -26,6 +26,7 @@ fun box() = parcelTest { parcel ->
 
     val bytes = parcel.marshall()
     parcel.unmarshall(bytes, 0, bytes.size)
+    parcel.setDataPosition(0)
 
     val second = J.readParcel(parcel)
     assert(first == second)
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/kt19747_2.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/kt19747_2.kt
index 4db7a2b0828..cd8d36c0f3c 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/kt19747_2.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/kt19747_2.kt
@@ -25,6 +25,7 @@ fun box() = parcelTest { parcel ->
 
     val bytes = parcel.marshall()
     parcel.unmarshall(bytes, 0, bytes.size)
+    parcel.setDataPosition(0)
 
     val test2 = readFromParcel<J>(parcel)
 
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/kt19749.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/kt19749.kt
index 4d62df63fea..a51c7643042 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/kt19749.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/kt19749.kt
@@ -21,6 +21,7 @@ fun box() = parcelTest { parcel ->
 
     val bytes = parcel.marshall()
     parcel.unmarshall(bytes, 0, bytes.size)
+    parcel.setDataPosition(0)
 
     val test2 = readFromParcel<M>(parcel)
 
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/kt20002.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/kt20002.kt
index 1d5ac06ddc1..553c3835d41 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/kt20002.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/kt20002.kt
@@ -32,6 +32,7 @@ fun box() = parcelTest { parcel ->
 
     val bytes = parcel.marshall()
     parcel.unmarshall(bytes, 0, bytes.size)
+    parcel.setDataPosition(0)
 
     val first2 = readFromParcel<Test>(parcel)
 
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/kt20021.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/kt20021.kt
index aaadd4ec9f5..5a0680e1687 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/kt20021.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/kt20021.kt
@@ -39,6 +39,7 @@ fun box() = parcelTest { parcel ->
 
     val bytes = parcel.marshall()
     parcel.unmarshall(bytes, 0, bytes.size)
+    parcel.setDataPosition(0)
 
     val first2 = readFromParcel<Test>(parcel)
 
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/kt25839.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/kt25839.kt
index 39520c1bc4f..f9804a8e79d 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/kt25839.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/kt25839.kt
@@ -22,6 +22,7 @@ fun box() = parcelTest { parcel ->
 
     val bytes = parcel.marshall()
     parcel.unmarshall(bytes, 0, bytes.size)
+    parcel.setDataPosition(0)
 
     readFromParcel<User>(parcel)
     readFromParcel<User2>(parcel)
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/kt26221.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/kt26221.kt
index 97d7d244f8f..26c3556bbd8 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/kt26221.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/kt26221.kt
@@ -28,6 +28,7 @@ fun box() = parcelTest { parcel ->
 
     val bytes = parcel.marshall()
     parcel.unmarshall(bytes, 0, bytes.size)
+    parcel.setDataPosition(0)
 
     val foo2 = readFromParcel<Foo>(parcel)
     assert(foo2.values.size() == 1)
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/kt36658.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/kt36658.kt
index 70d0314f411..73f7a40dbd4 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/kt36658.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/kt36658.kt
@@ -17,6 +17,7 @@ fun box() = parcelTest { parcel ->
 
     val bytes = parcel.marshall()
     parcel.unmarshall(bytes, 0, bytes.size)
+    parcel.setDataPosition(0)
 
     readFromParcel<MyObject>(parcel)
 }
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/listKinds.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/listKinds.kt
index 90c966480ea..c50c70cff2e 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/listKinds.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/listKinds.kt
@@ -43,6 +43,7 @@ fun box() = parcelTest { parcel ->
 
     val bytes = parcel.marshall()
     parcel.unmarshall(bytes, 0, bytes.size)
+    parcel.setDataPosition(0)
 
     val first2 = readFromParcel<Test>(parcel)
 
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/listSimple.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/listSimple.kt
index 463ab321c52..c8c9265e58b 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/listSimple.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/listSimple.kt
@@ -17,6 +17,7 @@ fun box() = parcelTest { parcel ->
 
     val bytes = parcel.marshall()
     parcel.unmarshall(bytes, 0, bytes.size)
+    parcel.setDataPosition(0)
 
     val first2 = readFromParcel<Test>(parcel)
 
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/lists.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/lists.kt
index c856e4c4a2e..9ac9a819bfa 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/lists.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/lists.kt
@@ -31,6 +31,7 @@ fun box() = parcelTest { parcel ->
 
     val bytes = parcel.marshall()
     parcel.unmarshall(bytes, 0, bytes.size)
+    parcel.setDataPosition(0)
 
     val first2 = readFromParcel<Test>(parcel)
 
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/mapKinds.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/mapKinds.kt
index 453f172dd76..7384ceb1e35 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/mapKinds.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/mapKinds.kt
@@ -35,6 +35,7 @@ fun box() = parcelTest { parcel ->
 
     val bytes = parcel.marshall()
     parcel.unmarshall(bytes, 0, bytes.size)
+    parcel.setDataPosition(0)
 
     val first2 = readFromParcel<Test>(parcel)
 
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/mapSimple.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/mapSimple.kt
index bb46f364f05..283cb6ff770 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/mapSimple.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/mapSimple.kt
@@ -17,6 +17,7 @@ fun box() = parcelTest { parcel ->
 
     val bytes = parcel.marshall()
     parcel.unmarshall(bytes, 0, bytes.size)
+    parcel.setDataPosition(0)
 
     val first2 = readFromParcel<Test>(parcel)
 
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/maps.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/maps.kt
index 48a0538ae44..77390bb4362 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/maps.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/maps.kt
@@ -33,6 +33,7 @@ fun box() = parcelTest { parcel ->
 
     val bytes = parcel.marshall()
     parcel.unmarshall(bytes, 0, bytes.size)
+    parcel.setDataPosition(0)
 
     val first2 = readFromParcel<Test>(parcel)
 
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/nestedParcelable.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/nestedParcelable.kt
index fcf8806fed3..9fe1b19c8f1 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/nestedParcelable.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/nestedParcelable.kt
@@ -27,6 +27,7 @@ fun box() = parcelTest { parcel ->
 
     val bytes = parcel.marshall()
     parcel.unmarshall(bytes, 0, bytes.size)
+    parcel.setDataPosition(0)
 
     val test2 = readFromParcel<Test>(parcel)
     assert(test == test2)
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/nullableTypes.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/nullableTypes.kt
index d7cfdfcf4bd..3fe457f0a1e 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/nullableTypes.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/nullableTypes.kt
@@ -28,6 +28,7 @@ fun box() = parcelTest { parcel ->
 
     val bytes = parcel.marshall()
     parcel.unmarshall(bytes, 0, bytes.size)
+    parcel.setDataPosition(0)
 
     val first2 = readFromParcel<Test>(parcel)
     val second2 = readFromParcel<Test>(parcel)
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/nullableTypesSimple.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/nullableTypesSimple.kt
index c90ff71fd05..8bcc2e54e23 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/nullableTypesSimple.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/nullableTypesSimple.kt
@@ -19,6 +19,7 @@ fun box() = parcelTest { parcel ->
 
     val bytes = parcel.marshall()
     parcel.unmarshall(bytes, 0, bytes.size)
+    parcel.setDataPosition(0)
 
     val first2 = readFromParcel<Test>(parcel)
     val second2 = readFromParcel<Test>(parcel)
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/objects.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/objects.kt
index 293b9e2a9a8..b344d73a66d 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/objects.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/objects.kt
@@ -24,6 +24,7 @@ fun box() = parcelTest { parcel ->
 
     val bytes = parcel.marshall()
     parcel.unmarshall(bytes, 0, bytes.size)
+    parcel.setDataPosition(0)
 
     val test2 = readFromParcel<Test>(parcel)
     assert(test == test2)
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/persistableBundle.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/persistableBundle.kt
index ef05266c19b..07e38d23d91 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/persistableBundle.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/persistableBundle.kt
@@ -23,6 +23,7 @@ fun box() = parcelTest { parcel ->
 
     val bytes = parcel.marshall()
     parcel.unmarshall(bytes, 0, bytes.size)
+    parcel.setDataPosition(0)
 
     val test2 = readFromParcel<User>(parcel)
 
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/primitiveTypes.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/primitiveTypes.kt
index 4c95ab3e4f2..8a8a5b4c23d 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/primitiveTypes.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/primitiveTypes.kt
@@ -29,6 +29,7 @@ fun box() = parcelTest { parcel ->
 
     val bytes = parcel.marshall()
     parcel.unmarshall(bytes, 0, bytes.size)
+    parcel.setDataPosition(0)
 
     val first2 = readFromParcel<PrimitiveTypes>(parcel)
     val second2 = readFromParcel<PrimitiveTypes>(parcel)
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/simple.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/simple.kt
index 8bae69551a6..7c003a9a024 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/simple.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/simple.kt
@@ -18,6 +18,7 @@ fun box() = parcelTest { parcel ->
 
     val bytes = parcel.marshall()
     parcel.unmarshall(bytes, 0, bytes.size)
+    parcel.setDataPosition(0)
 
     val user2 = readFromParcel<User>(parcel)
     assert(user == user2)
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/sparseArrays.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/sparseArrays.kt
index 8fb05660792..e82f3064b79 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/sparseArrays.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/sparseArrays.kt
@@ -25,6 +25,7 @@ fun box() = parcelTest { parcel ->
 
     val bytes = parcel.marshall()
     parcel.unmarshall(bytes, 0, bytes.size)
+    parcel.setDataPosition(0)
 
     val user2 = readFromParcel<User>(parcel)
 
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/sparseBooleanArray.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/sparseBooleanArray.kt
index 851b14e1f9a..07f61dd9195 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/sparseBooleanArray.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/sparseBooleanArray.kt
@@ -17,6 +17,7 @@ fun box() = parcelTest { parcel ->
 
     val bytes = parcel.marshall()
     parcel.unmarshall(bytes, 0, bytes.size)
+    parcel.setDataPosition(0)
 
     val test2 = readFromParcel<User>(parcel)