Support repeated entries in byte arrays: failing test

Author: oldergod

wire-protoc-compatibility-tests/src/main/proto/squareup/proto2/java/interop/interop_test.proto

@@ -55,3 +55,11 @@ message InteropBoxOneOf {
     sint32 f = 6;
   }
 }
+
+message SubInteropRepeatedUint {
+  repeated uint32 repeated_values = 1 [packed = true];
+}
+
+message InteropRepeatedUint {
+  optional SubInteropRepeatedUint sub_message = 1;
+}

wire-protoc-compatibility-tests/src/main/proto/squareup/proto2/kotlin/interop/interop_test.proto

@@ -55,3 +55,12 @@ message InteropBoxOneOf {
     sint32 f = 6;
   }
 }
+
+message SubInteropRepeatedUint {
+  repeated uint32 repeated_values = 1 [packed = true];
+}
+
+message InteropRepeatedUint {
+  optional SubInteropRepeatedUint sub_message = 1;
+}
+

wire-protoc-compatibility-tests/src/test/java/com/squareup/wire/Proto2WireProtocCompatibilityTests.kt

@@ -27,6 +27,10 @@ import okio.ByteString.Companion.decodeHex
 import org.junit.Test
 import squareup.proto2.java.empty.EmptyLength as EmptyLengthJ
 import squareup.proto2.java.interop.InteropMessage as InteropMessageJ
+import squareup.proto2.java.interop.InteropRepeatedUint as InteropRepeatedUintJ2
+import squareup.proto2.java.interop.InteropTest.InteropRepeatedUint as InteropRepeatedUintP2
+import squareup.proto2.java.interop.InteropTest.SubInteropRepeatedUint as SubInteropRepeatedUintP2
+import squareup.proto2.java.interop.SubInteropRepeatedUint as SubInteropRepeatedUintJ2
 import squareup.proto2.java.interop.type.EnumProto2 as EnumProto2J
 import squareup.proto2.java.interop.type.MessageProto2 as MessageProto2J
 import squareup.proto2.kotlin.MapTypes
@@ -49,10 +53,12 @@ import squareup.proto2.kotlin.interop.InteropMessageOuterClass.extRepProto2Enum
 import squareup.proto2.kotlin.interop.InteropMessageOuterClass.extRepProto2Message
 import squareup.proto2.kotlin.interop.InteropMessageOuterClass.extRepProto3Enum
 import squareup.proto2.kotlin.interop.InteropMessageOuterClass.extRepProto3Message
+import squareup.proto2.kotlin.interop.InteropRepeatedUint as InteropRepeatedUintK2
 import squareup.proto2.kotlin.interop.Quilt
 import squareup.proto2.kotlin.interop.QuiltColor
 import squareup.proto2.kotlin.interop.QuiltContainer
 import squareup.proto2.kotlin.interop.RepeatedEnum
+import squareup.proto2.kotlin.interop.SubInteropRepeatedUint as SubInteropRepeatedUintK2
 import squareup.proto2.kotlin.interop.type.EnumProto2 as EnumProto2K
 import squareup.proto2.kotlin.interop.type.InteropTypes.EnumProto2
 import squareup.proto2.kotlin.interop.type.InteropTypes.MessageProto2
@@ -183,6 +189,35 @@ class Proto2WireProtocCompatibilityTests {
     assertThat(mapTypeWire.map_string_string[""]).isEqualTo("ed")
   }
 
+  @Test fun decodingRepeatedEntries() {
+    // ── 1 ┐
+    //      ├─ 1: 1
+    //      ╰- 1: 1
+    val byteArray = byteArrayOf(10, 3, 10, 1, 1, 10, 3, 10, 1, 1)
+    assertThat(InteropRepeatedUintP2.parseFrom(byteArray))
+      .isEqualTo(
+        InteropRepeatedUintP2.newBuilder()
+          .setSubMessage(
+            SubInteropRepeatedUintP2.newBuilder().addAllRepeatedValues(listOf(1, 1)).build(),
+          )
+          .build(),
+      )
+    assertThat(InteropRepeatedUintJ2.ADAPTER.decode(byteArray)).isEqualTo(
+      InteropRepeatedUintJ2.Builder()
+        .sub_message(
+          SubInteropRepeatedUintJ2.Builder().repeated_values(listOf(1, 1)).build(),
+        )
+        .build(),
+    )
+    assertThat(InteropRepeatedUintK2.ADAPTER.decode(byteArray)).isEqualTo(
+      InteropRepeatedUintK2.Builder()
+        .sub_message(
+          SubInteropRepeatedUintK2.Builder().repeated_values(listOf(1, 1)).build(),
+        )
+        .build(),
+    )
+  }
+
   /**
    * The TS-proto library encodes enums differently from Wire or Protoc. Protoc is fine with this,
    * but it causes Wire to crash. The fix is to make Wire accept this format also.