fix optional params to mock methods, allow all signatures

test/codegen/language/no_such_method_mock_test.dart

Index: test/codegen/language/no_such_method_mock_test.dart
diff --git a/test/codegen/language/no_such_method_mock_test.dart b/test/codegen/language/no_such_method_mock_test.dart
index 2bcf00b1b4371b97c591fe9cbc709b097357df3e..4a461b3af42568fc8e32710e829d24d8fd5356d5 100644
--- a/test/codegen/language/no_such_method_mock_test.dart
+++ b/test/codegen/language/no_such_method_mock_test.dart
@@ -7,7 +7,7 @@ import "package:expect/expect.dart";
 
 class Cat {
   bool eatFood(String food) => true;
-  int scratch(String furniture) => 100;
+  String scratch(String furniture) => 'purr';
 }
 
 class MockCat implements Cat {
@@ -24,9 +24,13 @@ class MockCat2 extends MockCat {
 
 class MockCat3 extends MockCat2 implements Cat {
   bool eatFood(String food, {double amount});
-  int scratch(String furniture, [String furniture2]);
+  String scratch(String furniture, [String furniture2]);
 
   dynamic noSuchMethod(Invocation invocation) {
+    if (invocation.memberName == #scratch) {
+      return invocation.positionalArguments.join(',');
+    }
+
     return (invocation.positionalArguments[0] as String).isNotEmpty &&
         invocation.namedArguments[#amount] > 0.5;
   }
@@ -39,6 +43,14 @@ class MockWithGenerics {
   noSuchMethod(i) => i.positionalArguments[0] + 100;
 }
 
+class MockWithGetterSetter {
+  get getter;
+  set setter(value);
+
+  Invocation invocation;
+  noSuchMethod(i) { invocation = i; }
+}
+
 
 void main() {
   MockCat mock = new MockCat();
@@ -46,8 +58,8 @@ void main() {
   Expect.isFalse(mock.eatFood(""));
 
   // In strong mode this will be a runtime type error:
-  // bool is not an int. VM will fail with noSuchMethod +.
-  Expect.throws(() => mock.scratch("couch") + 0);
+  // bool is not a String. VM will fail with noSuchMethod +.
+  Expect.throws(() => mock.scratch("couch") + '');

[vsm, 2016/08/01 23:14:32]

Does this really get to +?  That would be a soundness problem.  The stub for
Mock.scratch tests the result is String, right?

[Jennifer Messerly, 2016/08/01 23:18:00]

It doesn't get there in strong mode (nSM returns bool and cast fails to String).
It's for Dart VM if we merge this back into language tests (see comment).

[vsm, 2016/08/01 23:19:31]

Ah, misread your comment.  thanks.  :-)

 
   var mock2 = new MockCat2();
   Expect.isTrue(mock2.eatFood("cat food"));
@@ -55,8 +67,24 @@ void main() {
   var mock3 = new MockCat3();
   Expect.isTrue(mock3.eatFood("cat food", amount: 0.9));
   Expect.isFalse(mock3.eatFood("cat food", amount: 0.3));
+  Expect.equals(mock3.scratch("chair"), "chair");
+  Expect.equals(mock3.scratch("chair", "couch"), "chair,couch");
+  Expect.equals(mock3.scratch("chair", null), "chair,null");
+  Expect.equals(mock3.scratch("chair", ""), "chair,");
 
   var g = new MockWithGenerics();
   Expect.equals(g.doStuff(42), 142);
   Expect.throws(() => g.doStuff('hi'));
+
+  var s = new MockWithGetterSetter();
+  s.getter;
+  Expect.equals(s.invocation.positionalArguments.length, 0);
+  Expect.equals(s.invocation.isGetter, true);
+  Expect.equals(s.invocation.isSetter, false);
+  Expect.equals(s.invocation.isMethod, false);
+  s.setter = 42;
+  Expect.equals(s.invocation.positionalArguments.single, 42);
+  Expect.equals(s.invocation.isGetter, false);
+  Expect.equals(s.invocation.isSetter, true);
+  Expect.equals(s.invocation.isMethod, false);
 }