Chiebot-Mirror
/
protobuf
mirror of https://github.com/protocolbuffers/protobuf.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixing java and protoc builds

Browse Source
pull/9461/head
Deanna Garcia 3 years ago
parent b7fe12e367
commit 349738dde5
9 changed files with 630 additions and 619 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      BUILD
  2. 2
      java/core/BUILD
  3. 15
      java/core/src/test/proto/com/google/protobuf/dynamic_message_test.proto
  4. 185
      java/kotlin-lite/src/test/kotlin/com/google/protobuf/Proto2LiteTest.kt
  5. 15
      java/kotlin-lite/src/test/proto/com/google/protobuf/multiple_files_proto3.proto
  6. 13
      java/kotlin/src/test/kotlin/com/google/protobuf/Proto2Test.kt
  7. 92
      java/kotlin/src/test/kotlin/com/google/protobuf/Proto3Test.kt
  8. 1
      java/lite/generate-test-sources-build.xml
  9. 2
      java/lite/pom.xml

4
BUILD
Unescape View File

@ -163,7 +163,6 @@ cc_library(
"src/google/protobuf/arenastring.cc",
"src/google/protobuf/extension_set.cc",
"src/google/protobuf/generated_enum_util.cc",
"src/google/protobuf/generated_message_table_driven_lite.cc",
"src/google/protobuf/generated_message_tctable_lite.cc",
"src/google/protobuf/generated_message_util.cc",
"src/google/protobuf/implicit_weak_message.cc",
@ -225,7 +224,6 @@ cc_library(
"src/google/protobuf/field_mask.pb.cc",
"src/google/protobuf/generated_message_bases.cc",
"src/google/protobuf/generated_message_reflection.cc",
"src/google/protobuf/generated_message_table_driven.cc",
"src/google/protobuf/generated_message_tctable_full.cc",
"src/google/protobuf/io/gzip_stream.cc",
"src/google/protobuf/io/printer.cc",
@ -501,6 +499,8 @@ cc_library(
"src/google/protobuf/compiler/plugin.cc",
"src/google/protobuf/compiler/plugin.pb.cc",
"src/google/protobuf/compiler/python/python_generator.cc",
"src/google/protobuf/compiler/python/python_helpers.cc",
"src/google/protobuf/compiler/python/python_pyi_generator.cc",
"src/google/protobuf/compiler/ruby/ruby_generator.cc",
"src/google/protobuf/compiler/subprocess.cc",
"src/google/protobuf/compiler/zip_writer.cc",

2
java/core/BUILD
Unescape View File

@ -27,6 +27,7 @@ LITE_SRCS = [
"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 @@ LITE_SRCS = [
"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",

15
java/core/src/test/proto/com/google/protobuf/dynamic_message_test.proto
Unescape View File

@ -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 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

185
java/kotlin-lite/src/test/kotlin/com/google/protobuf/Proto2LiteTest.kt
Unescape View File

@ -87,11 +87,15 @@ class Proto2LiteTest {
optionalBool = true
optionalString = "115"
optionalBytes = toBytes("116")
optionalGroup = TestAllTypesLiteKt.optionalGroup { a = 117 }
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()
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
@ -115,8 +119,12 @@ class Proto2LiteTest {
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())
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)
@ -140,9 +148,12 @@ class Proto2LiteTest {
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 }
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
@ -169,12 +180,14 @@ class Proto2LiteTest {
defaultStringPiece = "424"
defaultCord = "425"
oneofUint32 = 601
oneofNestedMessage = TestAllTypesLiteKt.nestedMessage { bb = 602 }
oneofNestedMessage =
TestAllTypesLiteKt.nestedMessage { bb = 602 }
oneofString = "603"
oneofBytes = toBytes("604")
}
).isEqualTo(
TestUtilLite.getAllLiteSetBuilder().build()
)
.isEqualTo(TestUtilLite.getAllLiteSetBuilder().build())
}
@Test
@ -230,8 +243,7 @@ class Proto2LiteTest {
TestAllTypesLiteKt.repeatedGroup { a = 2 }
)
)
assertThat(repeatedGroup)
.isEqualTo(
assertThat(repeatedGroup).isEqualTo(
listOf(
TestAllTypesLiteKt.repeatedGroup { a = 1 },
TestAllTypesLiteKt.repeatedGroup { a = 2 }
@ -242,8 +254,7 @@ class Proto2LiteTest {
TestAllTypesLiteKt.repeatedGroup { a = 3 },
TestAllTypesLiteKt.repeatedGroup { a = 4 }
)
assertThat(repeatedGroup)
.isEqualTo(
assertThat(repeatedGroup).isEqualTo(
listOf(
TestAllTypesLiteKt.repeatedGroup { a = 1 },
TestAllTypesLiteKt.repeatedGroup { a = 2 },
@ -252,8 +263,7 @@ class Proto2LiteTest {
)
)
repeatedGroup[0] = TestAllTypesLiteKt.repeatedGroup { a = 5 }
assertThat(repeatedGroup)
.isEqualTo(
assertThat(repeatedGroup).isEqualTo(
listOf(
TestAllTypesLiteKt.repeatedGroup { a = 5 },
TestAllTypesLiteKt.repeatedGroup { a = 2 },
@ -263,11 +273,14 @@ class Proto2LiteTest {
)
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(
assertThat(repeatedNestedMessage).isEqualTo(
listOf(
nestedMessage { bb = 1 },
nestedMessage { bb = 2 },
@ -276,8 +289,7 @@ class Proto2LiteTest {
)
)
repeatedNestedMessage[0] = nestedMessage { bb = 5 }
assertThat(repeatedNestedMessage)
.isEqualTo(
assertThat(repeatedNestedMessage).isEqualTo(
listOf(
nestedMessage { bb = 5 },
nestedMessage { bb = 2 },
@ -289,11 +301,13 @@ class Proto2LiteTest {
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,15 +380,21 @@ class Proto2LiteTest {
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(message).isEqualTo(
TestAllTypesLite.newBuilder()
.setOptionalInt32(101)
.setOptionalString("115")
.build()
)
assertThat(modifiedMessage)
.isEqualTo(
TestAllTypesLite.newBuilder().setOptionalInt32(201).setOptionalString("115").build()
assertThat(modifiedMessage).isEqualTo(
TestAllTypesLite.newBuilder()
.setOptionalInt32(201)
.setOptionalString("115")
.build()
)
}
@ -382,15 +402,18 @@ class Proto2LiteTest {
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)
}
@ -513,8 +536,9 @@ class Proto2LiteTest {
this[UnittestLite.oneofStringExtensionLite] = "603"
this[UnittestLite.oneofBytesExtensionLite] = toBytes("604")
}
).isEqualTo(
TestUtilLite.getAllLiteExtensionsSet()
)
.isEqualTo(TestUtilLite.getAllLiteExtensionsSet())
}
@Test
@ -560,16 +584,23 @@ class Proto2LiteTest {
.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 = 3 },
repeatedGroupExtensionLite { a = 4 }
)
assertThat(this[UnittestLite.repeatedGroupExtensionLite]).isEqualTo(
listOf(
repeatedGroupExtensionLite { a = 1 },
repeatedGroupExtensionLite { a = 2 },
@ -578,8 +609,7 @@ class Proto2LiteTest {
)
)
this[UnittestLite.repeatedGroupExtensionLite][0] = repeatedGroupExtensionLite { a = 5 }
assertThat(this[UnittestLite.repeatedGroupExtensionLite])
.isEqualTo(
assertThat(this[UnittestLite.repeatedGroupExtensionLite]).isEqualTo(
listOf(
repeatedGroupExtensionLite { a = 5 },
repeatedGroupExtensionLite { a = 2 },
@ -591,12 +621,12 @@ class Proto2LiteTest {
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(
assertThat(this[UnittestLite.repeatedNestedMessageExtensionLite]).isEqualTo(
listOf(
nestedMessage { bb = 1 },
nestedMessage { bb = 2 },
@ -605,8 +635,7 @@ class Proto2LiteTest {
)
)
this[UnittestLite.repeatedNestedMessageExtensionLite][0] = nestedMessage { bb = 5 }
assertThat(this[UnittestLite.repeatedNestedMessageExtensionLite])
.isEqualTo(
assertThat(this[UnittestLite.repeatedNestedMessageExtensionLite]).isEqualTo(
listOf(
nestedMessage { bb = 5 },
nestedMessage { bb = 2 },
@ -615,17 +644,18 @@ class Proto2LiteTest {
)
)
this[UnittestLite.repeatedNestedEnumExtensionLite].addAll(
listOf(NestedEnum.FOO, NestedEnum.BAR)
)
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,10 +726,17 @@ class Proto2LiteTest {
@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
@ -724,8 +761,7 @@ class Proto2LiteTest {
mapInt32Enum[1] = MapEnumLite.MAP_ENUM_FOO_LITE
mapInt32ForeignMessage[1] = foreignMessageLite { c = 1 }
}
)
.isEqualTo(
).isEqualTo(
TestMapLite.newBuilder()
.putMapInt32Int32(1, 2)
.putMapInt64Int64(1L, 2L)
@ -768,13 +804,13 @@ class Proto2LiteTest {
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(
assertThat(mapInt32Enum).isEqualTo(
mapOf(
1 to MapEnumLite.MAP_ENUM_FOO_LITE,
2 to MapEnumLite.MAP_ENUM_BAR_LITE,
@ -786,13 +822,13 @@ class Proto2LiteTest {
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(
assertThat(mapInt32ForeignMessage).isEqualTo(
mapOf(
1 to foreignMessageLite { c = 1 },
2 to foreignMessageLite { c = 2 },
@ -880,8 +916,7 @@ class Proto2LiteTest {
serializedSize_ = true
by = "foo"
}
)
.isEqualTo(
).isEqualTo(
EvilNamesProto2.newBuilder()
.setInitialized(true)
.setHasFoo(true)

15
java/kotlin-lite/src/test/proto/com/google/protobuf/multiple_files_proto3.proto
Unescape View File

@ -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 @@ enum NestedEnum { FOO = 0; }
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

13
java/kotlin/src/test/kotlin/com/google/protobuf/Proto2Test.kt
Unescape View File

@ -58,7 +58,6 @@ import protobuf_unittest.UnittestProto.TestEmptyMessageWithExtensions
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 @@ class Proto2Test {
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 })
}
}

92
java/kotlin/src/test/kotlin/com/google/protobuf/Proto3Test.kt
Unescape View File

@ -44,7 +44,6 @@ import proto3_unittest.UnittestProto3.TestAllTypes
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,11 +86,14 @@ class Proto3Test {
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(
assertThat(repeatedNestedMessage).isEqualTo(
listOf(
nestedMessage { bb = 1 },
nestedMessage { bb = 2 },
@ -100,8 +102,7 @@ class Proto3Test {
)
)
repeatedNestedMessage[0] = nestedMessage { bb = 5 }
assertThat(repeatedNestedMessage)
.isEqualTo(
assertThat(repeatedNestedMessage).isEqualTo(
listOf(
nestedMessage { bb = 5 },
nestedMessage { bb = 2 },
@ -113,11 +114,13 @@ class Proto3Test {
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)
)
}
}
@ -140,8 +143,9 @@ class Proto3Test {
oneofUint32 = 601
clearOneofUint32()
}
).isEqualTo(
TestAllTypes.newBuilder().build()
)
.isEqualTo(TestAllTypes.newBuilder().build())
}
@Test
@ -150,32 +154,49 @@ class Proto3Test {
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
@ -216,8 +237,7 @@ class Proto3Test {
LeadingUnderscore = "foo"
option = 1
}
)
.isEqualTo(
).isEqualTo(
EvilNamesProto3.newBuilder()
.setInitialized(true)
.setHasFoo(true)
@ -330,22 +350,16 @@ class Proto3Test {
@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.multipleFilesMessageB {})
.isEqualTo(com.google.protobuf.kotlin.generator.MultipleFilesMessageB.newBuilder().build())
}
@Test
fun testGetOrNull() {
val noNestedMessage = testAllTypes {}
assertThat(noNestedMessage.optionalNestedMessageOrNull).isEqualTo(null)
assertThat(
com.google.protobuf.kotlin.generator.multipleFilesMessageA {}
).isEqualTo(
com.google.protobuf.kotlin.generator.MultipleFilesMessageA.newBuilder().build()
)
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()
)
}
}

1
java/lite/generate-test-sources-build.xml
Unescape View File

@ -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"/>

2
java/lite/pom.xml
Unescape View File

@ -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>

Write Preview
Loading…
Cancel
Save