| OLD | NEW |
| 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2014, 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.integration.analysis; | 5 library test.integration.analysis; |
| 6 | 6 |
| 7 import 'dart:async'; | 7 import 'dart:async'; |
| 8 import 'dart:collection'; | 8 import 'dart:collection'; |
| 9 import 'dart:convert'; | 9 import 'dart:convert'; |
| 10 import 'dart:io'; | 10 import 'dart:io'; |
| (...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 397 /** | 397 /** |
| 398 * Server process object, or null if server hasn't been started yet. | 398 * Server process object, or null if server hasn't been started yet. |
| 399 */ | 399 */ |
| 400 Process _process = null; | 400 Process _process = null; |
| 401 | 401 |
| 402 /** | 402 /** |
| 403 * Commands that have been sent to the server but not yet acknowledged, and | 403 * Commands that have been sent to the server but not yet acknowledged, and |
| 404 * the [Completer] objects which should be completed when acknowledgement is | 404 * the [Completer] objects which should be completed when acknowledgement is |
| 405 * received. | 405 * received. |
| 406 */ | 406 */ |
| 407 final HashMap<String, Completer> _pendingCommands = <String, Completer>{}; | 407 final Map<String, Completer> _pendingCommands = <String, Completer>{}; |
| 408 | 408 |
| 409 /** | 409 /** |
| 410 * Number which should be used to compute the 'id' to send in the next command | 410 * Number which should be used to compute the 'id' to send in the next command |
| 411 * sent to the server. | 411 * sent to the server. |
| 412 */ | 412 */ |
| 413 int _nextId = 0; | 413 int _nextId = 0; |
| 414 | 414 |
| 415 /** | 415 /** |
| 416 * Messages which have been exchanged with the server; we buffer these | 416 * Messages which have been exchanged with the server; we buffer these |
| 417 * up until the test finishes, so that they can be examined in the debugger | 417 * up until the test finishes, so that they can be examined in the debugger |
| (...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 837 mismatchDescription.add('; ').add(subDescription); | 837 mismatchDescription.add('; ').add(subDescription); |
| 838 } | 838 } |
| 839 return mismatchDescription.add(')'); | 839 return mismatchDescription.add(')'); |
| 840 }); | 840 }); |
| 841 } | 841 } |
| 842 } | 842 } |
| 843 | 843 |
| 844 @override | 844 @override |
| 845 Description describeMismatch( | 845 Description describeMismatch( |
| 846 item, Description mismatchDescription, Map matchState, bool verbose) { | 846 item, Description mismatchDescription, Map matchState, bool verbose) { |
| 847 List<MismatchDescriber> mismatches = matchState['mismatches']; | 847 List<MismatchDescriber> mismatches = |
| 848 matchState['mismatches'] as List<MismatchDescriber>; |
| 848 if (mismatches != null) { | 849 if (mismatches != null) { |
| 849 for (int i = 0; i < mismatches.length; i++) { | 850 for (int i = 0; i < mismatches.length; i++) { |
| 850 MismatchDescriber mismatch = mismatches[i]; | 851 MismatchDescriber mismatch = mismatches[i]; |
| 851 if (i > 0) { | 852 if (i > 0) { |
| 852 if (mismatches.length == 2) { | 853 if (mismatches.length == 2) { |
| 853 mismatchDescription = mismatchDescription.add(' and '); | 854 mismatchDescription = mismatchDescription.add(' and '); |
| 854 } else if (i == mismatches.length - 1) { | 855 } else if (i == mismatches.length - 1) { |
| 855 mismatchDescription = mismatchDescription.add(', and '); | 856 mismatchDescription = mismatchDescription.add(', and '); |
| 856 } else { | 857 } else { |
| 857 mismatchDescription = mismatchDescription.add(', '); | 858 mismatchDescription = mismatchDescription.add(', '); |
| (...skipping 27 matching lines...) Expand all Loading... |
| 885 void populateMismatches(item, List<MismatchDescriber> mismatches); | 886 void populateMismatches(item, List<MismatchDescriber> mismatches); |
| 886 | 887 |
| 887 /** | 888 /** |
| 888 * Create a [MismatchDescriber] describing a mismatch with a simple string. | 889 * Create a [MismatchDescriber] describing a mismatch with a simple string. |
| 889 */ | 890 */ |
| 890 MismatchDescriber simpleDescription(String description) => | 891 MismatchDescriber simpleDescription(String description) => |
| 891 (Description mismatchDescription) { | 892 (Description mismatchDescription) { |
| 892 mismatchDescription.add(description); | 893 mismatchDescription.add(description); |
| 893 }; | 894 }; |
| 894 } | 895 } |
| OLD | NEW |