Mojom compiler backend: Stop re-computing interface version numbers and consume method declaration o

mojo/public/tools/bindings/pylib/mojom/generate/mojom_translator_unittest.py

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import unittest
 import module
 
 try:
   import mojom_translator
   from generated import mojom_files_mojom
@@ skipping 564 matching lines @@
     self.assertEquals(
         translator._transitive_imports['root/c.mojom'], struct.imported_from)
 
   def test_interface(self):
     self.do_interface_test(True)
     self.do_interface_test(False)
 
   def do_interface_test(self, specify_service_name):
     file_name = 'a.mojom'
     mojom_interface = mojom_types_mojom.MojomInterface(
+        current_version=47,
         decl_data=mojom_types_mojom.DeclarationData(
           short_name='AnInterface',
           source_file_info=mojom_types_mojom.SourceFileInfo(
             file_name=file_name)))
     if specify_service_name:
       mojom_interface.service_name = 'test::TheInterface'
       mojom_interface.decl_data.attributes = [mojom_types_mojom.Attribute(
           key='ServiceName', value=mojom_types_mojom.LiteralValue(
               string_value='test::TheInterface'))]
     else:
       mojom_interface.service_name = None
     mojom_method10 = mojom_types_mojom.MojomMethod(
         ordinal=10,
         decl_data=mojom_types_mojom.DeclarationData(
           short_name='AMethod10',
+          declaration_order=1,
           source_file_info=mojom_types_mojom.SourceFileInfo(
             file_name=file_name)),
         parameters=mojom_types_mojom.MojomStruct(fields=[],
             version_info=build_version_info(0),
             decl_data=build_decl_data('AMethod10_Request')))
     mojom_method0 = mojom_types_mojom.MojomMethod(
         ordinal=0,
         decl_data=mojom_types_mojom.DeclarationData(
           short_name='AMethod0',
+           declaration_order=1,
           source_file_info=mojom_types_mojom.SourceFileInfo(
             file_name=file_name)),
         parameters=mojom_types_mojom.MojomStruct(fields=[],
             version_info=build_version_info(0),
             decl_data=build_decl_data('AMethod0_Request')))
     mojom_method7 = mojom_types_mojom.MojomMethod(
         ordinal=7,
         decl_data=mojom_types_mojom.DeclarationData(
           short_name='AMethod7',
+          declaration_order=0,
           source_file_info=mojom_types_mojom.SourceFileInfo(
             file_name=file_name)),
         parameters=mojom_types_mojom.MojomStruct(fields=[],
             version_info=build_version_info(0),
             decl_data=build_decl_data('AMethod7_Request')))
     mojom_interface.methods = {10: mojom_method10, 0: mojom_method0,
         7: mojom_method7}
 
     interface = module.Interface()
     graph = mojom_files_mojom.MojomFileGraph()
     translator = mojom_translator.FileTranslator(graph, file_name)
     translator.InterfaceFromMojom(interface, mojom_types_mojom.UserDefinedType(
       interface_type=mojom_interface))
 
+
     self.assertEquals(translator._module, interface.module)
     self.assertEquals('AnInterface', interface.name)
-    self.assertEquals(0, interface.methods[0].ordinal)
-    self.assertEquals(7, interface.methods[1].ordinal)
+    self.assertEquals(mojom_interface.current_version, interface.version)
+    # The methods should be ordered by declaration_order.
+    self.assertEquals(7, interface.methods[0].ordinal)
+    self.assertEquals(0, interface.methods[1].ordinal)
     self.assertEquals(10, interface.methods[2].ordinal)
     if specify_service_name:
       self.assertEquals('test::TheInterface', interface.service_name)
     else:
       self.assertEquals(None, interface.service_name)
 
     # TODO(azani): Add the contained declarations.
 
   def test_method(self):
     file_name = 'a.mojom'
     mojom_method = mojom_types_mojom.MojomMethod(
         ordinal=10,
+        min_version=6,
         decl_data=mojom_types_mojom.DeclarationData(
           short_name='AMethod',
           source_file_info=mojom_types_mojom.SourceFileInfo(
             file_name=file_name)))
 
     param1 = mojom_types_mojom.StructField(
         decl_data=mojom_types_mojom.DeclarationData(short_name='a_param'),
         type=mojom_types_mojom.Type(
           simple_type=mojom_types_mojom.SimpleType.UINT32),
         offset=21,
@@ skipping 12 matching lines @@
         decl_data=build_decl_data('Not used'))
 
     interface = module.Interface('MyInterface')
     graph = mojom_files_mojom.MojomFileGraph()
     translator = mojom_translator.FileTranslator(graph, file_name)
     method = translator.MethodFromMojom(mojom_method, interface)
 
     self.assertEquals(mojom_method.decl_data.short_name, method.name)
     self.assertEquals(interface, method.interface)
     self.assertEquals(mojom_method.ordinal, method.ordinal)
+    self.assertEquals(mojom_method.min_version, method.min_version)
     self.assertIsNone(method.response_parameters)
     self.assertEquals(
         len(mojom_method.parameters.fields), len(method.parameters))
     self.assertEquals(param1.decl_data.short_name, method.parameters[0].name)
     self.assertEquals(param2.decl_data.short_name, method.parameters[1].name)
     self.assertEquals('MyInterface_AMethod_Params', method.param_struct.name)
     self.assertEquals(len(mojom_method.parameters.fields),
       len(method.param_struct.fields))
     for i in xrange(0, len(mojom_method.parameters.fields)):
         gold = mojom_method.parameters.fields[i]
@@ skipping 402 matching lines @@
   """Builds a list containing a single StructVersion with
   version_number=0, num_bytes=0, and the given value for num_fields. Adds this
   as the |version_info| attribute of |mojom_struct|.
 
   Args:
     mojom_struct: {any} The Python object to which a |version_info| attribute
         will be added.
     num_fields: {int} The value of num_fields to use.
   """
   mojom_struct.version_info=build_version_info(num_fields)