Skip to content
This repository was archived by the owner on Sep 16, 2022. It is now read-only.

Commit 5120e4c

Browse files
kevmooferhatb
authored andcommitted
Remove lib/testing_internal.dart
Closes #300 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=149775898
1 parent c26d23c commit 5120e4c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+139
-125
lines changed

lib/src/testing/internal.dart

Lines changed: 0 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import 'package:angular2/platform/testing/browser.dart';
66
import 'package:angular2/src/core/linker/app_view_utils.dart';
77
import 'package:angular2/src/core/reflection/reflection.dart';
88
import 'package:angular2/src/core/reflection/reflection_capabilities.dart';
9-
import 'package:matcher/matcher.dart';
109

1110
import "internal_injector.dart";
1211

@@ -119,71 +118,4 @@ void setBaseTestProviders(
119118
testInjector.reset();
120119
}
121120

122-
class _ThrowsWith extends Matcher {
123-
// RegExp or String.
124-
final expected;
125-
126-
_ThrowsWith(this.expected) {
127-
assert(expected is RegExp || expected is String);
128-
}
129-
130-
bool matches(item, Map matchState) {
131-
if (item is! Function) return false;
132-
133-
try {
134-
item();
135-
return false;
136-
} catch (e, s) {
137-
var errorString = e.toString();
138-
if (expected is String && errorString.contains(expected)) {
139-
return true;
140-
} else if (expected is RegExp && expected.hasMatch(errorString)) {
141-
return true;
142-
} else {
143-
addStateInfo(matchState, {'exception': errorString, 'stack': s});
144-
return false;
145-
}
146-
}
147-
}
148-
149-
Description describe(Description description) {
150-
if (expected is String) {
151-
return description
152-
.add('throws an error with a toString() containing ')
153-
.addDescriptionOf(expected);
154-
}
155-
156-
assert(expected is RegExp);
157-
return description
158-
.add('throws an error with a toString() matched with ')
159-
.addDescriptionOf(expected);
160-
}
161-
162-
Description describeMismatch(
163-
item, Description mismatchDescription, Map matchState, bool verbose) {
164-
if (item is! Function) {
165-
return mismatchDescription.add('is not a Function or Future');
166-
} else if (matchState['exception'] == null) {
167-
return mismatchDescription.add('did not throw');
168-
} else {
169-
if (expected is String) {
170-
mismatchDescription
171-
.add('threw an error with a toString() containing ')
172-
.addDescriptionOf(matchState['exception']);
173-
} else {
174-
assert(expected is RegExp);
175-
mismatchDescription
176-
.add('threw an error with a toString() matched with ')
177-
.addDescriptionOf(matchState['exception']);
178-
}
179-
if (verbose) {
180-
mismatchDescription.add(' at ').add(matchState['stack'].toString());
181-
}
182-
return mismatchDescription;
183-
}
184-
}
185-
}
186-
187-
Matcher throwsWith(message) => new _ThrowsWith(message);
188-
189121
TestInjector getTestInjector() => _testInjector;

lib/testing_internal.dart

Lines changed: 0 additions & 4 deletions
This file was deleted.

pubspec.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ dev_dependencies:
2929
build_runner: ^0.3.0
3030
build_test: ^0.4.0+1
3131
code_builder: '1.0.0-beta+3'
32-
matcher: '>=0.12.0 <0.12.1'
3332
mockito: '>=0.11.0 <2.0.0'
3433
source_gen: ^0.5.4
3534
quiver: '>=0.21.4 <0.25.0'

test/common/directives/ng_class_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ library angular2.test.common.directives.ng_class_test;
44
import "package:angular2/core.dart" show Component;
55
import 'package:angular2/common.dart' show NgFor;
66
import "package:angular2/src/common/directives/ng_class.dart";
7-
import "package:angular2/testing_internal.dart";
7+
import "package:angular2/src/testing/internal.dart";
88
import 'package:test/test.dart';
99

1010
void detectChangesAndCheckClasses(ComponentFixture fixture, String classes) {

test/common/directives/ng_for_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import "package:angular2/core.dart" show Component, TemplateRef, ContentChild;
55
import "package:angular2/src/common/directives/ng_for.dart" show NgFor;
66
import "package:angular2/src/common/directives/ng_if.dart" show NgIf;
77
import 'package:angular2/src/facade/exceptions.dart' show BaseException;
8-
import "package:angular2/testing_internal.dart";
8+
import "package:angular2/src/testing/internal.dart";
99
import 'package:test/test.dart';
1010

1111
void main() {

test/common/directives/ng_style_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import 'dart:html';
55

66
import "package:angular2/core.dart" show Component;
77
import "package:angular2/src/common/directives/ng_style.dart" show NgStyle;
8-
import "package:angular2/testing_internal.dart";
8+
import "package:angular2/src/testing/internal.dart";
99
import 'package:test/test.dart';
1010

1111
void main() {

test/common/directives/ng_switch_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ library angular2.test.common.directives.ng_switch_test;
44
import "package:angular2/core.dart" show Component;
55
import "package:angular2/src/common/directives/ng_switch.dart"
66
show NgSwitch, NgSwitchWhen, NgSwitchDefault;
7-
import "package:angular2/testing_internal.dart";
7+
import "package:angular2/src/testing/internal.dart";
88
import 'package:test/test.dart';
99

1010
void main() {

test/common/directives/non_bindable_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import 'dart:html';
55

66
import "package:angular2/core.dart" show Component, Directive;
77
import "package:angular2/src/core/linker/element_ref.dart" show ElementRef;
8-
import "package:angular2/testing_internal.dart";
8+
import "package:angular2/src/testing/internal.dart";
99
import 'package:test/test.dart';
1010

1111
void main() {

test/common/forms/directives_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import 'package:angular2/src/common/forms/directives/shared.dart'
2323
show selectValueAccessor, composeValidators;
2424
import 'package:angular2/src/core/change_detection.dart' show SimpleChange;
2525
import 'package:angular2/src/core/linker/element_ref.dart';
26-
import 'package:angular2/testing_internal.dart';
26+
import 'package:angular2/src/testing/internal.dart';
2727
import 'package:mockito/mockito.dart';
2828
import 'package:test/test.dart';
2929

test/common/forms/integration_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import "package:angular2/core.dart"
1010
show Component, Directive, Output, EventEmitter;
1111
import "package:angular2/core.dart" show Provider, Input;
1212
import "package:angular2/src/common/forms/validators.dart";
13-
import "package:angular2/testing_internal.dart";
13+
import "package:angular2/src/testing/internal.dart";
1414
import 'package:js/js.dart';
1515
import 'package:test/test.dart';
1616

0 commit comments

Comments
 (0)