Delete the |complete_type_set| field from mojom_types.mojom

mojom/mojom_tool/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 1141 matching lines @@
                 // Simulate setting the canonical file name for the imported files. In real operation
                 // this step is done in parser_driver.go when each of the imported files are parsed.
                 mojomFile := parser.GetMojomFile()
                 if mojomFile.Imports != nil {
                         for _, imp := range mojomFile.Imports {
                                 imp.CanonicalFileName = fmt.Sprintf("%s.canonical", imp.SpecifiedName)
                         }
                 }
 
                 // Serialize
-                bytes, _, err := serialize(descriptor, false, false, c.lineAndcolumnNumbers, false, false)
+                bytes, _, err := serialize(descriptor, false, false, c.lineAndcolumnNumbers, false)
                 if err != nil {
                         t.Errorf("Serialization error for %s: %s", c.fileName, err.Error())
                         continue
                 }
 
                 // Serialize again and check for consistency.
-                bytes2, _, err := serialize(descriptor, false, false, c.lineAndcolumnNumbers, false, false)
+                bytes2, _, err := serialize(descriptor, false, false, c.lineAndcolumnNumbers, false)
                 if err != nil {
                         t.Errorf("Serialization error for %s: %s", c.fileName, err.Error())
                         continue
                 }
 
                 if !reflect.DeepEqual(bytes, bytes2) {
                         t.Errorf("Inconsistent serialization for %s:\nbytes=%v\nbytes2=%v\n",
                                 c.fileName, bytes, bytes2)
                         continue
                 }
@@ skipping 1127 matching lines @@
                 // Simulate setting the canonical file name for the imported files. In real operation
                 // this step is done in parser_driver.go when each of the imported files are parsed.
                 mojomFile := parser.GetMojomFile()
                 if mojomFile.Imports != nil {
                         for _, imp := range mojomFile.Imports {
                                 imp.CanonicalFileName = fmt.Sprintf("%s.canonical", imp.SpecifiedName)
                         }
                 }
 
                 // Serialize. Notice that the fourth argument is |true|.
-                bytes, _, err := serialize(descriptor, false, false, true, false, false)
+                bytes, _, err := serialize(descriptor, false, false, true, false)
                 if err != nil {
                         t.Errorf("Serialization error for %s: %s", c.fileName, err.Error())
                         continue
                 }
 
                 // Serialize again and check for consistency.
-                bytes2, _, err := serialize(descriptor, false, false, true, false, false)
+                bytes2, _, err := serialize(descriptor, false, false, true, false)
                 if err != nil {
                         t.Errorf("Serialization error for %s: %s", c.fileName, err.Error())
                         continue
                 }
 
                 if !reflect.DeepEqual(bytes, bytes2) {
                         t.Errorf("Inconsistent serialization for %s:\nbytes=%v\nbytes2=%v\n",
                                 c.fileName, bytes, bytes2)
                         continue
                 }
@@ skipping 72 matching lines @@
                 if err := descriptor.Resolve(); err != nil {
                         t.Errorf("Resolve error for %s: %s", c.fileName, err.Error())
                         continue
                 }
                 if err := descriptor.ComputeFinalData(); err != nil {
                         t.Errorf("ComputeFinalData error for %s: %s", c.fileName, err.Error())
                         continue
                 }
 
                 // Serialize
-                bytes, _, err := serialize(descriptor, false, false, c.lineAndcolumnNumbers, false, false)
+                bytes, _, err := serialize(descriptor, false, false, c.lineAndcolumnNumbers, false)
                 if err != nil {
                         t.Errorf("Serialization error for %s: %s", c.fileName, err.Error())
                         continue
                 }
 
                 // Deserialize
                 decoder := bindings.NewDecoder(bytes, nil)
                 fileGraph := mojom_files.MojomFileGraph{}
                 fileGraph.Decode(decoder)
 
@@ skipping 254 matching lines @@
                 if err := descriptor.Resolve(); err != nil {
                         t.Errorf("Resolve error for case %d: %s", i, err.Error())
                         continue
                 }
                 if err := descriptor.ComputeFinalData(); err != nil {
                         t.Errorf("ComputeFinalData error for case %d: %s", i, err.Error())
                         continue
                 }
 
                 // Serialize
