Rename fn and mod to testFunction and testModule

ark120202 · ark120202 · commit 28a8aa15b2a0 · 2019-05-28T13:37:17.000+05:00
diff --git a/test/unit/classDecorator.spec.ts b/test/unit/classDecorator.spec.ts
@@ -2,7 +2,7 @@ import * as util from "../util";
 import { TSTLErrors } from "../../src/TSTLErrors";
 
 test("Class decorator with no parameters", () => {
-    util.fn`
+    util.testFunction`
         function SetBool<T extends { new(...args: any[]): {} }>(constructor: T) {
             return class extends constructor {
                 decoratorBool = true;
@@ -20,7 +20,7 @@ test("Class decorator with no parameters", () => {
 });
 
 test("Class decorator with parameters", () => {
-    util.fn`
+    util.testFunction`
         function SetNum(numArg: number) {
             return <T extends new(...args: any[]) => {}>(constructor: T) => {
                 return class extends constructor {
@@ -40,7 +40,7 @@ test("Class decorator with parameters", () => {
 });
 
 test("Class decorator with variable parameters", () => {
-    util.fn`
+    util.testFunction`
         function SetNumbers(...numArgs: number[]) {
             return <T extends new(...args: any[]) => {}>(constructor: T) => {
                 return class extends constructor {
@@ -64,7 +64,7 @@ test("Class decorator with variable parameters", () => {
 });
 
 test("Multiple class decorators", () => {
-    util.fn`
+    util.testFunction`
         function SetTen<T extends { new(...args: any[]): {} }>(constructor: T) {
             return class extends constructor {
                 decoratorTen = 10;
@@ -92,7 +92,7 @@ test("Multiple class decorators", () => {
 });
 
 test("Class decorator with inheritance", () => {
-    util.fn`
+    util.testFunction`
         function SetTen<T extends { new(...args: any[]): {} }>(constructor: T) {
             return class extends constructor {
                 decoratorTen = 10;
@@ -122,7 +122,7 @@ test("Class decorator with inheritance", () => {
 });
 
 test("Class decorators are applied in order and executed in reverse order", () => {
-    util.fn`
+    util.testFunction`
         const order = [];
 
         function SetString(stringArg: string) {
@@ -168,7 +168,7 @@ test("Throws error if decorator function has void context", () => {
 });
 
 test("Exported class decorator", () => {
-    util.mod`
+    util.testModule`
         function decorator<T extends any>(c: T): T {
             c.bar = "foobar";
             return c;
diff --git a/test/unit/loops.spec.ts b/test/unit/loops.spec.ts
@@ -171,7 +171,7 @@ test.each([{ inp: [0, 1, 2, 3], expected: [1, 2, 3, 4] }])("forNoCondition (%p)"
 });
 
 test("forNoPostExpression (%p)", () => {
-    util.fn`
+    util.testFunction`
         let arrTest = [0, 1, 2, 3];
         let i = 0;
         for (;;) {
@@ -197,7 +197,7 @@ test.each([
     { inp: [0, 1, 2, 3], header: "let i = arrTest.length - 1; i >= 0; i -= 2" },
     { inp: [0, 1, 2, 3], header: "let i = arrTest.length - 1; i > 0; i -= 2" },
 ])("forheader (%p)", ({ inp, header }) => {
-    util.fn`
+    util.testFunction`
         let arrTest = ${JSON.stringify(inp)};
         for (${header}) {
             arrTest[i] = arrTest[i] + 1;
@@ -207,7 +207,7 @@ test.each([
 });
 
 test("for scope", () => {
-    util.fn`
+    util.testFunction`
         let i = 42;
         for (let i = 0; i < 10; ++i) {}
         return i;
diff --git a/test/unit/require.spec.ts b/test/unit/require.spec.ts
@@ -74,7 +74,7 @@ test.each([
 ])(
     "require paths root from --baseUrl or --rootDir (%p)",
     ({ filePath, usedPath, expectedPath, options, throwsError }) => {
-        const builder = util.mod`
+        const builder = util.testModule`
             import * as module from "${usedPath}";
             module;
         `;
@@ -97,7 +97,7 @@ test.each([
 test.each([{ comment: "", expectedPath: "src.fake" }, { comment: "/** @noResolution */", expectedPath: "fake" }])(
     "noResolution on ambient modules causes no path alterations (%p)",
     ({ comment, expectedPath }) => {
-        const builder = util.mod`
+        const builder = util.testModule`
             import * as fake from "fake";
             fake;
         `;
diff --git a/test/util.ts b/test/util.ts
@@ -455,14 +455,14 @@ const templateFromValue = (valueOrTemplate: any): TemplateStringsArray =>
         ? Object.assign([valueOrTemplate], { raw: [valueOrTemplate] })
         : valueOrTemplate;
 
-export function fn(value: string): FunctionTestBuilder;
-export function fn(template: TemplateStringsArray, ...substitutions: any[]): FunctionTestBuilder;
-export function fn(valueOrTemplate: any, ...substitutions: any[]): FunctionTestBuilder {
+export function testFunction(value: string): FunctionTestBuilder;
+export function testFunction(template: TemplateStringsArray, ...substitutions: any[]): FunctionTestBuilder;
+export function testFunction(valueOrTemplate: any, ...substitutions: any[]): FunctionTestBuilder {
     return new FunctionTestBuilder(templateFromValue(valueOrTemplate), substitutions);
 }
 
-export function mod(value: string): ModuleTestBuilder;
-export function mod(template: TemplateStringsArray, ...substitutions: any[]): ModuleTestBuilder;
-export function mod(valueOrTemplate: any, ...substitutions: any[]): ModuleTestBuilder {
+export function testModule(value: string): ModuleTestBuilder;
+export function testModule(template: TemplateStringsArray, ...substitutions: any[]): ModuleTestBuilder;
+export function testModule(valueOrTemplate: any, ...substitutions: any[]): ModuleTestBuilder {
     return new ModuleTestBuilder(templateFromValue(valueOrTemplate), substitutions);
 }
