Remove lib/testing_internal.dart

Closes #300 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=149775898
angulardart · Mar 10, 2017 · 5120e4c · 5120e4c
1 parent c26d23c
commit 5120e4c
Show file tree

Hide file tree

Showing 53 changed files with 139 additions and 125 deletions.
diff --git a/lib/src/testing/internal.dart b/lib/src/testing/internal.dart
@@ -6,7 +6,6 @@ import 'package:angular2/platform/testing/browser.dart';
 import 'package:angular2/src/core/linker/app_view_utils.dart';
 import 'package:angular2/src/core/reflection/reflection.dart';
 import 'package:angular2/src/core/reflection/reflection_capabilities.dart';
-import 'package:matcher/matcher.dart';
 
 import "internal_injector.dart";
 
@@ -119,71 +118,4 @@ void setBaseTestProviders(
   testInjector.reset();
 }
 
-class _ThrowsWith extends Matcher {
-  // RegExp or String.
-  final expected;
-
-  _ThrowsWith(this.expected) {
-    assert(expected is RegExp || expected is String);
-  }
-
-  bool matches(item, Map matchState) {
-    if (item is! Function) return false;
-
-    try {
-      item();
-      return false;
-    } catch (e, s) {
-      var errorString = e.toString();
-      if (expected is String && errorString.contains(expected)) {
-        return true;
-      } else if (expected is RegExp && expected.hasMatch(errorString)) {
-        return true;
-      } else {
-        addStateInfo(matchState, {'exception': errorString, 'stack': s});
-        return false;
-      }
-    }
-  }
-
-  Description describe(Description description) {
-    if (expected is String) {
-      return description
-          .add('throws an error with a toString() containing ')
-          .addDescriptionOf(expected);
-    }
-
-    assert(expected is RegExp);
-    return description
-        .add('throws an error with a toString() matched with ')
-        .addDescriptionOf(expected);
-  }
-
-  Description describeMismatch(
-      item, Description mismatchDescription, Map matchState, bool verbose) {
-    if (item is! Function) {
-      return mismatchDescription.add('is not a Function or Future');
-    } else if (matchState['exception'] == null) {
-      return mismatchDescription.add('did not throw');
-    } else {
-      if (expected is String) {
-        mismatchDescription
-            .add('threw an error with a toString() containing ')
-            .addDescriptionOf(matchState['exception']);
-      } else {
-        assert(expected is RegExp);
-        mismatchDescription
-            .add('threw an error with a toString() matched with ')
-            .addDescriptionOf(matchState['exception']);
-      }
-      if (verbose) {
-        mismatchDescription.add(' at ').add(matchState['stack'].toString());
-      }
-      return mismatchDescription;
-    }
-  }
-}
-
-Matcher throwsWith(message) => new _ThrowsWith(message);
-
 TestInjector getTestInjector() => _testInjector;
diff --git a/lib/testing_internal.dart b/lib/testing_internal.dart
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -29,7 +29,6 @@ dev_dependencies:
   build_runner: ^0.3.0
   build_test: ^0.4.0+1
   code_builder: '1.0.0-beta+3'
-  matcher: '>=0.12.0 <0.12.1'
   mockito: '>=0.11.0 <2.0.0'
   source_gen: ^0.5.4
   quiver: '>=0.21.4 <0.25.0'

diff --git a/test/common/directives/ng_class_test.dart b/test/common/directives/ng_class_test.dart
@@ -4,7 +4,7 @@ library angular2.test.common.directives.ng_class_test;
 import "package:angular2/core.dart" show Component;
 import 'package:angular2/common.dart' show NgFor;
 import "package:angular2/src/common/directives/ng_class.dart";
