firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Migrate the rest of general.shard to explicit-package-dependencies. (#160280)

Browse Source 
Towards https://github.com/flutter/flutter/issues/160257.
This commit is contained in:
Matan Lurey 2024-12-13 15:14:22 -08:00 committed by GitHub
parent b008e5b60c
commit 14177eaa7c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/flutter_tools/test/general.shard/project_test.dart
View File

@ -15,6 +15,7 @@ import 'package:flutter_tools/src/base/version.dart';
import 'package:flutter_tools/src/build_info.dart'; import 'package:flutter_tools/src/build_info.dart';
import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/cache.dart';
import 'package:flutter_tools/src/convert.dart'; import 'package:flutter_tools/src/convert.dart';
import 'package:flutter_tools/src/dart/pub.dart';
import 'package:flutter_tools/src/features.dart'; import 'package:flutter_tools/src/features.dart';
import 'package:flutter_tools/src/flutter_manifest.dart'; import 'package:flutter_tools/src/flutter_manifest.dart';
import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/globals.dart' as globals;
@ -26,6 +27,7 @@ import 'package:test/fake.dart';
import '../src/common.dart'; import '../src/common.dart';
import '../src/context.dart'; import '../src/context.dart';
import '../src/fake_pub_deps.dart';
import '../src/fakes.dart'; import '../src/fakes.dart';
void main() { void main() {
@ -1624,6 +1626,12 @@ void _testInMemory(
fileSystem: testFileSystem, fileSystem: testFileSystem,
logger: globals.logger, logger: globals.logger,
), ),
// TODO(matanlurey): Remove after `explicit-package-dependencies` is enabled by default.
// See https://github.com/flutter/flutter/issues/160257 for details.
FeatureFlags: () => TestFeatureFlags(
isExplicitPackageDependenciesEnabled: true,
),
Pub: FakePubWithPrimedDeps.new,
}, },
); );
} }

16
packages/flutter_tools/test/general.shard/resident_runner_test.dart
View File

@ -16,6 +16,7 @@ import 'package:flutter_tools/src/base/platform.dart';
import 'package:flutter_tools/src/build_info.dart'; import 'package:flutter_tools/src/build_info.dart';
import 'package:flutter_tools/src/compile.dart'; import 'package:flutter_tools/src/compile.dart';
import 'package:flutter_tools/src/convert.dart'; import 'package:flutter_tools/src/convert.dart';
import 'package:flutter_tools/src/dart/pub.dart';
import 'package:flutter_tools/src/devfs.dart'; import 'package:flutter_tools/src/devfs.dart';
import 'package:flutter_tools/src/device.dart'; import 'package:flutter_tools/src/device.dart';
import 'package:flutter_tools/src/features.dart'; import 'package:flutter_tools/src/features.dart';
@ -34,6 +35,7 @@ import 'package:vm_service/vm_service.dart' as vm_service;
import '../src/common.dart'; import '../src/common.dart';
import '../src/context.dart'; import '../src/context.dart';
import '../src/fake_pub_deps.dart';
import '../src/fake_vm_services.dart'; import '../src/fake_vm_services.dart';
import '../src/fakes.dart'; import '../src/fakes.dart';
import '../src/testbed.dart'; import '../src/testbed.dart';
@ -49,6 +51,14 @@ void main() {
late FakeDevice device; late FakeDevice device;
FakeVmServiceHost? fakeVmServiceHost; FakeVmServiceHost? fakeVmServiceHost;
// TODO(matanlurey): Remove after `explicit-package-dependencies` is enabled by default.
// See https://github.com/flutter/flutter/issues/160257 for details.
FeatureFlags enableExplicitPackageDependencies() {
return TestFeatureFlags(
isExplicitPackageDependenciesEnabled: true,
);
}
setUp(() { setUp(() {
testbed = Testbed(setup: () { testbed = Testbed(setup: () {
globals.fs.file(globals.fs.path.join('build', 'app.dill')) globals.fs.file(globals.fs.path.join('build', 'app.dill'))
@ -1132,6 +1142,9 @@ void main() {
expect(testLogger.errorText, isEmpty); expect(testLogger.errorText, isEmpty);
expect(testLogger.statusText, isEmpty); expect(testLogger.statusText, isEmpty);
}, overrides: <Type, Generator>{
FeatureFlags: enableExplicitPackageDependencies,
Pub: FakePubWithPrimedDeps.new,
})); }));
testUsingContext('generated main uses correct target', () => testbed.run(() async { testUsingContext('generated main uses correct target', () => testbed.run(() async {
@ -1206,6 +1219,9 @@ flutter:
expect(generatedMain.existsSync(), isTrue); expect(generatedMain.existsSync(), isTrue);
expect(testLogger.errorText, isEmpty); expect(testLogger.errorText, isEmpty);
expect(testLogger.statusText, isEmpty); expect(testLogger.statusText, isEmpty);
}, overrides: <Type, Generator>{
FeatureFlags: enableExplicitPackageDependencies,
Pub: FakePubWithPrimedDeps.new,
})); }));
testUsingContext('ResidentRunner can run source generation - generation fails', () => testbed.run(() async { testUsingContext('ResidentRunner can run source generation - generation fails', () => testbed.run(() async {