Revert "third_party/protobuf: Update to HEAD (5f65ee6ac7)"

third_party/protobuf/python/google/protobuf/internal/descriptor_pool_test.py

 #! /usr/bin/env python
 #
 # Protocol Buffers - Google's data interchange format
 # Copyright 2008 Google Inc.  All rights reserved.
 # 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
 # met:
 #
@@ skipping 33 matching lines @@
 
 from google.protobuf import unittest_import_pb2
 from google.protobuf import unittest_import_public_pb2
 from google.protobuf import unittest_pb2
 from google.protobuf import descriptor_pb2
 from google.protobuf.internal import api_implementation
 from google.protobuf.internal import descriptor_pool_test1_pb2
 from google.protobuf.internal import descriptor_pool_test2_pb2
 from google.protobuf.internal import factory_test1_pb2
 from google.protobuf.internal import factory_test2_pb2
-from google.protobuf.internal import file_options_test_pb2
 from google.protobuf.internal import more_messages_pb2
 from google.protobuf import descriptor
 from google.protobuf import descriptor_database
 from google.protobuf import descriptor_pool
 from google.protobuf import message_factory
 from google.protobuf import symbol_database
 
 
 class DescriptorPoolTest(unittest.TestCase):
 
@@ skipping 47 matching lines @@
       self.pool.FindFileContainingSymbol('Does not exist')
 
   def testFindMessageTypeByName(self):
     msg1 = self.pool.FindMessageTypeByName(
         'google.protobuf.python.internal.Factory1Message')
     self.assertIsInstance(msg1, descriptor.Descriptor)
     self.assertEqual('Factory1Message', msg1.name)
     self.assertEqual('google.protobuf.python.internal.Factory1Message',
                      msg1.full_name)
     self.assertEqual(None, msg1.containing_type)
