commit f3d8b420a01a8a93c49da2d1cb57d97fcb6d5bcc
author Paul Berry <paulberry@google.com> Fri May 03 14:29:41 2019 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org> Fri May 03 14:29:41 2019 +0000
tree def8d38bf3975db6b07f66c019ceafe7e20121f2
parent c38b65d2bcd6592aa946a9d4e0f9bec437610962

Consolidate all NNBD enables in summary_common.dart.

Change-Id: I3cc0363f82674fd1a59ff0c3e2d11e46a72a0d4c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/101075
Reviewed-by: Konstantin Shcheglov <scheglov@google.com>

pkg/analyzer/test/src/summary/summary_common.dart

diff --git a/pkg/analyzer/test/src/summary/summary_common.dart b/pkg/analyzer/test/src/summary/summary_common.dart
index 947805e..2523cdd 100644
--- a/pkg/analyzer/test/src/summary/summary_common.dart
+++ b/pkg/analyzer/test/src/summary/summary_common.dart
@@ -83,6 +83,9 @@
   /// Get access to the linked defining compilation unit.
   LinkedUnit get definingUnit => linked.units[0];
 
+  FeatureSet get enableNnbd =>
+      FeatureSet.forTesting(additionalFeatures: [Feature.non_nullable]);
+
   /// TODO(scheglov) rename "Const" to "Expr" everywhere
   void assertUnlinkedConst(UnlinkedExpr constExpr, String sourceRepresentation,
       {bool isValidConst: true,
@@ -8730,8 +8733,7 @@
   }
 
   test_field_late() {
-    featureSet = FeatureSet.forTesting(
-        sdkVersion: '2.2.2', additionalFeatures: [Feature.non_nullable]);
+    featureSet = enableNnbd;
     UnlinkedClass cls = serializeClassText('class C { late int i; }');
     UnlinkedVariable variable = findVariable('i', variables: cls.fields);
     expect(variable, isNotNull);
@@ -8779,8 +8781,7 @@
   }
 
   test_field_static_final_late() {
-    featureSet = FeatureSet.forTesting(
-        sdkVersion: '2.2.2', additionalFeatures: [Feature.non_nullable]);
+    featureSet = enableNnbd;
     UnlinkedVariable variable =
         serializeClassText('class C { static late final int i = 0; }')
             .fields[0];
@@ -8803,8 +8804,7 @@
   }
 
   test_field_static_late() {
-    featureSet = FeatureSet.forTesting(
-        sdkVersion: '2.2.2', additionalFeatures: [Feature.non_nullable]);
+    featureSet = enableNnbd;
     UnlinkedVariable variable =
         serializeClassText('class C { static late int i; }').fields[0];
     expect(variable.isLate, isTrue);
@@ -11648,8 +11648,7 @@
   }
 
   test_variable_late() {
-    featureSet = FeatureSet.forTesting(
-        sdkVersion: '2.2.2', additionalFeatures: [Feature.non_nullable]);
+    featureSet = enableNnbd;
     UnlinkedVariable variable =
         serializeVariableText('late int i;', variableName: 'i');
     expect(variable.isLate, isTrue);