Unverified Commit 55e3770f authored by Jonah Williams's avatar Jonah Williams Committed by GitHub

[flutter_tools] remove globals from base/android (#60480)

Remove unnecessary use of globals from base tests, and an android test. This changes the test to avoid bouncing through the global getters, which can lead to incorrectly cached zone values. Switches the memory filesystem implementation to the test implementation
parent 84f50d14
...@@ -3,42 +3,46 @@ ...@@ -3,42 +3,46 @@
// found in the LICENSE file. // found in the LICENSE file.
import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/base/file_system.dart';
import 'package:flutter_tools/src/base/logger.dart';
import 'package:flutter_tools/src/base/os.dart'; import 'package:flutter_tools/src/base/os.dart';
import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/base/platform.dart';
import 'package:flutter_tools/src/base/signals.dart';
import 'package:process/process.dart';
import '../../src/common.dart'; import '../../src/common.dart';
import '../../src/context.dart';
void main() { void main() {
group('OperatingSystemUtils', () { group('OperatingSystemUtils', () {
Directory tempDir; Directory tempDir;
FileSystem fileSystem;
setUp(() { setUp(() {
tempDir = globals.fs.systemTempDirectory.createTempSync('flutter_tools_os_utils_test.'); fileSystem = LocalFileSystem.test(signals: Signals.test());
tempDir = fileSystem.systemTempDirectory.createTempSync('flutter_tools_os_utils_test.');
}); });
tearDown(() { tearDown(() {
tryToDelete(tempDir); tryToDelete(tempDir);
}); });
testUsingContext('makeExecutable', () async { testWithoutContext('makeExecutable', () async {
final File file = globals.fs.file(globals.fs.path.join(tempDir.path, 'foo.script')); const Platform platform = LocalPlatform();
final OperatingSystemUtils operatingSystemUtils = OperatingSystemUtils(
fileSystem: fileSystem,
logger: BufferLogger.test(),
platform: platform,
processManager: const LocalProcessManager(),
);
final File file = fileSystem.file(fileSystem.path.join(tempDir.path, 'foo.script'));
file.writeAsStringSync('hello world'); file.writeAsStringSync('hello world');
globals.os.makeExecutable(file); operatingSystemUtils.makeExecutable(file);
// Skip this test on windows. // Skip this test on windows.
if (!globals.platform.isWindows) { if (!platform.isWindows) {
final String mode = file.statSync().modeString(); final String mode = file.statSync().modeString();
// rwxr--r-- // rwxr--r--
expect(mode.substring(0, 3), endsWith('x')); expect(mode.substring(0, 3), endsWith('x'));
} }
}, overrides: <Type, Generator>{
OperatingSystemUtils: () => OperatingSystemUtils(
fileSystem: globals.fs,
logger: globals.logger,
platform: globals.platform,
processManager: globals.processManager,
),
}); });
}); });
} }
...@@ -8,7 +8,6 @@ import 'package:flutter_tools/src/base/io.dart'; ...@@ -8,7 +8,6 @@ import 'package:flutter_tools/src/base/io.dart';
import 'package:flutter_tools/src/base/logger.dart'; import 'package:flutter_tools/src/base/logger.dart';
import 'package:flutter_tools/src/base/platform.dart'; import 'package:flutter_tools/src/base/platform.dart';
import 'package:flutter_tools/src/base/terminal.dart'; import 'package:flutter_tools/src/base/terminal.dart';
import 'package:flutter_tools/src/globals.dart' as globals;
import 'package:mockito/mockito.dart'; import 'package:mockito/mockito.dart';
import '../../src/common.dart'; import '../../src/common.dart';
...@@ -42,7 +41,7 @@ void main() { ...@@ -42,7 +41,7 @@ void main() {
setUp(() { setUp(() {
terminal = AnsiTerminal( terminal = AnsiTerminal(
stdio: globals.stdio, // Danger, using real stdio. stdio: Stdio(), // Danger, using real stdio.
platform: FakePlatform()..stdoutSupportsAnsi = true, platform: FakePlatform()..stdoutSupportsAnsi = true,
); );
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment