Added some extra testcases

Perryvw · Perryvw · commit 15b52f8a004f · 2018-07-20T10:38:29.000+02:00
diff --git a/src/lualib/Map.ts b/src/lualib/Map.ts
@@ -1,7 +1,7 @@
 class Map<TKey, TValue> {
     public size: number;
 
-    private items: {[key: string]: TValue};
+    private items: {[key: string]: TValue}; // Type of key is actually TKey
 
     public Map(other: any) {
         this.items = {};
diff --git a/test/unit/lualib/map.spec.ts b/test/unit/lualib/map.spec.ts
@@ -1,5 +1,5 @@
 import { Expect, Test, TestCase } from "alsatian";
-import * as util from "../src/util";
+import * as util from "../../src/util";
 
 export class MapTests {
     @Test("map constructor")
@@ -19,6 +19,15 @@ export class MapTests {
         Expect(result).toBe(true);
     }
 
+    @Test("map iterable constructor map")
+    public mapIterableConstructor2() {
+        const lua = util.transpileString(`let mymap = new Map(new Map([["a", "c"],["b", "d"]]));
+                                          return mymap.has("a") && mymap.has("b");`);
+        const result = util.executeLua(lua);
+
+        Expect(result).toBe(true);
+    }
+
     @Test("map clear")
     public mapClear() {
         const mapTS = `let mymap = new Map([["a", "c"],["b", "d"]]); mymap.clear();`;
@@ -39,12 +48,22 @@ export class MapTests {
         Expect(contains).toBe(true);
     }
 
+    @Test("map entries")
+    public mapEntries() {
+        const lua = util.transpileString(`let mymap = new Map([[5, 2],[6, 3],[7, 4]]);
+                                          let count = 0;
+                                          for (var [key, value] of mymap.entries()) { count += key + value; }
+                                          return count;`);
+        const result = util.executeLua(lua);
+        Expect(result).toBe(27);
+    }
+
     @Test("map foreach")
     public mapForEach() {
         const lua = util.transpileString(
             `let mymap = new Map([["a", 2],["b", 3],["c", 4]]);
             let count = 0;
-            mymap.forEach(i => { count += i; });
+            mymap.forEach(i => count += i);
             return count;`
         );
 
diff --git a/test/unit/lualib/set.spec.ts b/test/unit/lualib/set.spec.ts
@@ -1,6 +1,7 @@
-import { Expect, Test, TestCase } from "alsatian";
-import * as util from "../src/util";
+import { Expect, Test, TestCase, FocusTests } from "alsatian";
+import * as util from "../../src/util";
 
+@FocusTests
 export class SetTests {
     @Test("set constructor")
     public setConstructor() {
@@ -19,6 +20,15 @@ export class SetTests {
         Expect(result).toBe(true);
     }
 
+    @Test("set iterable constructor set")
+    public setIterableConstructorSet() {
+        const lua = util.transpileString(`let myset = new Set(new Set(["a", "b"]));
+                                          return myset.has("a") || myset.has("b");`);
+        const result = util.executeLua(lua);
+
+        Expect(result).toBe(true);
+    }
+
     @Test("set add")
     public setAdd() {
         const lua = util.transpileString(`let myset = new Set(); myset.add("a"); return myset.has("a");`);
@@ -46,6 +56,16 @@ export class SetTests {
         Expect(contains).toBe(true);
     }
 
+    @Test("set entries")
+    public setEntries() {
+        const lua = util.transpileString(`let myset = new Set([5, 6, 7]);
+                                          let count = 0;
+                                          for (var [key, value] of myset.entries()) { count += key + value; }
+                                          return count;`);
+        const result = util.executeLua(lua);
+        Expect(result).toBe(36);
+    }
+
     @Test("set foreach")
     public setForEach() {
         const lua = util.transpileString(
