| Index: tests/standalone/io/test_runner_test.dart
|
| diff --git a/tests/standalone/io/test_runner_test.dart b/tests/standalone/io/test_runner_test.dart
|
| index e9f327680cdb047ce7bae6a7a7d0dc4b5cc0fff2..7468e9edb23db216407745384a85c647f67ccafc 100644
|
| --- a/tests/standalone/io/test_runner_test.dart
|
| +++ b/tests/standalone/io/test_runner_test.dart
|
| @@ -41,7 +41,7 @@ class TestController {
|
| print("stdout = [$stdout]");
|
| print("stderr = [$stderr]");
|
| throw "Test case ${testCase.displayName} passed unexpectedly, "
|
| - "result == ${testCase.result}";
|
| + "result == ${testCase.result}";
|
| }
|
| } else {
|
| if (testCase.unexpectedOutput) {
|
| @@ -52,7 +52,7 @@ class TestController {
|
| print("stdout = [$stdout]");
|
| print("stderr = [$stderr]");
|
| throw "Test case ${testCase.displayName} failed, "
|
| - "result == ${testCase.result}";
|
| + "result == ${testCase.result}";
|
| }
|
| }
|
| }
|
| @@ -60,12 +60,11 @@ class TestController {
|
| static void finished() {
|
| if (numTests != numCompletedTests) {
|
| throw "bad completion count. "
|
| - "expected: $numTests, actual: $numCompletedTests";
|
| + "expected: $numTests, actual: $numCompletedTests";
|
| }
|
| }
|
| }
|
|
|
| -
|
| class CustomTestSuite extends TestSuite {
|
| CustomTestSuite(Map configuration) : super(configuration, "CustomTestSuite");
|
|
|
| @@ -96,17 +95,14 @@ class CustomTestSuite extends TestSuite {
|
| TestCase _makeNormalTestCase(name, expectations) {
|
| var args = packageOptions();
|
| args.addAll([Platform.script.toFilePath(), name]);
|
| - var command = CommandBuilder.instance.getProcessCommand(
|
| - 'custom', Platform.executable,
|
| - args,
|
| - {});
|
| + var command = CommandBuilder.instance
|
| + .getProcessCommand('custom', Platform.executable, args, {});
|
| return _makeTestCase(name, DEFAULT_TIMEOUT, command, expectations);
|
| }
|
|
|
| _makeCrashTestCase(name, expectations) {
|
| var crashCommand = CommandBuilder.instance.getProcessCommand(
|
| - 'custom_crash', getProcessTestFileName(), ["0", "0", "1", "1"],
|
| - {});
|
| + 'custom_crash', getProcessTestFileName(), ["0", "0", "1", "1"], {});
|
| // The crash test sometimes times out. Run it with a large timeout
|
| // to help diagnose the delay.
|
| // The test loads a new executable, which may sometimes take a long time.
|
| @@ -116,12 +112,10 @@ class CustomTestSuite extends TestSuite {
|
| }
|
|
|
| _makeTestCase(name, timeout, command, expectations) {
|
| - var configuration = new TestOptionsParser()
|
| - .parse(['--timeout', '$timeout'])[0];
|
| - return new TestCase(name,
|
| - [command],
|
| - configuration,
|
| - new Set<Expectation>.from(expectations));
|
| + var configuration =
|
| + new TestOptionsParser().parse(['--timeout', '$timeout'])[0];
|
| + return new TestCase(name, [command], configuration,
|
| + new Set<Expectation>.from(expectations));
|
| }
|
| }
|
|
|
| @@ -129,12 +123,17 @@ void testProcessQueue() {
|
| var maxProcesses = 2;
|
| var maxBrowserProcesses = maxProcesses;
|
| var config = new TestOptionsParser().parse(['--nobatch'])[0];
|
| - new ProcessQueue(config, maxProcesses, maxBrowserProcesses,
|
| - new DateTime.now(), [new CustomTestSuite(config)],
|
| - [new EventListener()], TestController.finished);
|
| + new ProcessQueue(
|
| + config,
|
| + maxProcesses,
|
| + maxBrowserProcesses,
|
| + new DateTime.now(),
|
| + [new CustomTestSuite(config)],
|
| + [new EventListener()],
|
| + TestController.finished);
|
| }
|
|
|
| -class EventListener extends progress.EventListener{
|
| +class EventListener extends progress.EventListener {
|
| void done(TestCase test) {
|
| TestController.processCompletedTest(test);
|
| }
|
| @@ -158,7 +157,7 @@ void main(List<String> arguments) {
|
| break;
|
| case 'timeout':
|
| // This process should be killed by the test after DEFAULT_TIMEOUT
|
| - new Timer(new Duration(hours: 42), (){ });
|
| + new Timer(new Duration(hours: 42), () {});
|
| break;
|
| default:
|
| throw "Unknown option ${arguments[0]} passed to test_runner_test";
|
|
|