New Mojom parser: Fix serialization of arrays and maps.

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 (
         "fmt"
         "mojo/public/go/bindings"
         "mojom/mojom_parser/generated/mojom_files"
@@ skipping 70 matching lines @@
                         FileName: test.fileName(),
                 }}
 }
 
 // TestSingleFileSerialization uses a series of test cases in which the text of a .mojom
 // file is specified and the expected MojomFileGraph is specified using Go struct literals.
 func TestSingleFileSerialization(t *testing.T) {
         test := singleFileTest{}
 
         ////////////////////////////////////////////////////////////
+        // Test Case: array of int32
+        ////////////////////////////////////////////////////////////
+        {
+
+                contents := `
+        struct Foo{
+          array<int32> bar1;
+          array<int32, 7> bar2;
+          array<int32>? bar3;
+          array<int32, 8>? bar4;
+        };`
+
+                test.addTestCase("", contents)
+
+                // DeclaredMojomObjects
+                test.expectedFile().DeclaredMojomObjects.Structs = &[]string{"TYPE_KEY:Foo"}
+
+                // ResolvedTypes
+
+                // struct Foo
+                test.expectedGraph().ResolvedTypes["TYPE_KEY:Foo"] = &mojom_types.UserDefinedTypeStructType{mojom_types.MojomStruct{
+                        DeclData: test.newDeclData("Foo", "Foo"),
+                        Fields: []mojom_types.StructField{
+                                // field bar1 is not nullable and not fixed length
+                                {
+                                        DeclData: test.newDeclData("bar1", ""),
+                                        Type: &mojom_types.TypeArrayType{mojom_types.ArrayType{
+                                                false, -1, &mojom_types.TypeSimpleType{mojom_types.SimpleType_InT32}}},
+                                },
+                                // field bar2 is not nullable and fixed length of 7
+                                {
+                                        DeclData: test.newDeclData("bar2", ""),
+                                        Type: &mojom_types.TypeArrayType{mojom_types.ArrayType{
+                                                false, 7, &mojom_types.TypeSimpleType{mojom_types.SimpleType_InT32}}},
+                                },
+                                // field bar3 is nullable and not fixed length
+                                {
+                                        DeclData: test.newDeclData("bar3", ""),
+                                        Type: &mojom_types.TypeArrayType{mojom_types.ArrayType{
+                                                true, -1, &mojom_types.TypeSimpleType{mojom_types.SimpleType_InT32}}},
+                                },
+                                // field bar4 is nullable and fixed length of 8
+                                {
+                                        DeclData: test.newDeclData("bar4", ""),
+                                        Type: &mojom_types.TypeArrayType{mojom_types.ArrayType{
+                                                true, 8, &mojom_types.TypeSimpleType{mojom_types.SimpleType_InT32}}},
+                                },
+                        },
+                }}
+
+                test.endTestCase()
+        }
+
+        ////////////////////////////////////////////////////////////
+        // Test Case: map string to int32
+        ////////////////////////////////////////////////////////////
+        {
+
+                contents := `
+        struct Foo{
+          map<string,  int32>  bar1;
+          map<string?, int32>  bar2;
+          map<string,  int32>? bar3;
+          map<string?, int32>? bar4;
+        };`
+
+                test.addTestCase("", contents)
+
+                // DeclaredMojomObjects
+                test.expectedFile().DeclaredMojomObjects.Structs = &[]string{"TYPE_KEY:Foo"}
+
+                // ResolvedTypes
+
+                // struct Foo
+                test.expectedGraph().ResolvedTypes["TYPE_KEY:Foo"] = &mojom_types.UserDefinedTypeStructType{mojom_types.MojomStruct{
+                        DeclData: test.newDeclData("Foo", "Foo"),
+                        Fields: []mojom_types.StructField{
+                                // field bar1 is non-nullable with a non-nullable key.
+                                {
+                                        DeclData: test.newDeclData("bar1", ""),
+                                        Type: &mojom_types.TypeMapType{mojom_types.MapType{
+                                                false,
+                                                &mojom_types.TypeStringType{mojom_types.StringType{false}},
+                                                &mojom_types.TypeSimpleType{mojom_types.SimpleType_InT32}}},
+                                },
+                                // field bar2 is non-nullable with a nullable key.
+                                {
+                                        DeclData: test.newDeclData("bar2", ""),
+                                        Type: &mojom_types.TypeMapType{mojom_types.MapType{
+                                                false,
+                                                &mojom_types.TypeStringType{mojom_types.StringType{true}},
+                                                &mojom_types.TypeSimpleType{mojom_types.SimpleType_InT32}}},
+                                },
+                                // field bar3 is nullable with a non-nullable key.
+                                {
+                                        DeclData: test.newDeclData("bar3", ""),
+                                        Type: &mojom_types.TypeMapType{mojom_types.MapType{
+                                                true,
+                                                &mojom_types.TypeStringType{mojom_types.StringType{false}},
+                                                &mojom_types.TypeSimpleType{mojom_types.SimpleType_InT32}}},
+                                },
+                                // field bar4 is nullable with a nullable key.
+                                {
+                                        DeclData: test.newDeclData("bar4", ""),
+                                        Type: &mojom_types.TypeMapType{mojom_types.MapType{
+                                                true,
+                                                &mojom_types.TypeStringType{mojom_types.StringType{true}},
+                                                &mojom_types.TypeSimpleType{mojom_types.SimpleType_InT32}}},
+                                },
+                        },
+                }}
+
+                test.endTestCase()
+        }
+
+        ////////////////////////////////////////////////////////////
         // Test Case
         ////////////////////////////////////////////////////////////
         {
 
                 contents := `
         [go_namespace="go.test",
         lucky=true,
         planet=EARTH]
         module mojom.test;
 
@@ skipping 191 matching lines @@
                         }
                         return fmt.Errorf("*****\nexpected=\n*****\n%q\n*****\nactual=\n*****\n%q\n*****\n"+
                                 "match failed at position %d: expected=\n*****\n%s\n******\nactual=\n*****\n%s\n******\n",
                                 expectedString, actualString, diffPos, mismatchExpected, mismatchActual)
                 } else {
                         return fmt.Errorf("expected != actual but the two printed equal.")
                 }
         }
         return nil
 }