Index: lib/src/runner/loader.dart |
diff --git a/lib/src/runner/loader.dart b/lib/src/runner/loader.dart |
index cb28ab6a74c0363cf625a2abb5dfade5145fd38f..8720487260a4b0ac682c53a65daed25fd5a65295 100644 |
--- a/lib/src/runner/loader.dart |
+++ b/lib/src/runner/loader.dart |
@@ -14,7 +14,6 @@ import 'package:stack_trace/stack_trace.dart'; |
import '../backend/invoker.dart'; |
import '../backend/metadata.dart'; |
-import '../backend/suite.dart'; |
kevmoo
2015/07/28 01:48:00
Suite is still referenced by a couple of methods
nweiz
2015/07/28 20:01:21
Done.
|
import '../backend/test_platform.dart'; |
import '../util/async_thunk.dart'; |
import '../util/dart.dart' as dart; |
@@ -25,6 +24,7 @@ import 'browser/server.dart'; |
import 'load_exception.dart'; |
import 'load_suite.dart'; |
import 'parse_metadata.dart'; |
+import 'runner_suite.dart'; |
import 'vm/isolate_test.dart'; |
/// A class for finding test files and loading them into a runnable form. |
@@ -54,7 +54,7 @@ class Loader { |
final Uri _pubServeUrl; |
/// All suites that have been created by the loader. |
- final _suites = new Set<Suite>(); |
+ final _suites = new Set<RunnerSuite>(); |
/// The server that serves browser test pages. |
/// |
@@ -159,7 +159,7 @@ class Loader { |
// Don't load a skipped suite. |
if (metadata.skip) { |
- yield new LoadSuite.forSuite(new Suite([ |
+ yield new LoadSuite.forSuite(new RunnerSuite([ |
new LocalTest(path, metadata, () {}) |
], path: path, platform: platform, metadata: metadata)); |
continue; |
@@ -262,7 +262,7 @@ void main(_, Map message) { |
}); |
try { |
- var suite = new Suite((await completer.future).map((test) { |
+ var suite = new RunnerSuite((await completer.future).map((test) { |
var testMetadata = new Metadata.deserialize(test['metadata']); |
return new IsolateTest(test['name'], testMetadata, test['sendPort']); |
}), |