From 03c13af0b412744f62529345b0f58d84e0eb4709 Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Mon, 18 Nov 2024 11:00:04 -0800 Subject: [PATCH] Define and use `flutterBin` consistently across `integration.shard`. (#159007) Towards https://github.com/flutter/flutter/issues/158875. This should be a NOP, and just reduce the amount of copy-pasted code across tests. --- .../integration.shard/analyze_size_test.dart | 6 ------ .../integration.shard/android_e2e_api_test.dart | 1 - .../android_gradle_daemon_cache_test.dart | 2 -- ...roid_gradle_deprecated_plugin_apply_test.dart | 2 -- .../android_gradle_flutter_source_path_test.dart | 5 ----- .../android_gradle_java_version_test.dart | 2 -- ...flutter_plugins_strings_in_comments_test.dart | 6 ------ ...id_gradle_outputs_app_link_settings_test.dart | 4 ---- ...android_gradle_print_build_variants_test.dart | 2 -- ...d_plugin_compilesdkversion_mismatch_test.dart | 6 ------ .../android_plugin_example_app_build_test.dart | 6 ------ .../android_plugin_ndkversion_mismatch_test.dart | 6 ------ .../android_plugin_new_output_dir_test.dart | 5 ----- .../android_plugin_skip_unsupported_test.dart | 6 ------ .../asset_transformation_test.dart | 5 ----- .../build_ios_config_only_test.dart | 1 - .../build_macos_config_only_test.dart | 1 - .../integration.shard/build_preview_test.dart | 1 - .../integration.shard/command_output_test.dart | 16 ---------------- .../test/integration.shard/daemon_mode_test.dart | 2 -- .../deferred_components_test.dart | 7 ------- .../deprecated_gradle_settings_test.dart | 1 - .../integration.shard/devtools_uri_test.dart | 1 - .../downgrade_upgrade_integration_test.dart | 1 - ..._build_android_app_project_builddir_test.dart | 6 ------ .../flutter_build_apk_verbose_test.dart | 6 ------ .../flutter_build_config_only_test.dart | 6 ------ .../flutter_build_wasm_test.dart | 6 ------ .../flutter_build_windows_test.dart | 6 ------ ...lutter_build_with_compilation_error_test.dart | 6 ------ .../flutter_plugins_dependencies_test.dart | 3 --- .../test/integration.shard/flutter_run_test.dart | 1 - .../flutter_run_with_error_test.dart | 6 ------ .../gradle_non_android_plugin_test.dart | 6 ------ .../isolated/native_assets_agp_version_test.dart | 2 +- .../isolated/native_assets_test.dart | 2 +- .../isolated/native_assets_test_utils.dart | 2 +- ...tive_assets_without_cbuild_assemble_test.dart | 1 - .../integration.shard/observatory_port_test.dart | 3 --- .../swift_package_manager_create_app_test.dart | 6 ------ ...swift_package_manager_create_plugin_test.dart | 6 ------ .../swift_package_manager_test.dart | 6 ------ .../test/integration.shard/test_driver.dart | 1 - .../test/integration.shard/test_test.dart | 1 - .../test/integration.shard/test_utils.dart | 7 +++++++ .../integration.shard/transition_test_utils.dart | 3 +-- 46 files changed, 11 insertions(+), 176 deletions(-) diff --git a/packages/flutter_tools/test/integration.shard/analyze_size_test.dart b/packages/flutter_tools/test/integration.shard/analyze_size_test.dart index 13e85cb5e7..f7a12ec4a8 100644 --- a/packages/flutter_tools/test/integration.shard/analyze_size_test.dart +++ b/packages/flutter_tools/test/integration.shard/analyze_size_test.dart @@ -20,7 +20,6 @@ const String runDevToolsMessage = 'dart devtools '; void main() { testWithoutContext('--analyze-size flag produces expected output on hello_world for Android', () async { final String workingDirectory = fileSystem.path.join(getFlutterRoot(), 'examples', 'hello_world'); - final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); final ProcessResult result = await processManager.run([ flutterBin, 'build', @@ -53,7 +52,6 @@ void main() { testWithoutContext('--analyze-size flag produces expected output on hello_world for iOS', () async { final String workingDirectory = fileSystem.path.join(getFlutterRoot(), 'examples', 'hello_world'); - final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); final Directory tempDir = fileSystem.systemTempDirectory.createTempSync('flutter_size_test.'); final Directory codeSizeDir = tempDir.childDirectory('code size dir')..createSync(); final ProcessResult result = await processManager.run([ @@ -91,7 +89,6 @@ void main() { testWithoutContext('--analyze-size flag produces expected output on hello_world for macOS', () async { final String workingDirectory = fileSystem.path.join(getFlutterRoot(), 'examples', 'hello_world'); - final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); final Directory tempDir = fileSystem.systemTempDirectory.createTempSync('flutter_size_test.'); final Directory codeSizeDir = tempDir.childDirectory('code size dir')..createSync(); @@ -143,7 +140,6 @@ void main() { }, skip: !platform.isMacOS); // [intended] this is a macos only test. testWithoutContext('--analyze-size is only supported in release mode', () async { - final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); final ProcessResult result = await processManager.run([ flutterBin, 'build', @@ -163,7 +159,6 @@ void main() { }); testWithoutContext('--analyze-size is not supported in combination with --split-debug-info', () async { - final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); final List command = [ flutterBin, 'build', @@ -188,7 +183,6 @@ void main() { }); testWithoutContext('--analyze-size allows overriding the directory for code size files', () async { - final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); final Directory tempDir = fileSystem.systemTempDirectory.createTempSync('flutter_size_test.'); final List command = [ diff --git a/packages/flutter_tools/test/integration.shard/android_e2e_api_test.dart b/packages/flutter_tools/test/integration.shard/android_e2e_api_test.dart index 9c1c677f6a..599f66a606 100644 --- a/packages/flutter_tools/test/integration.shard/android_e2e_api_test.dart +++ b/packages/flutter_tools/test/integration.shard/android_e2e_api_test.dart @@ -24,7 +24,6 @@ void main() { }); testWithoutContext('build succeeds with api 33 features', () async { - final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); ProcessResult result = await processManager.run([ flutterBin, 'create', diff --git a/packages/flutter_tools/test/integration.shard/android_gradle_daemon_cache_test.dart b/packages/flutter_tools/test/integration.shard/android_gradle_daemon_cache_test.dart index b9b3af1db5..3b42601b19 100644 --- a/packages/flutter_tools/test/integration.shard/android_gradle_daemon_cache_test.dart +++ b/packages/flutter_tools/test/integration.shard/android_gradle_daemon_cache_test.dart @@ -22,8 +22,6 @@ void main() { testWithoutContext( 'gradle task succeeds when adding plugins with gradle daemon enabled', () async { - final String flutterBin = - fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); final Directory appDir = tempDir.childDirectory('testapp'); final Directory androidDir = appDir.childDirectory('android'); diff --git a/packages/flutter_tools/test/integration.shard/android_gradle_deprecated_plugin_apply_test.dart b/packages/flutter_tools/test/integration.shard/android_gradle_deprecated_plugin_apply_test.dart index 91bc50622a..20221f174b 100644 --- a/packages/flutter_tools/test/integration.shard/android_gradle_deprecated_plugin_apply_test.dart +++ b/packages/flutter_tools/test/integration.shard/android_gradle_deprecated_plugin_apply_test.dart @@ -28,8 +28,6 @@ void main() { testWithoutContext( 'gradle prints warning when Flutter\'s Gradle plugins are applied using deprecated "apply plugin" way', () async { // Create a new flutter project. - final String flutterBin = - fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); ProcessResult result = await processManager.run([ flutterBin, 'create', diff --git a/packages/flutter_tools/test/integration.shard/android_gradle_flutter_source_path_test.dart b/packages/flutter_tools/test/integration.shard/android_gradle_flutter_source_path_test.dart index 814cdfec9a..929cbb022c 100644 --- a/packages/flutter_tools/test/integration.shard/android_gradle_flutter_source_path_test.dart +++ b/packages/flutter_tools/test/integration.shard/android_gradle_flutter_source_path_test.dart @@ -29,11 +29,6 @@ void main() { final Project project = DeferredComponentsProject( MissingFlutterSourcePathDeferredComponentsConfig(), ); - final String flutterBin = fileSystem.path.join( - getFlutterRoot(), - 'bin', - 'flutter', - ); final Directory exampleAppDir = tempDir.childDirectory('example'); await project.setUpIn(exampleAppDir); diff --git a/packages/flutter_tools/test/integration.shard/android_gradle_java_version_test.dart b/packages/flutter_tools/test/integration.shard/android_gradle_java_version_test.dart index 6dea44867a..2c42f413c8 100644 --- a/packages/flutter_tools/test/integration.shard/android_gradle_java_version_test.dart +++ b/packages/flutter_tools/test/integration.shard/android_gradle_java_version_test.dart @@ -24,8 +24,6 @@ void main() { testWithoutContext( 'gradle task exists named javaVersion that prints jdk version', () async { // Create a new flutter project. - final String flutterBin = - fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); ProcessResult result = await processManager.run([ flutterBin, 'create', diff --git a/packages/flutter_tools/test/integration.shard/android_gradle_legacy_flutter_plugins_strings_in_comments_test.dart b/packages/flutter_tools/test/integration.shard/android_gradle_legacy_flutter_plugins_strings_in_comments_test.dart index 041b3aa453..4daf82441a 100644 --- a/packages/flutter_tools/test/integration.shard/android_gradle_legacy_flutter_plugins_strings_in_comments_test.dart +++ b/packages/flutter_tools/test/integration.shard/android_gradle_legacy_flutter_plugins_strings_in_comments_test.dart @@ -28,12 +28,6 @@ void main() { }); test('should build Android app with commented-out ".flutter-plugins" in settings.gradle', () async { - final String flutterBin = fileSystem.path.join( - getFlutterRoot(), - 'bin', - 'flutter', - ); - // Create Android app project instead of plugin processManager.runSync([ flutterBin, diff --git a/packages/flutter_tools/test/integration.shard/android_gradle_outputs_app_link_settings_test.dart b/packages/flutter_tools/test/integration.shard/android_gradle_outputs_app_link_settings_test.dart index 60788ae9dc..ea1521fd39 100644 --- a/packages/flutter_tools/test/integration.shard/android_gradle_outputs_app_link_settings_test.dart +++ b/packages/flutter_tools/test/integration.shard/android_gradle_outputs_app_link_settings_test.dart @@ -278,8 +278,6 @@ void main() { testWithoutContext( 'gradle task outputsAppLinkSettings works when a project has app links', () async { // Create a new flutter project. - final String flutterBin = - fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); ProcessResult result = await processManager.run([ flutterBin, 'create', @@ -345,8 +343,6 @@ void main() { testWithoutContext( 'gradle task outputsAppLinkSettings works when a project does not have app link and the flutter_deeplinking_enabled flag', () async { // Create a new flutter project. - final String flutterBin = - fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); ProcessResult result = await processManager.run([ flutterBin, 'create', diff --git a/packages/flutter_tools/test/integration.shard/android_gradle_print_build_variants_test.dart b/packages/flutter_tools/test/integration.shard/android_gradle_print_build_variants_test.dart index fa2c72359f..e8f60aff81 100644 --- a/packages/flutter_tools/test/integration.shard/android_gradle_print_build_variants_test.dart +++ b/packages/flutter_tools/test/integration.shard/android_gradle_print_build_variants_test.dart @@ -31,8 +31,6 @@ void main() { testWithoutContext( 'gradle task exists named printBuildVariants that prints build variants', () async { // Create a new flutter project. - final String flutterBin = - fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); ProcessResult result = await processManager.run([ flutterBin, 'create', diff --git a/packages/flutter_tools/test/integration.shard/android_plugin_compilesdkversion_mismatch_test.dart b/packages/flutter_tools/test/integration.shard/android_plugin_compilesdkversion_mismatch_test.dart index 301e851e71..d7cc48282f 100644 --- a/packages/flutter_tools/test/integration.shard/android_plugin_compilesdkversion_mismatch_test.dart +++ b/packages/flutter_tools/test/integration.shard/android_plugin_compilesdkversion_mismatch_test.dart @@ -24,12 +24,6 @@ void main() { }); test('error logged when plugin Android compileSdk version higher than project', () async { - final String flutterBin = fileSystem.path.join( - getFlutterRoot(), - 'bin', - 'flutter', - ); - // Create dummy plugin processManager.runSync([ flutterBin, diff --git a/packages/flutter_tools/test/integration.shard/android_plugin_example_app_build_test.dart b/packages/flutter_tools/test/integration.shard/android_plugin_example_app_build_test.dart index 8bb28785fa..67a70cf04e 100644 --- a/packages/flutter_tools/test/integration.shard/android_plugin_example_app_build_test.dart +++ b/packages/flutter_tools/test/integration.shard/android_plugin_example_app_build_test.dart @@ -32,12 +32,6 @@ void main() { required String template, required Directory tempDir, }) async { - final String flutterBin = fileSystem.path.join( - getFlutterRoot(), - 'bin', - 'flutter', - ); - final String testName = '${template}_test'; ProcessResult result = processManager.runSync([ diff --git a/packages/flutter_tools/test/integration.shard/android_plugin_ndkversion_mismatch_test.dart b/packages/flutter_tools/test/integration.shard/android_plugin_ndkversion_mismatch_test.dart index 21784f1b5e..e685c76efe 100644 --- a/packages/flutter_tools/test/integration.shard/android_plugin_ndkversion_mismatch_test.dart +++ b/packages/flutter_tools/test/integration.shard/android_plugin_ndkversion_mismatch_test.dart @@ -23,12 +23,6 @@ void main() { }); test('error logged when plugin Android ndkVersion higher than project', () async { - final String flutterBin = fileSystem.path.join( - getFlutterRoot(), - 'bin', - 'flutter', - ); - // Create dummy plugin processManager.runSync([ flutterBin, diff --git a/packages/flutter_tools/test/integration.shard/android_plugin_new_output_dir_test.dart b/packages/flutter_tools/test/integration.shard/android_plugin_new_output_dir_test.dart index 2452588765..3daa47b4c6 100644 --- a/packages/flutter_tools/test/integration.shard/android_plugin_new_output_dir_test.dart +++ b/packages/flutter_tools/test/integration.shard/android_plugin_new_output_dir_test.dart @@ -26,11 +26,6 @@ void main() { }); test('plugins use individualized build directories based on their name.', () async { - final String flutterBin = fileSystem.path.join( - getFlutterRoot(), - 'bin', - 'flutter', - ); // create flutter module project ProcessResult result = processManager.runSync([ flutterBin, diff --git a/packages/flutter_tools/test/integration.shard/android_plugin_skip_unsupported_test.dart b/packages/flutter_tools/test/integration.shard/android_plugin_skip_unsupported_test.dart index 297dc6a725..89e768bb57 100644 --- a/packages/flutter_tools/test/integration.shard/android_plugin_skip_unsupported_test.dart +++ b/packages/flutter_tools/test/integration.shard/android_plugin_skip_unsupported_test.dart @@ -37,12 +37,6 @@ void main() { required Project project, required bool createAndroidPluginFolder, }) async { - final String flutterBin = fileSystem.path.join( - getFlutterRoot(), - 'bin', - 'flutter', - ); - // Create dummy plugin that supports iOS and optionally Android. processManager.runSync([ flutterBin, diff --git a/packages/flutter_tools/test/integration.shard/asset_transformation_test.dart b/packages/flutter_tools/test/integration.shard/asset_transformation_test.dart index e53ea82b08..5e1ba07fc4 100644 --- a/packages/flutter_tools/test/integration.shard/asset_transformation_test.dart +++ b/packages/flutter_tools/test/integration.shard/asset_transformation_test.dart @@ -67,11 +67,6 @@ Future main() async { ..createSync(recursive: true) ..writeAsStringSync('abc'); - final String flutterBin = fileSystem.path.join( - getFlutterRoot(), - 'bin', - 'flutter', - ); final ProcessResult result = await processManager.run( [ flutterBin, diff --git a/packages/flutter_tools/test/integration.shard/build_ios_config_only_test.dart b/packages/flutter_tools/test/integration.shard/build_ios_config_only_test.dart index 86adcfba17..997f62e5d0 100644 --- a/packages/flutter_tools/test/integration.shard/build_ios_config_only_test.dart +++ b/packages/flutter_tools/test/integration.shard/build_ios_config_only_test.dart @@ -17,7 +17,6 @@ void main() { 'integration_tests', 'flutter_gallery', ); - final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); await processManager.run([ flutterBin, diff --git a/packages/flutter_tools/test/integration.shard/build_macos_config_only_test.dart b/packages/flutter_tools/test/integration.shard/build_macos_config_only_test.dart index 6fd271c55a..500239a16f 100644 --- a/packages/flutter_tools/test/integration.shard/build_macos_config_only_test.dart +++ b/packages/flutter_tools/test/integration.shard/build_macos_config_only_test.dart @@ -17,7 +17,6 @@ void main() { 'integration_tests', 'flutter_gallery', ); - final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); await processManager.run([ flutterBin, diff --git a/packages/flutter_tools/test/integration.shard/build_preview_test.dart b/packages/flutter_tools/test/integration.shard/build_preview_test.dart index f1d3f37704..cff31bb849 100644 --- a/packages/flutter_tools/test/integration.shard/build_preview_test.dart +++ b/packages/flutter_tools/test/integration.shard/build_preview_test.dart @@ -18,7 +18,6 @@ void main() { late Directory tempDir; final FileSystem fs = LocalFileSystemBlockingSetCurrentDirectory(); - final String flutterBin = fs.path.join(getFlutterRoot(), 'bin', 'flutter'); final File previewBin = fs .directory(getFlutterRoot()) .childDirectory('bin') diff --git a/packages/flutter_tools/test/integration.shard/command_output_test.dart b/packages/flutter_tools/test/integration.shard/command_output_test.dart index b03b64801b..8b1021155a 100644 --- a/packages/flutter_tools/test/integration.shard/command_output_test.dart +++ b/packages/flutter_tools/test/integration.shard/command_output_test.dart @@ -16,7 +16,6 @@ import 'test_utils.dart'; void main() { testWithoutContext('All development tools and deprecated commands are hidden and help text is not verbose', () async { - final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); final ProcessResult result = await processManager.run([ flutterBin, '-h', @@ -34,7 +33,6 @@ void main() { }); testWithoutContext('Flutter help is shown with -? command line argument', () async { - final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); final ProcessResult result = await processManager.run([ flutterBin, '-?', @@ -48,7 +46,6 @@ void main() { }); testWithoutContext('flutter doctor is not verbose', () async { - final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); final ProcessResult result = await processManager.run([ flutterBin, 'doctor', @@ -60,7 +57,6 @@ void main() { }); testWithoutContext('flutter doctor -vv super verbose', () async { - final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); final ProcessResult result = await processManager.run([ flutterBin, 'doctor', @@ -72,7 +68,6 @@ void main() { }); testWithoutContext('flutter config --list contains all features', () async { - final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); final ProcessResult result = await processManager.run([ flutterBin, 'config', @@ -99,7 +94,6 @@ void main() { .childDirectory('lib') .childFile('main.dart') .createSync(recursive: true); - final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); final ProcessResult result = await processManager.run([ flutterBin, 'run', @@ -115,7 +109,6 @@ void main() { }); testWithoutContext('flutter attach --machine uses AppRunLogger', () async { - final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); final ProcessResult result = await processManager.run([ flutterBin, 'attach', @@ -127,7 +120,6 @@ void main() { }); testWithoutContext('flutter --version --machine outputs JSON with flutterRoot', () async { - final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); final ProcessResult result = await processManager.run([ flutterBin, '--version', @@ -145,7 +137,6 @@ void main() { testWithoutContext('A tool exit is thrown for an invalid debug-url in flutter attach', () async { // This test is almost exactly like the next one; update them together please. - final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); final String helloWorld = fileSystem.path.join(getFlutterRoot(), 'examples', 'hello_world'); final ProcessResult result = await processManager.run([ flutterBin, @@ -164,7 +155,6 @@ void main() { testWithoutContext('--debug-uri is an alias for --debug-url', () async { // This text is exactly the same as the previous one but with a "l" turned to an "i". - final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); final String helloWorld = fileSystem.path.join(getFlutterRoot(), 'examples', 'hello_world'); final ProcessResult result = await processManager.run([ flutterBin, @@ -186,8 +176,6 @@ void main() { }); testWithoutContext('will load bootstrap script before starting', () async { - final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); - final File bootstrap = fileSystem.file(fileSystem.path.join( getFlutterRoot(), 'bin', @@ -208,7 +196,6 @@ void main() { }); testWithoutContext('Providing sksl bundle with missing file with tool exit', () async { - final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); final String helloWorld = fileSystem.path.join(getFlutterRoot(), 'examples', 'hello_world'); final ProcessResult result = await processManager.run([ flutterBin, @@ -224,7 +211,6 @@ void main() { }); testWithoutContext('flutter attach does not support --release', () async { - final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); final String helloWorld = fileSystem.path.join(getFlutterRoot(), 'examples', 'hello_world'); final ProcessResult result = await processManager.run([ flutterBin, @@ -238,7 +224,6 @@ void main() { }); testWithoutContext('flutter can report crashes', () async { - final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); final ProcessResult result = await processManager.run([ flutterBin, 'update-packages', @@ -255,7 +240,6 @@ void main() { }); testWithoutContext('flutter supports trailing args', () async { - final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); final String helloWorld = fileSystem.path.join(getFlutterRoot(), 'examples', 'hello_world'); final ProcessResult result = await processManager.run([ flutterBin, diff --git a/packages/flutter_tools/test/integration.shard/daemon_mode_test.dart b/packages/flutter_tools/test/integration.shard/daemon_mode_test.dart index c8d4b3952b..eb8655d802 100644 --- a/packages/flutter_tools/test/integration.shard/daemon_mode_test.dart +++ b/packages/flutter_tools/test/integration.shard/daemon_mode_test.dart @@ -31,8 +31,6 @@ void main() { final BasicProject project = BasicProject(); await project.setUpIn(tempDir); - final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); - const ProcessManager processManager = LocalProcessManager(); daemonProcess = await processManager.start( [flutterBin, ...getLocalEngineArguments(), '--show-test-device', 'daemon'], diff --git a/packages/flutter_tools/test/integration.shard/deferred_components_test.dart b/packages/flutter_tools/test/integration.shard/deferred_components_test.dart index f01ea24bf5..0402e8d4d7 100644 --- a/packages/flutter_tools/test/integration.shard/deferred_components_test.dart +++ b/packages/flutter_tools/test/integration.shard/deferred_components_test.dart @@ -30,7 +30,6 @@ void main() { testWithoutContext('simple build appbundle android-arm64 target succeeds', () async { final DeferredComponentsProject project = DeferredComponentsProject(BasicDeferredComponentsConfig()); await project.setUpIn(tempDir); - final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); final ProcessResult result = await processManager.run([ flutterBin, ...getLocalEngineArguments(), @@ -64,7 +63,6 @@ void main() { testWithoutContext('simple build appbundle all targets succeeds', () async { final DeferredComponentsProject project = DeferredComponentsProject(BasicDeferredComponentsConfig()); await project.setUpIn(tempDir); - final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); final ProcessResult result = await processManager.run([ flutterBin, ...getLocalEngineArguments(), @@ -109,7 +107,6 @@ void main() { testWithoutContext('simple build appbundle no-deferred-components succeeds', () async { final DeferredComponentsProject project = DeferredComponentsProject(BasicDeferredComponentsConfig()); await project.setUpIn(tempDir); - final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); final ProcessResult result = await processManager.run([ flutterBin, ...getLocalEngineArguments(), @@ -153,7 +150,6 @@ void main() { testWithoutContext('simple build appbundle mismatched golden no-validate-deferred-components succeeds', () async { final DeferredComponentsProject project = DeferredComponentsProject(MismatchedGoldenDeferredComponentsConfig()); await project.setUpIn(tempDir); - final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); final ProcessResult result = await processManager.run([ flutterBin, ...getLocalEngineArguments(), @@ -199,7 +195,6 @@ void main() { testWithoutContext('simple build appbundle missing android dynamic feature module fails', () async { final DeferredComponentsProject project = DeferredComponentsProject(NoAndroidDynamicFeatureModuleDeferredComponentsConfig()); await project.setUpIn(tempDir); - final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); final ProcessResult result = await processManager.run([ flutterBin, ...getLocalEngineArguments(), @@ -221,7 +216,6 @@ void main() { testWithoutContext('simple build appbundle missing golden fails', () async { final DeferredComponentsProject project = DeferredComponentsProject(NoGoldenDeferredComponentsConfig()); await project.setUpIn(tempDir); - final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); final ProcessResult result = await processManager.run([ flutterBin, ...getLocalEngineArguments(), @@ -243,7 +237,6 @@ void main() { testWithoutContext('simple build appbundle mismatched golden fails', () async { final DeferredComponentsProject project = DeferredComponentsProject(MismatchedGoldenDeferredComponentsConfig()); await project.setUpIn(tempDir); - final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); final ProcessResult result = await processManager.run([ flutterBin, ...getLocalEngineArguments(), diff --git a/packages/flutter_tools/test/integration.shard/deprecated_gradle_settings_test.dart b/packages/flutter_tools/test/integration.shard/deprecated_gradle_settings_test.dart index 95eb7302a8..50e5b21af3 100644 --- a/packages/flutter_tools/test/integration.shard/deprecated_gradle_settings_test.dart +++ b/packages/flutter_tools/test/integration.shard/deprecated_gradle_settings_test.dart @@ -15,7 +15,6 @@ import 'test_utils.dart'; void main() { test('android project using deprecated settings.gradle will still build', () async { final String workingDirectory = fileSystem.path.join(getFlutterRoot(), 'dev', 'integration_tests', 'gradle_deprecated_settings'); - final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); final File settingsDotGradleFile = fileSystem.file( fileSystem.path.join(workingDirectory, 'android', 'settings.gradle')); diff --git a/packages/flutter_tools/test/integration.shard/devtools_uri_test.dart b/packages/flutter_tools/test/integration.shard/devtools_uri_test.dart index af15861554..5da292df5b 100644 --- a/packages/flutter_tools/test/integration.shard/devtools_uri_test.dart +++ b/packages/flutter_tools/test/integration.shard/devtools_uri_test.dart @@ -30,7 +30,6 @@ void main() { final Completer completer = Completer(); const String matcher = 'The Flutter DevTools debugger and profiler on'; - final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); final Process process = await processManager.start([ flutterBin, 'run', diff --git a/packages/flutter_tools/test/integration.shard/downgrade_upgrade_integration_test.dart b/packages/flutter_tools/test/integration.shard/downgrade_upgrade_integration_test.dart index 20b7675b78..0775a0ecb8 100644 --- a/packages/flutter_tools/test/integration.shard/downgrade_upgrade_integration_test.dart +++ b/packages/flutter_tools/test/integration.shard/downgrade_upgrade_integration_test.dart @@ -23,7 +23,6 @@ final BufferLogger logger = BufferLogger.test( outputPreferences: OutputPreferences.test(wrapText: true), ); final ProcessUtils processUtils = ProcessUtils(processManager: processManager, logger: logger); -final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', platform.isWindows ? 'flutter.bat' : 'flutter'); /// A test for flutter upgrade & downgrade that checks out a parallel flutter repo. void main() { diff --git a/packages/flutter_tools/test/integration.shard/flutter_build_android_app_project_builddir_test.dart b/packages/flutter_tools/test/integration.shard/flutter_build_android_app_project_builddir_test.dart index 2f71f983dc..1a09cdf7e5 100644 --- a/packages/flutter_tools/test/integration.shard/flutter_build_android_app_project_builddir_test.dart +++ b/packages/flutter_tools/test/integration.shard/flutter_build_android_app_project_builddir_test.dart @@ -16,16 +16,10 @@ import 'test_utils.dart'; // project in the test. void main() { late Directory tempDir; - late String flutterBin; late Directory exampleAppDir; setUp(() async { tempDir = createResolvedTempDirectorySync('flutter_plugin_test.'); - flutterBin = fileSystem.path.join( - getFlutterRoot(), - 'bin', - 'flutter', - ); exampleAppDir = tempDir.childDirectory('aaa').childDirectory('example'); processManager.runSync([ diff --git a/packages/flutter_tools/test/integration.shard/flutter_build_apk_verbose_test.dart b/packages/flutter_tools/test/integration.shard/flutter_build_apk_verbose_test.dart index 4a5c253cc6..c4751936fa 100644 --- a/packages/flutter_tools/test/integration.shard/flutter_build_apk_verbose_test.dart +++ b/packages/flutter_tools/test/integration.shard/flutter_build_apk_verbose_test.dart @@ -11,16 +11,10 @@ import 'test_utils.dart'; // Test that verbosity it propagated to Gradle tasks correctly. void main() { late Directory tempDir; - late String flutterBin; late Directory exampleAppDir; setUp(() async { tempDir = createResolvedTempDirectorySync('flutter_build_test.'); - flutterBin = fileSystem.path.join( - getFlutterRoot(), - 'bin', - 'flutter', - ); exampleAppDir = tempDir.childDirectory('aaa').childDirectory('example'); processManager.runSync([ diff --git a/packages/flutter_tools/test/integration.shard/flutter_build_config_only_test.dart b/packages/flutter_tools/test/integration.shard/flutter_build_config_only_test.dart index 92f3814253..88ae26a244 100644 --- a/packages/flutter_tools/test/integration.shard/flutter_build_config_only_test.dart +++ b/packages/flutter_tools/test/integration.shard/flutter_build_config_only_test.dart @@ -12,16 +12,10 @@ import 'test_utils.dart'; // Test that configOnly creates the gradlew file and does not assemble and app. void main() { late Directory tempDir; - late String flutterBin; late Directory exampleAppDir; setUp(() async { tempDir = createResolvedTempDirectorySync('flutter_build_test.'); - flutterBin = fileSystem.path.join( - getFlutterRoot(), - 'bin', - 'flutter', - ); exampleAppDir = tempDir.childDirectory('bbb').childDirectory('example'); processManager.runSync( diff --git a/packages/flutter_tools/test/integration.shard/flutter_build_wasm_test.dart b/packages/flutter_tools/test/integration.shard/flutter_build_wasm_test.dart index 2af73f7d2a..31404c88da 100644 --- a/packages/flutter_tools/test/integration.shard/flutter_build_wasm_test.dart +++ b/packages/flutter_tools/test/integration.shard/flutter_build_wasm_test.dart @@ -12,16 +12,10 @@ import 'test_utils.dart'; void main() { late Directory tempDir; - late String flutterBin; late Directory exampleAppDir; setUp(() async { tempDir = createResolvedTempDirectorySync('flutter_web_wasm_test.'); - flutterBin = fileSystem.path.join( - getFlutterRoot(), - 'bin', - 'flutter', - ); exampleAppDir = tempDir.childDirectory('test_app'); processManager.runSync([ diff --git a/packages/flutter_tools/test/integration.shard/flutter_build_windows_test.dart b/packages/flutter_tools/test/integration.shard/flutter_build_windows_test.dart index a7bd8ff82f..2a93d58a7f 100644 --- a/packages/flutter_tools/test/integration.shard/flutter_build_windows_test.dart +++ b/packages/flutter_tools/test/integration.shard/flutter_build_windows_test.dart @@ -15,18 +15,12 @@ import 'test_utils.dart'; void main() { late Directory tempDir; late Directory projectRoot; - late String flutterBin; late Directory releaseDir; late File exeFile; group('flutter build windows command', () { setUpAll(() { tempDir = createResolvedTempDirectorySync('build_windows_test.'); - flutterBin = fileSystem.path.join( - getFlutterRoot(), - 'bin', - 'flutter', - ); ProcessResult result = processManager.runSync([flutterBin, 'config', '--enable-windows-desktop', ]); diff --git a/packages/flutter_tools/test/integration.shard/flutter_build_with_compilation_error_test.dart b/packages/flutter_tools/test/integration.shard/flutter_build_with_compilation_error_test.dart index c37ec4f66c..7c5d2aefa6 100644 --- a/packages/flutter_tools/test/integration.shard/flutter_build_with_compilation_error_test.dart +++ b/packages/flutter_tools/test/integration.shard/flutter_build_with_compilation_error_test.dart @@ -15,7 +15,6 @@ import 'test_utils.dart'; void main() { late Directory tempDir; late Directory projectRoot; - late String flutterBin; final List targetPlatforms = [ 'apk', 'web', @@ -27,11 +26,6 @@ void main() { setUpAll(() { tempDir = createResolvedTempDirectorySync('build_compilation_error_test.'); - flutterBin = fileSystem.path.join( - getFlutterRoot(), - 'bin', - 'flutter', - ); processManager.runSync([flutterBin, 'config', '--enable-macos-desktop', '--enable-windows-desktop', diff --git a/packages/flutter_tools/test/integration.shard/flutter_plugins_dependencies_test.dart b/packages/flutter_tools/test/integration.shard/flutter_plugins_dependencies_test.dart index 5939b0aa01..7f528dc4ca 100644 --- a/packages/flutter_tools/test/integration.shard/flutter_plugins_dependencies_test.dart +++ b/packages/flutter_tools/test/integration.shard/flutter_plugins_dependencies_test.dart @@ -30,9 +30,6 @@ void main() { '.flutter-plugins-dependencies correctly denotes project dev dependencies on all default platforms', () async { // Create Flutter project. - final String flutterBin = - fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); - await processManager.run([ flutterBin, 'create', diff --git a/packages/flutter_tools/test/integration.shard/flutter_run_test.dart b/packages/flutter_tools/test/integration.shard/flutter_run_test.dart index e3b94ed4c4..bff3bae35c 100644 --- a/packages/flutter_tools/test/integration.shard/flutter_run_test.dart +++ b/packages/flutter_tools/test/integration.shard/flutter_run_test.dart @@ -32,7 +32,6 @@ void main() { // like https://github.com/flutter/flutter/issues/21418 which were skipped // over because other integration tests run using flutter-tester which short-cuts // some of the checks for devices. - final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); const ProcessManager processManager = LocalProcessManager(); final ProcessResult proc = await processManager.run( diff --git a/packages/flutter_tools/test/integration.shard/flutter_run_with_error_test.dart b/packages/flutter_tools/test/integration.shard/flutter_run_with_error_test.dart index 4088ce9683..b980f1db82 100644 --- a/packages/flutter_tools/test/integration.shard/flutter_run_with_error_test.dart +++ b/packages/flutter_tools/test/integration.shard/flutter_run_with_error_test.dart @@ -31,12 +31,6 @@ void main() { }); testWithoutContext('flutter run in non-machine mode reports an early error in an application', () async { - final String flutterBin = fileSystem.path.join( - getFlutterRoot(), - 'bin', - 'flutter', - ); - final StringBuffer stdout = StringBuffer(); final Process process = await processManager.start([ diff --git a/packages/flutter_tools/test/integration.shard/gradle_non_android_plugin_test.dart b/packages/flutter_tools/test/integration.shard/gradle_non_android_plugin_test.dart index 59899ce826..c5cc633c8b 100644 --- a/packages/flutter_tools/test/integration.shard/gradle_non_android_plugin_test.dart +++ b/packages/flutter_tools/test/integration.shard/gradle_non_android_plugin_test.dart @@ -21,12 +21,6 @@ void main() { }); testWithoutContext('Flutter app that depends on a non-Android plugin can still build for Android', () { - final String flutterRoot = getFlutterRoot(); - final String flutterBin = fileSystem.path.join( - flutterRoot, - 'bin', - 'flutter', - ); processManager.runSync([ flutterBin, ...getLocalEngineArguments(), diff --git a/packages/flutter_tools/test/integration.shard/isolated/native_assets_agp_version_test.dart b/packages/flutter_tools/test/integration.shard/isolated/native_assets_agp_version_test.dart index 41acde6839..6973af8c64 100644 --- a/packages/flutter_tools/test/integration.shard/isolated/native_assets_agp_version_test.dart +++ b/packages/flutter_tools/test/integration.shard/isolated/native_assets_agp_version_test.dart @@ -13,7 +13,7 @@ import 'package:file/file.dart'; import 'package:file_testing/file_testing.dart'; import '../../src/common.dart'; -import '../test_utils.dart' show platform; +import '../test_utils.dart' show flutterBin, platform; import '../transition_test_utils.dart'; import 'native_assets_test_utils.dart'; diff --git a/packages/flutter_tools/test/integration.shard/isolated/native_assets_test.dart b/packages/flutter_tools/test/integration.shard/isolated/native_assets_test.dart index 572fb2959f..8d09e2af7d 100644 --- a/packages/flutter_tools/test/integration.shard/isolated/native_assets_test.dart +++ b/packages/flutter_tools/test/integration.shard/isolated/native_assets_test.dart @@ -24,7 +24,7 @@ import 'package:flutter_tools/src/base/os.dart'; import 'package:native_assets_cli/code_assets_builder.dart'; import '../../src/common.dart'; -import '../test_utils.dart' show fileSystem, platform; +import '../test_utils.dart' show fileSystem, flutterBin, platform; import '../transition_test_utils.dart'; import 'native_assets_test_utils.dart'; diff --git a/packages/flutter_tools/test/integration.shard/isolated/native_assets_test_utils.dart b/packages/flutter_tools/test/integration.shard/isolated/native_assets_test_utils.dart index 22d8134162..7cac9b11cb 100644 --- a/packages/flutter_tools/test/integration.shard/isolated/native_assets_test_utils.dart +++ b/packages/flutter_tools/test/integration.shard/isolated/native_assets_test_utils.dart @@ -10,7 +10,7 @@ import 'package:file_testing/file_testing.dart'; import 'package:yaml/yaml.dart'; import '../../src/common.dart'; -import '../test_utils.dart' show ProcessResultMatcher, fileSystem; +import '../test_utils.dart' show ProcessResultMatcher, fileSystem, flutterBin; import '../transition_test_utils.dart'; Future createTestProject(String packageName, Directory tempDirectory) async { diff --git a/packages/flutter_tools/test/integration.shard/isolated/native_assets_without_cbuild_assemble_test.dart b/packages/flutter_tools/test/integration.shard/isolated/native_assets_without_cbuild_assemble_test.dart index 2e36b4f616..0b06f436bf 100644 --- a/packages/flutter_tools/test/integration.shard/isolated/native_assets_without_cbuild_assemble_test.dart +++ b/packages/flutter_tools/test/integration.shard/isolated/native_assets_without_cbuild_assemble_test.dart @@ -15,7 +15,6 @@ import 'package:yaml/yaml.dart'; import '../../src/common.dart'; import '../test_utils.dart'; -import '../transition_test_utils.dart'; import 'native_assets_test_utils.dart'; /// Regression test as part of https://github.com/flutter/flutter/pull/150742. diff --git a/packages/flutter_tools/test/integration.shard/observatory_port_test.dart b/packages/flutter_tools/test/integration.shard/observatory_port_test.dart index 94e5cf9f43..eb143e2f85 100644 --- a/packages/flutter_tools/test/integration.shard/observatory_port_test.dart +++ b/packages/flutter_tools/test/integration.shard/observatory_port_test.dart @@ -54,7 +54,6 @@ void main() { }); testWithoutContext('flutter run --vm-service-port', () async { - final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); final int port = await getFreePort(); // If only --vm-service-port is provided, --vm-service-port will be used by DDS // and the VM service will bind to a random port. @@ -72,7 +71,6 @@ void main() { }); testWithoutContext('flutter run --dds-port --vm-service-port', () async { - final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); final int vmServicePort = await getFreePort(); int ddsPort = await getFreePort(); while (ddsPort == vmServicePort) { @@ -95,7 +93,6 @@ void main() { }); testWithoutContext('flutter run --dds-port', () async { - final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); final int ddsPort = await getFreePort(); // If only --dds-port is provided, --dds-port will be used by DDS and the VM service // will bind to a random port. diff --git a/packages/flutter_tools/test/integration.shard/swift_package_manager_create_app_test.dart b/packages/flutter_tools/test/integration.shard/swift_package_manager_create_app_test.dart index f40e0f6de2..4073863650 100644 --- a/packages/flutter_tools/test/integration.shard/swift_package_manager_create_app_test.dart +++ b/packages/flutter_tools/test/integration.shard/swift_package_manager_create_app_test.dart @@ -10,12 +10,6 @@ import 'swift_package_manager_utils.dart'; import 'test_utils.dart'; void main() { - final String flutterBin = fileSystem.path.join( - getFlutterRoot(), - 'bin', - 'flutter', - ); - final List platforms = ['ios', 'macos']; for (final String platformName in platforms) { final List iosLanguages = [ diff --git a/packages/flutter_tools/test/integration.shard/swift_package_manager_create_plugin_test.dart b/packages/flutter_tools/test/integration.shard/swift_package_manager_create_plugin_test.dart index 64b9761f97..55c3426adb 100644 --- a/packages/flutter_tools/test/integration.shard/swift_package_manager_create_plugin_test.dart +++ b/packages/flutter_tools/test/integration.shard/swift_package_manager_create_plugin_test.dart @@ -10,12 +10,6 @@ import 'swift_package_manager_utils.dart'; import 'test_utils.dart'; void main() { - final String flutterBin = fileSystem.path.join( - getFlutterRoot(), - 'bin', - 'flutter', - ); - final List platforms = ['ios', 'macos']; for (final String platformName in platforms) { final List iosLanguages = [ diff --git a/packages/flutter_tools/test/integration.shard/swift_package_manager_test.dart b/packages/flutter_tools/test/integration.shard/swift_package_manager_test.dart index dcc7f09df1..62bd520617 100644 --- a/packages/flutter_tools/test/integration.shard/swift_package_manager_test.dart +++ b/packages/flutter_tools/test/integration.shard/swift_package_manager_test.dart @@ -13,12 +13,6 @@ import 'swift_package_manager_utils.dart'; import 'test_utils.dart'; void main() { - final String flutterBin = fileSystem.path.join( - getFlutterRoot(), - 'bin', - 'flutter', - ); - final List platforms = ['ios', 'macos']; for (final String platformName in platforms) { final List iosLanguages = [ diff --git a/packages/flutter_tools/test/integration.shard/test_driver.dart b/packages/flutter_tools/test/integration.shard/test_driver.dart index 017a4f99c3..04941ba2e8 100644 --- a/packages/flutter_tools/test/integration.shard/test_driver.dart +++ b/packages/flutter_tools/test/integration.shard/test_driver.dart @@ -92,7 +92,6 @@ abstract class FlutterTestDriver { bool withDebugger = false, bool verbose = false, }) async { - final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); if (withDebugger) { arguments.add('--start-paused'); } diff --git a/packages/flutter_tools/test/integration.shard/test_test.dart b/packages/flutter_tools/test/integration.shard/test_test.dart index b84248f83e..eef2cd407c 100644 --- a/packages/flutter_tools/test/integration.shard/test_test.dart +++ b/packages/flutter_tools/test/integration.shard/test_test.dart @@ -17,7 +17,6 @@ final String automatedTestsDirectory = fileSystem.path.join('..', '..', 'dev', ' final String missingDependencyDirectory = fileSystem.path.join('..', '..', 'dev', 'missing_dependency_tests'); final String flutterTestDirectory = fileSystem.path.join(automatedTestsDirectory, 'flutter_test'); final String integrationTestDirectory = fileSystem.path.join(automatedTestsDirectory, 'integration_test'); -final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', platform.isWindows ? 'flutter.bat' : 'flutter'); // Running Integration Tests in the Flutter Tester will still exercise the same // flows specific to Integration Tests. diff --git a/packages/flutter_tools/test/integration.shard/test_utils.dart b/packages/flutter_tools/test/integration.shard/test_utils.dart index fa505c6121..aa0eeb2a4e 100644 --- a/packages/flutter_tools/test/integration.shard/test_utils.dart +++ b/packages/flutter_tools/test/integration.shard/test_utils.dart @@ -15,6 +15,13 @@ import 'test_driver.dart'; /// The [FileSystem] for the integration test environment. const FileSystem fileSystem = LocalFileSystem(); +/// The (real) `flutter` binary (i.e. `{ROOT}/bin/flutter`) to execute in tests. +final String flutterBin = fileSystem.path.join( + getFlutterRoot(), + 'bin', + platform.isWindows ? 'flutter.bat' : 'flutter', +); + /// The [Platform] for the integration test environment. const Platform platform = LocalPlatform(); diff --git a/packages/flutter_tools/test/integration.shard/transition_test_utils.dart b/packages/flutter_tools/test/integration.shard/transition_test_utils.dart index e0e0c0876b..0b98b6af7e 100644 --- a/packages/flutter_tools/test/integration.shard/transition_test_utils.dart +++ b/packages/flutter_tools/test/integration.shard/transition_test_utils.dart @@ -11,11 +11,10 @@ import 'package:meta/meta.dart'; import 'package:process/process.dart'; import '../src/common.dart'; -import 'test_utils.dart' show fileSystem; +import 'test_utils.dart' show flutterBin; const ProcessManager processManager = LocalProcessManager(); final String flutterRoot = getFlutterRoot(); -final String flutterBin = fileSystem.path.join(flutterRoot, 'bin', 'flutter'); void debugPrint(String message) { // This is called to intentionally print debugging output when a test is