-                bytes, _, err := serialize(descriptor, false, false, c.lineAndcolumnNumbers, false, false)
+                bytes, _, err := serialize(descriptor, false, false, c.lineAndcolumnNumbers, false)
                 if err != nil {
                         t.Errorf("Serialization error for case %d: %s", i, err.Error())
                         continue
                 }
 
                 // Deserialize
                 decoder := bindings.NewDecoder(bytes, nil)
                 fileGraph := mojom_files.MojomFileGraph{}
                 fileGraph.Decode(decoder)
 
@@ skipping 25 matching lines @@
 func (t *runtimeTypeInfoTest) expectedRuntimeTypeInfoA() *mojom_types.RuntimeTypeInfo {
         return t.cases[t.testCaseNum].expectedRuntimeTypeInfoA
 }
 
 func (t *runtimeTypeInfoTest) expectedRuntimeTypeInfoB() *mojom_types.RuntimeTypeInfo {
         return t.cases[t.testCaseNum].expectedRuntimeTypeInfoB
 }
 
 func (test *runtimeTypeInfoTest) addTestCase(contentsA, contentsB string) {
         test.cases = append(test.cases, runtimeTypeInfoTestCase{contentsA, contentsB, new(mojom_types.RuntimeTypeInfo), new(mojom_types.RuntimeTypeInfo)})
-        test.expectedRuntimeTypeInfoA().ServicesByName = make(map[string]mojom_types.ServiceTypeInfo)
+        test.expectedRuntimeTypeInfoA().Services = make(map[string]string)
         test.expectedRuntimeTypeInfoA().TypeMap = make(map[string]mojom_types.UserDefinedType)
-        test.expectedRuntimeTypeInfoB().ServicesByName = make(map[string]mojom_types.ServiceTypeInfo)
+        test.expectedRuntimeTypeInfoB().Services = make(map[string]string)
         test.expectedRuntimeTypeInfoB().TypeMap = make(map[string]mojom_types.UserDefinedType)
 }
 
 func (test *runtimeTypeInfoTest) fileNameA() string {
         return fmt.Sprintf("file%dA", test.testCaseNum)
 }
 
 func (test *runtimeTypeInfoTest) fileNameB() string {
         return fmt.Sprintf("file%dB", test.testCaseNum)
 }
@@ skipping 164 matching lines @@
         struct FooB{
         };
 
         interface InterfaceB {
         DoIt(a.b.c.FooA x) => (FooB? y);
     };
 
         `
                 test.addTestCase(contentsA, contentsB)
 
-                // ServicesByName for file A
-                test.expectedRuntimeTypeInfoA().ServicesByName["AwesomeService"] = mojom_types.ServiceTypeInfo{
-                        TopLevelInterface: "TYPE_KEY:a.b.c.InterfaceA",
-                        CompleteTypeSet:   []string{"TYPE_KEY:a.b.c.FooA", "TYPE_KEY:a.b.c.InterfaceA", "TYPE_KEY:b.c.d.FooB"},
-                }
+                // Services for file A
+                test.expectedRuntimeTypeInfoA().Services["AwesomeService"] = "TYPE_KEY:a.b.c.InterfaceA"
 
                 // TypeMap for file A
 
                 // 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{
@@ skipping 91 matching lines @@
         };
 
         [ServiceName = 42]
         interface InterfaceB {
         DoIt(a.b.c.FooA x) => (FooB? y);
     };
 
         `
                 test.addTestCase(contentsA, contentsB)
 
