| OLD | NEW |
| 1 // Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 #library("test_runner"); | 5 #library("test_runner"); |
| 6 | 6 |
| 7 #import("status_file_parser.dart"); | 7 #import("status_file_parser.dart"); |
| 8 #import("test_progress.dart"); | 8 #import("test_progress.dart"); |
| 9 #import("test_suite.dart"); | 9 #import("test_suite.dart"); |
| 10 | 10 |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 bool isNegative; | 29 bool isNegative; |
| 30 Set<String> expectedOutcomes; | 30 Set<String> expectedOutcomes; |
| 31 Function completedHandler; | 31 Function completedHandler; |
| 32 | 32 |
| 33 TestCase(this.displayName, | 33 TestCase(this.displayName, |
| 34 this.executablePath, | 34 this.executablePath, |
| 35 this.arguments, | 35 this.arguments, |
| 36 this.timeout, | 36 this.timeout, |
| 37 this.completedHandler, | 37 this.completedHandler, |
| 38 this.expectedOutcomes, | 38 this.expectedOutcomes, |
| 39 [isNegative = false]) | 39 [this.isNegative = false]) { |
| 40 : this.isNegative = isNegative { | |
| 41 if (!isNegative) { | 40 if (!isNegative) { |
| 42 this.isNegative = displayName.contains("NegativeTest"); | 41 this.isNegative = displayName.contains("NegativeTest"); |
| 43 } | 42 } |
| 44 commandLine = executablePath; | 43 commandLine = executablePath; |
| 45 for (var arg in arguments) { | 44 for (var arg in arguments) { |
| 46 commandLine += " " + arg; | 45 commandLine += " " + arg; |
| 47 } | 46 } |
| 48 } | 47 } |
| 49 | 48 |
| 50 void completed() { completedHandler(this); } | 49 void completed() { completedHandler(this); } |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 Process process; | 102 Process process; |
| 104 TestCase testCase; | 103 TestCase testCase; |
| 105 int timeout; | 104 int timeout; |
| 106 bool timedOut = false; | 105 bool timedOut = false; |
| 107 Date startTime; | 106 Date startTime; |
| 108 Timer timeoutTimer; | 107 Timer timeoutTimer; |
| 109 List<String> stdout; | 108 List<String> stdout; |
| 110 List<String> stderr; | 109 List<String> stderr; |
| 111 List<Function> handlers; | 110 List<Function> handlers; |
| 112 | 111 |
| 113 RunningProcess(this.testCase, [timeout = NO_TIMEOUT]) | 112 RunningProcess(this.testCase, [this.timeout = NO_TIMEOUT]); |
| 114 : this.timeout = timeout; | |
| 115 | 113 |
| 116 void exitHandler(int exitCode) { | 114 void exitHandler(int exitCode) { |
| 117 new TestOutput(testCase, exitCode, timedOut, stdout, | 115 new TestOutput(testCase, exitCode, timedOut, stdout, |
| 118 stderr, new Date.now().difference(startTime)); | 116 stderr, new Date.now().difference(startTime)); |
| 119 process.close(); | 117 process.close(); |
| 120 timeoutTimer.cancel(); | 118 timeoutTimer.cancel(); |
| 121 testCase.completed(); | 119 testCase.completed(); |
| 122 } | 120 } |
| 123 | 121 |
| 124 void makeReadHandler(StringInputStream source, List<String> destination) { | 122 void makeReadHandler(StringInputStream source, List<String> destination) { |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 207 _progress.done(test_arg); | 205 _progress.done(test_arg); |
| 208 _tryRunTest(); | 206 _tryRunTest(); |
| 209 oldCallback(test_arg); | 207 oldCallback(test_arg); |
| 210 }; | 208 }; |
| 211 test.completedHandler = wrapper; | 209 test.completedHandler = wrapper; |
| 212 new RunningProcess(test, test.timeout).start(); | 210 new RunningProcess(test, test.timeout).start(); |
| 213 _numProcesses++; | 211 _numProcesses++; |
| 214 } | 212 } |
| 215 } | 213 } |
| 216 } | 214 } |
| OLD | NEW |