feature: update exported pkg:matcher to 0.12.3 (#882)

Updated test to make new output of Type mismatch errors
Update usage of isInstanceOf to TypeMatcher

CHANGELOG.md

@@ -4,6 +4,30 @@
   and groups marked as solo will be run. It is still recommended that users
   instead filter their tests by using the runner argument `-n`.
 
+* Updated exported `package:matcher` to `0.12.3` which includes these updates:
+
+  - Many improvements to `TypeMatcher`
+    - Can now be used directly as `const TypeMatcher<MyType>()`.
+    - Added a type parameter to specify the target `Type`. 
+      - Made the `name` constructor parameter optional and marked it deprecated.
+        It's redundant to the type parameter.
+    - Migrated all `isType` matchers to `TypeMatcher`.
+    - Added a `having` function that allows chained validations of specific
+      features of the target type.
+
+      ```dart
+      /// Validates that the object is a [RangeError] with a message containing
+      /// the string 'details' and `start` and `end` properties that are `null`.
+      final _rangeMatcher = isRangeError
+         .having((e) => e.message, 'message', contains('details'))
+         .having((e) => e.start, 'start', isNull)
+         .having((e) => e.end, 'end', isNull);
+      ```
+
+  - Deprecated the `isInstanceOf` class. Use `TypeMatcher` instead.
+
+  - Improved the output of `Matcher` instances that fail due to type errors.
+
 ## 0.12.41
 
 * Add support for debugging VM tests.

lib/src/frontend/async_matcher.dart

@@ -35,8 +35,8 @@ abstract class AsyncMatcher extends Matcher {
         result,
         anyOf([
           equals(null),
-          new isInstanceOf<Future>(),
-          new isInstanceOf<String>()
+          new TypeMatcher<Future>(),
+          new TypeMatcher<String>()
         ]),
         reason: "matchAsync() may only return a String, a Future, or null.");
 

lib/src/frontend/expect.dart

@@ -124,8 +124,8 @@ Future _expect(actual, matcher,
         result,
         anyOf([
           equals(null),
-          new isInstanceOf<Future>(),
-          new isInstanceOf<String>()
+          new TypeMatcher<Future>(),
+          new TypeMatcher<String>()
         ]),
         reason: "matchAsync() may only return a String, a Future, or null.");
 

pubspec.yaml

@@ -40,7 +40,7 @@ dependencies:
 
   # Use a tight version constraint to ensure that a constraint on matcher
   # properly constrains all features it provides.
-  matcher: '>=0.12.2 <0.12.3'
+  matcher: '>=0.12.3 <0.12.4'
 dev_dependencies:
   fake_async: '>=0.1.2 <2.0.0'
   shelf_test_handler: '^1.0.0'

test/backend/declarer_test.dart

@@ -313,7 +313,7 @@ void main() {
       var testGroup = entries.single as Group;
       expect(testGroup.name, equals("group"));
       expect(testGroup.entries, hasLength(1));
-      expect(testGroup.entries.single, new isInstanceOf<Test>());
+      expect(testGroup.entries.single, new TypeMatcher<Test>());
       expect(testGroup.entries.single.name, "group description");
     });
 
@@ -328,7 +328,7 @@ void main() {
       var testGroup = entries.single as Group;
       expect(testGroup.name, equals("Object"));
       expect(testGroup.entries, hasLength(1));
-      expect(testGroup.entries.single, new isInstanceOf<Test>());
+      expect(testGroup.entries.single, new TypeMatcher<Test>());
       expect(testGroup.entries.single.name, "Object description");
     });
 
@@ -343,7 +343,7 @@ void main() {
       var testGroup = entries.single as Group;
       expect(testGroup.metadata.timeout.scaleFactor, equals(2));
       expect(testGroup.entries, hasLength(1));
-      expect(testGroup.entries.single, new isInstanceOf<Test>());
+      expect(testGroup.entries.single, new TypeMatcher<Test>());
       expect(testGroup.entries.single.metadata.timeout.scaleFactor, equals(6));
     });
 
@@ -359,7 +359,7 @@ void main() {
       expect(testGroup.metadata.timeout.duration,
           equals(new Duration(seconds: 10)));
       expect(testGroup.entries, hasLength(1));
-      expect(testGroup.entries.single, new isInstanceOf<Test>());
+      expect(testGroup.entries.single, new TypeMatcher<Test>());
       expect(testGroup.entries.single.metadata.timeout.duration,
           equals(new Duration(seconds: 20)));
     });
@@ -376,7 +376,7 @@ void main() {
       expect(testGroup.metadata.timeout.duration,
           equals(new Duration(seconds: 10)));
       expect(testGroup.entries, hasLength(1));
-      expect(testGroup.entries.single, new isInstanceOf<Test>());
+      expect(testGroup.entries.single, new TypeMatcher<Test>());
       expect(testGroup.entries.single.metadata.timeout.duration,
           equals(new Duration(seconds: 15)));
     });

test/backend/invoker_test.dart

