diff options
| author |  xiaofeng@google.com <xiaofeng@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2012-09-22 02:40:50 +0000 |
|---|---|---|
| committer | xiaofeng@google.com <xiaofeng@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2012-09-22 02:40:50 +0000 |
| commit | b55a20fa2c669b181f47ea9219b8e74d1263da19 (patch) | |
| tree | 3936a0e7c22196587a6d8397372de41434fe2129 /src/google/protobuf/testdata | |
| parent | 9ced30caf94bb4e7e9629c199679ff44e8ca7389 (diff) | |
Down-integrate from internal branch
Diffstat (limited to 'src/google/protobuf/testdata')
| -rw-r--r-- | src/google/protobuf/testdata/golden_message | bin | 487 -> 509 bytes | |||
| -rw-r--r-- | src/google/protobuf/testdata/text_format_unittest_data.txt | 12 | ||||
| -rw-r--r-- | src/google/protobuf/testdata/text_format_unittest_extensions_data.txt | 12 |
3 files changed, 24 insertions, 0 deletions
diff --git a/src/google/protobuf/testdata/golden_message b/src/google/protobuf/testdata/golden_message Binary files differindex 94898e49..4dd62cd3 100644 --- a/src/google/protobuf/testdata/golden_message +++ b/src/google/protobuf/testdata/golden_message diff --git a/src/google/protobuf/testdata/text_format_unittest_data.txt b/src/google/protobuf/testdata/text_format_unittest_data.txt index feea8f7b..bbe58826 100644 --- a/src/google/protobuf/testdata/text_format_unittest_data.txt +++ b/src/google/protobuf/testdata/text_format_unittest_data.txt @@ -30,6 +30,12 @@ optional_foreign_enum: FOREIGN_BAZ optional_import_enum: IMPORT_BAZ optional_string_piece: "124" optional_cord: "125" +optional_public_import_message { + e: 126 +} +optional_lazy_message { + bb: 127 +} repeated_int32: 201 repeated_int32: 301 repeated_int64: 202 @@ -94,6 +100,12 @@ repeated_string_piece: "224" repeated_string_piece: "324" repeated_cord: "225" repeated_cord: "325" +repeated_lazy_message { + bb: 227 +} +repeated_lazy_message { + bb: 327 +} default_int32: 401 default_int64: 402 default_uint32: 403 diff --git a/src/google/protobuf/testdata/text_format_unittest_extensions_data.txt b/src/google/protobuf/testdata/text_format_unittest_extensions_data.txt index 057beae8..0a217f02 100644 --- a/src/google/protobuf/testdata/text_format_unittest_extensions_data.txt +++ b/src/google/protobuf/testdata/text_format_unittest_extensions_data.txt @@ -30,6 +30,12 @@ [protobuf_unittest.optional_import_enum_extension]: IMPORT_BAZ [protobuf_unittest.optional_string_piece_extension]: "124" [protobuf_unittest.optional_cord_extension]: "125" +[protobuf_unittest.optional_public_import_message_extension] { + e: 126 +} +[protobuf_unittest.optional_lazy_message_extension] { + bb: 127 +} [protobuf_unittest.repeated_int32_extension]: 201 [protobuf_unittest.repeated_int32_extension]: 301 [protobuf_unittest.repeated_int64_extension]: 202 @@ -94,6 +100,12 @@ [protobuf_unittest.repeated_string_piece_extension]: "324" [protobuf_unittest.repeated_cord_extension]: "225" [protobuf_unittest.repeated_cord_extension]: "325" +[protobuf_unittest.repeated_lazy_message_extension] { + bb: 227 +} +[protobuf_unittest.repeated_lazy_message_extension] { + bb: 327 +} [protobuf_unittest.default_int32_extension]: 401 [protobuf_unittest.default_int64_extension]: 402 [protobuf_unittest.default_uint32_extension]: 403 |