Chromium Code Reviews| Index: tools/testing/dart/test_progress.dart |
| diff --git a/tools/testing/dart/test_progress.dart b/tools/testing/dart/test_progress.dart |
| index ca6e1112c22cfe14974a64b362c40f9c50d4896a..f6f7463d58d4d3eeeabd71cfc0e2d56c43b039fb 100644 |
| --- a/tools/testing/dart/test_progress.dart |
| +++ b/tools/testing/dart/test_progress.dart |
| @@ -15,9 +15,9 @@ import "utils.dart"; |
| String _pad(String s, int length) { |
| StringBuffer buffer = new StringBuffer(); |
| for (int i = s.length; i < length; i++) { |
| - buffer.add(' '); |
| + buffer.write(' '); |
| } |
| - buffer.add(s); |
| + buffer.write(s); |
| return buffer.toString(); |
| } |
| @@ -66,9 +66,9 @@ List<String> _buildFailureOutput(TestCase test, |
| output.add(formatter.failed('FAILED: ${test.configurationString}' |
| ' ${test.displayName}')); |
| StringBuffer expected = new StringBuffer(); |
| - expected.add('Expected: '); |
| + expected.write('Expected: '); |
| for (var expectation in test.expectedOutcomes) { |
| - expected.add('$expectation '); |
| + expected.write('$expectation '); |
| } |
| output.add(expected.toString()); |
| output.add('Actual: ${test.lastCommandOutput.result}'); |
| @@ -143,7 +143,7 @@ class FlakyLogWriter extends EventListener { |
| if (test.isFlaky && test.lastCommandOutput.result != PASS) { |
| var buf = new StringBuffer(); |
| for (var l in _buildFailureOutput(test)) { |
| - buf.add("$l\n"); |
| + buf.write("$l\n"); |
| } |
| _appendToFlakyFile(buf.toString()); |
| } |
| @@ -167,7 +167,7 @@ class SummaryPrinter extends EventListener { |
| class TimingPrinter extends EventListener { |
| List<TestCase> _tests = <TestCase>[]; |
| - Date _startTime; |
| + DateTime _startTime; |
| TimingPrinter(this._startTime); |
| @@ -177,7 +177,7 @@ class TimingPrinter extends EventListener { |
| void allDone() { |
| // TODO: We should take all the commands into account |
| - Duration d = (new Date.now()).difference(_startTime); |
| + Duration d = (new DateTime.now()).difference(_startTime); |
| print('\n--- Total time: ${_timeString(d)} ---'); |
| _tests.sort((a, b) { |
| Duration aDuration = a.lastCommandOutput.time; |
| @@ -289,15 +289,17 @@ class LeftOverTempDirPrinter extends EventListener { |
| void allDone() { |
| var tempDirs = []; |
|
Bill Hesse
2013/03/13 12:56:41
Why not just use a counter instead of a list for t
Søren Gjesse
2013/03/13 15:17:18
Done.
|
| var systemTempDir = _tempDir(); |
| - var lister = new Directory.fromPath(systemTempDir).list(); |
| - lister.onDir = (path) => tempDirs.add(path); |
| - lister.onDone = (_) { |
| - if (tempDirs.length > MIN_NUMBER_OF_TEMP_DIRS) { |
| - DebugLogger.warning("There are ${tempDirs.length} directories " |
| - "in the system tempdir ('$systemTempDir')! " |
| - "Maybe left over directories?\n"); |
| + var lister = new Directory.fromPath(systemTempDir).list().listen( |
| + (FileSystemEntity fse) { |
| + if (fse is Directory) tempDirs.add(fse.path); |
| + }, |
| + onDone: () { |
| + if (tempDirs.length > MIN_NUMBER_OF_TEMP_DIRS) { |
| + DebugLogger.warning("There are ${tempDirs.length} directories " |
|
ricow1
2013/03/13 13:38:41
indentation
Søren Gjesse
2013/03/13 15:17:18
Done.
|
| + "in the system tempdir ('$systemTempDir')! " |
| + "Maybe left over directories?\n"); |
| } |
| - }; |
| + }); |
| } |
| } |
| @@ -330,7 +332,7 @@ class ProgressIndicator extends EventListener { |
| ProgressIndicator(this._startTime); |
| factory ProgressIndicator.fromName(String name, |
| - Date startTime, |
| + DateTime startTime, |
| Formatter formatter) { |
| switch (name) { |
| case 'compact': |
| @@ -396,15 +398,15 @@ class ProgressIndicator extends EventListener { |
| int _passedTests = 0; |
| int _failedTests = 0; |
| bool _allTestsKnown = false; |
| - Date _startTime; |
| + DateTime _startTime; |
| } |
| abstract class CompactIndicator extends ProgressIndicator { |
| - CompactIndicator(Date startTime) |
| + CompactIndicator(DateTime startTime) |
| : super(startTime); |
| void allDone() { |
| - stdout.write('\n'.charCodes); |
| + stdout.writeln(''); |
| if (_failedTests > 0) { |
| // We may have printed many failure logs, so reprint the summary data. |
| _printProgress(); |
| @@ -424,7 +426,7 @@ abstract class CompactIndicator extends ProgressIndicator { |
| class CompactProgressIndicator extends CompactIndicator { |
| Formatter _formatter; |
| - CompactProgressIndicator(Date startTime, this._formatter) |
| + CompactProgressIndicator(DateTime startTime, this._formatter) |
| : super(startTime); |
| void _printProgress() { |
| @@ -432,18 +434,18 @@ class CompactProgressIndicator extends CompactIndicator { |
| var progressPadded = _pad(_allTestsKnown ? percent : '--', 3); |
| var passedPadded = _pad(_passedTests.toString(), 5); |
| var failedPadded = _pad(_failedTests.toString(), 5); |
| - Duration d = (new Date.now()).difference(_startTime); |
| + Duration d = (new DateTime.now()).difference(_startTime); |
| var progressLine = |
| '\r[${_timeString(d)} | $progressPadded% | ' |
| '+${_formatter.passed(passedPadded)} | ' |
| '-${_formatter.failed(failedPadded)}]'; |
| - stdout.write(progressLine.charCodes); |
| + stdout.write(progressLine); |
| } |
| } |
| class VerboseProgressIndicator extends ProgressIndicator { |
| - VerboseProgressIndicator(Date startTime) |
| + VerboseProgressIndicator(DateTime startTime) |
| : super(startTime); |
| void _printStartProgress(TestCase test) { |
| @@ -464,7 +466,7 @@ class BuildbotProgressIndicator extends ProgressIndicator { |
| static String stepName; |
| var _failureSummary = <String>[]; |
| - BuildbotProgressIndicator(Date startTime) : super(startTime); |
| + BuildbotProgressIndicator(DateTime startTime) : super(startTime); |
| void done(TestCase test) { |
| super.done(test); |
| @@ -496,4 +498,3 @@ class BuildbotProgressIndicator extends ProgressIndicator { |
| super.allDone(); |
| } |
| } |
| - |