Mojom compiler frontend: Populate the declaration_order field for Methods.

mojom/mojom_parser/serialization/serialization_test.go

 // 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.
 
 package serialization
 
 import (
         "bytes"
         "compress/gzip"
         "encoding/base64"
@@ skipping 679 matching lines @@
                 // DeclaredMojomObjects
                 test.expectedFile().DeclaredMojomObjects.Interfaces = &[]string{"TYPE_KEY:test.EchoService"}
 
                 // ResolvedTypes
 
                 // interface EchoService
                 test.expectedGraph().ResolvedTypes["TYPE_KEY:test.EchoService"] = &mojom_types.UserDefinedTypeInterfaceType{mojom_types.MojomInterface{
                         DeclData: test.newDeclData("EchoService", "test.EchoService"),
                         Methods: map[uint32]mojom_types.MojomMethod{
                                 0: mojom_types.MojomMethod{
-                                        DeclData: test.newDeclData("EchoString", ""),
+                                        DeclData: test.newDeclDataO(0, -1, "EchoString", ""),
                                         Parameters: mojom_types.MojomStruct{
                                                 DeclData: test.newDeclData("EchoString-request", ""),
                                                 Fields: []mojom_types.StructField{
                                                         mojom_types.StructField{
                                                                 DeclData: test.newDeclDataO(0, -1, "value", ""),
                                                                 Type:     &mojom_types.TypeStringType{mojom_types.StringType{true}},
                                                         },
                                                 },
                                         },
                                         ResponseParams: &mojom_types.MojomStruct{
                                                 DeclData: test.newDeclData("EchoString-response", ""),
                                                 Fields: []mojom_types.StructField{
                                                         mojom_types.StructField{
                                                                 DeclData: test.newDeclDataO(0, -1, "value", ""),
                                                                 Type:     &mojom_types.TypeStringType{mojom_types.StringType{true}},
                                                         },
                                                 },
                                         },
                                 },
                                 1: mojom_types.MojomMethod{
-                                        DeclData: test.newDeclData("DelayedEchoString", ""),
+                                        DeclData: test.newDeclDataO(1, -1, "DelayedEchoString", ""),
                                         Parameters: mojom_types.MojomStruct{
                                                 DeclData: test.newDeclData("DelayedEchoString-request", ""),
                                                 Fields: []mojom_types.StructField{
                                                         mojom_types.StructField{
                                                                 DeclData: test.newDeclDataO(0, -1, "value", ""),
                                                                 Type:     &mojom_types.TypeStringType{mojom_types.StringType{true}},
                                                         },
                                                         mojom_types.StructField{
                                                                 DeclData: test.newDeclDataO(1, -1, "millis", ""),
                                                                 Type:     &mojom_types.TypeSimpleType{mojom_types.SimpleType_Int32},
@@ skipping 11 matching lines @@
                                         },
                                         Ordinal: 1,
                                 },
                         },
                 }}
 
                 test.endTestCase()
         }
 
         ////////////////////////////////////////////////////////////
+        // Test Case: Explicit Method Ordinals. Tests the DeclarationOrder field.
+        ////////////////////////////////////////////////////////////
+        {
+
+                contents := `
+        interface MyInterface {
+      Method1@1();
+      Method0@0();
+    };`
+
+                test.addTestCase("", contents)
+
+                // DeclaredMojomObjects
+                test.expectedFile().DeclaredMojomObjects.Interfaces = &[]string{"TYPE_KEY:MyInterface"}
+
+                // interface EchoService
+                test.expectedGraph().ResolvedTypes["TYPE_KEY:MyInterface"] = &mojom_types.UserDefinedTypeInterfaceType{mojom_types.MojomInterface{
+                        DeclData: test.newDeclData("MyInterface", "MyInterface"),
+                        Methods: map[uint32]mojom_types.MojomMethod{
+                                0: mojom_types.MojomMethod{
+                                        DeclData: test.newDeclDataO(1, 0, "Method0", ""),
+                                        Parameters: mojom_types.MojomStruct{
+                                                DeclData: test.newDeclData("Method0-request", ""),
+                                                Fields:   []mojom_types.StructField{},
+                                        },
+                                        Ordinal: 0,
+                                },
+                                1: mojom_types.MojomMethod{
+                                        DeclData: test.newDeclDataO(0, 1, "Method1", ""),
+                                        Parameters: mojom_types.MojomStruct{
+                                                DeclData: test.newDeclData("Method1-request", ""),
+                                                Fields:   []mojom_types.StructField{},
+                                        },
+                                        Ordinal: 1,
+                                },
+                        },
+                }}
+
+                test.endTestCase()
+        }
+
+        ////////////////////////////////////////////////////////////
         // Test Case: Use of the ServiceName attribute
         ////////////////////////////////////////////////////////////
         {
 
                 contents := `
        module test;
 
        [ServiceName = "my.test.EchoService"]
        interface EchoService {
          EchoString(string? value) => (string? value);
        };`
 
                 test.addTestCase("test", contents)
 
                 // DeclaredMojomObjects
                 test.expectedFile().DeclaredMojomObjects.Interfaces = &[]string{"TYPE_KEY:test.EchoService"}
 
                 // ResolvedTypes
 
                 // interface EchoService
                 test.expectedGraph().ResolvedTypes["TYPE_KEY:test.EchoService"] = &mojom_types.UserDefinedTypeInterfaceType{mojom_types.MojomInterface{
                         DeclData:    test.newDeclDataA("EchoService", "test.EchoService", &[]mojom_types.Attribute{{"ServiceName", &mojom_types.LiteralValueStringValue{"my.test.EchoService"}}}),
                         ServiceName: stringPointer("my.test.EchoService"),
                         Methods: map[uint32]mojom_types.MojomMethod{
                                 0: mojom_types.MojomMethod{
-                                        DeclData: test.newDeclData("EchoString", ""),
+                                        DeclData: test.newDeclDataO(0, -1, "EchoString", ""),
                                         Parameters: mojom_types.MojomStruct{
                                                 DeclData: test.newDeclData("EchoString-request", ""),
                                                 Fields: []mojom_types.StructField{
                                                         mojom_types.StructField{
                                                                 DeclData: test.newDeclDataO(0, -1, "value", ""),
                                                                 Type:     &mojom_types.TypeStringType{mojom_types.StringType{true}},
                                                         },
                                                 },
                                         },
                                         ResponseParams: &mojom_types.MojomStruct{
@@ skipping 703 matching lines @@
                 test.addTestCase("", contents)
 
                 test.expectedFile().DeclaredMojomObjects.Interfaces = &[]string{"TYPE_KEY:MyInterface42"}
 
                 test.expectedGraph().ResolvedTypes["TYPE_KEY:MyInterface42"] = &mojom_types.UserDefinedTypeInterfaceType{mojom_types.MojomInterface{
                         DeclData:       test.newDeclData("MyInterface42", "MyInterface42"),
                         CurrentVersion: 2,
                         Methods: map[uint32]mojom_types.MojomMethod{
                                 // DoIt
                                 0: mojom_types.MojomMethod{
-                                        DeclData: test.newDeclData("DoIt", ""),
+                                        DeclData: test.newDeclDataO(0, -1, "DoIt", ""),
                                         Parameters: mojom_types.MojomStruct{
                                                 DeclData: test.newDeclData("DoIt-request", ""),
                                                 Fields: []mojom_types.StructField{
                                                         // The fields are in ordinal order and the first two arguments to newShortDeclDataO() are
                                                         // declarationOrder and declaredOrdinal.
                                                         // x0
                                                         mojom_types.StructField{
                                                                 DeclData:   test.newDeclDataO(0, -1, "x0", ""),
                                                                 Type:       &mojom_types.TypeSimpleType{mojom_types.SimpleType_Int8},
                                                                 Offset:     0,
@@ skipping 60 matching lines @@
                                                                 VersionNumber: 1,
                                                                 NumFields:     2,
                                                                 NumBytes:      24,
                                                         },
                                                 },
                                         },
                                 },
 
                                 // DoItAgain
                                 1: mojom_types.MojomMethod{
-                                        DeclData: test.newDeclDataA("DoItAgain", "", &[]mojom_types.Attribute{{"MinVersion", &mojom_types.LiteralValueInt8Value{1}}}),
+                                        DeclData: test.newShortDeclDataAO(1, -1, "DoItAgain", &[]mojom_types.Attribute{{"MinVersion", &mojom_types.LiteralValueInt8Value{1}}}),
                                         Parameters: mojom_types.MojomStruct{
                                                 DeclData: test.newDeclData("DoItAgain-request", ""),
                                                 Fields: []mojom_types.StructField{
                                                         // The fields are in ordinal order and the first two arguments to newShortDeclDataO() are
                                                         // declarationOrder and declaredOrdinal.
                                                         // x0
                                                         mojom_types.StructField{
                                                                 DeclData:   test.newDeclDataO(0, -1, "x0", ""),
                                                                 Type:       &mojom_types.TypeSimpleType{mojom_types.SimpleType_Int8},
                                                                 Offset:     0,
                                                                 MinVersion: 0,
                                                         },
                                                 },
                                                 VersionInfo: &[]mojom_types.StructVersion{
                                                         mojom_types.StructVersion{
                                                                 VersionNumber: 0,
                                                                 NumFields:     1,
                                                                 NumBytes:      16,
                                                         },
                                                 },
                                         },
                                         Ordinal:    1,
                                         MinVersion: 1,
                                 },
 
                                 // AndAgain
                                 2: mojom_types.MojomMethod{
-                                        DeclData: test.newDeclDataA("AndAgain", "", &[]mojom_types.Attribute{{"MinVersion", &mojom_types.LiteralValueInt8Value{2}}}),
+                                        DeclData: test.newShortDeclDataAO(2, -1, "AndAgain", &[]mojom_types.Attribute{{"MinVersion", &mojom_types.LiteralValueInt8Value{2}}}),
                                         Parameters: mojom_types.MojomStruct{
                                                 DeclData: test.newDeclData("AndAgain-request", ""),
                                                 Fields:   []mojom_types.StructField{},
                                                 VersionInfo: &[]mojom_types.StructVersion{
                                                         mojom_types.StructVersion{
                                                                 VersionNumber: 0,
                                                                 NumFields:     0,
                                                                 NumBytes:      8,
                                                         },
                                                 },
@@ skipping 1156 matching lines @@
                 // FooA
                 test.expectedRuntimeTypeInfoA().TypeMap["TYPE_KEY:a.b.c.FooA"] = &mojom_types.UserDefinedTypeStructType{mojom_types.MojomStruct{
                         DeclData: newDeclData(test.fileNameA(), "FooA", "a.b.c.FooA"),
                         Fields:   []mojom_types.StructField{}}}
 
                 // InterfaceA
                 test.expectedRuntimeTypeInfoA().TypeMap["TYPE_KEY:a.b.c.InterfaceA"] = &mojom_types.UserDefinedTypeInterfaceType{mojom_types.MojomInterface{
                         DeclData: newDeclData(test.fileNameA(), "InterfaceA", "a.b.c.InterfaceA"),
                         Methods: map[uint32]mojom_types.MojomMethod{
                                 0: mojom_types.MojomMethod{
-                                        DeclData: newDeclData(test.fileNameA(), "DoIt", ""),
+                                        DeclData: newDeclDataO(0, -1, test.fileNameA(), "DoIt", ""),
                                         Parameters: mojom_types.MojomStruct{
                                                 DeclData: newDeclData(test.fileNameA(), "DoIt-request", ""),
                                                 Fields: []mojom_types.StructField{
                                                         mojom_types.StructField{
                                                                 DeclData: newDeclDataO(0, -1, test.fileNameA(), "x", ""),
                                                                 Type: &mojom_types.TypeTypeReference{mojom_types.TypeReference{
                                                                         false, false, stringPointer("FooA"), stringPointer("TYPE_KEY:a.b.c.FooA")}},
                                                         },
                                                 },
                                         },
@@ skipping 18 matching lines @@
                 // FooA
                 test.expectedRuntimeTypeInfoB().TypeMap["TYPE_KEY:b.c.d.FooB"] = &mojom_types.UserDefinedTypeStructType{mojom_types.MojomStruct{
                         DeclData: newDeclData(test.fileNameB(), "FooB", "b.c.d.FooB"),
                         Fields:   []mojom_types.StructField{}}}
 
                 // InterfaceB
                 test.expectedRuntimeTypeInfoB().TypeMap["TYPE_KEY:b.c.d.InterfaceB"] = &mojom_types.UserDefinedTypeInterfaceType{mojom_types.MojomInterface{
                         DeclData: newDeclData(test.fileNameB(), "InterfaceB", "b.c.d.InterfaceB"),
                         Methods: map[uint32]mojom_types.MojomMethod{
                                 0: mojom_types.MojomMethod{
-                                        DeclData: newDeclData(test.fileNameB(), "DoIt", ""),
+                                        DeclData: newDeclDataO(0, -1, test.fileNameB(), "DoIt", ""),
                                         Parameters: mojom_types.MojomStruct{
                                                 DeclData: newDeclData(test.fileNameB(), "DoIt-request", ""),
                                                 Fields: []mojom_types.StructField{
                                                         mojom_types.StructField{
                                                                 DeclData: newDeclDataO(0, -1, test.fileNameB(), "x", ""),
                                                                 Type: &mojom_types.TypeTypeReference{mojom_types.TypeReference{
                                                                         false, false, stringPointer("a.b.c.FooA"), stringPointer("TYPE_KEY:a.b.c.FooA")}},
                                                         },
                                                 },
                                         },
@@ skipping 55 matching lines @@
                         DeclData: newDeclData(test.fileNameA(), "FooA", "a.b.c.FooA"),
                         Fields:   []mojom_types.StructField{}}}
 
                 // InterfaceA
                 test.expectedRuntimeTypeInfoA().TypeMap["TYPE_KEY:a.b.c.InterfaceA"] = &mojom_types.UserDefinedTypeInterfaceType{mojom_types.MojomInterface{
                         DeclData: newDeclDataA(test.fileNameA(), "InterfaceA", "a.b.c.InterfaceA",
                                 &[]mojom_types.Attribute{{"ServiceName", &mojom_types.LiteralValueStringValue{"AwesomeService"}}}),
                         ServiceName: stringPointer("AwesomeService"),
                         Methods: map[uint32]mojom_types.MojomMethod{
                                 0: mojom_types.MojomMethod{
-                                        DeclData: newDeclData(test.fileNameA(), "DoIt", ""),
+                                        DeclData: newDeclDataO(0, -1, test.fileNameA(), "DoIt", ""),
                                         Parameters: mojom_types.MojomStruct{
                                                 DeclData: newDeclData(test.fileNameA(), "DoIt-request", ""),
                                                 Fields: []mojom_types.StructField{
                                                         mojom_types.StructField{
                                                                 DeclData: newDeclDataO(0, -1, test.fileNameA(), "x", ""),
                                                                 Type: &mojom_types.TypeTypeReference{mojom_types.TypeReference{
                                                                         false, false, stringPointer("FooA"), stringPointer("TYPE_KEY:a.b.c.FooA")}},
                                                         },
                                                 },
                                         },
@@ skipping 18 matching lines @@
                 // FooA
                 test.expectedRuntimeTypeInfoB().TypeMap["TYPE_KEY:b.c.d.FooB"] = &mojom_types.UserDefinedTypeStructType{mojom_types.MojomStruct{
                         DeclData: newDeclData(test.fileNameB(), "FooB", "b.c.d.FooB"),
                         Fields:   []mojom_types.StructField{}}}
 
                 // InterfaceB
                 test.expectedRuntimeTypeInfoB().TypeMap["TYPE_KEY:b.c.d.InterfaceB"] = &mojom_types.UserDefinedTypeInterfaceType{mojom_types.MojomInterface{
                         DeclData: newDeclData(test.fileNameB(), "InterfaceB", "b.c.d.InterfaceB"),
                         Methods: map[uint32]mojom_types.MojomMethod{
                                 0: mojom_types.MojomMethod{
-                                        DeclData: newDeclData(test.fileNameB(), "DoIt", ""),
+                                        DeclData: newDeclDataO(0, -1, test.fileNameB(), "DoIt", ""),
                                         Parameters: mojom_types.MojomStruct{
                                                 DeclData: newDeclData(test.fileNameB(), "DoIt-request", ""),
                                                 Fields: []mojom_types.StructField{
                                                         mojom_types.StructField{
                                                                 DeclData: newDeclDataO(0, -1, test.fileNameB(), "x", ""),
                                                                 Type: &mojom_types.TypeTypeReference{mojom_types.TypeReference{
                                                                         false, false, stringPointer("a.b.c.FooA"), stringPointer("TYPE_KEY:a.b.c.FooA")}},
                                                         },
                                                 },
                                         },
@@ skipping 60 matching lines @@
                 test.expectedRuntimeTypeInfoA().TypeMap["TYPE_KEY:a.b.c.InterfaceA"] = &mojom_types.UserDefinedTypeInterfaceType{mojom_types.MojomInterface{
                         DeclData: newDeclDataA(test.fileNameA(), "InterfaceA", "a.b.c.InterfaceA",
                                 &[]mojom_types.Attribute{
                                         {"Color", &mojom_types.LiteralValueStringValue{"RED"}},
                                         {"ServiceName", &mojom_types.LiteralValueInt8Value{7}},
                                         {"ServiceName", &mojom_types.LiteralValueStringValue{"AwesomeService"}},
                                         {"Height", &mojom_types.LiteralValueDoubleValue{10.1}}}),
                         ServiceName: stringPointer("AwesomeService"),
                         Methods: map[uint32]mojom_types.MojomMethod{
                                 0: mojom_types.MojomMethod{
-                                        DeclData: newDeclData(test.fileNameA(), "DoIt", ""),
+                                        DeclData: newDeclDataO(0, -1, test.fileNameA(), "DoIt", ""),
                                         Parameters: mojom_types.MojomStruct{
                                                 DeclData: newDeclData(test.fileNameA(), "DoIt-request", ""),
                                                 Fields: []mojom_types.StructField{
                                                         mojom_types.StructField{
                                                                 DeclData: newDeclDataO(0, -1, test.fileNameA(), "x", ""),
                                                                 Type: &mojom_types.TypeTypeReference{mojom_types.TypeReference{
                                                                         false, false, stringPointer("FooA"), stringPointer("TYPE_KEY:a.b.c.FooA")}},
                                                         },
                                                 },
                                         },
@@ skipping 19 matching lines @@
                 test.expectedRuntimeTypeInfoB().TypeMap["TYPE_KEY:b.c.d.FooB"] = &mojom_types.UserDefinedTypeStructType{mojom_types.MojomStruct{
                         DeclData: newDeclData(test.fileNameB(), "FooB", "b.c.d.FooB"),
                         Fields:   []mojom_types.StructField{}}}
 
                 // InterfaceB
                 test.expectedRuntimeTypeInfoB().TypeMap["TYPE_KEY:b.c.d.InterfaceB"] = &mojom_types.UserDefinedTypeInterfaceType{mojom_types.MojomInterface{
                         DeclData: newDeclDataA(test.fileNameB(), "InterfaceB", "b.c.d.InterfaceB",
                                 &[]mojom_types.Attribute{{"ServiceName", &mojom_types.LiteralValueInt8Value{42}}}),
                         Methods: map[uint32]mojom_types.MojomMethod{
                                 0: mojom_types.MojomMethod{
-                                        DeclData: newDeclData(test.fileNameB(), "DoIt", ""),
+                                        DeclData: newDeclDataO(0, -1, test.fileNameB(), "DoIt", ""),
                                         Parameters: mojom_types.MojomStruct{
                                                 DeclData: newDeclData(test.fileNameB(), "DoIt-request", ""),
                                                 Fields: []mojom_types.StructField{
                                                         mojom_types.StructField{
                                                                 DeclData: newDeclDataO(0, -1, test.fileNameB(), "x", ""),
                                                                 Type: &mojom_types.TypeTypeReference{mojom_types.TypeReference{
                                                                         false, false, stringPointer("a.b.c.FooA"), stringPointer("TYPE_KEY:a.b.c.FooA")}},
                                                         },
                                                 },
                                         },
@@ skipping 60 matching lines @@
                         DeclData: newDeclData(test.fileNameA(), "FooA", "a.b.c.FooA"),
                         Fields:   []mojom_types.StructField{}}}
 
                 // InterfaceA
                 test.expectedRuntimeTypeInfoA().TypeMap["TYPE_KEY:a.b.c.InterfaceA"] = &mojom_types.UserDefinedTypeInterfaceType{mojom_types.MojomInterface{
                         DeclData: newDeclDataA(test.fileNameA(), "InterfaceA", "a.b.c.InterfaceA",
                                 &[]mojom_types.Attribute{{"ServiceName", &mojom_types.LiteralValueStringValue{"AwesomeService"}}}),
                         ServiceName: stringPointer("AwesomeService"),
                         Methods: map[uint32]mojom_types.MojomMethod{
                                 0: mojom_types.MojomMethod{
-                                        DeclData: newDeclData(test.fileNameA(), "DoIt", ""),
+                                        DeclData: newDeclDataO(0, -1, test.fileNameA(), "DoIt", ""),
                                         Parameters: mojom_types.MojomStruct{
                                                 DeclData: newDeclData(test.fileNameA(), "DoIt-request", ""),
                                                 Fields: []mojom_types.StructField{
                                                         mojom_types.StructField{
                                                                 DeclData: newDeclDataO(0, -1, test.fileNameA(), "x", ""),
                                                                 Type: &mojom_types.TypeTypeReference{mojom_types.TypeReference{
                                                                         false, false, stringPointer("FooA"), stringPointer("TYPE_KEY:a.b.c.FooA")}},
                                                         },
                                                 },
                                         },
@@ skipping 37 matching lines @@
                                                 false, false, stringPointer("Enum1"), stringPointer("TYPE_KEY:b.c.d.Enum1")}},
                                 },
                         },
                 }}
 
                 // InterfaceB
                 test.expectedRuntimeTypeInfoB().TypeMap["TYPE_KEY:b.c.d.InterfaceB"] = &mojom_types.UserDefinedTypeInterfaceType{mojom_types.MojomInterface{
                         DeclData: newDeclData(test.fileNameB(), "InterfaceB", "b.c.d.InterfaceB"),
                         Methods: map[uint32]mojom_types.MojomMethod{
                                 0: mojom_types.MojomMethod{
-                                        DeclData: newDeclData(test.fileNameB(), "DoIt", ""),
+                                        DeclData: newDeclDataO(0, -1, test.fileNameB(), "DoIt", ""),
                                         Parameters: mojom_types.MojomStruct{
                                                 DeclData: newDeclData(test.fileNameB(), "DoIt-request", ""),
                                                 Fields: []mojom_types.StructField{
                                                         mojom_types.StructField{
                                                                 DeclData: newDeclDataO(0, -1, test.fileNameB(), "x", ""),
                                                                 Type: &mojom_types.TypeTypeReference{mojom_types.TypeReference{
                                                                         false, false, stringPointer("a.b.c.FooA"), stringPointer("TYPE_KEY:a.b.c.FooA")}},
                                                         },
                                                 },
                                         },
@@ skipping 155 matching lines @@
                         }
                         return fmt.Errorf("*****\nexpected=\n*****\n%q\n*****\nactual=\n*****\n%q\n*****\n"+
                                 "match failed at position %d: expected=\n*****\n%q\n******\nactual=\n*****\n%q\n******\n",
                                 expectedString, actualString, diffPos, mismatchExpected, mismatchActual)
                 } else {
                         return fmt.Errorf("expected != actual but the two printed equal.")
                 }
         }
         return nil
 }