Update tests that have the current version number hardcoded
Some package configuration tests have the current version hardcoded
in local package_config.json files. Update these from 2.9 to 2.10.
Change-Id: I77bf63c0e5dfa73aa8a86fb1b4e8a404e8cfaa7f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/155441
Reviewed-by: Martin Kustermann <kustermann@google.com>
diff --git a/pkg/analyzer/test/src/dart/resolution/language_version_test.dart b/pkg/analyzer/test/src/dart/resolution/language_version_test.dart
index 795ead6..2391856 100644
--- a/pkg/analyzer/test/src/dart/resolution/language_version_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/language_version_test.dart
@@ -131,10 +131,10 @@
assertErrorsInList(result.errors, []);
assertType(findElement.topVar('x').type, 'int*');
- // Upgrade the language version to `2.9`, so enabled Null Safety.
+ // Upgrade the language version to `2.10`, so enabled Null Safety.
driver.changeFile(path);
await _resolveFile(path, r'''
-// @dart = 2.9
+// @dart = 2.10
var x = 0;
''');
assertType(findElement.topVar('x').type, 'int');
@@ -162,10 +162,10 @@
''');
assertType(findElement.topVar('x').type, 'int*');
- // Upgrade the language version to `2.9`, so enabled Null Safety.
+ // Upgrade the language version to `2.10`, so enabled Null Safety.
_changeTestFile();
await assertNoErrorsInCode('''
-// @dart = 2.9
+// @dart = 2.10
var x = 0;
''');
assertType(findElement.topVar('x').type, 'int');
diff --git a/pkg/analyzer/test/src/diagnostics/invalid_language_override_greater_test.dart b/pkg/analyzer/test/src/diagnostics/invalid_language_override_greater_test.dart
index 03299de..53609b5 100644
--- a/pkg/analyzer/test/src/diagnostics/invalid_language_override_greater_test.dart
+++ b/pkg/analyzer/test/src/diagnostics/invalid_language_override_greater_test.dart
@@ -40,12 +40,12 @@
test_greaterThanPackage() async {
_configureTestPackageLanguageVersion('2.5');
await assertNoErrorsInCode(r'''
-// @dart = 2.9
+// @dart = 2.10
int? a;
''');
_assertUnitLanguageVersion(
package: Version.parse('2.5.0'),
- override: Version.parse('2.9.0'),
+ override: Version.parse('2.10.0'),
);
}
diff --git a/pkg/analyzer/test/src/diagnostics/invalid_language_override_test.dart b/pkg/analyzer/test/src/diagnostics/invalid_language_override_test.dart
index 1495c82..ce3819f 100644
--- a/pkg/analyzer/test/src/diagnostics/invalid_language_override_test.dart
+++ b/pkg/analyzer/test/src/diagnostics/invalid_language_override_test.dart
@@ -24,9 +24,9 @@
]);
}
- test_correct_2_10() async {
+ test_correct_2_19() async {
await assertErrorsInCode(r'''
-// @dart = 2.10
+// @dart = 2.19
int i = 0;
''', [
error(HintCode.INVALID_LANGUAGE_VERSION_OVERRIDE_GREATER, 0, 15),
diff --git a/pkg/front_end/testcases/nnbd_mixed/issue42387/foundation_basic_types_lib.dart b/pkg/front_end/testcases/nnbd_mixed/issue42387/foundation_basic_types_lib.dart
index c2736fd..0984f7c 100644
--- a/pkg/front_end/testcases/nnbd_mixed/issue42387/foundation_basic_types_lib.dart
+++ b/pkg/front_end/testcases/nnbd_mixed/issue42387/foundation_basic_types_lib.dart
@@ -2,6 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// @dart = 2.9
+// @dart = 2.10
typedef Future<Null> AsyncCallback();
diff --git a/pkg/front_end/testcases/nnbd_mixed/issue42387/foundation_binding_lib.dart b/pkg/front_end/testcases/nnbd_mixed/issue42387/foundation_binding_lib.dart
index a1fb380..9666c88 100644
--- a/pkg/front_end/testcases/nnbd_mixed/issue42387/foundation_binding_lib.dart
+++ b/pkg/front_end/testcases/nnbd_mixed/issue42387/foundation_binding_lib.dart
@@ -2,7 +2,7 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// @dart = 2.9
+// @dart = 2.10
import 'foundation_basic_types_lib.dart';
diff --git a/pkg/front_end/testcases/nnbd_mixed/issue42660_lib.dart b/pkg/front_end/testcases/nnbd_mixed/issue42660_lib.dart
index 3cbb751..7207237 100644
--- a/pkg/front_end/testcases/nnbd_mixed/issue42660_lib.dart
+++ b/pkg/front_end/testcases/nnbd_mixed/issue42660_lib.dart
@@ -2,7 +2,7 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// @dart=2.9
+// @dart=2.10
extension E on int {
String m() => 'm';
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/lists_nnbd.dart b/pkg/vm/testcases/transformations/type_flow/transformer/lists_nnbd.dart
index f0bb3c0..76fafab 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/lists_nnbd.dart
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/lists_nnbd.dart
@@ -3,7 +3,7 @@
// BSD-style license that can be found in the LICENSE file.
// This test requires non-nullable experiment.
-// @dart = 2.9
+// @dart = 2.10
nonConstant() => int.parse('1') == 1;
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/null_check_elimination_nnbd.dart b/pkg/vm/testcases/transformations/type_flow/transformer/null_check_elimination_nnbd.dart
index 1d5fb04..b529e22 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/null_check_elimination_nnbd.dart
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/null_check_elimination_nnbd.dart
@@ -5,7 +5,7 @@
// Tests elimination of null checks.
// This test requires non-nullable experiment.
-// @dart = 2.9
+// @dart = 2.10
class A {
String? nonNullable;
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/regress_41452_nnbd_strong.dart b/pkg/vm/testcases/transformations/type_flow/transformer/regress_41452_nnbd_strong.dart
index b60f24c5..bc79497 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/regress_41452_nnbd_strong.dart
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/regress_41452_nnbd_strong.dart
@@ -6,7 +6,7 @@
// Tests handling of null initializer of covariant field.
// This test requires non-nullable experiment and NNBD strong mode.
-// @dart = 2.9
+// @dart = 2.10
class _SplayTreeNode<Node extends _SplayTreeNode<Node>> {
Node? left;
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/type_cast_elimination_nnbd.dart b/pkg/vm/testcases/transformations/type_flow/transformer/type_cast_elimination_nnbd.dart
index 710cf8f..5f0e8e8 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/type_cast_elimination_nnbd.dart
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/type_cast_elimination_nnbd.dart
@@ -5,7 +5,7 @@
// Tests elimination of type casts.
// This test requires non-nullable experiment.
-// @dart = 2.9
+// @dart = 2.10
class A<T> {}
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/type_cast_elimination_nnbd_strong.dart b/pkg/vm/testcases/transformations/type_flow/transformer/type_cast_elimination_nnbd_strong.dart
index 588f620..c828095 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/type_cast_elimination_nnbd_strong.dart
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/type_cast_elimination_nnbd_strong.dart
@@ -5,7 +5,7 @@
// Tests elimination of type casts.
// This test requires non-nullable experiment and NNBD strong mode.
-// @dart = 2.9
+// @dart = 2.10
class A<T> {}
diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/write_only_field3_nnbd.dart b/pkg/vm/testcases/transformations/type_flow/transformer/write_only_field3_nnbd.dart
index bcc6ec4..ea59290 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/write_only_field3_nnbd.dart
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/write_only_field3_nnbd.dart
@@ -5,7 +5,7 @@
// Test for tree shaking of write-only late fields.
// This test requires non-nullable experiment.
-// @dart = 2.9
+// @dart = 2.10
foo() {}
diff --git a/tests/lib/isolate/scenarios/package_relative_root/.dart_tool/package_config.json b/tests/lib/isolate/scenarios/package_relative_root/.dart_tool/package_config.json
index 00b936c..6d510b8 100644
--- a/tests/lib/isolate/scenarios/package_relative_root/.dart_tool/package_config.json
+++ b/tests/lib/isolate/scenarios/package_relative_root/.dart_tool/package_config.json
@@ -4,12 +4,12 @@
{
"name": "foo",
"rootUri": "../packages/foo",
- "languageVersion": "2.9"
+ "languageVersion": "2.10"
},
{
"name": "bar",
"rootUri": "../packages/bar",
- "languageVersion": "2.9"
+ "languageVersion": "2.10"
}
]
}
diff --git a/tests/lib/isolate/scenarios/package_relative_spec/.dart_tool/package_config.json b/tests/lib/isolate/scenarios/package_relative_spec/.dart_tool/package_config.json
index 581db8e..740a2dd 100644
--- a/tests/lib/isolate/scenarios/package_relative_spec/.dart_tool/package_config.json
+++ b/tests/lib/isolate/scenarios/package_relative_spec/.dart_tool/package_config.json
@@ -4,12 +4,12 @@
{
"name": "foo",
"rootUri": "../foo_package",
- "languageVersion": "2.9"
+ "languageVersion": "2.10"
},
{
"name": "bar",
"rootUri": "../bar1_package",
- "languageVersion": "2.9"
+ "languageVersion": "2.10"
}
]
}
diff --git a/tests/lib/isolate/scenarios/package_relative_spec/bar1_package/package.config b/tests/lib/isolate/scenarios/package_relative_spec/bar1_package/package.config
index daf3199..e4dc783 100644
--- a/tests/lib/isolate/scenarios/package_relative_spec/bar1_package/package.config
+++ b/tests/lib/isolate/scenarios/package_relative_spec/bar1_package/package.config
@@ -4,12 +4,12 @@
{
"name": "foo",
"rootUri": "../foo_package",
- "languageVersion": "2.9"
+ "languageVersion": "2.10"
},
{
"name": "bar",
"rootUri": "../bar2_package",
- "languageVersion": "2.9"
+ "languageVersion": "2.10"
}
]
}
diff --git a/tests/lib/isolate/scenarios/short_package/.dart_tool/package_config.json b/tests/lib/isolate/scenarios/short_package/.dart_tool/package_config.json
index f77884c..c043659 100644
--- a/tests/lib/isolate/scenarios/short_package/.dart_tool/package_config.json
+++ b/tests/lib/isolate/scenarios/short_package/.dart_tool/package_config.json
@@ -4,7 +4,7 @@
{
"name": "flu",
"rootUri": "../flu_package",
- "languageVersion": "2.9"
+ "languageVersion": "2.10"
}
]
}
diff --git a/tests/standalone/package/scenarios/both_dir_and_file/.dart_tool/package_config.json b/tests/standalone/package/scenarios/both_dir_and_file/.dart_tool/package_config.json
index 698202e..23e4838 100644
--- a/tests/standalone/package/scenarios/both_dir_and_file/.dart_tool/package_config.json
+++ b/tests/standalone/package/scenarios/both_dir_and_file/.dart_tool/package_config.json
@@ -9,7 +9,7 @@
{
"name": "foo",
"rootUri": "../foo",
- "languageVersion": "2.9"
+ "languageVersion": "2.10"
}
]
}
diff --git a/tests/standalone/package/scenarios/packages_file_in_parent/.dart_tool/package_config.json b/tests/standalone/package/scenarios/packages_file_in_parent/.dart_tool/package_config.json
index 698202e..23e4838 100644
--- a/tests/standalone/package/scenarios/packages_file_in_parent/.dart_tool/package_config.json
+++ b/tests/standalone/package/scenarios/packages_file_in_parent/.dart_tool/package_config.json
@@ -9,7 +9,7 @@
{
"name": "foo",
"rootUri": "../foo",
- "languageVersion": "2.9"
+ "languageVersion": "2.10"
}
]
}
diff --git a/tests/standalone/package/scenarios/packages_file_only/.dart_tool/package_config.json b/tests/standalone/package/scenarios/packages_file_only/.dart_tool/package_config.json
index 698202e..23e4838 100644
--- a/tests/standalone/package/scenarios/packages_file_only/.dart_tool/package_config.json
+++ b/tests/standalone/package/scenarios/packages_file_only/.dart_tool/package_config.json
@@ -9,7 +9,7 @@
{
"name": "foo",
"rootUri": "../foo",
- "languageVersion": "2.9"
+ "languageVersion": "2.10"
}
]
}
diff --git a/tests/standalone/package/scenarios/packages_option_only/sub/.dart_tool/package_config.json b/tests/standalone/package/scenarios/packages_option_only/sub/.dart_tool/package_config.json
index 698202e..23e4838 100644
--- a/tests/standalone/package/scenarios/packages_option_only/sub/.dart_tool/package_config.json
+++ b/tests/standalone/package/scenarios/packages_option_only/sub/.dart_tool/package_config.json
@@ -9,7 +9,7 @@
{
"name": "foo",
"rootUri": "../foo",
- "languageVersion": "2.9"
+ "languageVersion": "2.10"
}
]
}
