fix optional params to mock methods, allow all signatures

test/codegen_expected/language/no_such_method_mock_test.js

Index: test/codegen_expected/language/no_such_method_mock_test.js
diff --git a/test/codegen_expected/language/no_such_method_mock_test.js b/test/codegen_expected/language/no_such_method_mock_test.js
index c7174245a49c2f99d7355c491408490ad07ff783..9c014bc39d744658c9237366bb88d53c58f89d28 100644
--- a/test/codegen_expected/language/no_such_method_mock_test.js
+++ b/test/codegen_expected/language/no_such_method_mock_test.js
@@ -8,52 +8,56 @@ dart_library.library('language/no_such_method_mock_test', null, /* Imports */[
   const dartx = dart_sdk.dartx;
   const expect$ = expect.expect;
   const no_such_method_mock_test = Object.create(null);
-  let VoidToint = () => (VoidToint = dart.constFn(dart.definiteFunctionType(core.int, [])))();
+  let VoidToString = () => (VoidToString = dart.constFn(dart.definiteFunctionType(core.String, [])))();
   let VoidTovoid = () => (VoidTovoid = dart.constFn(dart.definiteFunctionType(dart.void, [])))();
   no_such_method_mock_test.Cat = class Cat extends core.Object {
     eatFood(food) {
       return true;
     }
     scratch(furniture) {
-      return 100;
+      return 'purr';
     }
   };
   dart.setSignature(no_such_method_mock_test.Cat, {
     methods: () => ({
       eatFood: dart.definiteFunctionType(core.bool, [core.String]),
-      scratch: dart.definiteFunctionType(core.int, [core.String])
+      scratch: dart.definiteFunctionType(core.String, [core.String])
     })
   });
   no_such_method_mock_test.MockCat = class MockCat extends core.Object {
     noSuchMethod(invocation) {
       return core.String.as(invocation.positionalArguments[dartx.get](0))[dartx.isNotEmpty];
     }
-    eatFood(food) {
-      return core.bool._check(this.noSuchMethod(new dart.InvocationImpl('eatFood', [food], {isMethod: true})));
+    eatFood(...args) {
+      return core.bool._check(this.noSuchMethod(new dart.InvocationImpl('eatFood', args, {isMethod: true})));
     }
-    scratch(furniture) {
-      return core.int._check(this.noSuchMethod(new dart.InvocationImpl('scratch', [furniture], {isMethod: true})));
+    scratch(...args) {
+      return core.String._check(this.noSuchMethod(new dart.InvocationImpl('scratch', args, {isMethod: true})));
     }
   };
   no_such_method_mock_test.MockCat[dart.implements] = () => [no_such_method_mock_test.Cat];
   no_such_method_mock_test.MockCat2 = class MockCat2 extends no_such_method_mock_test.MockCat {
-    eatFood(food) {
-      return core.bool._check(this.noSuchMethod(new dart.InvocationImpl('eatFood', [food], {isMethod: true})));
+    eatFood(...args) {
+      return core.bool._check(this.noSuchMethod(new dart.InvocationImpl('eatFood', args, {isMethod: true})));
     }
-    scratch(furniture) {
-      return core.int._check(this.noSuchMethod(new dart.InvocationImpl('scratch', [furniture], {isMethod: true})));
+    scratch(...args) {
+      return core.String._check(this.noSuchMethod(new dart.InvocationImpl('scratch', args, {isMethod: true})));
     }
   };
   let const$;
+  let const$0;
   no_such_method_mock_test.MockCat3 = class MockCat3 extends no_such_method_mock_test.MockCat2 {
     noSuchMethod(invocation) {
-      return dart.test(core.String.as(invocation.positionalArguments[dartx.get](0))[dartx.isNotEmpty]) && dart.test(dart.dsend(invocation.namedArguments[dartx.get](const$ || (const$ = dart.const(core.Symbol.new('amount')))), '>', 0.5));
+      if (dart.equals(invocation.memberName, const$ || (const$ = dart.const(core.Symbol.new('scratch'))))) {
+        return invocation.positionalArguments[dartx.join](',');
+      }
+      return dart.test(core.String.as(invocation.positionalArguments[dartx.get](0))[dartx.isNotEmpty]) && dart.test(dart.dsend(invocation.namedArguments[dartx.get](const$0 || (const$0 = dart.const(core.Symbol.new('amount')))), '>', 0.5));
     }
-    eatFood(food, opts) {
-      return core.bool._check(this.noSuchMethod(new dart.InvocationImpl('eatFood', [food], {namedArguments: opts, isMethod: true})));
+    eatFood(...args) {
+      return core.bool._check(this.noSuchMethod(new dart.InvocationImpl('eatFood', args, {namedArguments: dart.extractNamedArgs(args), isMethod: true})));
     }
-    scratch(furniture, furniture2) {
-      return core.int._check(this.noSuchMethod(new dart.InvocationImpl('scratch', [furniture, furniture2], {isMethod: true})));
+    scratch(...args) {
+      return core.String._check(this.noSuchMethod(new dart.InvocationImpl('scratch', args, {isMethod: true})));
     }
   };
   no_such_method_mock_test.MockCat3[dart.implements] = () => [no_such_method_mock_test.Cat];
@@ -62,24 +66,53 @@ dart_library.library('language/no_such_method_mock_test', null, /* Imports */[
       return dart.dsend(i.positionalArguments[dartx.get](0), '+', 100);
     }
     doStuff(T) {
-      return t => {
-        return T._check(this.noSuchMethod(new dart.InvocationImpl('doStuff', [t], {isMethod: true})));
+      return (...args) => {
+        return T._check(this.noSuchMethod(new dart.InvocationImpl('doStuff', args, {isMethod: true})));
       };
     }
   };
+  no_such_method_mock_test.MockWithGetterSetter = class MockWithGetterSetter extends core.Object {
+    new() {
+      this.invocation = null;
+    }
+    noSuchMethod(i) {
+      this.invocation = i;
+    }
+    get getter() {
+      return this.noSuchMethod(new dart.InvocationImpl('getter', [], {isGetter: true}));
+    }
+    set setter(args) {
+      return dart.void._check(this.noSuchMethod(new dart.InvocationImpl('setter', [args], {isSetter: true})));
+    }
+  };
   no_such_method_mock_test.main = function() {
     let mock = new no_such_method_mock_test.MockCat();
     expect$.Expect.isTrue(dart.dsend(mock, 'eatFood', "cat food"));
     expect$.Expect.isFalse(mock.eatFood(""));
-    expect$.Expect.throws(dart.fn(() => dart.notNull(mock.scratch("couch")) + 0, VoidToint()));
+    expect$.Expect.throws(dart.fn(() => dart.notNull(mock.scratch("couch")) + '', VoidToString()));
     let mock2 = new no_such_method_mock_test.MockCat2();
     expect$.Expect.isTrue(mock2.eatFood("cat food"));
     let mock3 = new no_such_method_mock_test.MockCat3();
     expect$.Expect.isTrue(mock3.eatFood("cat food", {amount: 0.9}));
     expect$.Expect.isFalse(mock3.eatFood("cat food", {amount: 0.3}));
+    expect$.Expect.equals(mock3.scratch("chair"), "chair");
+    expect$.Expect.equals(mock3.scratch("chair", "couch"), "chair,couch");
+    expect$.Expect.equals(mock3.scratch("chair", null), "chair,null");
+    expect$.Expect.equals(mock3.scratch("chair", ""), "chair,");
     let g = new no_such_method_mock_test.MockWithGenerics();
     expect$.Expect.equals(g.doStuff(core.int)(42), 142);
     expect$.Expect.throws(dart.fn(() => g.doStuff(dart.dynamic)('hi'), VoidTovoid()));
+    let s = new no_such_method_mock_test.MockWithGetterSetter();
+    s.getter;
+    expect$.Expect.equals(s.invocation.positionalArguments[dartx.length], 0);
+    expect$.Expect.equals(s.invocation.isGetter, true);
+    expect$.Expect.equals(s.invocation.isSetter, false);
+    expect$.Expect.equals(s.invocation.isMethod, false);
+    s.setter = 42;
+    expect$.Expect.equals(s.invocation.positionalArguments[dartx.single], 42);
+    expect$.Expect.equals(s.invocation.isGetter, false);
+    expect$.Expect.equals(s.invocation.isSetter, true);
+    expect$.Expect.equals(s.invocation.isMethod, false);
   };
   dart.fn(no_such_method_mock_test.main, VoidTovoid());
   // Exports: