[dartdevc] make nullable_inference_test resilient to const refactor

vsmenon · commit-bot@chromium.org · commit 723bb0eee195 · 2019-07-11T17:29:08.000Z
This test now appears to pass with and without --constant-update-2018. Change-Id: I9f2f49f6dc5187d5a09bc502f5460089448043e4 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/108820 Reviewed-by: Mark Zhou <markzipan@google.com> Reviewed-by: Nicholas Shahan <nshahan@google.com> Commit-Queue: Vijay Menon <vsm@google.com>
diff --git a/pkg/dev_compiler/test/nullable_inference_test.dart b/pkg/dev_compiler/test/nullable_inference_test.dart
@@ -470,8 +470,14 @@ Future expectNotNull(String code, String expectedNotNull) async {
   var component = await kernelCompile(code);
   var collector = NotNullCollector();
   component.accept(collector);
-  var actualNotNull =
-      collector.notNullExpressions.map((e) => e.toString()).join(', ');
+  var actualNotNull = collector.notNullExpressions
+      // ConstantExpressions print the table offset - we want to compare
+      // against the underlying constant value instead.
+      .map((e) => (e is ConstantExpression ? e.constant : e).toString())
+      // Filter out our own NotNull annotations.  The library prefix changes
+      // per test, so just filter on the suffix.
+      .where((s) => !s.endsWith('::_NotNull {}'))
+      .join(', ');
   expect(actualNotNull, equals(expectedNotNull));
 }
 
