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

Revert "refactor(testing): move common testing logic into test_injector"

Browse Source 
This reverts commit b88a6d983f.
This commit is contained in:
Alex Eagle
2015-12-14 20:27:31 -08:00
parent 3191fd1440
commit 2aaef81b1b
13 changed files with 103 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
modules_dart/angular2_testing/lib/angular2_testing.dart
View File

@ -1,8 +1,11 @@
library angular2_testing.angular2_testing;
import 'package:test/test.dart';
import 'package:test/src/backend/invoker.dart';
import 'package:test/src/backend/live_test.dart';
import 'package:angular2/angular2.dart';
import 'package:angular2/src/core/di/injector.dart' show Injector;
import 'package:angular2/src/core/di/metadata.dart' show InjectMetadata;
import 'package:angular2/src/core/di/exceptions.dart' show NoAnnotationError;
import 'package:angular2/platform/browser_static.dart' show BrowserDomAdapter;
@ -28,13 +31,6 @@ void initAngularTests() {
reflector.reflectionCapabilities = new ReflectionCapabilities();
}
void _addTestInjectorTearDown() {
// Multiple resets are harmless.
tearDown(() {
_testInjector.reset();
});
}
/// Allows overriding default bindings defined in test_injector.dart.
///
/// The given function must return a list of DI providers.
@ -49,17 +45,13 @@ void _addTestInjectorTearDown() {
/// ```
void setUpProviders(Iterable<Provider> providerFactory()) {
setUp(() {
try {
_testInjector.addProviders(providerFactory());
} catch(e) {
if (_currentInjector != null) {
throw 'setUpProviders was called after the injector had '
'been used in a setUp or test block. This invalidates the '
'test injector';
}
_currentTestProviders.addAll(providerFactory());
});
_addTestInjectorTearDown();
}
dynamic _runInjectableFunction(Function fn) {
@ -80,8 +72,11 @@ dynamic _runInjectableFunction(Function fn) {
tokens.add(token);
}
if (_currentInjector == null) {
_currentInjector = createTestInjectorWithRuntimeCompiler(_currentTestProviders);
}
var injectFn = new FunctionWithParamTokens(tokens, fn, false);
return _testInjector.execute(injectFn);
return injectFn.execute(_currentInjector);
}
/// Use the test injector to get bindings and run a function.
@ -97,8 +92,6 @@ void ngSetUp(Function fn) {
setUp(() async {
await _runInjectableFunction(fn);
});
_addTestInjectorTearDown();
}
/// Add a test which can use the test injector.
@ -115,8 +108,25 @@ void ngTest(String description, Function fn,
test(description, () async {
await _runInjectableFunction(fn);
}, testOn: testOn, timeout: timeout, skip: skip, onPlatform: onPlatform);
_addTestInjectorTearDown();
}
final TestInjector _testInjector = getTestInjector();
final _providersExpando =
new Expando<List<Provider>>('Providers for the current test');
final _injectorExpando =
new Expando<Injector>('Angular Injector for the current test');
List get _currentTestProviders {
if (_providersExpando[_currentTest] == null) {
return _providersExpando[_currentTest] = [];
}
return _providersExpando[_currentTest];
}
Injector get _currentInjector => _injectorExpando[_currentTest];
void set _currentInjector(Injector newInjector) {
_injectorExpando[_currentTest] = newInjector;
}
// TODO: warning, the Invoker.current.liveTest is not a settled API and is
// subject to change in future versions of package:test.
LiveTest get _currentTest => Invoker.current.liveTest;