Added test for mapOf

Author: alxmrs

src/tools/schema2kotlin.ts

@@ -138,7 +138,7 @@ abstract class Abstract${particleName} : ${this.opts.wasm ? 'WasmParticleImpl' :
   }
 }
 
-class KotlinGenerator implements ClassGenerator {
+export class KotlinGenerator implements ClassGenerator {
   fields: string[] = [];
   fieldVals: string[] = [];
   setFields: string[] = [];
@@ -201,10 +201,19 @@ class KotlinGenerator implements ClassGenerator {
 
   }
 
-  private mapOf(items: string[], indent: number): string {
-    if (items.length === 0) return `emptyMap()`;
+  mapOf(items: string[]): string {
+    switch (items.length) {
+      case 0:
+        return `emptyMap()`;
+      case 1:
+        return `mapOf(${items[0]})`;
+      default:
+        return `\
+mapOf(
+${this.leftPad(items.join(',\n'), 4)}
+)`;
+    }
 
-    return `mapOf(${items.join(',\n' + ' '.repeat(indent))})`;
   }
 
   createSchema(schemaHash: string): string {
@@ -213,8 +222,8 @@ class KotlinGenerator implements ClassGenerator {
 Schema(
     listOf(${schemaNames.join(',\n' + ' '.repeat(8))}),
     SchemaFields(
-        singletons = ${this.mapOf(this.singletonSchemaFields, 12)},
-        collections = ${this.mapOf(this.collectionSchemaFields, 12)}
+        singletons = ${this.leftPad(this.mapOf(this.singletonSchemaFields), 8, true)},
+        collections = ${this.leftPad(this.mapOf(this.collectionSchemaFields), 8, true)}
     ),
     "${schemaHash}"
 )`;

src/tools/tests/goldens/generated-schemas.jvm.kt

@@ -199,10 +199,12 @@ class Gold_Data_Spec() : EntitySpec<Gold_Data> {
         val schema = Schema(
                 listOf(),
                 SchemaFields(
-                    singletons = mapOf("num" to FieldType.Number,
+                    singletons = mapOf(
+                        "num" to FieldType.Number,
                         "txt" to FieldType.Text,
                         "lnk" to FieldType.Text,
-                        "flg" to FieldType.Boolean),
+                        "flg" to FieldType.Boolean
+                    ),
                     collections = emptyMap()
                 ),
                 "d8058d336e472da47b289eafb39733f77eadb111"

src/tools/tests/schema2kotlin-test.ts

@@ -0,0 +1,46 @@
+/**
+ * @license
+ * Copyright (c) 2020 Google Inc. All rights reserved.
+ * This code may only be used under the BSD style license found at
+ * http://polymer.github.io/LICENSE.txt
+ * Code distributed by Google as part of this project is also
+ * subject to an additional IP rights grant found at
+ * http://polymer.github.io/PATENTS.txt
+ */
+
+
+import {assert} from '../../platform/chai-node.js';
+import {KotlinGenerator} from '../schema2kotlin.js';
+import {SchemaNode} from '../schema2graph.js';
+import {Schema} from '../../runtime/schema.js';
+
+
+describe('schema2wasm', () => {
+  describe('kotlin-generator', () => {
+    it('when no items are present, it creates an empty map', () => {
+      const ktGen = new KotlinGenerator(new SchemaNode(new Schema([], {}), 'dummyNode'), {arg: '', _: []});
+
+      const actual = ktGen.mapOf([]);
+
+      assert.strictEqual('emptyMap()', actual);
+    });
+    it('when one item is present, it creates a single-line map', () => {
+      const ktGen = new KotlinGenerator(new SchemaNode(new Schema([], {}), 'dummyNode'), {arg: '', _: []});
+
+      const actual = ktGen.mapOf([`"a" to "b"`]);
+
+      assert.strictEqual('mapOf("a" to "b")', actual);
+    });
+    it('when multiple items are present, it creates a multi-line map', () => {
+      const ktGen = new KotlinGenerator(new SchemaNode(new Schema([], {}), 'dummyNode'), {arg: '', _: []});
+
+      const actual = ktGen.mapOf([`"a" to "b"`, `"b" to "c"`]);
+
+      assert.strictEqual(`\
+mapOf(
+    "a" to "b",
+    "b" to "c"
+)`, actual);
+    });
+  });
+});