-                // ServicesByName for file A
-                test.expectedRuntimeTypeInfoA().ServicesByName["AwesomeService"] = mojom_types.ServiceTypeInfo{
-                        TopLevelInterface: "TYPE_KEY:a.b.c.InterfaceA",
-                        CompleteTypeSet:   []string{"TYPE_KEY:a.b.c.FooA", "TYPE_KEY:a.b.c.InterfaceA", "TYPE_KEY:b.c.d.FooB"},
-                }
-
-                // TypeMap for file A
+                // Services for file A
+                test.expectedRuntimeTypeInfoA().Services["AwesomeService"] = "TYPE_KEY:a.b.c.InterfaceA"
 
                 // 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: newDeclDataA(test.fileNameA(), "InterfaceA", "a.b.c.InterfaceA",
                                 &[]mojom_types.Attribute{
@@ skipping 98 matching lines @@
                 Enum1 x;
         };
 
         interface InterfaceB {
         DoIt(a.b.c.FooA x) => (FooB? y, Enum2 z);
     };
 
         `
                 test.addTestCase(contentsA, contentsB)
 
-                // ServicesByName for file A
-                test.expectedRuntimeTypeInfoA().ServicesByName["AwesomeService"] = mojom_types.ServiceTypeInfo{
-                        TopLevelInterface: "TYPE_KEY:a.b.c.InterfaceA",
-                        CompleteTypeSet:   []string{"TYPE_KEY:a.b.c.FooA", "TYPE_KEY:a.b.c.InterfaceA", "TYPE_KEY:b.c.d.Enum1", "TYPE_KEY:b.c.d.FooB"},
-                }
+                // Services for file A
+                test.expectedRuntimeTypeInfoA().Services["AwesomeService"] = "TYPE_KEY:a.b.c.InterfaceA"
 
                 // TypeMap for file A
 
                 // 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{
@@ skipping 121 matching lines @@
                 if err := descriptor.Resolve(); err != nil {
                         t.Errorf("Resolve error for case %d: %s", i, err.Error())
                         continue
                 }
                 if err := descriptor.ComputeFinalData(); err != nil {
                         t.Errorf("ComputeFinalData error for case %d: %s", i, err.Error())
                         continue
                 }
 
                 // Serialize
-                bytes, _, err := serialize(descriptor, false, false, false, true, true)
+                bytes, _, err := serialize(descriptor, false, false, false, true)
                 if err != nil {
                         t.Errorf("Serialization error for case %d: %s", i, err.Error())
                         continue
                 }
 
                 // Deserialize
                 decoder := bindings.NewDecoder(bytes, nil)
                 fileGraph := mojom_files.MojomFileGraph{}
                 fileGraph.Decode(decoder)
 
                 // Deserialize  RuntimeTypeInfo A
                 runtimeTypeInfoA := deserializeRuntimeTypeInfo(*fileGraph.Files[fileNameA].SerializedRuntimeTypeInfo)
 
                 // Deserialize  RuntimeTypeInfo B
                 runtimeTypeInfoB := deserializeRuntimeTypeInfo(*fileGraph.Files[fileNameB].SerializedRuntimeTypeInfo)
 
                 // Compare A
                 if err := compareTwoGoObjects(c.expectedRuntimeTypeInfoA, &runtimeTypeInfoA); err != nil {
                         t.Errorf("case %d A:\n%s", i, err.Error())
                 }
 
                 // Compare B
                 if err := compareTwoGoObjects(c.expectedRuntimeTypeInfoB, &runtimeTypeInfoB); err != nil {
                         t.Errorf("case %d B:\n%s", i, err.Error())
                 }
-
-                // Test the parameter populateCompleteTypeSet. We set the final
-                // parameter to false.
-                bytes, _, err = serialize(descriptor, false, false, false, true, false)
-                if err != nil {
-                        t.Errorf("Serialization error for case %d: %s", i, err.Error())
-                        continue
-                }
-
-                // Deserialize
-                decoder = bindings.NewDecoder(bytes, nil)
-                fileGraph = mojom_files.MojomFileGraph{}
-                fileGraph.Decode(decoder)
-                runtimeTypeInfoA = deserializeRuntimeTypeInfo(*fileGraph.Files[fileNameA].SerializedRuntimeTypeInfo)
-
-                // Check that CompleteTypeSet has not been populated for any service.
-                for name, service := range runtimeTypeInfoA.ServicesByName {
-                        length := len(service.CompleteTypeSet)
-                        if length != 0 {
-                                t.Errorf("len(CompleteTypeSet)=%d for service=%q", length, name)
-                        }
-                }
         }
 }
 
 func deserializeRuntimeTypeInfo(base64String string) mojom_types.RuntimeTypeInfo {
         compressedBytes, err := base64.StdEncoding.DecodeString(base64String)
         if err != nil {
                 panic(fmt.Sprintf("Error while unencoding runtimeTypeInfo: %s", err.Error()))
         }
         reader, err2 := gzip.NewReader(bytes.NewBuffer(compressedBytes))
         if err2 != nil {
@@ skipping 40 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
 }