| Index: third_party/protobuf/python/google/protobuf/internal/test_util.py
|
| diff --git a/third_party/protobuf/python/google/protobuf/internal/test_util.py b/third_party/protobuf/python/google/protobuf/internal/test_util.py
|
| index be8ae7bef5b05b8282c17a38b9f12ca68ed8af56..ac88fa81d823a87379230a97f1a0ad7108f0cc8d 100755
|
| --- a/third_party/protobuf/python/google/protobuf/internal/test_util.py
|
| +++ b/third_party/protobuf/python/google/protobuf/internal/test_util.py
|
| @@ -1,6 +1,6 @@
|
| # Protocol Buffers - Google's data interchange format
|
| # Copyright 2008 Google Inc. All rights reserved.
|
| -# http://code.google.com/p/protobuf/
|
| +# https://developers.google.com/protocol-buffers/
|
| #
|
| # Redistribution and use in source and binary forms, with or without
|
| # modification, are permitted provided that the following conditions are
|
| @@ -40,13 +40,19 @@ import os.path
|
|
|
| from google.protobuf import unittest_import_pb2
|
| from google.protobuf import unittest_pb2
|
| +from google.protobuf import descriptor_pb2
|
|
|
| +# Tests whether the given TestAllTypes message is proto2 or not.
|
| +# This is used to gate several fields/features that only exist
|
| +# for the proto2 version of the message.
|
| +def IsProto2(message):
|
| + return message.DESCRIPTOR.syntax == "proto2"
|
|
|
| def SetAllNonLazyFields(message):
|
| """Sets every non-lazy field in the message to a unique value.
|
|
|
| Args:
|
| - message: A unittest_pb2.TestAllTypes instance.
|
| + message: A TestAllTypes instance.
|
| """
|
|
|
| #
|
| @@ -66,16 +72,11 @@ def SetAllNonLazyFields(message):
|
| message.optional_float = 111
|
| message.optional_double = 112
|
| message.optional_bool = True
|
| - # TODO(robinson): Firmly spec out and test how
|
| - # protos interact with unicode. One specific example:
|
| - # what happens if we change the literal below to
|
| - # u'115'? What *should* happen? Still some discussion
|
| - # to finish with Kenton about bytes vs. strings
|
| - # and forcing everything to be utf8. :-/
|
| - message.optional_string = '115'
|
| - message.optional_bytes = '116'
|
| -
|
| - message.optionalgroup.a = 117
|
| + message.optional_string = u'115'
|
| + message.optional_bytes = b'116'
|
| +
|
| + if IsProto2(message):
|
| + message.optionalgroup.a = 117
|
| message.optional_nested_message.bb = 118
|
| message.optional_foreign_message.c = 119
|
| message.optional_import_message.d = 120
|
| @@ -83,10 +84,11 @@ def SetAllNonLazyFields(message):
|
|
|
| message.optional_nested_enum = unittest_pb2.TestAllTypes.BAZ
|
| message.optional_foreign_enum = unittest_pb2.FOREIGN_BAZ
|
| - message.optional_import_enum = unittest_import_pb2.IMPORT_BAZ
|
| + if IsProto2(message):
|
| + message.optional_import_enum = unittest_import_pb2.IMPORT_BAZ
|
|
|
| - message.optional_string_piece = '124'
|
| - message.optional_cord = '125'
|
| + message.optional_string_piece = u'124'
|
| + message.optional_cord = u'125'
|
|
|
| #
|
| # Repeated fields.
|
| @@ -105,10 +107,11 @@ def SetAllNonLazyFields(message):
|
| message.repeated_float.append(211)
|
| message.repeated_double.append(212)
|
| message.repeated_bool.append(True)
|
| - message.repeated_string.append('215')
|
| - message.repeated_bytes.append('216')
|
| + message.repeated_string.append(u'215')
|
| + message.repeated_bytes.append(b'216')
|
|
|
| - message.repeatedgroup.add().a = 217
|
| + if IsProto2(message):
|
| + message.repeatedgroup.add().a = 217
|
| message.repeated_nested_message.add().bb = 218
|
| message.repeated_foreign_message.add().c = 219
|
| message.repeated_import_message.add().d = 220
|
| @@ -116,10 +119,11 @@ def SetAllNonLazyFields(message):
|
|
|
| message.repeated_nested_enum.append(unittest_pb2.TestAllTypes.BAR)
|
| message.repeated_foreign_enum.append(unittest_pb2.FOREIGN_BAR)
|
| - message.repeated_import_enum.append(unittest_import_pb2.IMPORT_BAR)
|
| + if IsProto2(message):
|
| + message.repeated_import_enum.append(unittest_import_pb2.IMPORT_BAR)
|
|
|
| - message.repeated_string_piece.append('224')
|
| - message.repeated_cord.append('225')
|
| + message.repeated_string_piece.append(u'224')
|
| + message.repeated_cord.append(u'225')
|
|
|
| # Add a second one of each field.
|
| message.repeated_int32.append(301)
|
| @@ -135,10 +139,11 @@ def SetAllNonLazyFields(message):
|
| message.repeated_float.append(311)
|
| message.repeated_double.append(312)
|
| message.repeated_bool.append(False)
|
| - message.repeated_string.append('315')
|
| - message.repeated_bytes.append('316')
|
| + message.repeated_string.append(u'315')
|
| + message.repeated_bytes.append(b'316')
|
|
|
| - message.repeatedgroup.add().a = 317
|
| + if IsProto2(message):
|
| + message.repeatedgroup.add().a = 317
|
| message.repeated_nested_message.add().bb = 318
|
| message.repeated_foreign_message.add().c = 319
|
| message.repeated_import_message.add().d = 320
|
| @@ -146,37 +151,44 @@ def SetAllNonLazyFields(message):
|
|
|
| message.repeated_nested_enum.append(unittest_pb2.TestAllTypes.BAZ)
|
| message.repeated_foreign_enum.append(unittest_pb2.FOREIGN_BAZ)
|
| - message.repeated_import_enum.append(unittest_import_pb2.IMPORT_BAZ)
|
| + if IsProto2(message):
|
| + message.repeated_import_enum.append(unittest_import_pb2.IMPORT_BAZ)
|
|
|
| - message.repeated_string_piece.append('324')
|
| - message.repeated_cord.append('325')
|
| + message.repeated_string_piece.append(u'324')
|
| + message.repeated_cord.append(u'325')
|
|
|
| #
|
| # Fields that have defaults.
|
| #
|
|
|
| - message.default_int32 = 401
|
| - message.default_int64 = 402
|
| - message.default_uint32 = 403
|
| - message.default_uint64 = 404
|
| - message.default_sint32 = 405
|
| - message.default_sint64 = 406
|
| - message.default_fixed32 = 407
|
| - message.default_fixed64 = 408
|
| - message.default_sfixed32 = 409
|
| - message.default_sfixed64 = 410
|
| - message.default_float = 411
|
| - message.default_double = 412
|
| - message.default_bool = False
|
| - message.default_string = '415'
|
| - message.default_bytes = '416'
|
| -
|
| - message.default_nested_enum = unittest_pb2.TestAllTypes.FOO
|
| - message.default_foreign_enum = unittest_pb2.FOREIGN_FOO
|
| - message.default_import_enum = unittest_import_pb2.IMPORT_FOO
|
| -
|
| - message.default_string_piece = '424'
|
| - message.default_cord = '425'
|
| + if IsProto2(message):
|
| + message.default_int32 = 401
|
| + message.default_int64 = 402
|
| + message.default_uint32 = 403
|
| + message.default_uint64 = 404
|
| + message.default_sint32 = 405
|
| + message.default_sint64 = 406
|
| + message.default_fixed32 = 407
|
| + message.default_fixed64 = 408
|
| + message.default_sfixed32 = 409
|
| + message.default_sfixed64 = 410
|
| + message.default_float = 411
|
| + message.default_double = 412
|
| + message.default_bool = False
|
| + message.default_string = '415'
|
| + message.default_bytes = b'416'
|
| +
|
| + message.default_nested_enum = unittest_pb2.TestAllTypes.FOO
|
| + message.default_foreign_enum = unittest_pb2.FOREIGN_FOO
|
| + message.default_import_enum = unittest_import_pb2.IMPORT_FOO
|
| +
|
| + message.default_string_piece = '424'
|
| + message.default_cord = '425'
|
| +
|
| + message.oneof_uint32 = 601
|
| + message.oneof_nested_message.bb = 602
|
| + message.oneof_string = '603'
|
| + message.oneof_bytes = b'604'
|
|
|
|
|
| def SetAllFields(message):
|
| @@ -212,8 +224,8 @@ def SetAllExtensions(message):
|
| extensions[pb2.optional_float_extension] = 111
|
| extensions[pb2.optional_double_extension] = 112
|
| extensions[pb2.optional_bool_extension] = True
|
| - extensions[pb2.optional_string_extension] = '115'
|
| - extensions[pb2.optional_bytes_extension] = '116'
|
| + extensions[pb2.optional_string_extension] = u'115'
|
| + extensions[pb2.optional_bytes_extension] = b'116'
|
|
|
| extensions[pb2.optionalgroup_extension].a = 117
|
| extensions[pb2.optional_nested_message_extension].bb = 118
|
| @@ -227,8 +239,8 @@ def SetAllExtensions(message):
|
| extensions[pb2.optional_foreign_enum_extension] = pb2.FOREIGN_BAZ
|
| extensions[pb2.optional_import_enum_extension] = import_pb2.IMPORT_BAZ
|
|
|
| - extensions[pb2.optional_string_piece_extension] = '124'
|
| - extensions[pb2.optional_cord_extension] = '125'
|
| + extensions[pb2.optional_string_piece_extension] = u'124'
|
| + extensions[pb2.optional_cord_extension] = u'125'
|
|
|
| #
|
| # Repeated fields.
|
| @@ -247,8 +259,8 @@ def SetAllExtensions(message):
|
| extensions[pb2.repeated_float_extension].append(211)
|
| extensions[pb2.repeated_double_extension].append(212)
|
| extensions[pb2.repeated_bool_extension].append(True)
|
| - extensions[pb2.repeated_string_extension].append('215')
|
| - extensions[pb2.repeated_bytes_extension].append('216')
|
| + extensions[pb2.repeated_string_extension].append(u'215')
|
| + extensions[pb2.repeated_bytes_extension].append(b'216')
|
|
|
| extensions[pb2.repeatedgroup_extension].add().a = 217
|
| extensions[pb2.repeated_nested_message_extension].add().bb = 218
|
| @@ -260,8 +272,8 @@ def SetAllExtensions(message):
|
| extensions[pb2.repeated_foreign_enum_extension].append(pb2.FOREIGN_BAR)
|
| extensions[pb2.repeated_import_enum_extension].append(import_pb2.IMPORT_BAR)
|
|
|
| - extensions[pb2.repeated_string_piece_extension].append('224')
|
| - extensions[pb2.repeated_cord_extension].append('225')
|
| + extensions[pb2.repeated_string_piece_extension].append(u'224')
|
| + extensions[pb2.repeated_cord_extension].append(u'225')
|
|
|
| # Append a second one of each field.
|
| extensions[pb2.repeated_int32_extension].append(301)
|
| @@ -277,8 +289,8 @@ def SetAllExtensions(message):
|
| extensions[pb2.repeated_float_extension].append(311)
|
| extensions[pb2.repeated_double_extension].append(312)
|
| extensions[pb2.repeated_bool_extension].append(False)
|
| - extensions[pb2.repeated_string_extension].append('315')
|
| - extensions[pb2.repeated_bytes_extension].append('316')
|
| + extensions[pb2.repeated_string_extension].append(u'315')
|
| + extensions[pb2.repeated_bytes_extension].append(b'316')
|
|
|
| extensions[pb2.repeatedgroup_extension].add().a = 317
|
| extensions[pb2.repeated_nested_message_extension].add().bb = 318
|
| @@ -290,8 +302,8 @@ def SetAllExtensions(message):
|
| extensions[pb2.repeated_foreign_enum_extension].append(pb2.FOREIGN_BAZ)
|
| extensions[pb2.repeated_import_enum_extension].append(import_pb2.IMPORT_BAZ)
|
|
|
| - extensions[pb2.repeated_string_piece_extension].append('324')
|
| - extensions[pb2.repeated_cord_extension].append('325')
|
| + extensions[pb2.repeated_string_piece_extension].append(u'324')
|
| + extensions[pb2.repeated_cord_extension].append(u'325')
|
|
|
| #
|
| # Fields with defaults.
|
| @@ -310,16 +322,21 @@ def SetAllExtensions(message):
|
| extensions[pb2.default_float_extension] = 411
|
| extensions[pb2.default_double_extension] = 412
|
| extensions[pb2.default_bool_extension] = False
|
| - extensions[pb2.default_string_extension] = '415'
|
| - extensions[pb2.default_bytes_extension] = '416'
|
| + extensions[pb2.default_string_extension] = u'415'
|
| + extensions[pb2.default_bytes_extension] = b'416'
|
|
|
| extensions[pb2.default_nested_enum_extension] = pb2.TestAllTypes.FOO
|
| extensions[pb2.default_foreign_enum_extension] = pb2.FOREIGN_FOO
|
| extensions[pb2.default_import_enum_extension] = import_pb2.IMPORT_FOO
|
|
|
| - extensions[pb2.default_string_piece_extension] = '424'
|
| + extensions[pb2.default_string_piece_extension] = u'424'
|
| extensions[pb2.default_cord_extension] = '425'
|
|
|
| + extensions[pb2.oneof_uint32_extension] = 601
|
| + extensions[pb2.oneof_nested_message_extension].bb = 602
|
| + extensions[pb2.oneof_string_extension] = u'603'
|
| + extensions[pb2.oneof_bytes_extension] = b'604'
|
| +
|
|
|
| def SetAllFieldsAndExtensions(message):
|
| """Sets every field and extension in the message to a unique value.
|
| @@ -358,7 +375,7 @@ def ExpectAllFieldsAndExtensionsInOrder(serialized):
|
| message.my_float = 1.0
|
| expected_strings.append(message.SerializeToString())
|
| message.Clear()
|
| - expected = ''.join(expected_strings)
|
| + expected = b''.join(expected_strings)
|
|
|
| if expected != serialized:
|
| raise ValueError('Expected %r, found %r' % (expected, serialized))
|
| @@ -382,7 +399,8 @@ def ExpectAllFieldsSet(test_case, message):
|
| test_case.assertTrue(message.HasField('optional_string'))
|
| test_case.assertTrue(message.HasField('optional_bytes'))
|
|
|
| - test_case.assertTrue(message.HasField('optionalgroup'))
|
| + if IsProto2(message):
|
| + test_case.assertTrue(message.HasField('optionalgroup'))
|
| test_case.assertTrue(message.HasField('optional_nested_message'))
|
| test_case.assertTrue(message.HasField('optional_foreign_message'))
|
| test_case.assertTrue(message.HasField('optional_import_message'))
|
| @@ -394,7 +412,8 @@ def ExpectAllFieldsSet(test_case, message):
|
|
|
| test_case.assertTrue(message.HasField('optional_nested_enum'))
|
| test_case.assertTrue(message.HasField('optional_foreign_enum'))
|
| - test_case.assertTrue(message.HasField('optional_import_enum'))
|
| + if IsProto2(message):
|
| + test_case.assertTrue(message.HasField('optional_import_enum'))
|
|
|
| test_case.assertTrue(message.HasField('optional_string_piece'))
|
| test_case.assertTrue(message.HasField('optional_cord'))
|
| @@ -413,9 +432,10 @@ def ExpectAllFieldsSet(test_case, message):
|
| test_case.assertEqual(112, message.optional_double)
|
| test_case.assertEqual(True, message.optional_bool)
|
| test_case.assertEqual('115', message.optional_string)
|
| - test_case.assertEqual('116', message.optional_bytes)
|
| + test_case.assertEqual(b'116', message.optional_bytes)
|
|
|
| - test_case.assertEqual(117, message.optionalgroup.a)
|
| + if IsProto2(message):
|
| + test_case.assertEqual(117, message.optionalgroup.a)
|
| test_case.assertEqual(118, message.optional_nested_message.bb)
|
| test_case.assertEqual(119, message.optional_foreign_message.c)
|
| test_case.assertEqual(120, message.optional_import_message.d)
|
| @@ -426,8 +446,9 @@ def ExpectAllFieldsSet(test_case, message):
|
| message.optional_nested_enum)
|
| test_case.assertEqual(unittest_pb2.FOREIGN_BAZ,
|
| message.optional_foreign_enum)
|
| - test_case.assertEqual(unittest_import_pb2.IMPORT_BAZ,
|
| - message.optional_import_enum)
|
| + if IsProto2(message):
|
| + test_case.assertEqual(unittest_import_pb2.IMPORT_BAZ,
|
| + message.optional_import_enum)
|
|
|
| # -----------------------------------------------------------------
|
|
|
| @@ -447,13 +468,15 @@ def ExpectAllFieldsSet(test_case, message):
|
| test_case.assertEqual(2, len(message.repeated_string))
|
| test_case.assertEqual(2, len(message.repeated_bytes))
|
|
|
| - test_case.assertEqual(2, len(message.repeatedgroup))
|
| + if IsProto2(message):
|
| + test_case.assertEqual(2, len(message.repeatedgroup))
|
| test_case.assertEqual(2, len(message.repeated_nested_message))
|
| test_case.assertEqual(2, len(message.repeated_foreign_message))
|
| test_case.assertEqual(2, len(message.repeated_import_message))
|
| test_case.assertEqual(2, len(message.repeated_nested_enum))
|
| test_case.assertEqual(2, len(message.repeated_foreign_enum))
|
| - test_case.assertEqual(2, len(message.repeated_import_enum))
|
| + if IsProto2(message):
|
| + test_case.assertEqual(2, len(message.repeated_import_enum))
|
|
|
| test_case.assertEqual(2, len(message.repeated_string_piece))
|
| test_case.assertEqual(2, len(message.repeated_cord))
|
| @@ -472,9 +495,10 @@ def ExpectAllFieldsSet(test_case, message):
|
| test_case.assertEqual(212, message.repeated_double[0])
|
| test_case.assertEqual(True, message.repeated_bool[0])
|
| test_case.assertEqual('215', message.repeated_string[0])
|
| - test_case.assertEqual('216', message.repeated_bytes[0])
|
| + test_case.assertEqual(b'216', message.repeated_bytes[0])
|
|
|
| - test_case.assertEqual(217, message.repeatedgroup[0].a)
|
| + if IsProto2(message):
|
| + test_case.assertEqual(217, message.repeatedgroup[0].a)
|
| test_case.assertEqual(218, message.repeated_nested_message[0].bb)
|
| test_case.assertEqual(219, message.repeated_foreign_message[0].c)
|
| test_case.assertEqual(220, message.repeated_import_message[0].d)
|
| @@ -484,8 +508,9 @@ def ExpectAllFieldsSet(test_case, message):
|
| message.repeated_nested_enum[0])
|
| test_case.assertEqual(unittest_pb2.FOREIGN_BAR,
|
| message.repeated_foreign_enum[0])
|
| - test_case.assertEqual(unittest_import_pb2.IMPORT_BAR,
|
| - message.repeated_import_enum[0])
|
| + if IsProto2(message):
|
| + test_case.assertEqual(unittest_import_pb2.IMPORT_BAR,
|
| + message.repeated_import_enum[0])
|
|
|
| test_case.assertEqual(301, message.repeated_int32[1])
|
| test_case.assertEqual(302, message.repeated_int64[1])
|
| @@ -501,9 +526,10 @@ def ExpectAllFieldsSet(test_case, message):
|
| test_case.assertEqual(312, message.repeated_double[1])
|
| test_case.assertEqual(False, message.repeated_bool[1])
|
| test_case.assertEqual('315', message.repeated_string[1])
|
| - test_case.assertEqual('316', message.repeated_bytes[1])
|
| + test_case.assertEqual(b'316', message.repeated_bytes[1])
|
|
|
| - test_case.assertEqual(317, message.repeatedgroup[1].a)
|
| + if IsProto2(message):
|
| + test_case.assertEqual(317, message.repeatedgroup[1].a)
|
| test_case.assertEqual(318, message.repeated_nested_message[1].bb)
|
| test_case.assertEqual(319, message.repeated_foreign_message[1].c)
|
| test_case.assertEqual(320, message.repeated_import_message[1].d)
|
| @@ -513,53 +539,56 @@ def ExpectAllFieldsSet(test_case, message):
|
| message.repeated_nested_enum[1])
|
| test_case.assertEqual(unittest_pb2.FOREIGN_BAZ,
|
| message.repeated_foreign_enum[1])
|
| - test_case.assertEqual(unittest_import_pb2.IMPORT_BAZ,
|
| - message.repeated_import_enum[1])
|
| + if IsProto2(message):
|
| + test_case.assertEqual(unittest_import_pb2.IMPORT_BAZ,
|
| + message.repeated_import_enum[1])
|
|
|
| # -----------------------------------------------------------------
|
|
|
| - test_case.assertTrue(message.HasField('default_int32'))
|
| - test_case.assertTrue(message.HasField('default_int64'))
|
| - test_case.assertTrue(message.HasField('default_uint32'))
|
| - test_case.assertTrue(message.HasField('default_uint64'))
|
| - test_case.assertTrue(message.HasField('default_sint32'))
|
| - test_case.assertTrue(message.HasField('default_sint64'))
|
| - test_case.assertTrue(message.HasField('default_fixed32'))
|
| - test_case.assertTrue(message.HasField('default_fixed64'))
|
| - test_case.assertTrue(message.HasField('default_sfixed32'))
|
| - test_case.assertTrue(message.HasField('default_sfixed64'))
|
| - test_case.assertTrue(message.HasField('default_float'))
|
| - test_case.assertTrue(message.HasField('default_double'))
|
| - test_case.assertTrue(message.HasField('default_bool'))
|
| - test_case.assertTrue(message.HasField('default_string'))
|
| - test_case.assertTrue(message.HasField('default_bytes'))
|
| -
|
| - test_case.assertTrue(message.HasField('default_nested_enum'))
|
| - test_case.assertTrue(message.HasField('default_foreign_enum'))
|
| - test_case.assertTrue(message.HasField('default_import_enum'))
|
| -
|
| - test_case.assertEqual(401, message.default_int32)
|
| - test_case.assertEqual(402, message.default_int64)
|
| - test_case.assertEqual(403, message.default_uint32)
|
| - test_case.assertEqual(404, message.default_uint64)
|
| - test_case.assertEqual(405, message.default_sint32)
|
| - test_case.assertEqual(406, message.default_sint64)
|
| - test_case.assertEqual(407, message.default_fixed32)
|
| - test_case.assertEqual(408, message.default_fixed64)
|
| - test_case.assertEqual(409, message.default_sfixed32)
|
| - test_case.assertEqual(410, message.default_sfixed64)
|
| - test_case.assertEqual(411, message.default_float)
|
| - test_case.assertEqual(412, message.default_double)
|
| - test_case.assertEqual(False, message.default_bool)
|
| - test_case.assertEqual('415', message.default_string)
|
| - test_case.assertEqual('416', message.default_bytes)
|
| -
|
| - test_case.assertEqual(unittest_pb2.TestAllTypes.FOO,
|
| - message.default_nested_enum)
|
| - test_case.assertEqual(unittest_pb2.FOREIGN_FOO,
|
| - message.default_foreign_enum)
|
| - test_case.assertEqual(unittest_import_pb2.IMPORT_FOO,
|
| - message.default_import_enum)
|
| + if IsProto2(message):
|
| + test_case.assertTrue(message.HasField('default_int32'))
|
| + test_case.assertTrue(message.HasField('default_int64'))
|
| + test_case.assertTrue(message.HasField('default_uint32'))
|
| + test_case.assertTrue(message.HasField('default_uint64'))
|
| + test_case.assertTrue(message.HasField('default_sint32'))
|
| + test_case.assertTrue(message.HasField('default_sint64'))
|
| + test_case.assertTrue(message.HasField('default_fixed32'))
|
| + test_case.assertTrue(message.HasField('default_fixed64'))
|
| + test_case.assertTrue(message.HasField('default_sfixed32'))
|
| + test_case.assertTrue(message.HasField('default_sfixed64'))
|
| + test_case.assertTrue(message.HasField('default_float'))
|
| + test_case.assertTrue(message.HasField('default_double'))
|
| + test_case.assertTrue(message.HasField('default_bool'))
|
| + test_case.assertTrue(message.HasField('default_string'))
|
| + test_case.assertTrue(message.HasField('default_bytes'))
|
| +
|
| + test_case.assertTrue(message.HasField('default_nested_enum'))
|
| + test_case.assertTrue(message.HasField('default_foreign_enum'))
|
| + test_case.assertTrue(message.HasField('default_import_enum'))
|
| +
|
| + test_case.assertEqual(401, message.default_int32)
|
| + test_case.assertEqual(402, message.default_int64)
|
| + test_case.assertEqual(403, message.default_uint32)
|
| + test_case.assertEqual(404, message.default_uint64)
|
| + test_case.assertEqual(405, message.default_sint32)
|
| + test_case.assertEqual(406, message.default_sint64)
|
| + test_case.assertEqual(407, message.default_fixed32)
|
| + test_case.assertEqual(408, message.default_fixed64)
|
| + test_case.assertEqual(409, message.default_sfixed32)
|
| + test_case.assertEqual(410, message.default_sfixed64)
|
| + test_case.assertEqual(411, message.default_float)
|
| + test_case.assertEqual(412, message.default_double)
|
| + test_case.assertEqual(False, message.default_bool)
|
| + test_case.assertEqual('415', message.default_string)
|
| + test_case.assertEqual(b'416', message.default_bytes)
|
| +
|
| + test_case.assertEqual(unittest_pb2.TestAllTypes.FOO,
|
| + message.default_nested_enum)
|
| + test_case.assertEqual(unittest_pb2.FOREIGN_FOO,
|
| + message.default_foreign_enum)
|
| + test_case.assertEqual(unittest_import_pb2.IMPORT_FOO,
|
| + message.default_import_enum)
|
| +
|
|
|
| def GoldenFile(filename):
|
| """Finds the given golden file and returns a file object representing it."""
|
| @@ -573,17 +602,31 @@ def GoldenFile(filename):
|
| return open(full_path, 'rb')
|
| path = os.path.join(path, '..')
|
|
|
| + # Search internally.
|
| + path = '.'
|
| + full_path = os.path.join(path, 'third_party/py/google/protobuf/testdata',
|
| + filename)
|
| + if os.path.exists(full_path):
|
| + # Found it. Load the golden file from the testdata directory.
|
| + return open(full_path, 'rb')
|
| +
|
| raise RuntimeError(
|
| - 'Could not find golden files. This test must be run from within the '
|
| - 'protobuf source package so that it can read test data files from the '
|
| - 'C++ source tree.')
|
| + 'Could not find golden files. This test must be run from within the '
|
| + 'protobuf source package so that it can read test data files from the '
|
| + 'C++ source tree.')
|
| +
|
| +
|
| +def GoldenFileData(filename):
|
| + """Finds the given golden file and returns its contents."""
|
| + with GoldenFile(filename) as f:
|
| + return f.read()
|
|
|
|
|
| def SetAllPackedFields(message):
|
| """Sets every field in the message to a unique value.
|
|
|
| Args:
|
| - message: A unittest_pb2.TestPackedTypes instance.
|
| + message: A TestPackedTypes instance.
|
| """
|
| message.packed_int32.extend([601, 701])
|
| message.packed_int64.extend([602, 702])
|
|
|