From 294d285b3fd5448272e26b2fb624adc8dc2fc19c Mon Sep 17 00:00:00 2001 From: Janice Collins Date: Mon, 19 Apr 2021 10:15:01 -0700 Subject: [PATCH 1/2] Fix test problems first --- test/end2end/model_special_cases_test.dart | 4 ++-- testing/test_package_experiments/pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/end2end/model_special_cases_test.dart b/test/end2end/model_special_cases_test.dart index 8f36898eb2..d318103b8e 100644 --- a/test/end2end/model_special_cases_test.dart +++ b/test/end2end/model_special_cases_test.dart @@ -77,9 +77,9 @@ void main() { final _generalizedTypedefsAllowed = VersionRange(min: Version.parse('2.13.0-0'), includeMin: true); final _genericMetadataAllowed = - VersionRange(min: Version.parse('2.13.0-0'), includeMin: true); + VersionRange(min: Version.parse('2.14.0-0'), includeMin: true); final _tripleShiftAllowed = - VersionRange(min: Version.parse('2.13.0-0'), includeMin: true); + VersionRange(min: Version.parse('2.14.0-0'), includeMin: true); // Experimental features not yet enabled by default. Move tests out of this // block when the feature is enabled by default. diff --git a/testing/test_package_experiments/pubspec.yaml b/testing/test_package_experiments/pubspec.yaml index 32c96d812b..d0ee15f855 100644 --- a/testing/test_package_experiments/pubspec.yaml +++ b/testing/test_package_experiments/pubspec.yaml @@ -1,5 +1,5 @@ name: test_package_experiments version: 0.0.1 environment: - sdk: '>=2.13.0-0 <3.0.0' + sdk: '>=2.14.0-0 <3.0.0' description: Experimental flags are tested here. From ee6e64438d9d24b237a54332ec854271a5a4df58 Mon Sep 17 00:00:00 2001 From: Janice Collins Date: Mon, 19 Apr 2021 13:40:21 -0700 Subject: [PATCH 2/2] Something is wrong with tripleshift/generic-metadata post 2.14 --- lib/src/model/operator.dart | 1 + test/end2end/model_special_cases_test.dart | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/lib/src/model/operator.dart b/lib/src/model/operator.dart index d8e73abac8..311a1bbf0e 100644 --- a/lib/src/model/operator.dart +++ b/lib/src/model/operator.dart @@ -22,6 +22,7 @@ class Operator extends Method { '<=': 'less_equal', '<<': 'shift_left', '>>': 'shift_right', + '>>>': 'triple_shift', '^': 'bitwise_exclusive_or', 'unary-': 'unary_minus', '|': 'bitwise_or', diff --git a/test/end2end/model_special_cases_test.dart b/test/end2end/model_special_cases_test.dart index d318103b8e..4f267ecf81 100644 --- a/test/end2end/model_special_cases_test.dart +++ b/test/end2end/model_special_cases_test.dart @@ -27,14 +27,10 @@ final Version _platformVersion = Version.parse(_platformVersionString); final _testPackageGraphExperimentsMemo = AsyncMemoizer(); Future get _testPackageGraphExperiments => _testPackageGraphExperimentsMemo.runOnce(() => utils.bootBasicPackage( - 'testing/test_package_experiments', - pubPackageMetaProvider, - PhysicalPackageConfigProvider(), - additionalArguments: [ - '--enable-experiment', - 'non-nullable,nonfunction-type-aliases', - '--no-link-to-remote' - ])); + 'testing/test_package_experiments', + pubPackageMetaProvider, + PhysicalPackageConfigProvider(), + additionalArguments: ['--no-link-to-remote'])); final _testPackageGraphGinormousMemo = AsyncMemoizer(); Future get _testPackageGraphGinormous => @@ -74,12 +70,16 @@ void main() { exit(1); } + // We can not use ExperimentalFeature.releaseVersion or even + // ExperimentalFeature.experimentalReleaseVersion as these are set to null + // even when partial analyzer implementations are available, and are often + // set too high after release. final _generalizedTypedefsAllowed = VersionRange(min: Version.parse('2.13.0-0'), includeMin: true); final _genericMetadataAllowed = - VersionRange(min: Version.parse('2.14.0-0'), includeMin: true); + VersionRange(min: Version.parse('2.15.0-0'), includeMin: true); final _tripleShiftAllowed = - VersionRange(min: Version.parse('2.14.0-0'), includeMin: true); + VersionRange(min: Version.parse('2.15.0-0'), includeMin: true); // Experimental features not yet enabled by default. Move tests out of this // block when the feature is enabled by default.