Small formatter fixes.

mojom/mojom_parser/formatter/printer_test.go

 // Copyright 2016 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 formatter
 
 import (
         "mojom/mojom_parser/lexer"
         "mojom/mojom_parser/mojom"
         "testing"
@@ skipping 71 matching lines @@
 }
 
 func TestWriteAttributes(t *testing.T) {
         attrs := mojom.NewAttributes(lexer.Token{})
         attrs.List = append(attrs.List, mojom.NewMojomAttribute("key1", nil, mojom.MakeUint64LiteralValue(10, &lexer.Token{Text: "10"})))
         attrs.List = append(attrs.List, mojom.NewMojomAttribute("key2", nil, mojom.MakeUint64LiteralValue(20, &lexer.Token{Text: "20"})))
 
         p := getNewPrinter()
         p.writeAttributes(attrs)
 
-        expected := "[key1=10,\nkey2=20]\n"
+        expected := "[key1=10,\n key2=20]\n"
         checkEq(t, expected, p.result())
 }
 
 func TestWriteAttributesSingleLine(t *testing.T) {
         attrs := mojom.NewAttributes(lexer.Token{})
         attrs.List = append(attrs.List, mojom.NewMojomAttribute("key1", nil, mojom.MakeUint64LiteralValue(10, &lexer.Token{Text: "10"})))
         attrs.List = append(attrs.List, mojom.NewMojomAttribute("key2", nil, mojom.MakeUint64LiteralValue(20, &lexer.Token{Text: "20"})))
 
         p := getNewPrinter()
         p.writeAttributesSingleLine(attrs)
 
-        expected := "[key1=10, key2=20]"
+        expected := "[key1=10, key2=20] "
         checkEq(t, expected, p.result())
 }
 
 func TestWriteImportedFiles(t *testing.T) {
         imports := []*mojom.ImportedFile{
                 mojom.NewImportedFile("foo2.mojom", nil),
                 mojom.NewImportedFile("foo1.mojom", nil),
         }
 
         p := getNewPrinter()
@@ skipping 191 matching lines @@
 
         p := getNewPrinter()
         p.writeDeclaredObject(mojomStruct)
         checkEq(t, expected, p.result())
 }
 
 func TestWriteMojomStructEmpty(t *testing.T) {
         declData := mojom.DeclData("", nil, lexer.Token{Text: "FooStruct"}, nil)
         mojomStruct := mojom.NewMojomStruct(declData)
 
-        expected := "struct FooStruct{};"
+        expected := "struct FooStruct {};"
 
         p := getNewPrinter()
         p.writeDeclaredObject(mojomStruct)
         checkEq(t, expected, p.result())
 }
 
 func TestWriteUnionField(t *testing.T) {
         unionField := &mojom.UnionField{FieldType: mojom.BuiltInType("int8")}
         unionField.DeclarationData = mojom.DeclDataWithOrdinal("field1", nil, lexer.Token{Text: "field1"}, nil, 5)
         p := getNewPrinter()
@@ skipping 65 matching lines @@
         responseParams.InitAsScope(mojom.NewTestFileScope("test.scope"))
         responseParams.AddField(mojom.NewStructField(mojom.DeclTestData("rparam1"), mojom.SimpleTypeInt32, nil))
         responseParams.AddField(mojom.NewStructField(mojom.DeclTestData("rparam2"), mojom.SimpleTypeInt64, nil))
 
         mojomMethod := mojom.NewMojomMethod(mojom.DeclTestData("method_foo"), params, responseParams)
 
         p := getNewPrinter()
         p.writeDeclaredObject(mojomMethod)
         checkEq(t, "method_foo(int8 param1, int16 param2) => (int32 rparam1, int64 rparam2);", p.result())
 }