honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(di): capture original exception in InvalidBindingError 

Fixes #1406

Closes #1459
This commit is contained in:
Pawel Kozlowski 2015-04-20 15:35:16 +02:00
parent fe70c2647a
commit e23004df52
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/angular2/src/di/exceptions.js vendored
View File

@ -140,13 +140,17 @@ export class CyclicDependencyError extends AbstractBindingError {
* @exportedAs angular2/di_errors * @exportedAs angular2/di_errors
*/ */
export class InstantiationError extends AbstractBindingError { export class InstantiationError extends AbstractBindingError {
cause;
causeKey;
// TODO(tbosch): Can't do key:Key as this results in a circular dependency! // TODO(tbosch): Can't do key:Key as this results in a circular dependency!
constructor(originalException, key) { constructor(cause, key) {
super(key, function (keys:List) { super(key, function (keys:List) {
var first = stringify(ListWrapper.first(keys).token); var first = stringify(ListWrapper.first(keys).token);
return `Error during instantiation of ${first}!${constructResolvingPath(keys)}.` + return `Error during instantiation of ${first}!${constructResolvingPath(keys)}.` +
` ORIGINAL ERROR: ${originalException}`; ` ORIGINAL ERROR: ${cause}`;
}); });
this.cause = cause;
this.causeKey = key;
} }
} }

6
modules/angular2/test/di/injector_spec.js vendored
View File

@ -1,4 +1,4 @@
import {isBlank} from 'angular2/src/facade/lang'; import {isBlank, BaseException} from 'angular2/src/facade/lang';
import {describe, ddescribe, it, iit, expect, beforeEach} from 'angular2/test_lib'; import {describe, ddescribe, it, iit, expect, beforeEach} from 'angular2/test_lib';
import {Injector, Inject, InjectLazy, Optional, bind, ResolvedBinding} from 'angular2/di'; import {Injector, Inject, InjectLazy, Optional, bind, ResolvedBinding} from 'angular2/di';
@ -7,7 +7,7 @@ class Engine {
class BrokenEngine { class BrokenEngine {
constructor() { constructor() {
throw "Broken Engine"; throw new BaseException("Broken Engine");
} }
} }
@ -251,6 +251,8 @@ export function main() {
throw "Must throw"; throw "Must throw";
} catch (e) { } catch (e) {
expect(e.message).toContain("Error during instantiation of Engine! (Car -> Engine)"); expect(e.message).toContain("Error during instantiation of Engine! (Car -> Engine)");
expect(e.cause instanceof BaseException).toBeTruthy();
expect(e.causeKey.token).toEqual(Engine);
} }
}); });