| 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 // VMOptions=--compile-all --error_on_bad_type --error_on_bad_override | 4 // VMOptions=--compile-all --error_on_bad_type --error_on_bad_override |
| 5 | 5 |
| 6 library string_escaping_test; | 6 library string_escaping_test; |
| 7 | 7 |
| 8 import 'package:observatory/service_io.dart'; | 8 import 'package:observatory/service_io.dart'; |
| 9 import 'package:unittest/unittest.dart'; | 9 import 'package:unittest/unittest.dart'; |
| 10 import 'test_helper.dart'; | 10 import 'test_helper.dart'; |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 malformedWithLeadSurrogate = "before" + "𝄞"[0] + "after"; | 47 malformedWithLeadSurrogate = "before" + "𝄞"[0] + "after"; |
| 48 malformedWithTrailSurrogate = "before" + "𝄞"[1] + "after"; | 48 malformedWithTrailSurrogate = "before" + "𝄞"[1] + "after"; |
| 49 } | 49 } |
| 50 | 50 |
| 51 var tests = [ | 51 var tests = [ |
| 52 | 52 |
| 53 (Isolate isolate) => | 53 (Isolate isolate) => |
| 54 isolate.rootLibrary.load().then((Library lib) { | 54 isolate.rootLibrary.load().then((Library lib) { |
| 55 expectFullString(String varName, String varValueAsString) { | 55 expectFullString(String varName, String varValueAsString) { |
| 56 Field field = lib.variables.singleWhere((v) => v.name == varName); | 56 Field field = lib.variables.singleWhere((v) => v.name == varName); |
| 57 Instance value = field.value; | 57 field.load().then((_) { |
| 58 expect(value.valueAsString, equals(varValueAsString)); | 58 Instance value = field.staticValue; |
| 59 expect(value.valueAsStringIsTruncated, isFalse); | 59 expect(value.valueAsString, equals(varValueAsString)); |
| 60 expect(value.valueAsStringIsTruncated, isFalse); |
| 61 }); |
| 60 } | 62 } |
| 61 expectTruncatedString(String varName, String varValueAsString) { | 63 expectTruncatedString(String varName, String varValueAsString) { |
| 62 Field field = lib.variables.singleWhere((v) => v.name == varName); | 64 Field field = lib.variables.singleWhere((v) => v.name == varName); |
| 63 Instance value = field.value; | 65 field.load().then((_) { |
| 64 expect(varValueAsString, startsWith(value.valueAsString)); | 66 Instance value = field.staticValue; |
| 65 expect(value.valueAsStringIsTruncated, isTrue); | 67 expect(varValueAsString, startsWith(value.valueAsString)); |
| 68 expect(value.valueAsStringIsTruncated, isTrue); |
| 69 }); |
| 66 } | 70 } |
| 67 | 71 |
| 68 script(); // Need to initialize variables in the testing isolate. | 72 script(); // Need to initialize variables in the testing isolate. |
| 69 expectFullString('ascii', ascii); | 73 expectFullString('ascii', ascii); |
| 70 expectFullString('latin1', latin1); | 74 expectFullString('latin1', latin1); |
| 71 expectFullString('unicode', unicode); | 75 expectFullString('unicode', unicode); |
| 72 expectFullString('hebrew', hebrew); | 76 expectFullString('hebrew', hebrew); |
| 73 expectFullString('singleQuotes', singleQuotes); | 77 expectFullString('singleQuotes', singleQuotes); |
| 74 expectFullString('doubleQuotes', doubleQuotes); | 78 expectFullString('doubleQuotes', doubleQuotes); |
| 75 expectFullString('newLines', newLines); | 79 expectFullString('newLines', newLines); |
| 76 expectFullString('tabs', tabs); | 80 expectFullString('tabs', tabs); |
| 77 expectFullString('suggrogatePairs', suggrogatePairs); | 81 expectFullString('suggrogatePairs', suggrogatePairs); |
| 78 expectFullString('nullInTheMiddle', nullInTheMiddle); | 82 expectFullString('nullInTheMiddle', nullInTheMiddle); |
| 79 expectTruncatedString('longStringEven', longStringEven); | 83 expectTruncatedString('longStringEven', longStringEven); |
| 80 expectTruncatedString('longStringOdd', longStringOdd); | 84 expectTruncatedString('longStringOdd', longStringOdd); |
| 81 expectFullString('malformedWithLeadSurrogate', malformedWithLeadSurrogate); | 85 expectFullString('malformedWithLeadSurrogate', malformedWithLeadSurrogate); |
| 82 expectFullString('malformedWithTrailSurrogate', malformedWithTrailSurrogate)
; | 86 expectFullString('malformedWithTrailSurrogate', malformedWithTrailSurrogate)
; |
| 83 }), | 87 }), |
| 84 | 88 |
| 85 ]; | 89 ]; |
| 86 | 90 |
| 87 main(args) => runIsolateTests(args, tests, testeeBefore: script); | 91 main(args) => runIsolateTests(args, tests, testeeBefore: script); |
| OLD | NEW |