issue 48 - validating arguments count while verifying call count

NagRock · Oct 4, 2017 · 9822df4 · 9822df4
1 parent a14a3ef
commit 9822df4
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 2 deletions.
diff --git a/src/MethodAction.ts b/src/MethodAction.ts
@@ -9,7 +9,9 @@ export class MethodAction {
     }
 
     public isApplicable(methodName: string, matchers: Matcher[]): boolean {
-        if (this.methodName !== methodName) {
+        const methodNameMatch = this.methodName === methodName;
+        const argumentsCountMatch = this.args.length == matchers.length;
+        if (!methodNameMatch || !argumentsCountMatch) {
             return false;
         }
         let allValid = true;

diff --git a/test/utils/Foo.ts b/test/utils/Foo.ts
@@ -30,4 +30,8 @@ export class Foo {
     public sampleMethodWithOptionalArgument(a: number, b?: number): number {
         return a + b;
     }
-}
+
+    public sampleMethodWithTwoOptionalArguments(a?: number, b?:number): number {
+        return a + b;
+    }
+}
diff --git a/test/verification.spec.ts b/test/verification.spec.ts
@@ -87,6 +87,37 @@ describe("verifying mocked object", () => {
             });
         });
 
+        describe("and arguments are optional", () => {
+            describe("but just first one is given", () => {
+                it("throws error", () => {
+                    // given
+                    foo.sampleMethodWithTwoOptionalArguments(5);
+
+                    // when
+                    let error;
+                    try {
+                        verify(mockedFoo.sampleMethodWithTwoOptionalArguments(5, 6)).called();
+                    } catch (e) {
+                        error = e;
+                    }
+                    expect(error).toBeTruthy();
+                });
+            });
+        });
+
+        describe("and arguments are optional", () => {
+            it("verifies call count correctly", () => {
+                // given
+                foo.sampleMethodWithTwoOptionalArguments(5);
+                foo.sampleMethodWithTwoOptionalArguments(5);
+                foo.sampleMethodWithTwoOptionalArguments(5, 6);
+
+                // when
+                verify(mockedFoo.sampleMethodWithTwoOptionalArguments(5)).twice();
+                verify(mockedFoo.sampleMethodWithTwoOptionalArguments(5, 6)).once();
+            });
+        });
+
         describe("but two has occurred", () => {
             it("throws error", () => {
                 // given