Fixing java and protoc builds
diff --git a/java/core/BUILD b/java/core/BUILD
index a698fc8..cf4ae7c 100644
--- a/java/core/BUILD
+++ b/java/core/BUILD
@@ -27,6 +27,7 @@
"src/main/java/com/google/protobuf/CodedInputStreamReader.java",
"src/main/java/com/google/protobuf/CodedOutputStream.java",
"src/main/java/com/google/protobuf/CodedOutputStreamWriter.java",
+ "src/main/java/com/google/protobuf/CompileTimeConstant.java",
"src/main/java/com/google/protobuf/DoubleArrayList.java",
"src/main/java/com/google/protobuf/ExperimentalApi.java",
"src/main/java/com/google/protobuf/ExtensionLite.java",
@@ -41,6 +42,7 @@
"src/main/java/com/google/protobuf/FloatArrayList.java",
"src/main/java/com/google/protobuf/GeneratedMessageInfoFactory.java",
"src/main/java/com/google/protobuf/GeneratedMessageLite.java",
+ "src/main/java/com/google/protobuf/InlineMe.java",
"src/main/java/com/google/protobuf/IntArrayList.java",
"src/main/java/com/google/protobuf/Internal.java",
"src/main/java/com/google/protobuf/InvalidProtocolBufferException.java",
diff --git a/java/core/src/test/proto/com/google/protobuf/dynamic_message_test.proto b/java/core/src/test/proto/com/google/protobuf/dynamic_message_test.proto
index 42d09f0..a0f28ac 100644
--- a/java/core/src/test/proto/com/google/protobuf/dynamic_message_test.proto
+++ b/java/core/src/test/proto/com/google/protobuf/dynamic_message_test.proto
@@ -28,20 +28,6 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-<<<<<<<< HEAD:java/kotlin-lite/src/test/proto/com/google/protobuf/multiple_files_proto3.proto
-syntax = "proto3";
-
-package protobuf.kotlin.generator;
-
-option java_package = "com.google.protobuf.kotlin.generator";
-option java_multiple_files = true;
-
-enum NestedEnum { FOO = 0; }
-
-message MultipleFilesMessageA {}
-
-message MultipleFilesMessageB {}
-========
syntax = "proto2";
package dynamic_message_test;
@@ -54,4 +40,3 @@
message MessageWithMapFields {
map<string, EmptyMessage> string_message_map = 1;
}
->>>>>>>> refs/tags/sync-piper:java/core/src/test/proto/com/google/protobuf/dynamic_message_test.proto
diff --git a/java/kotlin-lite/src/test/kotlin/com/google/protobuf/Proto2LiteTest.kt b/java/kotlin-lite/src/test/kotlin/com/google/protobuf/Proto2LiteTest.kt
index 1f45f65..76d4847 100644
--- a/java/kotlin-lite/src/test/kotlin/com/google/protobuf/Proto2LiteTest.kt
+++ b/java/kotlin-lite/src/test/kotlin/com/google/protobuf/Proto2LiteTest.kt
@@ -71,110 +71,123 @@
@Test
fun testSetters() {
assertThat(
- testAllTypesLite {
- optionalInt32 = 101
- optionalInt64 = 102
- optionalUint32 = 103
- optionalUint64 = 104
- optionalSint32 = 105
- optionalSint64 = 106
- optionalFixed32 = 107
- optionalFixed64 = 108
- optionalSfixed32 = 109
- optionalSfixed64 = 110
- optionalFloat = 111.0f
- optionalDouble = 112.0
- optionalBool = true
- optionalString = "115"
- optionalBytes = toBytes("116")
- optionalGroup = TestAllTypesLiteKt.optionalGroup { a = 117 }
- optionalNestedMessage = nestedMessage { bb = 118 }
- optionalForeignMessage = foreignMessageLite { c = 119 }
- optionalImportMessage = ImportMessageLite.newBuilder().setD(120).build()
- optionalPublicImportMessage = PublicImportMessageLite.newBuilder().setE(126).build()
- optionalLazyMessage = nestedMessage { bb = 127 }
- optionalNestedEnum = NestedEnum.BAZ
- optionalForeignEnum = ForeignEnumLite.FOREIGN_LITE_BAZ
- optionalImportEnum = ImportEnumLite.IMPORT_LITE_BAZ
- optionalStringPiece = "124"
- optionalCord = "125"
- repeatedInt32.add(201)
- repeatedInt64.add(202)
- repeatedUint32.add(203)
- repeatedUint64.add(204)
- repeatedSint32.add(205)
- repeatedSint64.add(206)
- repeatedFixed32.add(207)
- repeatedFixed64.add(208)
- repeatedSfixed32.add(209)
- repeatedSfixed64.add(210)
- repeatedFloat.add(211f)
- repeatedDouble.add(212.0)
- repeatedBool.add(true)
- repeatedString.add("215")
- repeatedBytes.add(toBytes("216"))
- repeatedGroup.add(TestAllTypesLiteKt.repeatedGroup { a = 217 })
- repeatedNestedMessage.add(nestedMessage { bb = 218 })
- repeatedForeignMessage.add(foreignMessageLite { c = 219 })
- repeatedImportMessage.add(ImportMessageLite.newBuilder().setD(220).build())
- repeatedLazyMessage.add(nestedMessage { bb = 227 })
- repeatedNestedEnum.add(NestedEnum.BAR)
- repeatedForeignEnum.add(ForeignEnumLite.FOREIGN_LITE_BAR)
- repeatedImportEnum.add(ImportEnumLite.IMPORT_LITE_BAR)
- repeatedStringPiece.add("224")
- repeatedCord.add("225")
- repeatedInt32 += 301
- repeatedInt64 += 302
- repeatedUint32 += 303
- repeatedUint64 += 304
- repeatedSint32 += 305
- repeatedSint64 += 306
- repeatedFixed32 += 307
- repeatedFixed64 += 308
- repeatedSfixed32 += 309
- repeatedSfixed64 += 310
- repeatedFloat += 311f
- repeatedDouble += 312.0
- repeatedBool += false
- repeatedString += "315"
- repeatedBytes += toBytes("316")
- repeatedGroup += TestAllTypesLiteKt.repeatedGroup { a = 317 }
- repeatedNestedMessage += nestedMessage { bb = 318 }
- repeatedForeignMessage += foreignMessageLite { c = 319 }
- repeatedImportMessage += ImportMessageLite.newBuilder().setD(320).build()
- repeatedLazyMessage += TestAllTypesLiteKt.nestedMessage { bb = 327 }
- repeatedNestedEnum += NestedEnum.BAZ
- repeatedForeignEnum += ForeignEnumLite.FOREIGN_LITE_BAZ
- repeatedImportEnum += ImportEnumLite.IMPORT_LITE_BAZ
- repeatedStringPiece += "324"
- repeatedCord += "325"
- defaultInt32 = 401
- defaultInt64 = 402
- defaultUint32 = 403
- defaultUint64 = 404
- defaultSint32 = 405
- defaultSint64 = 406
- defaultFixed32 = 407
- defaultFixed64 = 408
- defaultSfixed32 = 409
- defaultSfixed64 = 410
- defaultFloat = 411f
- defaultDouble = 412.0
- defaultBool = false
- defaultString = "415"
- defaultBytes = toBytes("416")
- defaultNestedEnum = NestedEnum.FOO
- defaultForeignEnum = ForeignEnumLite.FOREIGN_LITE_FOO
- defaultImportEnum = ImportEnumLite.IMPORT_LITE_FOO
- defaultStringPiece = "424"
- defaultCord = "425"
- oneofUint32 = 601
- oneofNestedMessage = TestAllTypesLiteKt.nestedMessage { bb = 602 }
- oneofString = "603"
- oneofBytes = toBytes("604")
- }
- )
- .isEqualTo(TestUtilLite.getAllLiteSetBuilder().build())
+ testAllTypesLite {
+ optionalInt32 = 101
+ optionalInt64 = 102
+ optionalUint32 = 103
+ optionalUint64 = 104
+ optionalSint32 = 105
+ optionalSint64 = 106
+ optionalFixed32 = 107
+ optionalFixed64 = 108
+ optionalSfixed32 = 109
+ optionalSfixed64 = 110
+ optionalFloat = 111.0f
+ optionalDouble = 112.0
+ optionalBool = true
+ optionalString = "115"
+ optionalBytes = toBytes("116")
+ optionalGroup =
+ TestAllTypesLiteKt.optionalGroup { a = 117 }
+ optionalNestedMessage = nestedMessage { bb = 118 }
+ optionalForeignMessage =
+ foreignMessageLite { c = 119 }
+ optionalImportMessage =
+ ImportMessageLite.newBuilder().setD(120).build()
+ optionalPublicImportMessage =
+ PublicImportMessageLite.newBuilder().setE(126).build()
+ optionalLazyMessage = nestedMessage { bb = 127 }
+ optionalNestedEnum = NestedEnum.BAZ
+ optionalForeignEnum = ForeignEnumLite.FOREIGN_LITE_BAZ
+ optionalImportEnum = ImportEnumLite.IMPORT_LITE_BAZ
+ optionalStringPiece = "124"
+ optionalCord = "125"
+ repeatedInt32.add(201)
+ repeatedInt64.add(202)
+ repeatedUint32.add(203)
+ repeatedUint64.add(204)
+ repeatedSint32.add(205)
+ repeatedSint64.add(206)
+ repeatedFixed32.add(207)
+ repeatedFixed64.add(208)
+ repeatedSfixed32.add(209)
+ repeatedSfixed64.add(210)
+ repeatedFloat.add(211f)
+ repeatedDouble.add(212.0)
+ repeatedBool.add(true)
+ repeatedString.add("215")
+ repeatedBytes.add(toBytes("216"))
+ repeatedGroup.add(TestAllTypesLiteKt.repeatedGroup { a = 217 })
+ repeatedNestedMessage.add(nestedMessage { bb = 218 })
+ repeatedForeignMessage.add(
+ foreignMessageLite { c = 219 }
+ )
+ repeatedImportMessage.add(
+ ImportMessageLite.newBuilder().setD(220).build()
+ )
+ repeatedLazyMessage.add(nestedMessage { bb = 227 })
+ repeatedNestedEnum.add(NestedEnum.BAR)
+ repeatedForeignEnum.add(ForeignEnumLite.FOREIGN_LITE_BAR)
+ repeatedImportEnum.add(ImportEnumLite.IMPORT_LITE_BAR)
+ repeatedStringPiece.add("224")
+ repeatedCord.add("225")
+ repeatedInt32 += 301
+ repeatedInt64 += 302
+ repeatedUint32 += 303
+ repeatedUint64 += 304
+ repeatedSint32 += 305
+ repeatedSint64 += 306
+ repeatedFixed32 += 307
+ repeatedFixed64 += 308
+ repeatedSfixed32 += 309
+ repeatedSfixed64 += 310
+ repeatedFloat += 311f
+ repeatedDouble += 312.0
+ repeatedBool += false
+ repeatedString += "315"
+ repeatedBytes += toBytes("316")
+ repeatedGroup += TestAllTypesLiteKt.repeatedGroup { a = 317 }
+ repeatedNestedMessage += nestedMessage { bb = 318 }
+ repeatedForeignMessage +=
+ foreignMessageLite { c = 319 }
+ repeatedImportMessage +=
+ ImportMessageLite.newBuilder().setD(320).build()
+ repeatedLazyMessage +=
+ TestAllTypesLiteKt.nestedMessage { bb = 327 }
+ repeatedNestedEnum += NestedEnum.BAZ
+ repeatedForeignEnum += ForeignEnumLite.FOREIGN_LITE_BAZ
+ repeatedImportEnum += ImportEnumLite.IMPORT_LITE_BAZ
+ repeatedStringPiece += "324"
+ repeatedCord += "325"
+ defaultInt32 = 401
+ defaultInt64 = 402
+ defaultUint32 = 403
+ defaultUint64 = 404
+ defaultSint32 = 405
+ defaultSint64 = 406
+ defaultFixed32 = 407
+ defaultFixed64 = 408
+ defaultSfixed32 = 409
+ defaultSfixed64 = 410
+ defaultFloat = 411f
+ defaultDouble = 412.0
+ defaultBool = false
+ defaultString = "415"
+ defaultBytes = toBytes("416")
+ defaultNestedEnum = NestedEnum.FOO
+ defaultForeignEnum = ForeignEnumLite.FOREIGN_LITE_FOO
+ defaultImportEnum = ImportEnumLite.IMPORT_LITE_FOO
+ defaultStringPiece = "424"
+ defaultCord = "425"
+ oneofUint32 = 601
+ oneofNestedMessage =
+ TestAllTypesLiteKt.nestedMessage { bb = 602 }
+ oneofString = "603"
+ oneofBytes = toBytes("604")
+ }
+ ).isEqualTo(
+ TestUtilLite.getAllLiteSetBuilder().build()
+ )
}
@Test
@@ -230,70 +243,71 @@
TestAllTypesLiteKt.repeatedGroup { a = 2 }
)
)
- assertThat(repeatedGroup)
- .isEqualTo(
- listOf(
- TestAllTypesLiteKt.repeatedGroup { a = 1 },
- TestAllTypesLiteKt.repeatedGroup { a = 2 }
- )
+ assertThat(repeatedGroup).isEqualTo(
+ listOf(
+ TestAllTypesLiteKt.repeatedGroup { a = 1 },
+ TestAllTypesLiteKt.repeatedGroup { a = 2 }
)
+ )
repeatedGroup +=
listOf(
TestAllTypesLiteKt.repeatedGroup { a = 3 },
TestAllTypesLiteKt.repeatedGroup { a = 4 }
)
- assertThat(repeatedGroup)
- .isEqualTo(
- listOf(
- TestAllTypesLiteKt.repeatedGroup { a = 1 },
- TestAllTypesLiteKt.repeatedGroup { a = 2 },
- TestAllTypesLiteKt.repeatedGroup { a = 3 },
- TestAllTypesLiteKt.repeatedGroup { a = 4 }
- )
+ assertThat(repeatedGroup).isEqualTo(
+ listOf(
+ TestAllTypesLiteKt.repeatedGroup { a = 1 },
+ TestAllTypesLiteKt.repeatedGroup { a = 2 },
+ TestAllTypesLiteKt.repeatedGroup { a = 3 },
+ TestAllTypesLiteKt.repeatedGroup { a = 4 }
)
+ )
repeatedGroup[0] = TestAllTypesLiteKt.repeatedGroup { a = 5 }
- assertThat(repeatedGroup)
- .isEqualTo(
- listOf(
- TestAllTypesLiteKt.repeatedGroup { a = 5 },
- TestAllTypesLiteKt.repeatedGroup { a = 2 },
- TestAllTypesLiteKt.repeatedGroup { a = 3 },
- TestAllTypesLiteKt.repeatedGroup { a = 4 }
- )
+ assertThat(repeatedGroup).isEqualTo(
+ listOf(
+ TestAllTypesLiteKt.repeatedGroup { a = 5 },
+ TestAllTypesLiteKt.repeatedGroup { a = 2 },
+ TestAllTypesLiteKt.repeatedGroup { a = 3 },
+ TestAllTypesLiteKt.repeatedGroup { a = 4 }
)
+ )
repeatedNestedMessage.addAll(listOf(nestedMessage { bb = 1 }, nestedMessage { bb = 2 }))
- assertThat(repeatedNestedMessage)
- .isEqualTo(listOf(nestedMessage { bb = 1 }, nestedMessage { bb = 2 }))
+ assertThat(repeatedNestedMessage).isEqualTo(
+ listOf(
+ nestedMessage { bb = 1 },
+ nestedMessage { bb = 2 }
+ )
+ )
repeatedNestedMessage += listOf(nestedMessage { bb = 3 }, nestedMessage { bb = 4 })
- assertThat(repeatedNestedMessage)
- .isEqualTo(
- listOf(
- nestedMessage { bb = 1 },
- nestedMessage { bb = 2 },
- nestedMessage { bb = 3 },
- nestedMessage { bb = 4 }
- )
+ assertThat(repeatedNestedMessage).isEqualTo(
+ listOf(
+ nestedMessage { bb = 1 },
+ nestedMessage { bb = 2 },
+ nestedMessage { bb = 3 },
+ nestedMessage { bb = 4 }
)
+ )
repeatedNestedMessage[0] = nestedMessage { bb = 5 }
- assertThat(repeatedNestedMessage)
- .isEqualTo(
- listOf(
- nestedMessage { bb = 5 },
- nestedMessage { bb = 2 },
- nestedMessage { bb = 3 },
- nestedMessage { bb = 4 }
- )
+ assertThat(repeatedNestedMessage).isEqualTo(
+ listOf(
+ nestedMessage { bb = 5 },
+ nestedMessage { bb = 2 },
+ nestedMessage { bb = 3 },
+ nestedMessage { bb = 4 }
)
+ )
repeatedNestedEnum.addAll(listOf(NestedEnum.FOO, NestedEnum.BAR))
assertThat(repeatedNestedEnum).isEqualTo(listOf(NestedEnum.FOO, NestedEnum.BAR))
repeatedNestedEnum += listOf(NestedEnum.BAZ, NestedEnum.FOO)
- assertThat(repeatedNestedEnum)
- .isEqualTo(listOf(NestedEnum.FOO, NestedEnum.BAR, NestedEnum.BAZ, NestedEnum.FOO))
+ assertThat(repeatedNestedEnum).isEqualTo(
+ listOf(NestedEnum.FOO, NestedEnum.BAR, NestedEnum.BAZ, NestedEnum.FOO)
+ )
repeatedNestedEnum[0] = NestedEnum.BAR
- assertThat(repeatedNestedEnum)
- .isEqualTo(listOf(NestedEnum.BAR, NestedEnum.BAR, NestedEnum.BAZ, NestedEnum.FOO))
+ assertThat(repeatedNestedEnum).isEqualTo(
+ listOf(NestedEnum.BAR, NestedEnum.BAR, NestedEnum.BAZ, NestedEnum.FOO)
+ )
}
}
@@ -366,155 +380,165 @@
optionalInt32 = 101
optionalString = "115"
}
- val modifiedMessage = message.copy { optionalInt32 = 201 }
+ val modifiedMessage = message.copy {
+ optionalInt32 = 201
+ }
- assertThat(message)
- .isEqualTo(
- TestAllTypesLite.newBuilder().setOptionalInt32(101).setOptionalString("115").build()
- )
- assertThat(modifiedMessage)
- .isEqualTo(
- TestAllTypesLite.newBuilder().setOptionalInt32(201).setOptionalString("115").build()
- )
+ assertThat(message).isEqualTo(
+ TestAllTypesLite.newBuilder()
+ .setOptionalInt32(101)
+ .setOptionalString("115")
+ .build()
+ )
+ assertThat(modifiedMessage).isEqualTo(
+ TestAllTypesLite.newBuilder()
+ .setOptionalInt32(201)
+ .setOptionalString("115")
+ .build()
+ )
}
@Test
fun testOneof() {
val message = testAllTypesLite {
oneofString = "foo"
- assertThat(oneofFieldCase).isEqualTo(TestAllTypesLite.OneofFieldCase.ONEOF_STRING)
+ assertThat(oneofFieldCase)
+ .isEqualTo(TestAllTypesLite.OneofFieldCase.ONEOF_STRING)
assertThat(oneofString).isEqualTo("foo")
clearOneofField()
assertThat(hasOneofUint32()).isFalse()
- assertThat(oneofFieldCase).isEqualTo(TestAllTypesLite.OneofFieldCase.ONEOFFIELD_NOT_SET)
+ assertThat(oneofFieldCase)
+ .isEqualTo(TestAllTypesLite.OneofFieldCase.ONEOFFIELD_NOT_SET)
oneofUint32 = 5
}
- assertThat(message.getOneofFieldCase()).isEqualTo(TestAllTypesLite.OneofFieldCase.ONEOF_UINT32)
+ assertThat(message.getOneofFieldCase())
+ .isEqualTo(TestAllTypesLite.OneofFieldCase.ONEOF_UINT32)
assertThat(message.getOneofUint32()).isEqualTo(5)
}
@Test
fun testExtensionsSet() {
assertThat(
- testAllExtensionsLite {
- this[UnittestLite.optionalInt32ExtensionLite] = 101
- this[UnittestLite.optionalInt64ExtensionLite] = 102L
- this[UnittestLite.optionalUint32ExtensionLite] = 103
- this[UnittestLite.optionalUint64ExtensionLite] = 104L
- this[UnittestLite.optionalSint32ExtensionLite] = 105
- this[UnittestLite.optionalSint64ExtensionLite] = 106L
- this[UnittestLite.optionalFixed32ExtensionLite] = 107
- this[UnittestLite.optionalFixed64ExtensionLite] = 108L
- this[UnittestLite.optionalSfixed32ExtensionLite] = 109
- this[UnittestLite.optionalSfixed64ExtensionLite] = 110L
- this[UnittestLite.optionalFloatExtensionLite] = 111F
- this[UnittestLite.optionalDoubleExtensionLite] = 112.0
- this[UnittestLite.optionalBoolExtensionLite] = true
- this[UnittestLite.optionalStringExtensionLite] = "115"
- this[UnittestLite.optionalBytesExtensionLite] = toBytes("116")
- this[UnittestLite.optionalGroupExtensionLite] = optionalGroupExtensionLite { a = 117 }
- this[UnittestLite.optionalNestedMessageExtensionLite] =
- TestAllTypesLiteKt.nestedMessage { bb = 118 }
- this[UnittestLite.optionalForeignMessageExtensionLite] = foreignMessageLite { c = 119 }
- this[UnittestLite.optionalImportMessageExtensionLite] =
- ImportMessageLite.newBuilder().setD(120).build()
- this[UnittestLite.optionalPublicImportMessageExtensionLite] =
- PublicImportMessageLite.newBuilder().setE(126).build()
- this[UnittestLite.optionalLazyMessageExtensionLite] =
- TestAllTypesLiteKt.nestedMessage { bb = 127 }
- this[UnittestLite.optionalNestedEnumExtensionLite] = NestedEnum.BAZ
- this[UnittestLite.optionalForeignEnumExtensionLite] = ForeignEnumLite.FOREIGN_LITE_BAZ
- this[UnittestLite.optionalImportEnumExtensionLite] = ImportEnumLite.IMPORT_LITE_BAZ
- this[UnittestLite.optionalStringPieceExtensionLite] = "124"
- this[UnittestLite.optionalCordExtensionLite] = "125"
- this[UnittestLite.repeatedInt32ExtensionLite].add(201)
- this[UnittestLite.repeatedInt64ExtensionLite].add(202L)
- this[UnittestLite.repeatedUint32ExtensionLite].add(203)
- this[UnittestLite.repeatedUint64ExtensionLite].add(204L)
- this[UnittestLite.repeatedSint32ExtensionLite].add(205)
- this[UnittestLite.repeatedSint64ExtensionLite].add(206L)
- this[UnittestLite.repeatedFixed32ExtensionLite].add(207)
- this[UnittestLite.repeatedFixed64ExtensionLite].add(208L)
- this[UnittestLite.repeatedSfixed32ExtensionLite].add(209)
- this[UnittestLite.repeatedSfixed64ExtensionLite].add(210L)
- this[UnittestLite.repeatedFloatExtensionLite].add(211F)
- this[UnittestLite.repeatedDoubleExtensionLite].add(212.0)
- this[UnittestLite.repeatedBoolExtensionLite].add(true)
- this[UnittestLite.repeatedStringExtensionLite].add("215")
- this[UnittestLite.repeatedBytesExtensionLite].add(toBytes("216"))
- this[UnittestLite.repeatedGroupExtensionLite].add(repeatedGroupExtensionLite { a = 217 })
- this[UnittestLite.repeatedNestedMessageExtensionLite].add(
- TestAllTypesLiteKt.nestedMessage { bb = 218 }
- )
- this[UnittestLite.repeatedForeignMessageExtensionLite].add(foreignMessageLite { c = 219 })
- this[UnittestLite.repeatedImportMessageExtensionLite].add(
- ImportMessageLite.newBuilder().setD(220).build()
- )
- this[UnittestLite.repeatedLazyMessageExtensionLite].add(
- TestAllTypesLiteKt.nestedMessage { bb = 227 }
- )
- this[UnittestLite.repeatedNestedEnumExtensionLite].add(NestedEnum.BAR)
- this[UnittestLite.repeatedForeignEnumExtensionLite].add(ForeignEnumLite.FOREIGN_LITE_BAR)
- this[UnittestLite.repeatedImportEnumExtensionLite].add(ImportEnumLite.IMPORT_LITE_BAR)
- this[UnittestLite.repeatedStringPieceExtensionLite].add("224")
- this[UnittestLite.repeatedCordExtensionLite].add("225")
- this[UnittestLite.repeatedInt32ExtensionLite] += 301
- this[UnittestLite.repeatedInt64ExtensionLite] += 302L
- this[UnittestLite.repeatedUint32ExtensionLite] += 303
- this[UnittestLite.repeatedUint64ExtensionLite] += 304L
- this[UnittestLite.repeatedSint32ExtensionLite] += 305
- this[UnittestLite.repeatedSint64ExtensionLite] += 306L
- this[UnittestLite.repeatedFixed32ExtensionLite] += 307
- this[UnittestLite.repeatedFixed64ExtensionLite] += 308L
- this[UnittestLite.repeatedSfixed32ExtensionLite] += 309
- this[UnittestLite.repeatedSfixed64ExtensionLite] += 310L
- this[UnittestLite.repeatedFloatExtensionLite] += 311F
- this[UnittestLite.repeatedDoubleExtensionLite] += 312.0
- this[UnittestLite.repeatedBoolExtensionLite] += false
- this[UnittestLite.repeatedStringExtensionLite] += "315"
- this[UnittestLite.repeatedBytesExtensionLite] += toBytes("316")
- this[UnittestLite.repeatedGroupExtensionLite] += repeatedGroupExtensionLite { a = 317 }
- this[UnittestLite.repeatedNestedMessageExtensionLite] +=
- TestAllTypesLiteKt.nestedMessage { bb = 318 }
- this[UnittestLite.repeatedForeignMessageExtensionLite] += foreignMessageLite { c = 319 }
- this[UnittestLite.repeatedImportMessageExtensionLite] +=
- ImportMessageLite.newBuilder().setD(320).build()
- this[UnittestLite.repeatedLazyMessageExtensionLite] +=
- TestAllTypesLiteKt.nestedMessage { bb = 327 }
- this[UnittestLite.repeatedNestedEnumExtensionLite] += NestedEnum.BAZ
- this[UnittestLite.repeatedForeignEnumExtensionLite] += ForeignEnumLite.FOREIGN_LITE_BAZ
- this[UnittestLite.repeatedImportEnumExtensionLite] += ImportEnumLite.IMPORT_LITE_BAZ
- this[UnittestLite.repeatedStringPieceExtensionLite] += "324"
- this[UnittestLite.repeatedCordExtensionLite] += "325"
- this[UnittestLite.defaultInt32ExtensionLite] = 401
- this[UnittestLite.defaultInt64ExtensionLite] = 402L
- this[UnittestLite.defaultUint32ExtensionLite] = 403
- this[UnittestLite.defaultUint64ExtensionLite] = 404L
- this[UnittestLite.defaultSint32ExtensionLite] = 405
- this[UnittestLite.defaultSint64ExtensionLite] = 406L
- this[UnittestLite.defaultFixed32ExtensionLite] = 407
- this[UnittestLite.defaultFixed64ExtensionLite] = 408L
- this[UnittestLite.defaultSfixed32ExtensionLite] = 409
- this[UnittestLite.defaultSfixed64ExtensionLite] = 410L
- this[UnittestLite.defaultFloatExtensionLite] = 411F
- this[UnittestLite.defaultDoubleExtensionLite] = 412.0
- this[UnittestLite.defaultBoolExtensionLite] = false
- this[UnittestLite.defaultStringExtensionLite] = "415"
- this[UnittestLite.defaultBytesExtensionLite] = toBytes("416")
- this[UnittestLite.defaultNestedEnumExtensionLite] = NestedEnum.FOO
- this[UnittestLite.defaultForeignEnumExtensionLite] = ForeignEnumLite.FOREIGN_LITE_FOO
- this[UnittestLite.defaultImportEnumExtensionLite] = ImportEnumLite.IMPORT_LITE_FOO
- this[UnittestLite.defaultStringPieceExtensionLite] = "424"
- this[UnittestLite.defaultCordExtensionLite] = "425"
- this[UnittestLite.oneofUint32ExtensionLite] = 601
- this[UnittestLite.oneofNestedMessageExtensionLite] =
- TestAllTypesLiteKt.nestedMessage { bb = 602 }
- this[UnittestLite.oneofStringExtensionLite] = "603"
- this[UnittestLite.oneofBytesExtensionLite] = toBytes("604")
- }
- )
- .isEqualTo(TestUtilLite.getAllLiteExtensionsSet())
+ testAllExtensionsLite {
+ this[UnittestLite.optionalInt32ExtensionLite] = 101
+ this[UnittestLite.optionalInt64ExtensionLite] = 102L
+ this[UnittestLite.optionalUint32ExtensionLite] = 103
+ this[UnittestLite.optionalUint64ExtensionLite] = 104L
+ this[UnittestLite.optionalSint32ExtensionLite] = 105
+ this[UnittestLite.optionalSint64ExtensionLite] = 106L
+ this[UnittestLite.optionalFixed32ExtensionLite] = 107
+ this[UnittestLite.optionalFixed64ExtensionLite] = 108L
+ this[UnittestLite.optionalSfixed32ExtensionLite] = 109
+ this[UnittestLite.optionalSfixed64ExtensionLite] = 110L
+ this[UnittestLite.optionalFloatExtensionLite] = 111F
+ this[UnittestLite.optionalDoubleExtensionLite] = 112.0
+ this[UnittestLite.optionalBoolExtensionLite] = true
+ this[UnittestLite.optionalStringExtensionLite] = "115"
+ this[UnittestLite.optionalBytesExtensionLite] = toBytes("116")
+ this[UnittestLite.optionalGroupExtensionLite] = optionalGroupExtensionLite { a = 117 }
+ this[UnittestLite.optionalNestedMessageExtensionLite] =
+ TestAllTypesLiteKt.nestedMessage { bb = 118 }
+ this[UnittestLite.optionalForeignMessageExtensionLite] = foreignMessageLite { c = 119 }
+ this[UnittestLite.optionalImportMessageExtensionLite] =
+ ImportMessageLite.newBuilder().setD(120).build()
+ this[UnittestLite.optionalPublicImportMessageExtensionLite] =
+ PublicImportMessageLite.newBuilder().setE(126).build()
+ this[UnittestLite.optionalLazyMessageExtensionLite] =
+ TestAllTypesLiteKt.nestedMessage { bb = 127 }
+ this[UnittestLite.optionalNestedEnumExtensionLite] = NestedEnum.BAZ
+ this[UnittestLite.optionalForeignEnumExtensionLite] = ForeignEnumLite.FOREIGN_LITE_BAZ
+ this[UnittestLite.optionalImportEnumExtensionLite] = ImportEnumLite.IMPORT_LITE_BAZ
+ this[UnittestLite.optionalStringPieceExtensionLite] = "124"
+ this[UnittestLite.optionalCordExtensionLite] = "125"
+ this[UnittestLite.repeatedInt32ExtensionLite].add(201)
+ this[UnittestLite.repeatedInt64ExtensionLite].add(202L)
+ this[UnittestLite.repeatedUint32ExtensionLite].add(203)
+ this[UnittestLite.repeatedUint64ExtensionLite].add(204L)
+ this[UnittestLite.repeatedSint32ExtensionLite].add(205)
+ this[UnittestLite.repeatedSint64ExtensionLite].add(206L)
+ this[UnittestLite.repeatedFixed32ExtensionLite].add(207)
+ this[UnittestLite.repeatedFixed64ExtensionLite].add(208L)
+ this[UnittestLite.repeatedSfixed32ExtensionLite].add(209)
+ this[UnittestLite.repeatedSfixed64ExtensionLite].add(210L)
+ this[UnittestLite.repeatedFloatExtensionLite].add(211F)
+ this[UnittestLite.repeatedDoubleExtensionLite].add(212.0)
+ this[UnittestLite.repeatedBoolExtensionLite].add(true)
+ this[UnittestLite.repeatedStringExtensionLite].add("215")
+ this[UnittestLite.repeatedBytesExtensionLite].add(toBytes("216"))
+ this[UnittestLite.repeatedGroupExtensionLite].add(repeatedGroupExtensionLite { a = 217 })
+ this[UnittestLite.repeatedNestedMessageExtensionLite].add(
+ TestAllTypesLiteKt.nestedMessage { bb = 218 }
+ )
+ this[UnittestLite.repeatedForeignMessageExtensionLite].add(foreignMessageLite { c = 219 })
+ this[UnittestLite.repeatedImportMessageExtensionLite].add(
+ ImportMessageLite.newBuilder().setD(220).build()
+ )
+ this[UnittestLite.repeatedLazyMessageExtensionLite].add(
+ TestAllTypesLiteKt.nestedMessage { bb = 227 }
+ )
+ this[UnittestLite.repeatedNestedEnumExtensionLite].add(NestedEnum.BAR)
+ this[UnittestLite.repeatedForeignEnumExtensionLite].add(ForeignEnumLite.FOREIGN_LITE_BAR)
+ this[UnittestLite.repeatedImportEnumExtensionLite].add(ImportEnumLite.IMPORT_LITE_BAR)
+ this[UnittestLite.repeatedStringPieceExtensionLite].add("224")
+ this[UnittestLite.repeatedCordExtensionLite].add("225")
+ this[UnittestLite.repeatedInt32ExtensionLite] += 301
+ this[UnittestLite.repeatedInt64ExtensionLite] += 302L
+ this[UnittestLite.repeatedUint32ExtensionLite] += 303
+ this[UnittestLite.repeatedUint64ExtensionLite] += 304L
+ this[UnittestLite.repeatedSint32ExtensionLite] += 305
+ this[UnittestLite.repeatedSint64ExtensionLite] += 306L
+ this[UnittestLite.repeatedFixed32ExtensionLite] += 307
+ this[UnittestLite.repeatedFixed64ExtensionLite] += 308L
+ this[UnittestLite.repeatedSfixed32ExtensionLite] += 309
+ this[UnittestLite.repeatedSfixed64ExtensionLite] += 310L
+ this[UnittestLite.repeatedFloatExtensionLite] += 311F
+ this[UnittestLite.repeatedDoubleExtensionLite] += 312.0
+ this[UnittestLite.repeatedBoolExtensionLite] += false
+ this[UnittestLite.repeatedStringExtensionLite] += "315"
+ this[UnittestLite.repeatedBytesExtensionLite] += toBytes("316")
+ this[UnittestLite.repeatedGroupExtensionLite] += repeatedGroupExtensionLite { a = 317 }
+ this[UnittestLite.repeatedNestedMessageExtensionLite] +=
+ TestAllTypesLiteKt.nestedMessage { bb = 318 }
+ this[UnittestLite.repeatedForeignMessageExtensionLite] += foreignMessageLite { c = 319 }
+ this[UnittestLite.repeatedImportMessageExtensionLite] +=
+ ImportMessageLite.newBuilder().setD(320).build()
+ this[UnittestLite.repeatedLazyMessageExtensionLite] +=
+ TestAllTypesLiteKt.nestedMessage { bb = 327 }
+ this[UnittestLite.repeatedNestedEnumExtensionLite] += NestedEnum.BAZ
+ this[UnittestLite.repeatedForeignEnumExtensionLite] += ForeignEnumLite.FOREIGN_LITE_BAZ
+ this[UnittestLite.repeatedImportEnumExtensionLite] += ImportEnumLite.IMPORT_LITE_BAZ
+ this[UnittestLite.repeatedStringPieceExtensionLite] += "324"
+ this[UnittestLite.repeatedCordExtensionLite] += "325"
+ this[UnittestLite.defaultInt32ExtensionLite] = 401
+ this[UnittestLite.defaultInt64ExtensionLite] = 402L
+ this[UnittestLite.defaultUint32ExtensionLite] = 403
+ this[UnittestLite.defaultUint64ExtensionLite] = 404L
+ this[UnittestLite.defaultSint32ExtensionLite] = 405
+ this[UnittestLite.defaultSint64ExtensionLite] = 406L
+ this[UnittestLite.defaultFixed32ExtensionLite] = 407
+ this[UnittestLite.defaultFixed64ExtensionLite] = 408L
+ this[UnittestLite.defaultSfixed32ExtensionLite] = 409
+ this[UnittestLite.defaultSfixed64ExtensionLite] = 410L
+ this[UnittestLite.defaultFloatExtensionLite] = 411F
+ this[UnittestLite.defaultDoubleExtensionLite] = 412.0
+ this[UnittestLite.defaultBoolExtensionLite] = false
+ this[UnittestLite.defaultStringExtensionLite] = "415"
+ this[UnittestLite.defaultBytesExtensionLite] = toBytes("416")
+ this[UnittestLite.defaultNestedEnumExtensionLite] = NestedEnum.FOO
+ this[UnittestLite.defaultForeignEnumExtensionLite] = ForeignEnumLite.FOREIGN_LITE_FOO
+ this[UnittestLite.defaultImportEnumExtensionLite] = ImportEnumLite.IMPORT_LITE_FOO
+ this[UnittestLite.defaultStringPieceExtensionLite] = "424"
+ this[UnittestLite.defaultCordExtensionLite] = "425"
+ this[UnittestLite.oneofUint32ExtensionLite] = 601
+ this[UnittestLite.oneofNestedMessageExtensionLite] =
+ TestAllTypesLiteKt.nestedMessage { bb = 602 }
+ this[UnittestLite.oneofStringExtensionLite] = "603"
+ this[UnittestLite.oneofBytesExtensionLite] = toBytes("604")
+ }
+ ).isEqualTo(
+ TestUtilLite.getAllLiteExtensionsSet()
+ )
}
@Test
@@ -560,72 +584,78 @@
.isEqualTo(listOf("5", "2", "3", "4"))
this[UnittestLite.repeatedGroupExtensionLite].addAll(
- listOf(repeatedGroupExtensionLite { a = 1 }, repeatedGroupExtensionLite { a = 2 })
+ listOf(
+ repeatedGroupExtensionLite { a = 1 },
+ repeatedGroupExtensionLite { a = 2 }
+ )
)
- assertThat(this[UnittestLite.repeatedGroupExtensionLite])
- .isEqualTo(
- listOf(repeatedGroupExtensionLite { a = 1 }, repeatedGroupExtensionLite { a = 2 })
+ assertThat(this[UnittestLite.repeatedGroupExtensionLite]).isEqualTo(
+ listOf(
+ repeatedGroupExtensionLite { a = 1 },
+ repeatedGroupExtensionLite { a = 2 }
)
+ )
this[UnittestLite.repeatedGroupExtensionLite] +=
- listOf(repeatedGroupExtensionLite { a = 3 }, repeatedGroupExtensionLite { a = 4 })
- assertThat(this[UnittestLite.repeatedGroupExtensionLite])
- .isEqualTo(
- listOf(
- repeatedGroupExtensionLite { a = 1 },
- repeatedGroupExtensionLite { a = 2 },
- repeatedGroupExtensionLite { a = 3 },
- repeatedGroupExtensionLite { a = 4 }
- )
+ listOf(
+ repeatedGroupExtensionLite { a = 3 },
+ repeatedGroupExtensionLite { a = 4 }
)
+ assertThat(this[UnittestLite.repeatedGroupExtensionLite]).isEqualTo(
+ listOf(
+ repeatedGroupExtensionLite { a = 1 },
+ repeatedGroupExtensionLite { a = 2 },
+ repeatedGroupExtensionLite { a = 3 },
+ repeatedGroupExtensionLite { a = 4 }
+ )
+ )
this[UnittestLite.repeatedGroupExtensionLite][0] = repeatedGroupExtensionLite { a = 5 }
- assertThat(this[UnittestLite.repeatedGroupExtensionLite])
- .isEqualTo(
- listOf(
- repeatedGroupExtensionLite { a = 5 },
- repeatedGroupExtensionLite { a = 2 },
- repeatedGroupExtensionLite { a = 3 },
- repeatedGroupExtensionLite { a = 4 }
- )
+ assertThat(this[UnittestLite.repeatedGroupExtensionLite]).isEqualTo(
+ listOf(
+ repeatedGroupExtensionLite { a = 5 },
+ repeatedGroupExtensionLite { a = 2 },
+ repeatedGroupExtensionLite { a = 3 },
+ repeatedGroupExtensionLite { a = 4 }
)
+ )
this[UnittestLite.repeatedNestedMessageExtensionLite].addAll(
listOf(nestedMessage { bb = 1 }, nestedMessage { bb = 2 })
)
- assertThat(this[UnittestLite.repeatedNestedMessageExtensionLite])
- .isEqualTo(listOf(nestedMessage { bb = 1 }, nestedMessage { bb = 2 }))
+ assertThat(this[UnittestLite.repeatedNestedMessageExtensionLite]).isEqualTo(
+ listOf(nestedMessage { bb = 1 }, nestedMessage { bb = 2 })
+ )
this[UnittestLite.repeatedNestedMessageExtensionLite] +=
listOf(nestedMessage { bb = 3 }, nestedMessage { bb = 4 })
- assertThat(this[UnittestLite.repeatedNestedMessageExtensionLite])
- .isEqualTo(
- listOf(
- nestedMessage { bb = 1 },
- nestedMessage { bb = 2 },
- nestedMessage { bb = 3 },
- nestedMessage { bb = 4 }
- )
+ assertThat(this[UnittestLite.repeatedNestedMessageExtensionLite]).isEqualTo(
+ listOf(
+ nestedMessage { bb = 1 },
+ nestedMessage { bb = 2 },
+ nestedMessage { bb = 3 },
+ nestedMessage { bb = 4 }
)
- this[UnittestLite.repeatedNestedMessageExtensionLite][0] = nestedMessage { bb = 5 }
- assertThat(this[UnittestLite.repeatedNestedMessageExtensionLite])
- .isEqualTo(
- listOf(
- nestedMessage { bb = 5 },
- nestedMessage { bb = 2 },
- nestedMessage { bb = 3 },
- nestedMessage { bb = 4 }
- )
- )
-
- this[UnittestLite.repeatedNestedEnumExtensionLite].addAll(
- listOf(NestedEnum.FOO, NestedEnum.BAR)
)
+ this[UnittestLite.repeatedNestedMessageExtensionLite][0] = nestedMessage { bb = 5 }
+ assertThat(this[UnittestLite.repeatedNestedMessageExtensionLite]).isEqualTo(
+ listOf(
+ nestedMessage { bb = 5 },
+ nestedMessage { bb = 2 },
+ nestedMessage { bb = 3 },
+ nestedMessage { bb = 4 }
+ )
+ )
+
+ this[UnittestLite.repeatedNestedEnumExtensionLite]
+ .addAll(listOf(NestedEnum.FOO, NestedEnum.BAR))
assertThat(this[UnittestLite.repeatedNestedEnumExtensionLite])
.isEqualTo(listOf(NestedEnum.FOO, NestedEnum.BAR))
this[UnittestLite.repeatedNestedEnumExtensionLite] += listOf(NestedEnum.BAZ, NestedEnum.FOO)
- assertThat(this[UnittestLite.repeatedNestedEnumExtensionLite])
- .isEqualTo(listOf(NestedEnum.FOO, NestedEnum.BAR, NestedEnum.BAZ, NestedEnum.FOO))
+ assertThat(this[UnittestLite.repeatedNestedEnumExtensionLite]).isEqualTo(
+ listOf(NestedEnum.FOO, NestedEnum.BAR, NestedEnum.BAZ, NestedEnum.FOO)
+ )
this[UnittestLite.repeatedNestedEnumExtensionLite][0] = NestedEnum.BAR
- assertThat(this[UnittestLite.repeatedNestedEnumExtensionLite])
- .isEqualTo(listOf(NestedEnum.BAR, NestedEnum.BAR, NestedEnum.BAZ, NestedEnum.FOO))
+ assertThat(this[UnittestLite.repeatedNestedEnumExtensionLite]).isEqualTo(
+ listOf(NestedEnum.BAR, NestedEnum.BAR, NestedEnum.BAZ, NestedEnum.FOO)
+ )
}
}
@@ -696,56 +726,62 @@
@Test
fun testEmptyMessages() {
- assertThat(testEmptyMessageLite {}).isEqualTo(TestEmptyMessageLite.newBuilder().build())
+ assertThat(
+ testEmptyMessageLite {}
+ ).isEqualTo(
+ TestEmptyMessageLite.newBuilder().build()
+ )
- assertThat(testEmptyMessageWithExtensionsLite {})
- .isEqualTo(TestEmptyMessageWithExtensionsLite.newBuilder().build())
+ assertThat(
+ testEmptyMessageWithExtensionsLite {}
+ ).isEqualTo(
+ TestEmptyMessageWithExtensionsLite.newBuilder().build()
+ )
}
@Test
fun testMapSetters() {
assertThat(
- testMapLite {
- mapInt32Int32[1] = 2
- mapInt64Int64[1L] = 2L
- mapUint32Uint32[1] = 2
- mapUint64Uint64[1L] = 2L
- mapSint32Sint32[1] = 2
- mapSint64Sint64[1L] = 2L
- mapFixed32Fixed32[1] = 2
- mapFixed64Fixed64[1L] = 2L
- mapSfixed32Sfixed32[1] = 2
- mapSfixed64Sfixed64[1L] = 2L
- mapInt32Float[1] = 2F
- mapInt32Double[1] = 2.0
- mapBoolBool[true] = true
- mapStringString["1"] = "2"
- mapInt32Bytes[1] = toBytes("2")
- mapInt32Enum[1] = MapEnumLite.MAP_ENUM_FOO_LITE
- mapInt32ForeignMessage[1] = foreignMessageLite { c = 1 }
- }
- )
- .isEqualTo(
- TestMapLite.newBuilder()
- .putMapInt32Int32(1, 2)
- .putMapInt64Int64(1L, 2L)
- .putMapUint32Uint32(1, 2)
- .putMapUint64Uint64(1L, 2L)
- .putMapSint32Sint32(1, 2)
- .putMapSint64Sint64(1L, 2L)
- .putMapFixed32Fixed32(1, 2)
- .putMapFixed64Fixed64(1L, 2L)
- .putMapSfixed32Sfixed32(1, 2)
- .putMapSfixed64Sfixed64(1L, 2L)
- .putMapInt32Float(1, 2F)
- .putMapInt32Double(1, 2.0)
- .putMapBoolBool(true, true)
- .putMapStringString("1", "2")
- .putMapInt32Bytes(1, toBytes("2"))
- .putMapInt32Enum(1, MapEnumLite.MAP_ENUM_FOO_LITE)
- .putMapInt32ForeignMessage(1, foreignMessageLite { c = 1 })
- .build()
- )
+ testMapLite {
+ mapInt32Int32[1] = 2
+ mapInt64Int64[1L] = 2L
+ mapUint32Uint32[1] = 2
+ mapUint64Uint64[1L] = 2L
+ mapSint32Sint32[1] = 2
+ mapSint64Sint64[1L] = 2L
+ mapFixed32Fixed32[1] = 2
+ mapFixed64Fixed64[1L] = 2L
+ mapSfixed32Sfixed32[1] = 2
+ mapSfixed64Sfixed64[1L] = 2L
+ mapInt32Float[1] = 2F
+ mapInt32Double[1] = 2.0
+ mapBoolBool[true] = true
+ mapStringString["1"] = "2"
+ mapInt32Bytes[1] = toBytes("2")
+ mapInt32Enum[1] = MapEnumLite.MAP_ENUM_FOO_LITE
+ mapInt32ForeignMessage[1] = foreignMessageLite { c = 1 }
+ }
+ ).isEqualTo(
+ TestMapLite.newBuilder()
+ .putMapInt32Int32(1, 2)
+ .putMapInt64Int64(1L, 2L)
+ .putMapUint32Uint32(1, 2)
+ .putMapUint64Uint64(1L, 2L)
+ .putMapSint32Sint32(1, 2)
+ .putMapSint64Sint64(1L, 2L)
+ .putMapFixed32Fixed32(1, 2)
+ .putMapFixed64Fixed64(1L, 2L)
+ .putMapSfixed32Sfixed32(1, 2)
+ .putMapSfixed64Sfixed64(1L, 2L)
+ .putMapInt32Float(1, 2F)
+ .putMapInt32Double(1, 2.0)
+ .putMapBoolBool(true, true)
+ .putMapStringString("1", "2")
+ .putMapInt32Bytes(1, toBytes("2"))
+ .putMapInt32Enum(1, MapEnumLite.MAP_ENUM_FOO_LITE)
+ .putMapInt32ForeignMessage(1, foreignMessageLite { c = 1 })
+ .build()
+ )
}
@Test
@@ -768,38 +804,38 @@
mapInt32Enum.put(1, MapEnumLite.MAP_ENUM_FOO_LITE)
assertThat(mapInt32Enum).isEqualTo(mapOf(1 to MapEnumLite.MAP_ENUM_FOO_LITE))
mapInt32Enum[2] = MapEnumLite.MAP_ENUM_BAR_LITE
- assertThat(mapInt32Enum)
- .isEqualTo(mapOf(1 to MapEnumLite.MAP_ENUM_FOO_LITE, 2 to MapEnumLite.MAP_ENUM_BAR_LITE))
+ assertThat(mapInt32Enum).isEqualTo(
+ mapOf(1 to MapEnumLite.MAP_ENUM_FOO_LITE, 2 to MapEnumLite.MAP_ENUM_BAR_LITE)
+ )
mapInt32Enum.putAll(
mapOf(3 to MapEnumLite.MAP_ENUM_BAZ_LITE, 4 to MapEnumLite.MAP_ENUM_FOO_LITE)
)
- assertThat(mapInt32Enum)
- .isEqualTo(
- mapOf(
- 1 to MapEnumLite.MAP_ENUM_FOO_LITE,
- 2 to MapEnumLite.MAP_ENUM_BAR_LITE,
- 3 to MapEnumLite.MAP_ENUM_BAZ_LITE,
- 4 to MapEnumLite.MAP_ENUM_FOO_LITE
- )
+ assertThat(mapInt32Enum).isEqualTo(
+ mapOf(
+ 1 to MapEnumLite.MAP_ENUM_FOO_LITE,
+ 2 to MapEnumLite.MAP_ENUM_BAR_LITE,
+ 3 to MapEnumLite.MAP_ENUM_BAZ_LITE,
+ 4 to MapEnumLite.MAP_ENUM_FOO_LITE
)
+ )
mapInt32ForeignMessage.put(1, foreignMessageLite { c = 1 })
assertThat(mapInt32ForeignMessage).isEqualTo(mapOf(1 to foreignMessageLite { c = 1 }))
mapInt32ForeignMessage[2] = foreignMessageLite { c = 2 }
- assertThat(mapInt32ForeignMessage)
- .isEqualTo(mapOf(1 to foreignMessageLite { c = 1 }, 2 to foreignMessageLite { c = 2 }))
+ assertThat(mapInt32ForeignMessage).isEqualTo(
+ mapOf(1 to foreignMessageLite { c = 1 }, 2 to foreignMessageLite { c = 2 })
+ )
mapInt32ForeignMessage.putAll(
mapOf(3 to foreignMessageLite { c = 3 }, 4 to foreignMessageLite { c = 4 })
)
- assertThat(mapInt32ForeignMessage)
- .isEqualTo(
- mapOf(
- 1 to foreignMessageLite { c = 1 },
- 2 to foreignMessageLite { c = 2 },
- 3 to foreignMessageLite { c = 3 },
- 4 to foreignMessageLite { c = 4 }
- )
+ assertThat(mapInt32ForeignMessage).isEqualTo(
+ mapOf(
+ 1 to foreignMessageLite { c = 1 },
+ 2 to foreignMessageLite { c = 2 },
+ 3 to foreignMessageLite { c = 3 },
+ 4 to foreignMessageLite { c = 4 }
)
+ )
}
}
@@ -856,57 +892,56 @@
@Test
fun testEvilNames() {
assertThat(
- evilNamesProto2 {
- initialized = true
- hasFoo = true
- bar = "foo"
- isInitialized = true
- fooBar = "foo"
- aLLCAPS += "foo"
- aLLCAPSMAP[1] = true
- hasUnderbarPrecedingNumeric1Foo = true
- hasUnderbarPrecedingNumeric42Bar = true
- hasUnderbarPrecedingNumeric123Foo42BarBaz = true
- extension += "foo"
- class_ += 1
- int = 1.0
- long = true
- boolean = 1L
- sealed = "foo"
- interface_ = 1F
- in_ = 1
- object_ = "foo"
- cachedSize_ = "foo"
- serializedSize_ = true
- by = "foo"
- }
- )
- .isEqualTo(
- EvilNamesProto2.newBuilder()
- .setInitialized(true)
- .setHasFoo(true)
- .setBar("foo")
- .setIsInitialized(true)
- .setFooBar("foo")
- .addALLCAPS("foo")
- .putALLCAPSMAP(1, true)
- .setHasUnderbarPrecedingNumeric1Foo(true)
- .setHasUnderbarPrecedingNumeric42Bar(true)
- .setHasUnderbarPrecedingNumeric123Foo42BarBaz(true)
- .addExtension("foo")
- .addClass_(1)
- .setInt(1.0)
- .setLong(true)
- .setBoolean(1L)
- .setSealed("foo")
- .setInterface(1F)
- .setIn(1)
- .setObject("foo")
- .setCachedSize_("foo")
- .setSerializedSize_(true)
- .setBy("foo")
- .build()
- )
+ evilNamesProto2 {
+ initialized = true
+ hasFoo = true
+ bar = "foo"
+ isInitialized = true
+ fooBar = "foo"
+ aLLCAPS += "foo"
+ aLLCAPSMAP[1] = true
+ hasUnderbarPrecedingNumeric1Foo = true
+ hasUnderbarPrecedingNumeric42Bar = true
+ hasUnderbarPrecedingNumeric123Foo42BarBaz = true
+ extension += "foo"
+ class_ += 1
+ int = 1.0
+ long = true
+ boolean = 1L
+ sealed = "foo"
+ interface_ = 1F
+ in_ = 1
+ object_ = "foo"
+ cachedSize_ = "foo"
+ serializedSize_ = true
+ by = "foo"
+ }
+ ).isEqualTo(
+ EvilNamesProto2.newBuilder()
+ .setInitialized(true)
+ .setHasFoo(true)
+ .setBar("foo")
+ .setIsInitialized(true)
+ .setFooBar("foo")
+ .addALLCAPS("foo")
+ .putALLCAPSMAP(1, true)
+ .setHasUnderbarPrecedingNumeric1Foo(true)
+ .setHasUnderbarPrecedingNumeric42Bar(true)
+ .setHasUnderbarPrecedingNumeric123Foo42BarBaz(true)
+ .addExtension("foo")
+ .addClass_(1)
+ .setInt(1.0)
+ .setLong(true)
+ .setBoolean(1L)
+ .setSealed("foo")
+ .setInterface(1F)
+ .setIn(1)
+ .setObject("foo")
+ .setCachedSize_("foo")
+ .setSerializedSize_(true)
+ .setBy("foo")
+ .build()
+ )
assertThat(interface_ {}).isEqualTo(Interface.newBuilder().build())
}
diff --git a/java/kotlin-lite/src/test/proto/com/google/protobuf/multiple_files_proto3.proto b/java/kotlin-lite/src/test/proto/com/google/protobuf/multiple_files_proto3.proto
index 42d09f0..61141c5 100644
--- a/java/kotlin-lite/src/test/proto/com/google/protobuf/multiple_files_proto3.proto
+++ b/java/kotlin-lite/src/test/proto/com/google/protobuf/multiple_files_proto3.proto
@@ -28,7 +28,6 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-<<<<<<<< HEAD:java/kotlin-lite/src/test/proto/com/google/protobuf/multiple_files_proto3.proto
syntax = "proto3";
package protobuf.kotlin.generator;
@@ -41,17 +40,3 @@
message MultipleFilesMessageA {}
message MultipleFilesMessageB {}
-========
-syntax = "proto2";
-
-package dynamic_message_test;
-
-option java_package = "dynamicmessagetest";
-option java_outer_classname = "DynamicMessageTestProto";
-
-message EmptyMessage {}
-
-message MessageWithMapFields {
- map<string, EmptyMessage> string_message_map = 1;
-}
->>>>>>>> refs/tags/sync-piper:java/core/src/test/proto/com/google/protobuf/dynamic_message_test.proto
diff --git a/java/kotlin/src/test/kotlin/com/google/protobuf/Proto2Test.kt b/java/kotlin/src/test/kotlin/com/google/protobuf/Proto2Test.kt
index 4463bc1..f3cbf2d 100644
--- a/java/kotlin/src/test/kotlin/com/google/protobuf/Proto2Test.kt
+++ b/java/kotlin/src/test/kotlin/com/google/protobuf/Proto2Test.kt
@@ -58,7 +58,6 @@
import protobuf_unittest.copy
import protobuf_unittest.foreignMessage
import protobuf_unittest.optionalGroupExtension
-import protobuf_unittest.optionalNestedMessageOrNull
import protobuf_unittest.repeatedGroupExtension
import protobuf_unittest.testAllExtensions
import protobuf_unittest.testAllTypes
@@ -954,16 +953,4 @@
assertThat(hasDo_()).isFalse()
}
}
-
- @Test
- fun testGetOrNull() {
- val noNestedMessage = testAllTypes {}
- assertThat(noNestedMessage.optionalNestedMessageOrNull).isEqualTo(null)
-
- val someNestedMessage = testAllTypes {
- optionalNestedMessage = TestAllTypesKt.nestedMessage { bb = 118 }
- }
- assertThat(someNestedMessage.optionalNestedMessageOrNull)
- .isEqualTo(TestAllTypesKt.nestedMessage { bb = 118 })
- }
}
diff --git a/java/kotlin/src/test/kotlin/com/google/protobuf/Proto3Test.kt b/java/kotlin/src/test/kotlin/com/google/protobuf/Proto3Test.kt
index ba69dca..7b394da 100644
--- a/java/kotlin/src/test/kotlin/com/google/protobuf/Proto3Test.kt
+++ b/java/kotlin/src/test/kotlin/com/google/protobuf/Proto3Test.kt
@@ -44,7 +44,6 @@
import proto3_unittest.UnittestProto3.TestAllTypes.NestedEnum
import proto3_unittest.UnittestProto3.TestEmptyMessage
import proto3_unittest.copy
-import proto3_unittest.optionalNestedMessageOrNull
import proto3_unittest.testAllTypes
import proto3_unittest.testEmptyMessage
import org.junit.Test
@@ -87,61 +86,66 @@
assertThat(repeatedString).isEqualTo(listOf("5", "2", "3", "4"))
repeatedNestedMessage.addAll(listOf(nestedMessage { bb = 1 }, nestedMessage { bb = 2 }))
- assertThat(repeatedNestedMessage)
- .isEqualTo(listOf(nestedMessage { bb = 1 }, nestedMessage { bb = 2 }))
+ assertThat(repeatedNestedMessage).isEqualTo(
+ listOf(
+ nestedMessage { bb = 1 },
+ nestedMessage { bb = 2 }
+ )
+ )
repeatedNestedMessage += listOf(nestedMessage { bb = 3 }, nestedMessage { bb = 4 })
- assertThat(repeatedNestedMessage)
- .isEqualTo(
- listOf(
- nestedMessage { bb = 1 },
- nestedMessage { bb = 2 },
- nestedMessage { bb = 3 },
- nestedMessage { bb = 4 }
- )
+ assertThat(repeatedNestedMessage).isEqualTo(
+ listOf(
+ nestedMessage { bb = 1 },
+ nestedMessage { bb = 2 },
+ nestedMessage { bb = 3 },
+ nestedMessage { bb = 4 }
)
+ )
repeatedNestedMessage[0] = nestedMessage { bb = 5 }
- assertThat(repeatedNestedMessage)
- .isEqualTo(
- listOf(
- nestedMessage { bb = 5 },
- nestedMessage { bb = 2 },
- nestedMessage { bb = 3 },
- nestedMessage { bb = 4 }
- )
+ assertThat(repeatedNestedMessage).isEqualTo(
+ listOf(
+ nestedMessage { bb = 5 },
+ nestedMessage { bb = 2 },
+ nestedMessage { bb = 3 },
+ nestedMessage { bb = 4 }
)
+ )
repeatedNestedEnum.addAll(listOf(NestedEnum.FOO, NestedEnum.BAR))
assertThat(repeatedNestedEnum).isEqualTo(listOf(NestedEnum.FOO, NestedEnum.BAR))
repeatedNestedEnum += listOf(NestedEnum.BAZ, NestedEnum.FOO)
- assertThat(repeatedNestedEnum)
- .isEqualTo(listOf(NestedEnum.FOO, NestedEnum.BAR, NestedEnum.BAZ, NestedEnum.FOO))
+ assertThat(repeatedNestedEnum).isEqualTo(
+ listOf(NestedEnum.FOO, NestedEnum.BAR, NestedEnum.BAZ, NestedEnum.FOO)
+ )
repeatedNestedEnum[0] = NestedEnum.BAR
- assertThat(repeatedNestedEnum)
- .isEqualTo(listOf(NestedEnum.BAR, NestedEnum.BAR, NestedEnum.BAZ, NestedEnum.FOO))
+ assertThat(repeatedNestedEnum).isEqualTo(
+ listOf(NestedEnum.BAR, NestedEnum.BAR, NestedEnum.BAZ, NestedEnum.FOO)
+ )
}
}
@Test
fun testClears() {
assertThat(
- testAllTypes {
- optionalInt32 = 101
- clearOptionalInt32()
+ testAllTypes {
+ optionalInt32 = 101
+ clearOptionalInt32()
- optionalString = "115"
- clearOptionalString()
+ optionalString = "115"
+ clearOptionalString()
- optionalNestedMessage = TestAllTypesKt.nestedMessage { bb = 118 }
- clearOptionalNestedMessage()
+ optionalNestedMessage = TestAllTypesKt.nestedMessage { bb = 118 }
+ clearOptionalNestedMessage()
- optionalNestedEnum = NestedEnum.BAZ
- clearOptionalNestedEnum()
+ optionalNestedEnum = NestedEnum.BAZ
+ clearOptionalNestedEnum()
- oneofUint32 = 601
- clearOneofUint32()
- }
- )
- .isEqualTo(TestAllTypes.newBuilder().build())
+ oneofUint32 = 601
+ clearOneofUint32()
+ }
+ ).isEqualTo(
+ TestAllTypes.newBuilder().build()
+ )
}
@Test
@@ -150,110 +154,126 @@
optionalInt32 = 101
optionalString = "115"
}
- val modifiedMessage = message.copy { optionalInt32 = 201 }
+ val modifiedMessage = message.copy {
+ optionalInt32 = 201
+ }
- assertThat(message)
- .isEqualTo(TestAllTypes.newBuilder().setOptionalInt32(101).setOptionalString("115").build())
- assertThat(modifiedMessage)
- .isEqualTo(TestAllTypes.newBuilder().setOptionalInt32(201).setOptionalString("115").build())
+ assertThat(message).isEqualTo(
+ TestAllTypes.newBuilder()
+ .setOptionalInt32(101)
+ .setOptionalString("115")
+ .build()
+ )
+ assertThat(modifiedMessage).isEqualTo(
+ TestAllTypes.newBuilder()
+ .setOptionalInt32(201)
+ .setOptionalString("115")
+ .build()
+ )
}
@Test
fun testOneof() {
val message = testAllTypes {
oneofString = "foo"
- assertThat(oneofFieldCase).isEqualTo(TestAllTypes.OneofFieldCase.ONEOF_STRING)
+ assertThat(oneofFieldCase)
+ .isEqualTo(TestAllTypes.OneofFieldCase.ONEOF_STRING)
assertThat(oneofString).isEqualTo("foo")
clearOneofField()
- assertThat(oneofFieldCase).isEqualTo(TestAllTypes.OneofFieldCase.ONEOFFIELD_NOT_SET)
+ assertThat(oneofFieldCase)
+ .isEqualTo(TestAllTypes.OneofFieldCase.ONEOFFIELD_NOT_SET)
oneofUint32 = 5
}
- assertThat(message.getOneofFieldCase()).isEqualTo(TestAllTypes.OneofFieldCase.ONEOF_UINT32)
+ assertThat(message.getOneofFieldCase())
+ .isEqualTo(TestAllTypes.OneofFieldCase.ONEOF_UINT32)
assertThat(message.getOneofUint32()).isEqualTo(5)
}
@Test
fun testEmptyMessages() {
- assertThat(testEmptyMessage {}).isEqualTo(TestEmptyMessage.newBuilder().build())
+ assertThat(
+ testEmptyMessage {}
+ ).isEqualTo(
+ TestEmptyMessage.newBuilder().build()
+ )
}
@Test
fun testEvilNames() {
assertThat(
- evilNamesProto3 {
- initialized = true
- hasFoo = true
- bar = "foo"
- isInitialized = true
- fooBar = "foo"
- aLLCAPS += "foo"
- aLLCAPSMAP[1] = true
- hasUnderbarPrecedingNumeric1Foo = true
- hasUnderbarPrecedingNumeric42Bar = true
- hasUnderbarPrecedingNumeric123Foo42BarBaz = true
- extension += "foo"
- class_ = "foo"
- int = 1.0
- long = true
- boolean = 1L
- sealed = "foo"
- interface_ = 1F
- in_ = 1
- object_ = "foo"
- cachedSize_ = "foo"
- serializedSize_ = true
- value = "foo"
- index = 1L
- values += "foo"
- newValues += "foo"
- builder = true
- k[1] = 1
- v["foo"] = "foo"
- key["foo"] = 1
- map[1] = "foo"
- pairs["foo"] = 1
- LeadingUnderscore = "foo"
- option = 1
- }
- )
- .isEqualTo(
- EvilNamesProto3.newBuilder()
- .setInitialized(true)
- .setHasFoo(true)
- .setBar("foo")
- .setIsInitialized(true)
- .setFooBar("foo")
- .addALLCAPS("foo")
- .putALLCAPSMAP(1, true)
- .setHasUnderbarPrecedingNumeric1Foo(true)
- .setHasUnderbarPrecedingNumeric42Bar(true)
- .setHasUnderbarPrecedingNumeric123Foo42BarBaz(true)
- .addExtension("foo")
- .setClass_("foo")
- .setInt(1.0)
- .setLong(true)
- .setBoolean(1L)
- .setSealed("foo")
- .setInterface(1F)
- .setIn(1)
- .setObject("foo")
- .setCachedSize_("foo")
- .setSerializedSize_(true)
- .setValue("foo")
- .setIndex(1L)
- .addValues("foo")
- .addNewValues("foo")
- .setBuilder(true)
- .putK(1, 1)
- .putV("foo", "foo")
- .putKey("foo", 1)
- .putMap(1, "foo")
- .putPairs("foo", 1)
- .setLeadingUnderscore("foo")
- .setOption(1)
- .build()
- )
+ evilNamesProto3 {
+ initialized = true
+ hasFoo = true
+ bar = "foo"
+ isInitialized = true
+ fooBar = "foo"
+ aLLCAPS += "foo"
+ aLLCAPSMAP[1] = true
+ hasUnderbarPrecedingNumeric1Foo = true
+ hasUnderbarPrecedingNumeric42Bar = true
+ hasUnderbarPrecedingNumeric123Foo42BarBaz = true
+ extension += "foo"
+ class_ = "foo"
+ int = 1.0
+ long = true
+ boolean = 1L
+ sealed = "foo"
+ interface_ = 1F
+ in_ = 1
+ object_ = "foo"
+ cachedSize_ = "foo"
+ serializedSize_ = true
+ value = "foo"
+ index = 1L
+ values += "foo"
+ newValues += "foo"
+ builder = true
+ k[1] = 1
+ v["foo"] = "foo"
+ key["foo"] = 1
+ map[1] = "foo"
+ pairs["foo"] = 1
+ LeadingUnderscore = "foo"
+ option = 1
+ }
+ ).isEqualTo(
+ EvilNamesProto3.newBuilder()
+ .setInitialized(true)
+ .setHasFoo(true)
+ .setBar("foo")
+ .setIsInitialized(true)
+ .setFooBar("foo")
+ .addALLCAPS("foo")
+ .putALLCAPSMAP(1, true)
+ .setHasUnderbarPrecedingNumeric1Foo(true)
+ .setHasUnderbarPrecedingNumeric42Bar(true)
+ .setHasUnderbarPrecedingNumeric123Foo42BarBaz(true)
+ .addExtension("foo")
+ .setClass_("foo")
+ .setInt(1.0)
+ .setLong(true)
+ .setBoolean(1L)
+ .setSealed("foo")
+ .setInterface(1F)
+ .setIn(1)
+ .setObject("foo")
+ .setCachedSize_("foo")
+ .setSerializedSize_(true)
+ .setValue("foo")
+ .setIndex(1L)
+ .addValues("foo")
+ .addNewValues("foo")
+ .setBuilder(true)
+ .putK(1, 1)
+ .putV("foo", "foo")
+ .putKey("foo", 1)
+ .putMap(1, "foo")
+ .putPairs("foo", 1)
+ .setLeadingUnderscore("foo")
+ .setOption(1)
+ .build()
+ )
assertThat(class_ {}).isEqualTo(Class.newBuilder().build())
}
@@ -330,22 +350,16 @@
@Test
fun testMultipleFiles() {
- assertThat(com.google.protobuf.kotlin.generator.multipleFilesMessageA {})
- .isEqualTo(com.google.protobuf.kotlin.generator.MultipleFilesMessageA.newBuilder().build())
+ assertThat(
+ com.google.protobuf.kotlin.generator.multipleFilesMessageA {}
+ ).isEqualTo(
+ com.google.protobuf.kotlin.generator.MultipleFilesMessageA.newBuilder().build()
+ )
- assertThat(com.google.protobuf.kotlin.generator.multipleFilesMessageB {})
- .isEqualTo(com.google.protobuf.kotlin.generator.MultipleFilesMessageB.newBuilder().build())
- }
-
- @Test
- fun testGetOrNull() {
- val noNestedMessage = testAllTypes {}
- assertThat(noNestedMessage.optionalNestedMessageOrNull).isEqualTo(null)
-
- val someNestedMessage = testAllTypes {
- optionalNestedMessage = TestAllTypesKt.nestedMessage { bb = 118 }
- }
- assertThat(someNestedMessage.optionalNestedMessageOrNull)
- .isEqualTo(TestAllTypesKt.nestedMessage { bb = 118 })
+ assertThat(
+ com.google.protobuf.kotlin.generator.multipleFilesMessageB {}
+ ).isEqualTo(
+ com.google.protobuf.kotlin.generator.MultipleFilesMessageB.newBuilder().build()
+ )
}
}
diff --git a/java/lite/generate-test-sources-build.xml b/java/lite/generate-test-sources-build.xml
index 365194e..8123efb 100644
--- a/java/lite/generate-test-sources-build.xml
+++ b/java/lite/generate-test-sources-build.xml
@@ -5,6 +5,7 @@
<arg value="--proto_path=${protobuf.source.dir}"/>
<arg value="--proto_path=${protobuf.basedir}/java/core/${test.proto.dir}"/>
<arg value="${protobuf.source.dir}/google/protobuf/descriptor.proto"/>
+ <arg value="${protobuf.source.dir}/google/protobuf/map_lite_unittest.proto"/>
<arg value="${protobuf.source.dir}/google/protobuf/unittest.proto"/>
<arg value="${protobuf.source.dir}/google/protobuf/unittest_import.proto"/>
<arg value="${protobuf.source.dir}/google/protobuf/unittest_import_lite.proto"/>
diff --git a/java/lite/pom.xml b/java/lite/pom.xml
index 901ae67..c19d596 100644
--- a/java/lite/pom.xml
+++ b/java/lite/pom.xml
@@ -105,6 +105,7 @@
<include>CodedInputStreamReader.java</include>
<include>CodedOutputStream.java</include>
<include>CodedOutputStreamWriter.java</include>
+ <include>CompileTimeConstant.java</include>
<include>DoubleArrayList.java</include>
<include>ExperimentalApi.java</include>
<include>ExtensionLite.java</include>
@@ -119,6 +120,7 @@
<include>FloatArrayList.java</include>
<include>GeneratedMessageInfoFactory.java</include>
<include>GeneratedMessageLite.java</include>
+ <include>InlineMe.java</include>
<include>IntArrayList.java</include>
<include>Internal.java</include>
<include>InvalidProtocolBufferException.java</include>
