cargdev/angular
1
0
Fork 0
Code Issues 17 Pull Requests Actions Packages Projects Releases Wiki Activity

fix(exception_handler): fix error messages of wrapped exceptions

Browse Source 
Closes #4117
This commit is contained in:
vsavkin
2015-09-10 15:25:36 -07:00
committed by Victor Savkin
parent 892d2b9652
commit f6cc573687
137 changed files with 339 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/angular2/src/test_lib/benchmark_util.ts
View File

@ -1,6 +1,7 @@
import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter';
import {document, window} from 'angular2/src/core/facade/browser';
import {NumberWrapper, BaseException, isBlank} from 'angular2/src/core/facade/lang';
import {NumberWrapper, isBlank} from 'angular2/src/core/facade/lang';
import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
var DOM = new BrowserDomAdapter();

2
modules/angular2/src/test_lib/fake_async.dart
View File

@ -2,7 +2,7 @@ library test_lib.fake_async;
import 'dart:async' show runZoned, ZoneSpecification;
import 'package:quiver/testing/async.dart' as quiver;
import 'package:angular2/src/core/facade/lang.dart' show BaseException;
import 'package:angular2/src/core/facade/exceptions.dart' show BaseException;
const _u = const Object();

3
modules/angular2/src/test_lib/fake_async.ts
View File

@ -1,6 +1,7 @@
/// <reference path="../../typings/jasmine/jasmine.d.ts"/>
import {BaseException, global} from 'angular2/src/core/facade/lang';
import {global} from 'angular2/src/core/facade/lang';
import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
import {ListWrapper} from 'angular2/src/core/facade/collection';
import {NgZoneZone} from 'angular2/src/core/zone/ng_zone';

2
modules/angular2/src/test_lib/test_component_builder.ts
View File

@ -1,6 +1,6 @@
import {Injector, bind, Injectable} from 'angular2/src/core/di';
import {Type, isPresent, BaseException, isBlank} from 'angular2/src/core/facade/lang';
import {Type, isPresent, isBlank} from 'angular2/src/core/facade/lang';
import {Promise} from 'angular2/src/core/facade/async';
import {ListWrapper, MapWrapper} from 'angular2/src/core/facade/collection';

2
modules/angular2/src/test_lib/test_injector.ts
View File

@ -13,7 +13,7 @@ import {
KeyValueDiffers,
defaultKeyValueDiffers
} from 'angular2/src/core/change_detection/change_detection';
import {ExceptionHandler} from 'angular2/src/core/facade/exception_handler';
import {ExceptionHandler} from 'angular2/src/core/facade/exceptions';
import {ViewLoader} from 'angular2/src/core/render/dom/compiler/view_loader';
import {ViewResolver} from 'angular2/src/core/compiler/view_resolver';
import {DirectiveResolver} from 'angular2/src/core/compiler/directive_resolver';

3
modules/angular2/src/test_lib/test_lib.dart
View File

@ -22,7 +22,6 @@ import 'package:angular2/src/core/reflection/reflection_capabilities.dart';
import 'package:angular2/src/core/di/binding.dart' show bind;
import 'package:angular2/src/core/di/injector.dart' show Injector;
import 'package:angular2/src/core/facade/exception_handler.dart' show ExceptionHandler;
import 'package:angular2/src/core/facade/collection.dart' show StringMapWrapper;
import 'test_injector.dart';
@ -77,7 +76,7 @@ Expect expect(actual, [matcher]) {
const _u = const Object();
expectErrorMessage(actual, expectedMessage) {
expect(ExceptionHandler.exceptionToString(actual)).toContain(expectedMessage);
expect(actual.toString()).toContain(expectedMessage);
}
expectException(Function actual, expectedMessage) {

5
modules/angular2/src/test_lib/test_lib.ts
View File

@ -6,7 +6,6 @@ import {global, isFunction} from 'angular2/src/core/facade/lang';
import {NgZoneZone} from 'angular2/src/core/zone/ng_zone';
import {bind} from 'angular2/src/core/di';
import {ExceptionHandler} from 'angular2/src/core/facade/exception_handler';
import {createTestInjector, FunctionWithParamTokens, inject} from './test_injector';
@ -285,7 +284,7 @@ _global.beforeEach(function() {
toContainError: function() {
return {
compare: function(actual, expectedText) {
var errorMessage = ExceptionHandler.exceptionToString(actual);
var errorMessage = actual.toString();
return {
pass: errorMessage.indexOf(expectedText) > -1,
get message() { return 'Expected ' + errorMessage + ' to contain ' + expectedText; }
@ -304,7 +303,7 @@ _global.beforeEach(function() {
get message() { return "Was expected to throw, but did not throw"; }
};
} catch (e) {
var errorMessage = ExceptionHandler.exceptionToString(e);
var errorMessage = e.toString();
return {
pass: errorMessage.indexOf(expectedText) > -1,
get message() { return 'Expected ' + errorMessage + ' to contain ' + expectedText; }