Unverified Commit 555721de authored by Jonah Williams's avatar Jonah Williams Committed by GitHub

[flutter_tools] remove mock process manager from gradle tests (#76252)

parent 00630d09
...@@ -65,7 +65,7 @@ class ApplicationPackageFactory { ...@@ -65,7 +65,7 @@ class ApplicationPackageFactory {
case TargetPlatform.android_x64: case TargetPlatform.android_x64:
case TargetPlatform.android_x86: case TargetPlatform.android_x86:
if (_androidSdk?.licensesAvailable == true && _androidSdk?.latestVersion == null) { if (_androidSdk?.licensesAvailable == true && _androidSdk?.latestVersion == null) {
await checkGradleDependencies(_logger); await checkGradleDependencies(_logger, _processUtils);
} }
if (applicationBinary == null) { if (applicationBinary == null) {
return await AndroidApk.fromAndroidProject( return await AndroidApk.fromAndroidProject(
......
...@@ -81,6 +81,8 @@ Future<T> runInContext<T>( ...@@ -81,6 +81,8 @@ Future<T> runInContext<T>(
fallbacks: <Type, Generator>{ fallbacks: <Type, Generator>{
AndroidBuilder: () => AndroidGradleBuilder( AndroidBuilder: () => AndroidGradleBuilder(
logger: globals.logger, logger: globals.logger,
processManager: globals.processManager,
fileSystem: globals.fs,
), ),
AndroidLicenseValidator: () => AndroidLicenseValidator( AndroidLicenseValidator: () => AndroidLicenseValidator(
operatingSystemUtils: globals.os, operatingSystemUtils: globals.os,
......
...@@ -436,9 +436,11 @@ void main() { ...@@ -436,9 +436,11 @@ void main() {
group('Config files', () { group('Config files', () {
Directory tempDir; Directory tempDir;
FileSystem fileSystem;
setUp(() { setUp(() {
tempDir = globals.fs.systemTempDirectory.createTempSync('flutter_settings_aar_test.'); fileSystem = MemoryFileSystem.test();
tempDir = fileSystem.systemTempDirectory.createTempSync('flutter_settings_aar_test.');
}); });
testUsingContext('create settings_aar.gradle when current settings.gradle loads plugins', () { testUsingContext('create settings_aar.gradle when current settings.gradle loads plugins', () {
...@@ -468,25 +470,24 @@ include ':app' ...@@ -468,25 +470,24 @@ include ':app'
tempDir.childFile('settings.gradle').writeAsStringSync(currentSettingsGradle); tempDir.childFile('settings.gradle').writeAsStringSync(currentSettingsGradle);
final String toolGradlePath = globals.fs.path.join( final String toolGradlePath = fileSystem.path.join(
globals.fs.path.absolute(Cache.flutterRoot), fileSystem.path.absolute(Cache.flutterRoot),
'packages', 'packages',
'flutter_tools', 'flutter_tools',
'gradle'); 'gradle');
globals.fs.directory(toolGradlePath).createSync(recursive: true); fileSystem.directory(toolGradlePath).createSync(recursive: true);
globals.fs.file(globals.fs.path.join(toolGradlePath, 'settings.gradle.legacy_versions')) fileSystem.file(fileSystem.path.join(toolGradlePath, 'settings.gradle.legacy_versions'))
.writeAsStringSync(currentSettingsGradle); .writeAsStringSync(currentSettingsGradle);
globals.fs.file(globals.fs.path.join(toolGradlePath, 'settings_aar.gradle.tmpl')) fileSystem.file(fileSystem.path.join(toolGradlePath, 'settings_aar.gradle.tmpl'))
.writeAsStringSync(settingsAarFile); .writeAsStringSync(settingsAarFile);
createSettingsAarGradle(tempDir, testLogger); createSettingsAarGradle(tempDir, testLogger);
expect(testLogger.statusText, contains('created successfully')); expect(testLogger.statusText, contains('created successfully'));
expect(tempDir.childFile('settings_aar.gradle').existsSync(), isTrue); expect(tempDir.childFile('settings_aar.gradle').existsSync(), isTrue);
}, overrides: <Type, Generator>{ }, overrides: <Type, Generator>{
FileSystem: () => MemoryFileSystem.test(), FileSystem: () => fileSystem,
ProcessManager: () => FakeProcessManager.any(), ProcessManager: () => FakeProcessManager.any(),
}); });
...@@ -501,25 +502,24 @@ include ':app' ...@@ -501,25 +502,24 @@ include ':app'
tempDir.childFile('settings.gradle').writeAsStringSync(currentSettingsGradle); tempDir.childFile('settings.gradle').writeAsStringSync(currentSettingsGradle);
final String toolGradlePath = globals.fs.path.join( final String toolGradlePath = fileSystem.path.join(
globals.fs.path.absolute(Cache.flutterRoot), fileSystem.path.absolute(Cache.flutterRoot),
'packages', 'packages',
'flutter_tools', 'flutter_tools',
'gradle'); 'gradle');
globals.fs.directory(toolGradlePath).createSync(recursive: true); fileSystem.directory(toolGradlePath).createSync(recursive: true);
globals.fs.file(globals.fs.path.join(toolGradlePath, 'settings.gradle.legacy_versions')) fileSystem.file(fileSystem.path.join(toolGradlePath, 'settings.gradle.legacy_versions'))
.writeAsStringSync(currentSettingsGradle); .writeAsStringSync(currentSettingsGradle);
globals.fs.file(globals.fs.path.join(toolGradlePath, 'settings_aar.gradle.tmpl')) fileSystem.file(fileSystem.path.join(toolGradlePath, 'settings_aar.gradle.tmpl'))
.writeAsStringSync(settingsAarFile); .writeAsStringSync(settingsAarFile);
createSettingsAarGradle(tempDir, testLogger); createSettingsAarGradle(tempDir, testLogger);
expect(testLogger.statusText, contains('created successfully')); expect(testLogger.statusText, contains('created successfully'));
expect(tempDir.childFile('settings_aar.gradle').existsSync(), isTrue); expect(tempDir.childFile('settings_aar.gradle').existsSync(), isTrue);
}, overrides: <Type, Generator>{ }, overrides: <Type, Generator>{
FileSystem: () => MemoryFileSystem.test(), FileSystem: () => fileSystem,
ProcessManager: () => FakeProcessManager.any(), ProcessManager: () => FakeProcessManager.any(),
}); });
}); });
...@@ -860,7 +860,7 @@ flutter: ...@@ -860,7 +860,7 @@ flutter:
fakeProcessManager = FakeProcessManager.list(<FakeCommand>[]); fakeProcessManager = FakeProcessManager.list(<FakeCommand>[]);
mockAndroidSdk = MockAndroidSdk(); mockAndroidSdk = MockAndroidSdk();
when(mockAndroidSdk.directory).thenReturn(fs.directory('irrelevant')); when(mockAndroidSdk.directory).thenReturn(fs.directory('irrelevant'));
builder = AndroidGradleBuilder(logger: logger); builder = AndroidGradleBuilder(logger: logger, processManager: fakeProcessManager, fileSystem: fs);
}); });
testUsingContext('calls gradle', () async { testUsingContext('calls gradle', () async {
......
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