-    self.assertFalse(msg1.has_options)
 
     nested_msg1 = msg1.nested_types[0]
     self.assertEqual('NestedFactory1Message', nested_msg1.name)
     self.assertEqual(msg1, nested_msg1.containing_type)
 
     nested_enum1 = msg1.enum_types[0]
     self.assertEqual('NestedFactory1Enum', nested_enum1.name)
     self.assertEqual(msg1, nested_enum1.containing_type)
 
     self.assertEqual(nested_msg1, msg1.fields_by_name[
@@ skipping 63 matching lines @@
   def testFindMessageTypeByNameFailure(self):
     with self.assertRaises(KeyError):
       self.pool.FindMessageTypeByName('Does not exist')
 
   def testFindEnumTypeByName(self):
     enum1 = self.pool.FindEnumTypeByName(
         'google.protobuf.python.internal.Factory1Enum')
     self.assertIsInstance(enum1, descriptor.EnumDescriptor)
     self.assertEqual(0, enum1.values_by_name['FACTORY_1_VALUE_0'].number)
     self.assertEqual(1, enum1.values_by_name['FACTORY_1_VALUE_1'].number)
-    self.assertFalse(enum1.has_options)
 
     nested_enum1 = self.pool.FindEnumTypeByName(
         'google.protobuf.python.internal.Factory1Message.NestedFactory1Enum')
     self.assertIsInstance(nested_enum1, descriptor.EnumDescriptor)
     self.assertEqual(
         0, nested_enum1.values_by_name['NESTED_FACTORY_1_VALUE_0'].number)
     self.assertEqual(
         1, nested_enum1.values_by_name['NESTED_FACTORY_1_VALUE_1'].number)
 
     enum2 = self.pool.FindEnumTypeByName(
@@ skipping 12 matching lines @@
 
   def testFindEnumTypeByNameFailure(self):
     with self.assertRaises(KeyError):
       self.pool.FindEnumTypeByName('Does not exist')
 
   def testFindFieldByName(self):
     field = self.pool.FindFieldByName(
         'google.protobuf.python.internal.Factory1Message.list_value')
     self.assertEqual(field.name, 'list_value')
     self.assertEqual(field.label, field.LABEL_REPEATED)
-    self.assertFalse(field.has_options)
-
     with self.assertRaises(KeyError):
       self.pool.FindFieldByName('Does not exist')
 
   def testFindExtensionByName(self):
     # An extension defined in a message.
     extension = self.pool.FindExtensionByName(
         'google.protobuf.python.internal.Factory2Message.one_more_field')
     self.assertEqual(extension.name, 'one_more_field')
     # An extension defined at file scope.
     extension = self.pool.FindExtensionByName(
         'google.protobuf.python.internal.another_field')
     self.assertEqual(extension.name, 'another_field')
     self.assertEqual(extension.number, 1002)
     with self.assertRaises(KeyError):
       self.pool.FindFieldByName('Does not exist')
 
-  def testFindAllExtensions(self):
-    factory1_message = self.pool.FindMessageTypeByName(
-        'google.protobuf.python.internal.Factory1Message')
-    factory2_message = self.pool.FindMessageTypeByName(
-        'google.protobuf.python.internal.Factory2Message')
-    # An extension defined in a message.
-    one_more_field = factory2_message.extensions_by_name['one_more_field']
-    self.pool.AddExtensionDescriptor(one_more_field)
-    # An extension defined at file scope.
-    factory_test2 = self.pool.FindFileByName(
-        'google/protobuf/internal/factory_test2.proto')
-    another_field = factory_test2.extensions_by_name['another_field']
-    self.pool.AddExtensionDescriptor(another_field)
-
-    extensions = self.pool.FindAllExtensions(factory1_message)
-    expected_extension_numbers = set([one_more_field, another_field])
-    self.assertEqual(expected_extension_numbers, set(extensions))
-    # Verify that mutating the returned list does not affect the pool.
-    extensions.append('unexpected_element')
-    # Get the extensions again, the returned value does not contain the
-    # 'unexpected_element'.
-    extensions = self.pool.FindAllExtensions(factory1_message)
-    self.assertEqual(expected_extension_numbers, set(extensions))
-
-  def testFindExtensionByNumber(self):
-    factory1_message = self.pool.FindMessageTypeByName(
-        'google.protobuf.python.internal.Factory1Message')
-    factory2_message = self.pool.FindMessageTypeByName(
-        'google.protobuf.python.internal.Factory2Message')
-    # An extension defined in a message.
-    one_more_field = factory2_message.extensions_by_name['one_more_field']
-    self.pool.AddExtensionDescriptor(one_more_field)
-    # An extension defined at file scope.
-    factory_test2 = self.pool.FindFileByName(
-        'google/protobuf/internal/factory_test2.proto')
-    another_field = factory_test2.extensions_by_name['another_field']
-    self.pool.AddExtensionDescriptor(another_field)
-
-    # An extension defined in a message.
-    extension = self.pool.FindExtensionByNumber(factory1_message, 1001)
-    self.assertEqual(extension.name, 'one_more_field')
-    # An extension defined at file scope.
-    extension = self.pool.FindExtensionByNumber(factory1_message, 1002)
-    self.assertEqual(extension.name, 'another_field')
-    with self.assertRaises(KeyError):
-      extension = self.pool.FindExtensionByNumber(factory1_message, 1234567)
-
   def testExtensionsAreNotFields(self):
     with self.assertRaises(KeyError):
       self.pool.FindFieldByName('google.protobuf.python.internal.another_field')
     with self.assertRaises(KeyError):
       self.pool.FindFieldByName(
           'google.protobuf.python.internal.Factory2Message.one_more_field')
     with self.assertRaises(KeyError):
       self.pool.FindExtensionByName(
           'google.protobuf.python.internal.Factory1Message.list_value')
 
@@ skipping 178 matching lines @@
     expected_field_full_name = '.'.join([msg_desc.full_name, name])
     test.assertEqual(expected_field_full_name, field_desc.full_name)
     test.assertEqual(index, field_desc.index)
     test.assertEqual(self.number, field_desc.number)
     test.assertEqual(descriptor.FieldDescriptor.TYPE_ENUM, field_desc.type)
     test.assertEqual(descriptor.FieldDescriptor.CPPTYPE_ENUM,
                      field_desc.cpp_type)
     test.assertTrue(field_desc.has_default_value)
     test.assertEqual(enum_desc.values_by_name[self.default_value].number,
                      field_desc.default_value)
-    test.assertFalse(enum_desc.values_by_name[self.default_value].has_options)
     test.assertEqual(msg_desc, field_desc.containing_type)
     test.assertEqual(enum_desc, field_desc.enum_type)
 
 
 class MessageField(object):
 
   def __init__(self, number, type_name):
     self.number = number
     self.type_name = type_name
 
@@ skipping 163 matching lines @@
     pool = descriptor_pool.DescriptorPool()
     file_desc = descriptor_pb2.FileDescriptorProto(
         name='some/file.proto', package='package')
     file_desc.message_type.add(name='Message')
     pool.Add(file_desc)
     self.assertEqual(pool.FindFileByName('some/file.proto').name,
                      'some/file.proto')
     self.assertEqual(pool.FindMessageTypeByName('package.Message').name,
                      'Message')
 
-  def testFileDescriptorOptionsWithCustomDescriptorPool(self):
-    # Create a descriptor pool, and add a new FileDescriptorProto to it.
-    pool = descriptor_pool.DescriptorPool()
-    file_name = 'file_descriptor_options_with_custom_descriptor_pool.proto'
-    file_descriptor_proto = descriptor_pb2.FileDescriptorProto(name=file_name)
-    extension_id = file_options_test_pb2.foo_options
-    file_descriptor_proto.options.Extensions[extension_id].foo_name = 'foo'
-    pool.Add(file_descriptor_proto)
-    # The options set on the FileDescriptorProto should be available in the
-    # descriptor even if they contain extensions that cannot be deserialized
-    # using the pool.
-    file_descriptor = pool.FindFileByName(file_name)
-    options = file_descriptor.GetOptions()
-    self.assertEqual('foo', options.Extensions[extension_id].foo_name)
-    # The object returned by GetOptions() is cached.
-    self.assertIs(options, file_descriptor.GetOptions())
-
 
 @unittest.skipIf(
     api_implementation.Type() != 'cpp',
     'default_pool is only supported by the C++ implementation')
 class DefaultPoolTest(unittest.TestCase):
 
   def testFindMethods(self):
     # pylint: disable=g-import-not-at-top
     from google.protobuf.pyext import _message
     pool = _message.default_pool
@@ skipping 98 matching lines @@
              ExtensionField(1001, 'DescriptorPoolTest1')),
         ]),
     },
     dependencies=['google/protobuf/internal/descriptor_pool_test1.proto',
                   'google/protobuf/internal/more_messages.proto'],
     public_dependencies=['google/protobuf/internal/more_messages.proto'])
 
 
 if __name__ == '__main__':
   unittest.main()