Make matchers check type

NagRock · May 25, 2019 · e59b0c8 · e59b0c8
1 parent 4477bb1
commit e59b0c8
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 37 deletions.
diff --git a/src/ts-mockito.ts b/src/ts-mockito.ts
@@ -89,35 +89,35 @@ export function anyFunction(): any {
     return new AnyFunctionMatcher() as any;
 }
 
-export function anyNumber(): any {
+export function anyNumber(): number {
     return new AnyNumberMatcher() as any;
 }
 
-export function anyString(): any {
+export function anyString(): string {
     return new AnyStringMatcher() as any;
 }
 
 export function anything(): any {
     return new AnythingMatcher() as any;
 }
 
-export function between(min: number, max: number): any {
+export function between(min: number, max: number): number {
     return new BetweenMatcher(min, max) as any;
 }
 
-export function deepEqual(expectedValue: any): any {
-    return new DeepEqualMatcher(expectedValue);
+export function deepEqual<T>(expectedValue: T): T {
+    return new DeepEqualMatcher(expectedValue) as any;
 }
 
 export function notNull(): any {
     return new NotNullMatcher() as any;
 }
 
-export function strictEqual(expectedValue: any): any {
+export function strictEqual<T>(expectedValue: T): T {
     return new StrictEqualMatcher(expectedValue) as any;
 }
 
-export function match(expectedValue: RegExp | string): any {
+export function match(expectedValue: RegExp | string): string {
     return new MatchingStringMatcher(expectedValue) as any;
 }
 

diff --git a/test/MethodAction.spec.ts b/test/MethodAction.spec.ts
@@ -12,7 +12,7 @@ describe("MethodAction", () => {
                 const testObj: MethodAction = new MethodAction(methodName, [firstArg, secondArg]);
 
                 // when
-                const result = testObj.isApplicable(methodName, [strictEqual(firstArg), strictEqual(secondArg)]);
+                const result = testObj.isApplicable(methodName, [strictEqual(firstArg) as any, strictEqual(secondArg) as any]);
 
                 // then
                 expect(result).toBeTruthy();
@@ -28,7 +28,7 @@ describe("MethodAction", () => {
                 const testObj: MethodAction = new MethodAction(methodName, [firstArg, notMatchingArg]);
 
                 // when
-                const result = testObj.isApplicable(methodName, [strictEqual(firstArg), strictEqual(secondArg)]);
+                const result = testObj.isApplicable(methodName, [strictEqual(firstArg) as any, strictEqual(secondArg) as any]);
 
                 // then
                 expect(result).toBeFalsy();

diff --git a/test/MethodStub.spec.ts b/test/MethodStub.spec.ts
@@ -5,7 +5,7 @@ describe("ReturnValueMethodStub", () => {
     describe("checking if given arg is applicable", () => {
         it("returns true when arg match", () => {
             // given
-            const testObj: ReturnValueMethodStub = new ReturnValueMethodStub(0, [strictEqual(10)], 50);
+            const testObj: ReturnValueMethodStub = new ReturnValueMethodStub(0, [strictEqual(10) as any], 50);
 
             // when
             const result = testObj.isApplicable([10]);
@@ -16,7 +16,7 @@ describe("ReturnValueMethodStub", () => {
 
         it("returns false when arg doesn't match", () => {
             // given
-            const testObj: ReturnValueMethodStub = new ReturnValueMethodStub(0, [strictEqual(10)], 50);
+            const testObj: ReturnValueMethodStub = new ReturnValueMethodStub(0, [strictEqual(10) as any], 50);
 
             // when
             const result = testObj.isApplicable([999]);
@@ -31,7 +31,7 @@ describe("ReturnValueMethodStub", () => {
             // given
             const firstValue = 10;
             const secondValue = 20;
-            const testObj: ReturnValueMethodStub = new ReturnValueMethodStub(0, [strictEqual(firstValue), strictEqual(secondValue)], 50);
+            const testObj: ReturnValueMethodStub = new ReturnValueMethodStub(0, [strictEqual(firstValue) as any, strictEqual(secondValue) as any], 50);
 
             // when
             const result = testObj.isApplicable([firstValue, secondValue]);
@@ -44,7 +44,7 @@ describe("ReturnValueMethodStub", () => {
             // given
             const firstValue = 10;
             const secondValue = 20;
-            const testObj: ReturnValueMethodStub = new ReturnValueMethodStub(0, [strictEqual(firstValue), strictEqual(secondValue)], 50);
+            const testObj: ReturnValueMethodStub = new ReturnValueMethodStub(0, [strictEqual(firstValue) as any, strictEqual(secondValue) as any], 50);
 
             // when
             const result = testObj.isApplicable([30, secondValue]);
@@ -57,7 +57,7 @@ describe("ReturnValueMethodStub", () => {
             // given
             const firstValue = 10;
             const secondValue = 20;
-            const testObj: ReturnValueMethodStub = new ReturnValueMethodStub(0, [strictEqual(firstValue), strictEqual(secondValue)], 50);
+            const testObj: ReturnValueMethodStub = new ReturnValueMethodStub(0, [strictEqual(firstValue) as any, strictEqual(secondValue) as any], 50);
 
             // when
             const result = testObj.isApplicable([firstValue, 30]);
@@ -70,7 +70,7 @@ describe("ReturnValueMethodStub", () => {
             // given
             const firstValue = 10;
             const secondValue = 20;
-            const testObj: ReturnValueMethodStub = new ReturnValueMethodStub(0, [strictEqual(firstValue), strictEqual(secondValue)], 50);
+            const testObj: ReturnValueMethodStub = new ReturnValueMethodStub(0, [strictEqual(firstValue) as any, strictEqual(secondValue) as any], 50);
 
             // when
             const result = testObj.isApplicable([30, 40]);

diff --git a/test/matcher/type/AnyNumberMatcher.spec.ts b/test/matcher/type/AnyNumberMatcher.spec.ts
@@ -5,7 +5,7 @@ describe("AnyNumberMatcher", () => {
     describe("checking if positive number is matching", () => {
         it("returns true", () => {
             // given
-            const testObj: Matcher = anyNumber();
+            const testObj: Matcher = anyNumber() as any;
 
             // when
             const result = testObj.match(3);
@@ -18,7 +18,7 @@ describe("AnyNumberMatcher", () => {
     describe("checking if negative number is matching", () => {
         it("returns true", () => {
             // given
-            const testObj: Matcher = anyNumber();
+            const testObj: Matcher = anyNumber() as any;
 
             // when
             const result = testObj.match(-3);
@@ -31,7 +31,7 @@ describe("AnyNumberMatcher", () => {
     describe("checking if zero is matching", () => {
         it("returns true", () => {
             // given
-            const testObj: Matcher = anyNumber();
+            const testObj: Matcher = anyNumber() as any;
 
             // when
             const result = testObj.match(0);
@@ -44,7 +44,7 @@ describe("AnyNumberMatcher", () => {
     describe("checking if string representation of number is matching", () => {
         it("returns false", () => {
             // given
-            const testObj: Matcher = anyNumber();
+            const testObj: Matcher = anyNumber() as any;
 
             // when
             const result = testObj.match("5");
@@ -57,7 +57,7 @@ describe("AnyNumberMatcher", () => {
     describe("checking if object is matching", () => {
         it("returns false", () => {
             // given
-            const testObj: Matcher = anyNumber();
+            const testObj: Matcher = anyNumber() as any;
 
             // when
             const result = testObj.match({});

diff --git a/test/matcher/type/AnyStringMatcher.spec.ts b/test/matcher/type/AnyStringMatcher.spec.ts
@@ -5,7 +5,7 @@ describe("AnyStringMatcher", () => {
     describe("checking if number matches", () => {
         it("returns false", () => {
             // given
-            const testObj: Matcher = anyString();
+            const testObj: Matcher = anyString() as any;
 
             // when
             const result = testObj.match(3);
@@ -18,7 +18,7 @@ describe("AnyStringMatcher", () => {
     describe("checking if object matches", () => {
         it("returns false", () => {
             // given
-            const testObj: Matcher = anyString();
+            const testObj: Matcher = anyString() as any;
 
             // when
             const result = testObj.match({});
@@ -31,7 +31,7 @@ describe("AnyStringMatcher", () => {
     describe("checking if empty string matches", () => {
         it("returns true", () => {
             // given
-            const testObj: Matcher = anyString();
+            const testObj: Matcher = anyString() as any;
 
             // when
             const result = testObj.match("");
@@ -44,7 +44,7 @@ describe("AnyStringMatcher", () => {
     describe("checking if sample string matches", () => {
         it("returns true", () => {
             // given
-            const testObj: Matcher = anyString();
+            const testObj: Matcher = anyString() as any;
 
             // when
             const result = testObj.match("sampleString");

diff --git a/test/matcher/type/BetweenMatcher.spec.ts b/test/matcher/type/BetweenMatcher.spec.ts
@@ -3,7 +3,7 @@ import {between} from "../../../src/ts-mockito";
 
 describe("BetweenMatcher", () => {
     describe("checking if value matches given min and max", () => {
-        const testObj: Matcher = between(5, 10);
+        const testObj: Matcher = between(5, 10) as any;
 
         describe("when given value is lower than min", () => {
             it("returns false", () => {
@@ -61,7 +61,7 @@ describe("BetweenMatcher", () => {
             // when
             let error = null;
             try {
-                const testObj: Matcher = between(10, 9);
+                const testObj: Matcher = between(10, 9) as any;
             } catch (e) {
                 error = e;
             }

diff --git a/test/matcher/type/DeepEqualMatcher.spec.ts b/test/matcher/type/DeepEqualMatcher.spec.ts
@@ -7,7 +7,7 @@ describe("DeepEqualMatcher", () => {
             // given
             const firstValue = 3;
             const secondValue = 3;
-            const testObj: Matcher = deepEqual(firstValue);
+            const testObj: Matcher = deepEqual(firstValue) as any;
 
             // when
             const result = testObj.match(secondValue);
@@ -22,7 +22,7 @@ describe("DeepEqualMatcher", () => {
             // given
             const firstValue = "sampleString";
             const secondValue = "sampleString";
-            const testObj: Matcher = deepEqual(firstValue);
+            const testObj: Matcher = deepEqual(firstValue) as any;
 
             // when
             const result = testObj.match(secondValue);
@@ -37,7 +37,7 @@ describe("DeepEqualMatcher", () => {
             // given
             const firstValue = {a: 1, b: {c: 2}};
             const secondValue = {a: 1, b: {c: 2}};
-            const testObj: Matcher = deepEqual(firstValue);
+            const testObj: Matcher = deepEqual(firstValue) as any;
 
             // when
             const result = testObj.match(secondValue);
@@ -52,7 +52,7 @@ describe("DeepEqualMatcher", () => {
             // given
             const firstValue = {a: 1, b: {c: 2}};
             const secondValue = {a: 1, b: {c: 99999}};
-            const testObj: Matcher = deepEqual(firstValue);
+            const testObj: Matcher = deepEqual(firstValue) as any;
 
             // when
             const result = testObj.match(secondValue);
@@ -67,7 +67,7 @@ describe("DeepEqualMatcher", () => {
             // given
             const firstValue = {a: 1, b: anyString()};
             const secondValue = {a: 1, b: "2"};
-            const testObj: Matcher = deepEqual(firstValue);
+            const testObj: Matcher = deepEqual(firstValue) as any;
 
             // when
             const result = testObj.match(secondValue);
@@ -80,7 +80,7 @@ describe("DeepEqualMatcher", () => {
             // given
             const firstValue = {a: 1, b: anyString()};
             const secondValue = {a: 1, b: 2};
-            const testObj: Matcher = deepEqual(firstValue);
+            const testObj: Matcher = deepEqual(firstValue) as any;
 
             // when
             const result = testObj.match(secondValue);

diff --git a/test/matcher/type/MatchingStringMatcher.spec.ts b/test/matcher/type/MatchingStringMatcher.spec.ts
@@ -3,7 +3,7 @@ import {match} from "../../../src/ts-mockito";
 
 describe("MatchingStringMatcher", () => {
     describe("checking if value matches given regexp", () => {
-        const testObj: Matcher = match(/\w123/);
+        const testObj: Matcher = match(/\w123/) as any;
 
         describe("when given value matches regexp", () => {
             it("returns true", () => {

diff --git a/test/matcher/type/StrictEqualMatcher.spec.ts b/test/matcher/type/StrictEqualMatcher.spec.ts
@@ -5,7 +5,7 @@ describe("StrictEqualMatcher", () => {
     describe("checking if string representation of number matches with number", () => {
         it("returns false", () => {
             // given
-            const testObj: Matcher = strictEqual("5");
+            const testObj: Matcher = strictEqual("5") as any;
 
             // when
             const result = testObj.match(5);
@@ -18,7 +18,7 @@ describe("StrictEqualMatcher", () => {
     describe("checking if false matches with zero", () => {
         it("returns false", () => {
             // given
-            const testObj: Matcher = strictEqual(false);
+            const testObj: Matcher = strictEqual(false) as any;
 
             // when
             const result = testObj.match(0);
@@ -31,7 +31,7 @@ describe("StrictEqualMatcher", () => {
     describe("checking if true matches with one", () => {
         it("returns false", () => {
             // given
-            const testObj: Matcher = strictEqual(true);
+            const testObj: Matcher = strictEqual(true) as any;
 
             // when
             const result = testObj.match(1);
@@ -44,7 +44,7 @@ describe("StrictEqualMatcher", () => {
     describe("checking if same strings matches", () => {
         it("returns true", () => {
             // given
-            const testObj: Matcher = strictEqual("5");
+            const testObj: Matcher = strictEqual("5") as any;
 
             // when
             const result = testObj.match("5");