-import "package:angular2/testing_internal.dart";
+import "package:angular2/src/testing/internal.dart";
 import 'package:test/test.dart';
 
 void detectChangesAndCheckClasses(ComponentFixture fixture, String classes) {

diff --git a/test/common/directives/ng_for_test.dart b/test/common/directives/ng_for_test.dart
@@ -5,7 +5,7 @@ import "package:angular2/core.dart" show Component, TemplateRef, ContentChild;
 import "package:angular2/src/common/directives/ng_for.dart" show NgFor;
 import "package:angular2/src/common/directives/ng_if.dart" show NgIf;
 import 'package:angular2/src/facade/exceptions.dart' show BaseException;
-import "package:angular2/testing_internal.dart";
+import "package:angular2/src/testing/internal.dart";
 import 'package:test/test.dart';
 
 void main() {

diff --git a/test/common/directives/ng_style_test.dart b/test/common/directives/ng_style_test.dart
@@ -5,7 +5,7 @@ import 'dart:html';
 
 import "package:angular2/core.dart" show Component;
 import "package:angular2/src/common/directives/ng_style.dart" show NgStyle;
-import "package:angular2/testing_internal.dart";
+import "package:angular2/src/testing/internal.dart";
 import 'package:test/test.dart';
 
 void main() {

diff --git a/test/common/directives/ng_switch_test.dart b/test/common/directives/ng_switch_test.dart
@@ -4,7 +4,7 @@ library angular2.test.common.directives.ng_switch_test;
 import "package:angular2/core.dart" show Component;
 import "package:angular2/src/common/directives/ng_switch.dart"
     show NgSwitch, NgSwitchWhen, NgSwitchDefault;
-import "package:angular2/testing_internal.dart";
+import "package:angular2/src/testing/internal.dart";
 import 'package:test/test.dart';
 
 void main() {

diff --git a/test/common/directives/non_bindable_test.dart b/test/common/directives/non_bindable_test.dart
@@ -5,7 +5,7 @@ import 'dart:html';
 
 import "package:angular2/core.dart" show Component, Directive;
 import "package:angular2/src/core/linker/element_ref.dart" show ElementRef;
-import "package:angular2/testing_internal.dart";
+import "package:angular2/src/testing/internal.dart";
 import 'package:test/test.dart';
 
 void main() {

diff --git a/test/common/forms/directives_test.dart b/test/common/forms/directives_test.dart
@@ -23,7 +23,7 @@ import 'package:angular2/src/common/forms/directives/shared.dart'
     show selectValueAccessor, composeValidators;
 import 'package:angular2/src/core/change_detection.dart' show SimpleChange;
 import 'package:angular2/src/core/linker/element_ref.dart';
-import 'package:angular2/testing_internal.dart';
+import 'package:angular2/src/testing/internal.dart';
 import 'package:mockito/mockito.dart';
 import 'package:test/test.dart';
 

diff --git a/test/common/forms/integration_test.dart b/test/common/forms/integration_test.dart
@@ -10,7 +10,7 @@ import "package:angular2/core.dart"
     show Component, Directive, Output, EventEmitter;
 import "package:angular2/core.dart" show Provider, Input;
 import "package:angular2/src/common/forms/validators.dart";
-import "package:angular2/testing_internal.dart";
+import "package:angular2/src/testing/internal.dart";
 import 'package:js/js.dart';
 import 'package:test/test.dart';
 

diff --git a/test/common/forms/model_test.dart b/test/common/forms/model_test.dart
@@ -5,7 +5,7 @@ import 'dart:async';
 
 import 'package:angular2/common.dart'
     show AbstractControl, ControlGroup, Control, ControlArray, Validators;
-import "package:angular2/testing_internal.dart";
+import "package:angular2/src/testing/internal.dart";
 import 'package:test/test.dart';
 
 void main() {

diff --git a/test/common/forms/validators_test.dart b/test/common/forms/validators_test.dart
@@ -4,7 +4,7 @@ library angular2.test.common.forms.validators_spec;
 import "dart:async";
 
 import 'package:angular2/common.dart' show Control, Validators, AbstractControl;
-import "package:angular2/testing_internal.dart";
+import "package:angular2/src/testing/internal.dart";
 import 'package:test/test.dart';
 
 typedef Future AsyncValidatorFunction(AbstractControl ac);

diff --git a/test/common/pipes/async_pipe_test.dart b/test/common/pipes/async_pipe_test.dart
@@ -6,7 +6,7 @@ import 'dart:async';
 import 'package:angular2/angular2.dart' show AsyncPipe;
 import 'package:angular2/core.dart' show WrappedValue;
 import 'package:angular2/src/facade/async.dart' show EventEmitter;
-import 'package:angular2/testing_internal.dart';
+import 'package:angular2/src/testing/internal.dart';
 import 'package:mockito/mockito.dart';
 import 'package:test/test.dart';
 

diff --git a/test/common/pipes/date_pipe_test.dart b/test/common/pipes/date_pipe_test.dart
@@ -3,7 +3,7 @@ library angular2.test.common.pipes.date_pipe_test;
 
 import 'package:angular2/angular2.dart' show DatePipe;
 import 'package:angular2/src/compiler/pipe_resolver.dart' show PipeResolver;
-import 'package:angular2/testing_internal.dart';
+import 'package:angular2/src/testing/internal.dart';
 import 'package:test/test.dart';
 
 void main() {

diff --git a/test/common/pipes/json_pipe_test.dart b/test/common/pipes/json_pipe_test.dart
@@ -5,7 +5,7 @@ import 'dart:convert';
 
 import 'package:angular2/angular2.dart' show JsonPipe;
 import 'package:angular2/core.dart' show Component;
-import 'package:angular2/testing_internal.dart';
+import 'package:angular2/src/testing/internal.dart';
 import 'package:test/test.dart';
 
 void main() {

diff --git a/test/common/pipes/slice_pipe_test.dart b/test/common/pipes/slice_pipe_test.dart
@@ -3,7 +3,7 @@ library angular2.test.common.pipes.slice_pipe_test;
 
 import 'package:angular2/angular2.dart' show SlicePipe;
 import 'package:angular2/core.dart' show Component;
-import 'package:angular2/testing_internal.dart';
+import 'package:angular2/src/testing/internal.dart';
 import 'package:test/test.dart';
 
 void main() {

diff --git a/test/compiler/directive_lifecycle_test.dart b/test/compiler/directive_lifecycle_test.dart
@@ -3,7 +3,7 @@ library angular2.test.core.compiler.directive_lifecycle_test;
 
 import 'package:angular2/src/compiler/directive_lifecycle_reflector.dart';
 import 'package:angular2/src/core/metadata/lifecycle_hooks.dart';
-import 'package:angular2/testing_internal.dart';
+import 'package:angular2/src/testing/internal.dart';
 import 'package:test/test.dart';
 
 void main() {

diff --git a/test/compiler/directive_normalizer_test.dart b/test/compiler/directive_normalizer_test.dart
@@ -8,9 +8,10 @@ import 'package:angular2/src/compiler/directive_normalizer.dart'
 import 'package:angular2/src/compiler/xhr.dart' show XHR;
 import 'package:angular2/src/compiler/xhr_mock.dart' show MockXHR;
 import 'package:angular2/src/core/metadata/view.dart' show ViewEncapsulation;
-import 'package:angular2/testing_internal.dart';
+import 'package:angular2/src/testing/internal.dart';
 import 'package:test/test.dart';
 
+import "../test_util.dart";
 import 'test_bindings.dart' show TEST_PROVIDERS;
 
 void main() {

diff --git a/test/compiler/directive_resolver_test.dart b/test/compiler/directive_resolver_test.dart
@@ -4,9 +4,11 @@ library angular2.test.compiler.directive_resolver_test;
 import 'package:angular2/src/compiler/directive_resolver.dart'
     show DirectiveResolver;
 import 'package:angular2/src/core/metadata.dart';
-import 'package:angular2/testing_internal.dart';
+import 'package:angular2/src/testing/internal.dart';
 import 'package:test/test.dart';
 
+import "../test_util.dart";
+
 @Directive(selector: 'someDirective')
 class SomeDirective {}
 

diff --git a/test/compiler/expression_parser/lexer_test.dart b/test/compiler/expression_parser/lexer_test.dart
@@ -3,9 +3,10 @@ library angular2.test.compiler.expression_parser.lexer_test;
 
 import "package:angular2/src/compiler/expression_parser/lexer.dart"
     show Lexer, Token;
-import "package:angular2/testing_internal.dart";
 import "package:test/test.dart";
 
+import "../../test_util.dart";
+
 List<Token> lex(String text) {
   return new Lexer().tokenize(text);
 }

diff --git a/test/compiler/expression_parser/parser_test.dart b/test/compiler/expression_parser/parser_test.dart
@@ -6,9 +6,9 @@ import "package:angular2/src/compiler/expression_parser/ast.dart"
 import "package:angular2/src/compiler/expression_parser/lexer.dart" show Lexer;
 import "package:angular2/src/compiler/expression_parser/parser.dart"
     show Parser;
-import "package:angular2/testing_internal.dart";
 import "package:test/test.dart";
 
+import "../../test_util.dart";
 import "unparser.dart" show Unparser;
 
 void main() {

diff --git a/test/compiler/output/output_emitter_test.dart b/test/compiler/output/output_emitter_test.dart
@@ -6,9 +6,10 @@ import "package:angular2/src/compiler/output/output_interpreter.dart"
 import "package:angular2/src/core/linker/view_type.dart" show ViewType;
 import "package:angular2/src/facade/async.dart" show EventEmitter;
 import "package:angular2/src/facade/exceptions.dart" show BaseException;
-import "package:angular2/testing_internal.dart";
+import "package:angular2/src/testing/internal.dart";
 import "package:test/test.dart";
 
+import "../../test_util.dart";
 import "output_emitter_codegen_typed.dart" as typed;
 import "output_emitter_util.dart"
     show codegenStmts, ExternalClass, DynamicClassInstanceFactory;

diff --git a/test/compiler/output/path_util_test.dart b/test/compiler/output/path_util_test.dart
@@ -3,9 +3,10 @@ library angular2.test.compiler.output.path_util_test;
 
 import 'package:angular2/src/compiler/output/path_util.dart'
     show getImportModulePath;
-import 'package:angular2/testing_internal.dart';
 import 'package:test/test.dart';
 
+import "../../test_util.dart";
+
 void main() {
   group('PathUtils getImportModulePath', () {
     test('should calculate relative paths', () {

diff --git a/test/compiler/runtime_metadata_test.dart b/test/compiler/runtime_metadata_test.dart
@@ -23,7 +23,7 @@ import 'package:angular2/src/core/metadata/lifecycle_hooks.dart'
     show LIFECYCLE_HOOKS_VALUES;
 import 'package:angular2/src/core/platform_directives_and_pipes.dart'
     show PLATFORM_DIRECTIVES;
-import 'package:angular2/testing_internal.dart';
+import 'package:angular2/src/testing/internal.dart';
 import 'package:test/test.dart';
 
 import 'test_bindings.dart' show TEST_PROVIDERS;

diff --git a/test/compiler/selector_test.dart b/test/compiler/selector_test.dart
@@ -5,9 +5,10 @@ import 'dart:html';
 
 import 'package:angular2/src/compiler/selector.dart'
     show CssSelector, SelectorMatcher;
-import 'package:angular2/testing_internal.dart';
 import 'package:test/test.dart';
 
+import "../test_util.dart";
+
 void main() {
   group('SelectorMatcher', () {
     var matcher, selectableCollector, s1, s2, s3, s4;

diff --git a/test/compiler/shadow_css_test.dart b/test/compiler/shadow_css_test.dart
@@ -3,7 +3,7 @@ library angular2.test.compiler.shadow_css_test;
 
 import "package:angular2/src/compiler/shadow_css.dart"
     show ShadowCss, processRules, CssRule;
-import "package:angular2/testing_internal.dart";
+import "package:angular2/src/testing/internal.dart";
 import 'package:test/test.dart';
 
 void main() {

diff --git a/test/compiler/template_parser_test.dart b/test/compiler/template_parser_test.dart
@@ -10,10 +10,11 @@ import "package:angular2/src/compiler/template_ast.dart";
 import "package:angular2/src/compiler/template_parser.dart"
     show TemplateParser, splitClasses;
 import "package:angular2/src/core/di.dart" show provide;
-import "package:angular2/testing_internal.dart";
+import "package:angular2/src/testing/internal.dart";
 import "package:logging/logging.dart";
 import 'package:test/test.dart';
 
+import "../test_util.dart";
 import "expression_parser/unparser.dart" show Unparser;
 import "schema_registry_mock.dart" show MockSchemaRegistry;
 import "test_bindings.dart" show TEST_PROVIDERS;

diff --git a/test/compiler/template_preparser_test.dart b/test/compiler/template_preparser_test.dart
@@ -4,7 +4,7 @@ library angular2.test.compiler.template_preparser_test;
 import "package:angular2/src/compiler/html_parser.dart" show HtmlParser;
 import "package:angular2/src/compiler/template_preparser.dart"
     show preparseElement, PreparsedElementType, PreparsedElement;
-import "package:angular2/testing_internal.dart";
+import "package:angular2/src/testing/internal.dart";
 import 'package:test/test.dart';
 
 void main() {

diff --git a/test/compiler/url_resolver_test.dart b/test/compiler/url_resolver_test.dart
@@ -3,7 +3,7 @@ library angular2.test.compiler.url_resolver_test;
 
 import "package:angular2/src/compiler/url_resolver.dart"
     show UrlResolver, createOfflineCompileUrlResolver;
-import "package:angular2/testing_internal.dart";
+import "package:angular2/src/testing/internal.dart";
 import 'package:test/test.dart';
 
 void main() {

diff --git a/test/compiler/view_resolver_test.dart b/test/compiler/view_resolver_test.dart
@@ -3,9 +3,11 @@ library angular2.test.compiler.view_resolver_test;
 
 import "package:angular2/src/compiler/view_resolver.dart" show ViewResolver;
 import "package:angular2/src/core/metadata.dart" show Component;
-import "package:angular2/testing_internal.dart";
+import "package:angular2/src/testing/internal.dart";
 import 'package:test/test.dart';
 
+import "../test_util.dart";
+
 class SomeDir {}
 
 class SomePipe {}

diff --git a/test/compiler/xhr_mock_test.dart b/test/compiler/xhr_mock_test.dart
@@ -4,9 +4,11 @@ library angular2.test.compiler.xhr_mock_test;
 import "dart:async";
 
 import "package:angular2/src/compiler/xhr_mock.dart" show MockXHR;
-import "package:angular2/testing_internal.dart";
+import "package:angular2/src/testing/internal.dart";
 import 'package:test/test.dart';
 
+import "../test_util.dart";
+
 void main() {
   group("MockXHR", () {
     MockXHR xhr;

diff --git a/test/core/application_ref_test.dart b/test/core/application_ref_test.dart
@@ -31,11 +31,12 @@ import 'package:angular2/src/facade/exception_handler.dart'
     show ExceptionHandler;
 import 'package:angular2/src/facade/exceptions.dart' show BaseException;
 import 'package:angular2/src/platform/browser_common.dart';
-import 'package:angular2/testing_internal.dart';
+import 'package:angular2/src/testing/internal.dart';
 import 'package:logging/logging.dart';
 import 'package:mockito/mockito.dart';
 import 'package:test/test.dart';
 
+import "../test_util.dart";
 import 'core_mocks.dart';
 
 void main() {