mirror of
https://github.com/dart-lang/sdk
synced 2024-09-15 23:29:47 +00:00
Tweaks for typed_mock.
1. Force dynamic type for 'any*' matchers, now we propagate types of top-level variables and fields, so using these matchers causes hints. 2. Remove equals() matcher, in conflicts with the one from unittest. R=brianwilkerson@google.com, paulberry@google.com BUG= Review URL: https://codereview.chromium.org//311893002 git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@36954 260f80e4-7a28-3924-810f-c04153c831b5
This commit is contained in:
parent
a89ae2f947
commit
6fe362f666
|
@ -115,7 +115,7 @@ class _InvocationMatcher {
|
|||
if (argument is ArgumentMatcher) {
|
||||
matcher = argument;
|
||||
} else {
|
||||
matcher = equals(argument);
|
||||
matcher = new _ArgumentMatcher_equals(argument);
|
||||
}
|
||||
_matchers.add(matcher);
|
||||
});
|
||||
|
@ -380,11 +380,6 @@ class _ArgumentMatcher_equals extends ArgumentMatcher {
|
|||
}
|
||||
}
|
||||
|
||||
/// Matches an argument that is equal to the given [expected] value.
|
||||
equals(expected) {
|
||||
return new _ArgumentMatcher_equals(expected);
|
||||
}
|
||||
|
||||
|
||||
class _ArgumentMatcher_anyBool extends ArgumentMatcher {
|
||||
@override
|
||||
|
@ -394,7 +389,7 @@ class _ArgumentMatcher_anyBool extends ArgumentMatcher {
|
|||
}
|
||||
|
||||
/// Matches any [bool] value.
|
||||
final anyBool = new _ArgumentMatcher_anyBool();
|
||||
final anyBool = new _ArgumentMatcher_anyBool() as dynamic;
|
||||
|
||||
|
||||
class _ArgumentMatcher_anyInt extends ArgumentMatcher {
|
||||
|
@ -405,7 +400,7 @@ class _ArgumentMatcher_anyInt extends ArgumentMatcher {
|
|||
}
|
||||
|
||||
/// Matches any [int] value.
|
||||
final anyInt = new _ArgumentMatcher_anyInt();
|
||||
final anyInt = new _ArgumentMatcher_anyInt() as dynamic;
|
||||
|
||||
|
||||
class _ArgumentMatcher_anyObject extends ArgumentMatcher {
|
||||
|
@ -416,7 +411,7 @@ class _ArgumentMatcher_anyObject extends ArgumentMatcher {
|
|||
}
|
||||
|
||||
/// Matches any [Object] (or subclass) value.
|
||||
final anyObject = new _ArgumentMatcher_anyObject();
|
||||
final anyObject = new _ArgumentMatcher_anyObject() as dynamic;
|
||||
|
||||
|
||||
class _ArgumentMatcher_anyString extends ArgumentMatcher {
|
||||
|
@ -427,4 +422,4 @@ class _ArgumentMatcher_anyString extends ArgumentMatcher {
|
|||
}
|
||||
|
||||
/// Matches any [String] value.
|
||||
final anyString = new _ArgumentMatcher_anyString();
|
||||
final anyString = new _ArgumentMatcher_anyString() as dynamic;
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
name: typed_mock
|
||||
version: 0.0.1
|
||||
version: 0.0.2
|
||||
author: Dart Team <misc@dartlang.org>
|
||||
description: A library for mocking classes using Mockito-like syntax
|
||||
homepage: http://www.dartlang.org
|
||||
|
|
|
@ -2,8 +2,7 @@ library test.typed_mock;
|
|||
|
||||
import 'package:unittest/unittest.dart';
|
||||
|
||||
import 'package:typed_mock/typed_mock.dart' hide equals;
|
||||
import 'package:typed_mock/typed_mock.dart' as typed_mocks show equals;
|
||||
import 'package:typed_mock/typed_mock.dart';
|
||||
|
||||
|
||||
abstract class TestInterface {
|
||||
|
@ -36,13 +35,6 @@ main() {
|
|||
});
|
||||
|
||||
group('Matchers', () {
|
||||
test('equals', () {
|
||||
expect(typed_mocks.equals(10).matches(10), true);
|
||||
expect(typed_mocks.equals(10).matches(20), false);
|
||||
expect(typed_mocks.equals('abc').matches('abc'), true);
|
||||
expect(typed_mocks.equals('abc').matches('xyz'), false);
|
||||
});
|
||||
|
||||
test('anyBool', () {
|
||||
expect(anyBool.matches(true), true);
|
||||
expect(anyBool.matches(false), true);
|
||||
|
|
Loading…
Reference in a new issue