@@ -438,7 +438,7 @@ void main() {
         expectErrors(liveTest, [
           (error) {
             expect(lastState.status, equals(Status.complete));
-            expect(error, new isInstanceOf<TimeoutException>());
+            expect(error, new TypeMatcher<TimeoutException>());
           }
         ]);
 
@@ -464,7 +464,7 @@ void main() {
         expectErrors(liveTest, [
           (error) {
             expect(lastState.status, equals(Status.complete));
-            expect(error, new isInstanceOf<TimeoutException>());
+            expect(error, new TypeMatcher<TimeoutException>());
           }
         ]);
 
@@ -488,7 +488,7 @@ void main() {
         expectErrors(liveTest, [
           (error) {
             expect(lastState.status, equals(Status.complete));
-            expect(error, new isInstanceOf<TimeoutException>());
+            expect(error, new TypeMatcher<TimeoutException>());
           }
         ]);
 

test/frontend/matcher/throws_type_test.dart

@@ -17,7 +17,8 @@ void main() {
         expect(() => throw new Exception(), throwsArgumentError);
       });
 
-      expectTestFailed(liveTest, startsWith("Expected: throws ArgumentError"));
+      expectTestFailed(liveTest,
+          startsWith("Expected: throws <Instance of 'ArgumentError'>"));
     });
   });
 
@@ -33,7 +34,9 @@ void main() {
       });
 
       expectTestFailed(
-          liveTest, startsWith("Expected: throws ConcurrentModificationError"));
+          liveTest,
+          startsWith(
+              "Expected: throws <Instance of 'ConcurrentModificationError'>"));
     });
   });
 
@@ -49,7 +52,9 @@ void main() {
       });
 
       expectTestFailed(
-          liveTest, startsWith("Expected: throws CyclicInitializationError"));
+          liveTest,
+          startsWith(
+              "Expected: throws <Instance of 'CyclicInitializationError'>"));
     });
   });
 
@@ -63,7 +68,8 @@ void main() {
         expect(() => throw 'oh no', throwsException);
       });
 
-      expectTestFailed(liveTest, startsWith("Expected: throws Exception"));
+      expectTestFailed(
+          liveTest, startsWith("Expected: throws <Instance of 'Exception'>"));
     });
   });
 
@@ -77,8 +83,8 @@ void main() {
         expect(() => throw new Exception(), throwsFormatException);
       });
 
-      expectTestFailed(
-          liveTest, startsWith("Expected: throws FormatException"));
+      expectTestFailed(liveTest,
+          startsWith("Expected: throws <Instance of 'FormatException'>"));
     });
   });
 
@@ -94,8 +100,8 @@ void main() {
         expect(() => throw new Exception(), throwsNoSuchMethodError);
       });
 
-      expectTestFailed(
-          liveTest, startsWith("Expected: throws NoSuchMethodError"));
+      expectTestFailed(liveTest,
+          startsWith("Expected: throws <Instance of 'NoSuchMethodError'>"));
     });
   });
 
@@ -109,8 +115,8 @@ void main() {
         expect(() => throw new Exception(), throwsNullThrownError);
       });
 
-      expectTestFailed(
-          liveTest, startsWith("Expected: throws NullThrownError"));
+      expectTestFailed(liveTest,
+          startsWith("Expected: throws <Instance of 'NullThrownError'>"));
     });
   });
 
@@ -124,7 +130,8 @@ void main() {
         expect(() => throw new Exception(), throwsRangeError);
       });
 
-      expectTestFailed(liveTest, startsWith("Expected: throws RangeError"));
+      expectTestFailed(
+          liveTest, startsWith("Expected: throws <Instance of 'RangeError'>"));
     });
   });
 
@@ -138,7 +145,8 @@ void main() {
         expect(() => throw new Exception(), throwsStateError);
       });
 
-      expectTestFailed(liveTest, startsWith("Expected: throws StateError"));
+      expectTestFailed(
+          liveTest, startsWith("Expected: throws <Instance of 'StateError'>"));
     });
   });
 
@@ -152,8 +160,8 @@ void main() {
         expect(() => throw new Exception(), throwsUnimplementedError);
       });
 
-      expectTestFailed(
-          liveTest, startsWith("Expected: throws UnimplementedError"));
+      expectTestFailed(liveTest,
+          startsWith("Expected: throws <Instance of 'UnimplementedError'>"));
     });
   });
 
@@ -167,8 +175,8 @@ void main() {
         expect(() => throw new Exception(), throwsUnsupportedError);
       });
 
-      expectTestFailed(
-          liveTest, startsWith("Expected: throws UnsupportedError"));
+      expectTestFailed(liveTest,
+          startsWith("Expected: throws <Instance of 'UnsupportedError'>"));
     });
   });
 }

test/runner/hybrid_test.dart

@@ -168,7 +168,7 @@ void main() {
         }
       """);
 
-      expect(channel.stream.first, throwsA(new isInstanceOf<TestFailure>()));
+      expect(channel.stream.first, throwsA(new TypeMatcher<TestFailure>()));
     });
 
     test("gracefully handles an unserializable message in the VM", () {
@@ -582,6 +582,6 @@ void _spawnHybridUriTests([Iterable<String> arguments]) {
   test("emits an error from the stream channel if the isolate fails to load",
       () {
     expect(spawnHybridUri("non existent file").stream.first,
-        throwsA(new isInstanceOf<IsolateSpawnException>()));
+        throwsA(new TypeMatcher<IsolateSpawnException>()));
   });
 }