From 0971bb0d57aa6f2db1abee4008b365d52b402891 Mon Sep 17 00:00:00 2001 From: Feng Xiao Date: Tue, 7 Oct 2014 17:44:33 -0700 Subject: Down-integrate from internal branch. --- python/google/protobuf/internal/message_test.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'python/google/protobuf/internal/message_test.py') diff --git a/python/google/protobuf/internal/message_test.py b/python/google/protobuf/internal/message_test.py index 3cce3383..48b7ffd4 100755 --- a/python/google/protobuf/internal/message_test.py +++ b/python/google/protobuf/internal/message_test.py @@ -634,7 +634,12 @@ class MessageTest(basetest.TestCase): self.assertTrue(m.HasField('oneof_uint32')) self.assertEqual('oneof_uint32', m.WhichOneof('oneof_field')) - + def testOneofDeserialize(self): + m = unittest_pb2.TestAllTypes() + m.oneof_uint32 = 11 + m2 = unittest_pb2.TestAllTypes() + m2.ParseFromString(m.SerializeToString()) + self.assertEqual('oneof_uint32', m2.WhichOneof('oneof_field')) def testSortEmptyRepeatedCompositeContainer(self): """Exercise a scenario that has led to segfaults in the past. -- cgit v1.2.3