decorator tests

Perryvw · Perryvw · commit f25f6c5c130d · 2018-02-22T20:56:30.000+01:00
diff --git a/test/integration/decorators.spec.ts b/test/integration/decorators.spec.ts
@@ -1,27 +1,49 @@
 import { Expect, Test, TestCase } from "alsatian";
 
 import * as util from "../src/util";
+const fs = require("fs");
 
 export class DecoratorTests {
 
+    // Expect the passed lua string to be equal to the file's contents.
+    private ExpectEqualToFile(lua: string, path: string) {
+        const expected = fs.readFileSync(path).toString();
+        Expect(lua).toBe(expected.trim().split("\r\n").join("\n"));
+    }
+
     @Test("RegularEnum")
     public regularEnum() {
         const lua = util.transpileFile("test/integration/testfiles/enum.ts");
-        Expect(lua).toBe(
-            "TestEnum={}\n"+
-            "TestEnum.val1=0\n"+
-            "TestEnum.val2=2\n"+
-            "TestEnum.val3=3"
-        );
+        this.ExpectEqualToFile(lua, "test/integration/testfiles/enum-expected.lua");
     }
 
     @Test("MembersOnlyEnumDecorator")
     public membersOnly() {
-        const lua = util.transpileFile("test/integration/testfiles/membersOnlyEnum.ts");
-        Expect(lua).toBe(
-            "val1=0\n"+
-            "val2=2\n"+
-            "val3=3"
-        );
+        const lua = util.transpileFile("test/integration/testfiles/enumMembersOnly.ts");
+        this.ExpectEqualToFile(lua, "test/integration/testfiles/enumMembersOnly-expected.lua");
+    }
+
+    @Test("RegularClassExtend")
+    public regularClassExtend() {
+        const lua = util.transpileFile("test/integration/testfiles/class.ts");
+        this.ExpectEqualToFile(lua, "test/integration/testfiles/class-expected.lua");
+    }
+
+    @Test("PureAbstractClassExtend")
+    public pureAbstractClassExtend() {
+        const lua = util.transpileFile("test/integration/testfiles/classPureAbstract.ts");
+        this.ExpectEqualToFile(lua, "test/integration/testfiles/classPureAbstract-expected.lua");
+    }
+
+    @Test("ExtensionClass")
+    public extensionClass() {
+        const lua = util.transpileFile("test/integration/testfiles/classExtension.ts");
+        this.ExpectEqualToFile(lua, "test/integration/testfiles/classExtension-expected.lua");
+    }
+
+    @Test("RegularNamespace")
+    public regularNamespace() {
+        const lua = util.transpileFile("test/integration/testfiles/namespace.ts");
+        this.ExpectEqualToFile(lua, "test/integration/testfiles/namespace-expected.lua");
     }
 }
diff --git a/test/integration/testfiles/class-expected.lua b/test/integration/testfiles/class-expected.lua
@@ -0,0 +1,8 @@
+ClassB = ClassB or ClassA.new()
+ClassB.__index = ClassB
+ClassB.__base = ClassA
+function ClassB.new(construct, ...)
+    local instance = setmetatable({}, ClassB)
+    if construct and ClassB.constructor then ClassB.constructor(instance, ...) end
+    return instance
+end
diff --git a/test/integration/testfiles/class.ts b/test/integration/testfiles/class.ts
@@ -1,29 +1,2 @@
-class testA {
-    fieldA: number = 5;
-    constructor(a: number) {
-        this.fieldA = a;
-    }
-
-    testMethod(): number {
-        return this.fieldA;
-    }
-}
-
-class testB extends testA {
-    fieldB: number;
-    constructor(a: number, b: number) {
-        super(a);
-        this.fieldB = b;
-    }
-
-    mul(): number {
-        return this.fieldA * this.fieldB;
-    }
-}
-
-declare function print(...args:any[]): void;
-
-let instance = new testB(4, 6);
-print(instance.fieldA);
-print(instance.fieldB);
-print(instance.mul());
+declare class ClassA {}
+class ClassB extends ClassA {}
diff --git a/test/integration/testfiles/classExtension-expected.lua b/test/integration/testfiles/classExtension-expected.lua
@@ -0,0 +1,2 @@
+function MyClass.myFunction(self)
+end
diff --git a/test/integration/testfiles/classExtension.ts b/test/integration/testfiles/classExtension.ts
@@ -0,0 +1,4 @@
+/** !Extension */
+class MyClass {
+    myFunction() {}
+}
diff --git a/test/integration/testfiles/classPureAbstract-expected.lua b/test/integration/testfiles/classPureAbstract-expected.lua
@@ -0,0 +1,7 @@
+ClassB = ClassB or {}
+ClassB.__index = ClassB
+function ClassB.new(construct, ...)
+    local instance = setmetatable({}, ClassB)
+    if construct and ClassB.constructor then ClassB.constructor(instance, ...) end
+    return instance
+end
diff --git a/test/integration/testfiles/classPureAbstract.ts b/test/integration/testfiles/classPureAbstract.ts
@@ -0,0 +1,3 @@
+/** !PureAbstract */
+declare class ClassA {}
+class ClassB extends ClassA {}
diff --git a/test/integration/testfiles/enum-expected.lua b/test/integration/testfiles/enum-expected.lua
@@ -0,0 +1,4 @@
+TestEnum={}
+TestEnum.val1=0
+TestEnum.val2=2
+TestEnum.val3=3
diff --git a/test/integration/testfiles/enumMembersOnly-expected.lua b/test/integration/testfiles/enumMembersOnly-expected.lua
@@ -0,0 +1,3 @@
+val1=0
+val2=2
+val3=3
diff --git a/test/integration/testfiles/enumMembersOnly.ts b/test/integration/testfiles/enumMembersOnly.ts
diff --git a/test/integration/testfiles/namespace-expected.lua b/test/integration/testfiles/namespace-expected.lua
@@ -0,0 +1,6 @@
+myNamespace = myNamespace or {}
+do
+    function nsMember()
+    end
+    myNamespace.nsMember = nsMember
+end
diff --git a/test/integration/testfiles/namespace.ts b/test/integration/testfiles/namespace.ts
@@ -0,0 +1,3 @@
+namespace myNamespace {
+    function nsMember() {}
+}
diff --git a/test/integration/testfiles/namespacePhantom-expected.lua b/test/integration/testfiles/namespacePhantom-expected.lua
@@ -0,0 +1,2 @@
+function nsMember()
+end
diff --git a/test/integration/testfiles/namespacePhantom.ts b/test/integration/testfiles/namespacePhantom.ts
@@ -0,0 +1,4 @@
+/** !Phantom */
+namespace myNamespace {
+    function nsMember() {}
+}
diff --git a/test/integration/testfiles/test.ts b/test/integration/testfiles/test.ts
diff --git a/test/integration/testfiles/test2.ts b/test/integration/testfiles/test2.ts
diff --git a/test/integration/testfiles/test3.ts b/test/integration/testfiles/test3.ts
diff --git a/test/integration/testfiles/test4.ts b/test/integration/testfiles/test4.ts
diff --git a/test/src/util.ts b/test/src/util.ts

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+function MyClass.myFunction(self)`
	`2`	`+end`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+/** !PureAbstract */`
	`2`	`+declare class ClassA {}`
	`3`	`+class ClassB extends ClassA {}`