| OLD | NEW |
| 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2013, 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_progress; | 5 library test_progress; |
| 6 | 6 |
| 7 import "dart:async"; | 7 import "dart:async"; |
| 8 import "dart:io"; | 8 import "dart:io"; |
| 9 import "dart:io" as io; | 9 import "dart:io" as io; |
| 10 import "dart:convert" show JSON; | 10 import "dart:convert" show JSON; |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 ' ${test.displayName}')); | 74 ' ${test.displayName}')); |
| 75 StringBuffer expected = new StringBuffer(); | 75 StringBuffer expected = new StringBuffer(); |
| 76 expected.write('Expected: '); | 76 expected.write('Expected: '); |
| 77 for (var expectation in test.expectedOutcomes) { | 77 for (var expectation in test.expectedOutcomes) { |
| 78 expected.write('$expectation '); | 78 expected.write('$expectation '); |
| 79 } | 79 } |
| 80 output.add(expected.toString()); | 80 output.add(expected.toString()); |
| 81 output.add('Actual: ${test.result}'); | 81 output.add('Actual: ${test.result}'); |
| 82 if (!test.lastCommandOutput.hasTimedOut && test.info != null) { | 82 if (!test.lastCommandOutput.hasTimedOut && test.info != null) { |
| 83 if (test.commandOutputs.length != test.commands.length | 83 if (test.commandOutputs.length != test.commands.length |
| 84 && !test.info.hasCompileError) { | 84 && !test.expectCompileError) { |
| 85 output.add('Unexpected compile-time error.'); | 85 output.add('Unexpected compile-time error.'); |
| 86 } else { | 86 } else { |
| 87 if (test.info.hasCompileError) { | 87 if (test.expectCompileError) { |
| 88 output.add('Compile-time error expected.'); | 88 output.add('Compile-time error expected.'); |
| 89 } | 89 } |
| 90 if (test.info.hasRuntimeError) { | 90 if (test.info.hasRuntimeError) { |
| 91 output.add('Runtime error expected.'); | 91 output.add('Runtime error expected.'); |
| 92 } | 92 } |
| 93 if (test.configuration['checked'] && test.info.isNegativeIfChecked) { |
| 94 output.add('Dynamic type error expected.'); |
| 95 } |
| 93 } | 96 } |
| 94 } | 97 } |
| 95 for (var i = 0; i < test.commands.length; i++) { | 98 for (var i = 0; i < test.commands.length; i++) { |
| 96 var command = test.commands[i]; | 99 var command = test.commands[i]; |
| 97 var commandOutput = test.commandOutputs[command]; | 100 var commandOutput = test.commandOutputs[command]; |
| 98 if (commandOutput != null) { | 101 if (commandOutput != null) { |
| 99 output.add("CommandOutput[${command.displayName}]:"); | 102 output.add("CommandOutput[${command.displayName}]:"); |
| 100 if (!commandOutput.diagnostics.isEmpty) { | 103 if (!commandOutput.diagnostics.isEmpty) { |
| 101 String prefix = 'diagnostics:'; | 104 String prefix = 'diagnostics:'; |
| 102 for (var s in commandOutput.diagnostics) { | 105 for (var s in commandOutput.diagnostics) { |
| (...skipping 555 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 658 return new VerboseProgressIndicator(startTime); | 661 return new VerboseProgressIndicator(startTime); |
| 659 case 'status': | 662 case 'status': |
| 660 return new ProgressIndicator(startTime); | 663 return new ProgressIndicator(startTime); |
| 661 case 'buildbot': | 664 case 'buildbot': |
| 662 return new BuildbotProgressIndicator(startTime); | 665 return new BuildbotProgressIndicator(startTime); |
| 663 default: | 666 default: |
| 664 assert(false); | 667 assert(false); |
| 665 break; | 668 break; |
| 666 } | 669 } |
| 667 } | 670 } |
| OLD | NEW |