Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(177)

Unified Diff: runtime/observatory/tests/service/string_escaping_test.dart

Issue 2085683003: Fix string_escaping_test exiting early by re-writing to use async-await. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/observatory/tests/service/string_escaping_test.dart
diff --git a/runtime/observatory/tests/service/string_escaping_test.dart b/runtime/observatory/tests/service/string_escaping_test.dart
index fd99cee8e6359d6ae9d4f7b35811412ca240b977..0f5dee49daf0e4a653f49390c5f27df467f41c5d 100644
--- a/runtime/observatory/tests/service/string_escaping_test.dart
+++ b/runtime/observatory/tests/service/string_escaping_test.dart
@@ -48,44 +48,47 @@ void script() {
malformedWithTrailSurrogate = "before" + "𝄞"[1] + "after";
}
-var tests = [
+testStrings(Isolate isolate) async {
+ Library lib = isolate.rootLibrary;
+ await lib.load();
+ for (var variable in lib.variables) {
+ await variable.load();
+ }
+
+ expectFullString(String varName, String varValueAsString) {
+ Field field = lib.variables.singleWhere((v) => v.name == varName);
+ Instance value = field.staticValue;
+ expect(value.valueAsString, equals(varValueAsString));
+ expect(value.valueAsStringIsTruncated, isFalse);
+ }
-(Isolate isolate) =>
- isolate.rootLibrary.load().then((Library lib) {
- expectFullString(String varName, String varValueAsString) {
- Field field = lib.variables.singleWhere((v) => v.name == varName);
- field.load().then((_) {
- Instance value = field.staticValue;
- expect(value.valueAsString, equals(varValueAsString));
- expect(value.valueAsStringIsTruncated, isFalse);
- });
- }
- expectTruncatedString(String varName, String varValueAsString) {
- Field field = lib.variables.singleWhere((v) => v.name == varName);
- field.load().then((_) {
- Instance value = field.staticValue;
- expect(varValueAsString, startsWith(value.valueAsString));
- expect(value.valueAsStringIsTruncated, isTrue);
- });
- }
+ expectTruncatedString(String varName, String varValueAsString) {
+ Field field = lib.variables.singleWhere((v) => v.name == varName);
+ Instance value = field.staticValue;
+ print(value.valueAsString);
+ expect(varValueAsString, startsWith(value.valueAsString));
+ expect(value.valueAsStringIsTruncated, isTrue);
+ }
- script(); // Need to initialize variables in the testing isolate.
- expectFullString('ascii', ascii);
- expectFullString('latin1', latin1);
- expectFullString('unicode', unicode);
- expectFullString('hebrew', hebrew);
- expectFullString('singleQuotes', singleQuotes);
- expectFullString('doubleQuotes', doubleQuotes);
- expectFullString('newLines', newLines);
- expectFullString('tabs', tabs);
- expectFullString('suggrogatePairs', suggrogatePairs);
- expectFullString('nullInTheMiddle', nullInTheMiddle);
- expectTruncatedString('longStringEven', longStringEven);
- expectTruncatedString('longStringOdd', longStringOdd);
- expectFullString('malformedWithLeadSurrogate', malformedWithLeadSurrogate);
- expectFullString('malformedWithTrailSurrogate', malformedWithTrailSurrogate);
- }),
+ script(); // Need to initialize variables in the testing isolate.
+ expectFullString('ascii', ascii);
+ expectFullString('latin1', latin1);
+ expectFullString('unicode', unicode);
+ expectFullString('hebrew', hebrew);
+ expectFullString('singleQuotes', singleQuotes);
+ expectFullString('doubleQuotes', doubleQuotes);
+ expectFullString('newLines', newLines);
+ expectFullString('tabs', tabs);
+ expectFullString('suggrogatePairs', suggrogatePairs);
+ expectFullString('nullInTheMiddle', nullInTheMiddle);
+ expectTruncatedString('longStringEven', longStringEven);
+ expectTruncatedString('longStringOdd', longStringOdd);
+ expectFullString('malformedWithLeadSurrogate', malformedWithLeadSurrogate);
+ expectFullString('malformedWithTrailSurrogate', malformedWithTrailSurrogate);
+}
+var tests = [
+ testStrings,
];
main(args) => runIsolateTests(args, tests, testeeBefore: script);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698