AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Fix issue 208.

Browse Source
This commit is contained in:
kenton@google.com 2010-07-27 21:19:59 +00:00
parent 0c293def6c
commit 27028bcb97
2 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
python/google/protobuf/internal/reflection_test.py
View File

@ -200,6 +200,32 @@ class ReflectionTest(unittest.TestCase):
unittest_pb2.ForeignMessage(c=12)],
list(proto.repeated_foreign_message))
def testConstructorTypeError(self):
self.assertRaises(TypeError, unittest_pb2.TestAllTypes, optional_int32="foo")
self.assertRaises(TypeError, unittest_pb2.TestAllTypes, optional_string=1234)
self.assertRaises(TypeError, unittest_pb2.TestAllTypes, optional_nested_message=1234)
self.assertRaises(TypeError, unittest_pb2.TestAllTypes, repeated_int32=1234)
self.assertRaises(TypeError, unittest_pb2.TestAllTypes, repeated_int32=["foo"])
self.assertRaises(TypeError, unittest_pb2.TestAllTypes, repeated_string=1234)
self.assertRaises(TypeError, unittest_pb2.TestAllTypes, repeated_string=[1234])
self.assertRaises(TypeError, unittest_pb2.TestAllTypes, repeated_nested_message=1234)
self.assertRaises(TypeError, unittest_pb2.TestAllTypes, repeated_nested_message=[1234])
def testConstructorInvalidatesCachedByteSize(self):
message = unittest_pb2.TestAllTypes(optional_int32 = 12)
self.assertEquals(2, message.ByteSize())
message = unittest_pb2.TestAllTypes(
optional_nested_message = unittest_pb2.TestAllTypes.NestedMessage())
self.assertEquals(3, message.ByteSize())
message = unittest_pb2.TestAllTypes(repeated_int32 = [12])
self.assertEquals(3, message.ByteSize())
message = unittest_pb2.TestAllTypes(
repeated_nested_message = [unittest_pb2.TestAllTypes.NestedMessage()])
self.assertEquals(3, message.ByteSize())
def testSimpleHasBits(self):
# Test a scalar.
proto = unittest_pb2.TestAllTypes()
@ -1038,12 +1064,12 @@ class ReflectionTest(unittest.TestCase):
def testMergeFromBug(self):
message1 = unittest_pb2.TestAllTypes()
message2 = unittest_pb2.TestAllTypes()
# Cause optional_nested_message to be instantiated within message1, even
# though it is not considered to be "present".
message1.optional_nested_message
self.assertFalse(message1.HasField('optional_nested_message'))
# Merge into message2. This should not instantiate the field is message2.
message2.MergeFrom(message1)
self.assertFalse(message2.HasField('optional_nested_message'))

6
python/google/protobuf/reflection.py
View File

@ -384,7 +384,7 @@ def _AddInitMethod(message_descriptor, cls):
copy.MergeFrom(field_value)
self._fields[field] = copy
else:
self._fields[field] = field_value
setattr(self, field_name, field_value)
init.__module__ = None
init.__doc__ = None
@ -937,6 +937,10 @@ def _AddMergeFromMethod(cls):
CPPTYPE_MESSAGE = _FieldDescriptor.CPPTYPE_MESSAGE
def MergeFrom(self, msg):
if not isinstance(msg, cls):
raise TypeError(
"Parameter to MergeFrom() must be instance of same class.")
assert msg is not self
self._Modified()