Skip to content

F
Front-End
Unverified Commit d6f5767e authored by Jenn Magder's avatar Jenn Magder Committed by GitHub
Browse files
Options

Remove MockFlutterVersions (#77962)

parent 413c8a0b
Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 173 deletions
packages/flutter_tools/test/commands.shard/hermetic/build_ios_framework_test.dart
View file @ d6f5767e
...@@ -12,7 +12,6 @@ import 'package:flutter_tools/src/build_system/build_system.dart'; ...@@ -12,7 +12,6 @@ import 'package:flutter_tools/src/build_system/build_system.dart';
import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/cache.dart';
import 'package:flutter_tools/src/commands/build_ios_framework.dart'; import 'package:flutter_tools/src/commands/build_ios_framework.dart';
import 'package:flutter_tools/src/version.dart'; import 'package:flutter_tools/src/version.dart';
import 'package:mockito/mockito.dart';
import '../../src/common.dart'; import '../../src/common.dart';
import '../../src/context.dart'; import '../../src/context.dart';
...@@ -21,8 +20,6 @@ import '../../src/fakes.dart'; ...@@ -21,8 +20,6 @@ import '../../src/fakes.dart';
void main() { void main() {
group('build ios-framework', () { group('build ios-framework', () {
MemoryFileSystem memoryFileSystem; MemoryFileSystem memoryFileSystem;
MockFlutterVersion mockFlutterVersion;
MockGitTagVersion mockGitTagVersion;
Directory outputDirectory; Directory outputDirectory;
FakePlatform fakePlatform; FakePlatform fakePlatform;
...@@ -33,8 +30,6 @@ void main() { ...@@ -33,8 +30,6 @@ void main() {
const String storageBaseUrl = 'https://fake.googleapis.com'; const String storageBaseUrl = 'https://fake.googleapis.com';
setUp(() { setUp(() {
memoryFileSystem = MemoryFileSystem.test(); memoryFileSystem = MemoryFileSystem.test();
mockFlutterVersion = MockFlutterVersion();
mockGitTagVersion = MockGitTagVersion();
fakePlatform = FakePlatform( fakePlatform = FakePlatform(
operatingSystem: 'macos', operatingSystem: 'macos',
environment: <String, String>{ environment: <String, String>{
...@@ -42,7 +37,6 @@ void main() { ...@@ -42,7 +37,6 @@ void main() {
}, },
); );
when(mockFlutterVersion.gitTagVersion).thenReturn(mockGitTagVersion);
outputDirectory = memoryFileSystem.systemTempDirectory outputDirectory = memoryFileSystem.systemTempDirectory
.createTempSync('flutter_build_ios_framework_test_output.') .createTempSync('flutter_build_ios_framework_test_output.')
.childDirectory('Debug') .childDirectory('Debug')
...@@ -63,17 +57,16 @@ void main() { ...@@ -63,17 +57,16 @@ void main() {
rootOverride.childDirectory('bin').childDirectory('internal').childFile('engine.version') rootOverride.childDirectory('bin').childDirectory('internal').childFile('engine.version')
..createSync(recursive: true) ..createSync(recursive: true)
..writeAsStringSync(engineRevision); ..writeAsStringSync(engineRevision);
when(mockFlutterVersion.gitTagVersion).thenReturn(mockGitTagVersion);
}); });
testUsingContext('version unknown', () async { testUsingContext('version unknown', () async {
const String frameworkVersion = '0.0.0-unknown'; const String frameworkVersion = '0.0.0-unknown';
when(mockFlutterVersion.frameworkVersion).thenReturn(frameworkVersion); final FakeFlutterVersion fakeFlutterVersion = FakeFlutterVersion(frameworkVersion: frameworkVersion);
final BuildIOSFrameworkCommand command = BuildIOSFrameworkCommand( final BuildIOSFrameworkCommand command = BuildIOSFrameworkCommand(
buildSystem: TestBuildSystem.all(BuildResult(success: true)), buildSystem: TestBuildSystem.all(BuildResult(success: true)),
platform: fakePlatform, platform: fakePlatform,
flutterVersion: mockFlutterVersion, flutterVersion: fakeFlutterVersion,
cache: cache, cache: cache,
verboseHelp: false, verboseHelp: false,
); );
...@@ -87,18 +80,22 @@ void main() { ...@@ -87,18 +80,22 @@ void main() {
testUsingContext('throws when not on a released version', () async { testUsingContext('throws when not on a released version', () async {
const String frameworkVersion = 'v1.13.10+hotfix-pre.2'; const String frameworkVersion = 'v1.13.10+hotfix-pre.2';
when(mockFlutterVersion.frameworkVersion).thenReturn(frameworkVersion); const GitTagVersion gitTagVersion = GitTagVersion(
x: 1,
when(mockGitTagVersion.x).thenReturn(1); y: 13,
when(mockGitTagVersion.y).thenReturn(13); z: 10,
when(mockGitTagVersion.z).thenReturn(10); hotfix: 13,
when(mockGitTagVersion.hotfix).thenReturn(13); commits: 2,
when(mockGitTagVersion.commits).thenReturn(2); );
final FakeFlutterVersion fakeFlutterVersion = FakeFlutterVersion(
gitTagVersion: gitTagVersion,
frameworkVersion: frameworkVersion,
);
final BuildIOSFrameworkCommand command = BuildIOSFrameworkCommand( final BuildIOSFrameworkCommand command = BuildIOSFrameworkCommand(
buildSystem: TestBuildSystem.all(BuildResult(success: true)), buildSystem: TestBuildSystem.all(BuildResult(success: true)),
platform: fakePlatform, platform: fakePlatform,
flutterVersion: mockFlutterVersion, flutterVersion: fakeFlutterVersion,
cache: cache, cache: cache,
verboseHelp: false, verboseHelp: false,
); );
...@@ -111,16 +108,20 @@ void main() { ...@@ -111,16 +108,20 @@ void main() {
}); });
testUsingContext('throws when license not found', () async { testUsingContext('throws when license not found', () async {
when(mockGitTagVersion.x).thenReturn(1); final FakeFlutterVersion fakeFlutterVersion = FakeFlutterVersion(
when(mockGitTagVersion.y).thenReturn(13); gitTagVersion: const GitTagVersion(
when(mockGitTagVersion.z).thenReturn(10); x: 1,
when(mockGitTagVersion.hotfix).thenReturn(13); y: 13,
when(mockGitTagVersion.commits).thenReturn(0); z: 10,
hotfix: 13,
commits: 0,
),
);
final BuildIOSFrameworkCommand command = BuildIOSFrameworkCommand( final BuildIOSFrameworkCommand command = BuildIOSFrameworkCommand(
buildSystem: TestBuildSystem.all(BuildResult(success: true)), buildSystem: TestBuildSystem.all(BuildResult(success: true)),
platform: fakePlatform, platform: fakePlatform,
flutterVersion: mockFlutterVersion, flutterVersion: fakeFlutterVersion,
cache: cache, cache: cache,
verboseHelp: false, verboseHelp: false,
); );
...@@ -137,28 +138,29 @@ void main() { ...@@ -137,28 +138,29 @@ void main() {
const String licenseText = 'This is the license!'; const String licenseText = 'This is the license!';
setUp(() { setUp(() {
when(mockGitTagVersion.x).thenReturn(1);
when(mockGitTagVersion.y).thenReturn(13);
when(mockGitTagVersion.z).thenReturn(11);
when(mockGitTagVersion.hotfix).thenReturn(13);
when(mockFlutterVersion.frameworkVersion).thenReturn(frameworkVersion);
cache.getLicenseFile() cache.getLicenseFile()
..createSync(recursive: true) ..createSync(recursive: true)
..writeAsStringSync(licenseText); ..writeAsStringSync(licenseText);
}); });
group('on master channel', () { group('on master channel', () {
setUp(() {
when(mockGitTagVersion.commits).thenReturn(100);
});
testUsingContext('created when forced', () async { testUsingContext('created when forced', () async {
const GitTagVersion gitTagVersion = GitTagVersion(
x: 1,
y: 13,
z: 11,
hotfix: 13,
commits: 100,
);
final FakeFlutterVersion fakeFlutterVersion = FakeFlutterVersion(
gitTagVersion: gitTagVersion,
frameworkVersion: frameworkVersion,
);
final BuildIOSFrameworkCommand command = BuildIOSFrameworkCommand( final BuildIOSFrameworkCommand command = BuildIOSFrameworkCommand(
buildSystem: TestBuildSystem.all(BuildResult(success: true)), buildSystem: TestBuildSystem.all(BuildResult(success: true)),
platform: fakePlatform, platform: fakePlatform,
flutterVersion: mockFlutterVersion, flutterVersion: fakeFlutterVersion,
cache: cache, cache: cache,
verboseHelp: false, verboseHelp: false,
); );
...@@ -173,15 +175,26 @@ void main() { ...@@ -173,15 +175,26 @@ void main() {
}); });
group('not on master channel', () { group('not on master channel', () {
FakeFlutterVersion fakeFlutterVersion;
setUp(() { setUp(() {
when(mockGitTagVersion.commits).thenReturn(0); const GitTagVersion gitTagVersion = GitTagVersion(
x: 1,
y: 13,
z: 11,
hotfix: 13,
commits: 0,
);
fakeFlutterVersion = FakeFlutterVersion(
gitTagVersion: gitTagVersion,
frameworkVersion: frameworkVersion,
);
}); });
testUsingContext('contains license and version', () async { testUsingContext('contains license and version', () async {
final BuildIOSFrameworkCommand command = BuildIOSFrameworkCommand( final BuildIOSFrameworkCommand command = BuildIOSFrameworkCommand(
buildSystem: TestBuildSystem.all(BuildResult(success: true)), buildSystem: TestBuildSystem.all(BuildResult(success: true)),
platform: fakePlatform, platform: fakePlatform,
flutterVersion: mockFlutterVersion, flutterVersion: fakeFlutterVersion,
cache: cache, cache: cache,
verboseHelp: false, verboseHelp: false,
); );
...@@ -201,7 +214,7 @@ void main() { ...@@ -201,7 +214,7 @@ void main() {
final BuildIOSFrameworkCommand command = BuildIOSFrameworkCommand( final BuildIOSFrameworkCommand command = BuildIOSFrameworkCommand(
buildSystem: TestBuildSystem.all(BuildResult(success: true)), buildSystem: TestBuildSystem.all(BuildResult(success: true)),
platform: fakePlatform, platform: fakePlatform,
flutterVersion: mockFlutterVersion, flutterVersion: fakeFlutterVersion,
cache: cache, cache: cache,
verboseHelp: false, verboseHelp: false,
); );
...@@ -219,7 +232,7 @@ void main() { ...@@ -219,7 +232,7 @@ void main() {
final BuildIOSFrameworkCommand command = BuildIOSFrameworkCommand( final BuildIOSFrameworkCommand command = BuildIOSFrameworkCommand(
buildSystem: TestBuildSystem.all(BuildResult(success: true)), buildSystem: TestBuildSystem.all(BuildResult(success: true)),
platform: fakePlatform, platform: fakePlatform,
flutterVersion: mockFlutterVersion, flutterVersion: fakeFlutterVersion,
cache: cache, cache: cache,
verboseHelp: false, verboseHelp: false,
); );
...@@ -237,7 +250,7 @@ void main() { ...@@ -237,7 +250,7 @@ void main() {
final BuildIOSFrameworkCommand command = BuildIOSFrameworkCommand( final BuildIOSFrameworkCommand command = BuildIOSFrameworkCommand(
buildSystem: TestBuildSystem.all(BuildResult(success: true)), buildSystem: TestBuildSystem.all(BuildResult(success: true)),
platform: fakePlatform, platform: fakePlatform,
flutterVersion: mockFlutterVersion, flutterVersion: fakeFlutterVersion,
cache: cache, cache: cache,
verboseHelp: false, verboseHelp: false,
); );
...@@ -255,6 +268,3 @@ void main() { ...@@ -255,6 +268,3 @@ void main() {
}); });
}); });
} }
class MockFlutterVersion extends Mock implements FlutterVersion {}
class MockGitTagVersion extends Mock implements GitTagVersion {}
packages/flutter_tools/test/commands.shard/permeable/create_test.dart
View file @ d6f5767e
...@@ -23,7 +23,6 @@ import 'package:flutter_tools/src/features.dart'; ...@@ -23,7 +23,6 @@ import 'package:flutter_tools/src/features.dart';
import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/globals.dart' as globals;
import 'package:flutter_tools/src/project.dart'; import 'package:flutter_tools/src/project.dart';
import 'package:flutter_tools/src/version.dart'; import 'package:flutter_tools/src/version.dart';
import 'package:mockito/mockito.dart';
import 'package:process/process.dart'; import 'package:process/process.dart';
import 'package:pub_semver/pub_semver.dart'; import 'package:pub_semver/pub_semver.dart';
import 'package:pubspec_parse/pubspec_parse.dart'; import 'package:pubspec_parse/pubspec_parse.dart';
...@@ -53,7 +52,7 @@ const String samplesIndexJson = ''' ...@@ -53,7 +52,7 @@ const String samplesIndexJson = '''
void main() { void main() {
Directory tempDir; Directory tempDir;
Directory projectDir; Directory projectDir;
FlutterVersion mockFlutterVersion; FakeFlutterVersion fakeFlutterVersion;
LoggingProcessManager loggingProcessManager; LoggingProcessManager loggingProcessManager;
BufferLogger logger; BufferLogger logger;
...@@ -67,7 +66,10 @@ void main() { ...@@ -67,7 +66,10 @@ void main() {
logger = BufferLogger.test(); logger = BufferLogger.test();
tempDir = globals.fs.systemTempDirectory.createTempSync('flutter_tools_create_test.'); tempDir = globals.fs.systemTempDirectory.createTempSync('flutter_tools_create_test.');
projectDir = tempDir.childDirectory('flutter_project'); projectDir = tempDir.childDirectory('flutter_project');
mockFlutterVersion = MockFlutterVersion(); fakeFlutterVersion = FakeFlutterVersion(
frameworkRevision: frameworkRevision,
channel: frameworkChannel,
);
}); });
tearDown(() { tearDown(() {
...@@ -612,8 +614,6 @@ void main() { ...@@ -612,8 +614,6 @@ void main() {
testUsingContext('androidx is used by default in an app project', () async { testUsingContext('androidx is used by default in an app project', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -633,8 +633,6 @@ void main() { ...@@ -633,8 +633,6 @@ void main() {
testUsingContext('androidx is used by default in a module project', () async { testUsingContext('androidx is used by default in a module project', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -650,8 +648,6 @@ void main() { ...@@ -650,8 +648,6 @@ void main() {
testUsingContext('androidx is used by default in a plugin project', () async { testUsingContext('androidx is used by default in a plugin project', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -671,8 +667,6 @@ void main() { ...@@ -671,8 +667,6 @@ void main() {
testUsingContext('creating a new project should create v2 embedding and never show an Android v1 deprecation warning', () async { testUsingContext('creating a new project should create v2 embedding and never show an Android v1 deprecation warning', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -698,8 +692,6 @@ void main() { ...@@ -698,8 +692,6 @@ void main() {
testUsingContext('app does not include desktop or web by default', () async { testUsingContext('app does not include desktop or web by default', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -717,8 +709,6 @@ void main() { ...@@ -717,8 +709,6 @@ void main() {
testUsingContext('plugin does not include desktop or web by default', testUsingContext('plugin does not include desktop or web by default',
() async { () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -744,8 +734,6 @@ void main() { ...@@ -744,8 +734,6 @@ void main() {
testUsingContext('app supports Linux if requested', () async { testUsingContext('app supports Linux if requested', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -772,8 +760,6 @@ void main() { ...@@ -772,8 +760,6 @@ void main() {
testUsingContext('plugin supports Linux if requested', () async { testUsingContext('plugin supports Linux if requested', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -809,8 +795,6 @@ void main() { ...@@ -809,8 +795,6 @@ void main() {
testUsingContext('app supports macOS if requested', () async { testUsingContext('app supports macOS if requested', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -838,8 +822,6 @@ void main() { ...@@ -838,8 +822,6 @@ void main() {
testUsingContext('plugin supports macOS if requested', () async { testUsingContext('plugin supports macOS if requested', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -872,8 +854,6 @@ void main() { ...@@ -872,8 +854,6 @@ void main() {
testUsingContext('app supports Windows if requested', () async { testUsingContext('app supports Windows if requested', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -900,8 +880,6 @@ void main() { ...@@ -900,8 +880,6 @@ void main() {
testUsingContext('Windows has correct VERSIONINFO', () async { testUsingContext('Windows has correct VERSIONINFO', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -919,8 +897,6 @@ void main() { ...@@ -919,8 +897,6 @@ void main() {
testUsingContext('plugin supports Windows if requested', () async { testUsingContext('plugin supports Windows if requested', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -964,8 +940,6 @@ void main() { ...@@ -964,8 +940,6 @@ void main() {
testUsingContext('app supports web if requested', () async { testUsingContext('app supports web if requested', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -993,8 +967,6 @@ void main() { ...@@ -993,8 +967,6 @@ void main() {
testUsingContext('plugin uses new platform schema', () async { testUsingContext('plugin uses new platform schema', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -1008,8 +980,6 @@ void main() { ...@@ -1008,8 +980,6 @@ void main() {
testUsingContext('has correct content and formatting with module template', () async { testUsingContext('has correct content and formatting with module template', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -1110,14 +1080,12 @@ void main() { ...@@ -1110,14 +1080,12 @@ void main() {
expect(sdkMetaContents, contains('<root url="file:/')); expect(sdkMetaContents, contains('<root url="file:/'));
expect(sdkMetaContents, contains('/bin/cache/dart-sdk/lib/core"')); expect(sdkMetaContents, contains('/bin/cache/dart-sdk/lib/core"'));
}, overrides: <Type, Generator>{ }, overrides: <Type, Generator>{
FlutterVersion: () => mockFlutterVersion, FlutterVersion: () => fakeFlutterVersion,
Platform: _kNoColorTerminalPlatform, Platform: _kNoColorTerminalPlatform,
}); });
testUsingContext('has correct content and formatting with app template', () async { testUsingContext('has correct content and formatting with app template', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -1194,14 +1162,12 @@ void main() { ...@@ -1194,14 +1162,12 @@ void main() {
expect(sdkMetaContents, contains('<root url="file:/')); expect(sdkMetaContents, contains('<root url="file:/'));
expect(sdkMetaContents, contains('/bin/cache/dart-sdk/lib/core"')); expect(sdkMetaContents, contains('/bin/cache/dart-sdk/lib/core"'));
}, overrides: <Type, Generator>{ }, overrides: <Type, Generator>{
FlutterVersion: () => mockFlutterVersion, FlutterVersion: () => fakeFlutterVersion,
Platform: _kNoColorTerminalPlatform, Platform: _kNoColorTerminalPlatform,
}); });
testUsingContext('has correct application id for android, bundle id for ios and application id for Linux', () async { testUsingContext('has correct application id for android, bundle id for ios and application id for Linux', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -1262,7 +1228,7 @@ void main() { ...@@ -1262,7 +1228,7 @@ void main() {
'flutter_project.untitled', 'flutter_project.untitled',
); );
}, overrides: <Type, Generator>{ }, overrides: <Type, Generator>{
FlutterVersion: () => mockFlutterVersion, FlutterVersion: () => fakeFlutterVersion,
Platform: _kNoColorTerminalPlatform, Platform: _kNoColorTerminalPlatform,
FeatureFlags: () => TestFeatureFlags(isLinuxEnabled: true), FeatureFlags: () => TestFeatureFlags(isLinuxEnabled: true),
}); });
...@@ -1748,8 +1714,6 @@ void main() { ...@@ -1748,8 +1714,6 @@ void main() {
testUsingContext('plugin does not support any platform by default', () async { testUsingContext('plugin does not support any platform by default', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -1785,8 +1749,6 @@ void main() { ...@@ -1785,8 +1749,6 @@ void main() {
testUsingContext('plugin supports ios if requested', () async { testUsingContext('plugin supports ios if requested', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -1807,8 +1769,6 @@ void main() { ...@@ -1807,8 +1769,6 @@ void main() {
testUsingContext('plugin supports android if requested', () async { testUsingContext('plugin supports android if requested', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -1831,8 +1791,6 @@ void main() { ...@@ -1831,8 +1791,6 @@ void main() {
testUsingContext('plugin supports web if requested', () async { testUsingContext('plugin supports web if requested', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -1855,8 +1813,6 @@ void main() { ...@@ -1855,8 +1813,6 @@ void main() {
testUsingContext('plugin doe not support web if feature is not enabled', () async { testUsingContext('plugin doe not support web if feature is not enabled', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -1877,8 +1833,6 @@ void main() { ...@@ -1877,8 +1833,6 @@ void main() {
testUsingContext('create an empty plugin, then add ios', () async { testUsingContext('create an empty plugin, then add ios', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -1893,8 +1847,6 @@ void main() { ...@@ -1893,8 +1847,6 @@ void main() {
testUsingContext('create an empty plugin, then add android', () async { testUsingContext('create an empty plugin, then add android', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -1910,8 +1862,6 @@ void main() { ...@@ -1910,8 +1862,6 @@ void main() {
testUsingContext('create an empty plugin, then add linux', () async { testUsingContext('create an empty plugin, then add linux', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -1927,8 +1877,6 @@ void main() { ...@@ -1927,8 +1877,6 @@ void main() {
testUsingContext('create an empty plugin, then add macos', () async { testUsingContext('create an empty plugin, then add macos', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -1944,8 +1892,6 @@ void main() { ...@@ -1944,8 +1892,6 @@ void main() {
testUsingContext('create an empty plugin, then add windows', () async { testUsingContext('create an empty plugin, then add windows', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -1961,8 +1907,6 @@ void main() { ...@@ -1961,8 +1907,6 @@ void main() {
testUsingContext('create an empty plugin, then add web', () async { testUsingContext('create an empty plugin, then add web', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -1978,8 +1922,6 @@ void main() { ...@@ -1978,8 +1922,6 @@ void main() {
testUsingContext('create a plugin with ios, then add macos', () async { testUsingContext('create a plugin with ios, then add macos', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -2003,8 +1945,6 @@ void main() { ...@@ -2003,8 +1945,6 @@ void main() {
testUsingContext('create a plugin with ios and android', () async { testUsingContext('create a plugin with ios and android', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -2026,8 +1966,6 @@ void main() { ...@@ -2026,8 +1966,6 @@ void main() {
testUsingContext('create a module with --platforms throws error.', () async { testUsingContext('create a module with --platforms throws error.', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -2038,8 +1976,6 @@ void main() { ...@@ -2038,8 +1976,6 @@ void main() {
testUsingContext('create a package with --platforms throws error.', () async { testUsingContext('create a package with --platforms throws error.', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -2050,8 +1986,6 @@ void main() { ...@@ -2050,8 +1986,6 @@ void main() {
testUsingContext('create a plugin with android, delete then re-create folders', () async { testUsingContext('create a plugin with android, delete then re-create folders', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -2075,8 +2009,6 @@ void main() { ...@@ -2075,8 +2009,6 @@ void main() {
testUsingContext('create a plugin with android, delete then re-create folders while also adding windows', () async { testUsingContext('create a plugin with android, delete then re-create folders while also adding windows', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -2105,8 +2037,6 @@ void main() { ...@@ -2105,8 +2037,6 @@ void main() {
testUsingContext('flutter create . on and existing plugin does not add android folders if android is not supported in pubspec', () async { testUsingContext('flutter create . on and existing plugin does not add android folders if android is not supported in pubspec', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -2119,8 +2049,6 @@ void main() { ...@@ -2119,8 +2049,6 @@ void main() {
testUsingContext('flutter create . on and existing plugin does not add windows folder even feature is enabled', () async { testUsingContext('flutter create . on and existing plugin does not add windows folder even feature is enabled', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -2135,8 +2063,6 @@ void main() { ...@@ -2135,8 +2063,6 @@ void main() {
testUsingContext('flutter create . on and existing plugin does not add linux folder even feature is enabled', () async { testUsingContext('flutter create . on and existing plugin does not add linux folder even feature is enabled', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -2151,8 +2077,6 @@ void main() { ...@@ -2151,8 +2077,6 @@ void main() {
testUsingContext('flutter create . on and existing plugin does not add web files even feature is enabled', () async { testUsingContext('flutter create . on and existing plugin does not add web files even feature is enabled', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -2166,8 +2090,6 @@ void main() { ...@@ -2166,8 +2090,6 @@ void main() {
testUsingContext('flutter create . on and existing plugin does not add macos folder even feature is enabled', () async { testUsingContext('flutter create . on and existing plugin does not add macos folder even feature is enabled', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -2182,8 +2104,6 @@ void main() { ...@@ -2182,8 +2104,6 @@ void main() {
testUsingContext('flutter create -t plugin in an empty folder should not show pubspec.yaml updating suggestion', () async { testUsingContext('flutter create -t plugin in an empty folder should not show pubspec.yaml updating suggestion', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -2197,8 +2117,6 @@ void main() { ...@@ -2197,8 +2117,6 @@ void main() {
testUsingContext('flutter create -t plugin in an existing plugin should show pubspec.yaml updating suggestion', () async { testUsingContext('flutter create -t plugin in an existing plugin should show pubspec.yaml updating suggestion', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -2214,8 +2132,6 @@ void main() { ...@@ -2214,8 +2132,6 @@ void main() {
testUsingContext('newly created plugin has min flutter sdk version as 1.20.0', () async { testUsingContext('newly created plugin has min flutter sdk version as 1.20.0', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -2229,8 +2145,6 @@ void main() { ...@@ -2229,8 +2145,6 @@ void main() {
testUsingContext('default app uses Android SDK 30', () async { testUsingContext('default app uses Android SDK 30', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -2247,8 +2161,6 @@ void main() { ...@@ -2247,8 +2161,6 @@ void main() {
testUsingContext('Linux plugins handle partially camel-case project names correctly', () async { testUsingContext('Linux plugins handle partially camel-case project names correctly', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -2280,8 +2192,6 @@ void main() { ...@@ -2280,8 +2192,6 @@ void main() {
testUsingContext('Windows plugins handle partially camel-case project names correctly', () async { testUsingContext('Windows plugins handle partially camel-case project names correctly', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -2314,8 +2224,6 @@ void main() { ...@@ -2314,8 +2224,6 @@ void main() {
testUsingContext('Linux plugins handle project names ending in _plugin correctly', () async { testUsingContext('Linux plugins handle project names ending in _plugin correctly', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -2352,8 +2260,6 @@ void main() { ...@@ -2352,8 +2260,6 @@ void main() {
testUsingContext('Windows plugins handle project names ending in _plugin correctly', () async { testUsingContext('Windows plugins handle project names ending in _plugin correctly', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -2390,8 +2296,6 @@ void main() { ...@@ -2390,8 +2296,6 @@ void main() {
testUsingContext('created plugin supports no platforms should print `no platforms` message', () async { testUsingContext('created plugin supports no platforms should print `no platforms` message', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -2408,8 +2312,6 @@ void main() { ...@@ -2408,8 +2312,6 @@ void main() {
testUsingContext('created plugin with no --platforms flag should not print `no platforms` message if the existing plugin supports a platform.', () async { testUsingContext('created plugin with no --platforms flag should not print `no platforms` message if the existing plugin supports a platform.', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -2425,8 +2327,6 @@ void main() { ...@@ -2425,8 +2327,6 @@ void main() {
testUsingContext('should show warning when disabled platforms are selected while creating a plugin', () async { testUsingContext('should show warning when disabled platforms are selected while creating a plugin', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -2442,8 +2342,6 @@ void main() { ...@@ -2442,8 +2342,6 @@ void main() {
testUsingContext("shouldn't show warning when only enabled platforms are selected while creating a plugin", () async { testUsingContext("shouldn't show warning when only enabled platforms are selected while creating a plugin", () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -2459,8 +2357,6 @@ void main() { ...@@ -2459,8 +2357,6 @@ void main() {
testUsingContext('should show warning when disabled platforms are selected while creating a app', () async { testUsingContext('should show warning when disabled platforms are selected while creating a app', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -2476,8 +2372,6 @@ void main() { ...@@ -2476,8 +2372,6 @@ void main() {
testUsingContext("shouldn't show warning when only enabled platforms are selected while creating a app", () async { testUsingContext("shouldn't show warning when only enabled platforms are selected while creating a app", () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
final CreateCommand command = CreateCommand(); final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
...@@ -2673,8 +2567,6 @@ Future<void> _runFlutterTest(Directory workingDir, { String target }) async { ...@@ -2673,8 +2567,6 @@ Future<void> _runFlutterTest(Directory workingDir, { String target }) async {
expect(exec.exitCode, 0); expect(exec.exitCode, 0);
} }
class MockFlutterVersion extends Mock implements FlutterVersion {}
/// A ProcessManager that invokes a real process manager, but keeps /// A ProcessManager that invokes a real process manager, but keeps
/// track of all commands sent to it. /// track of all commands sent to it.
class LoggingProcessManager extends LocalProcessManager { class LoggingProcessManager extends LocalProcessManager {
......
packages/flutter_tools/test/general.shard/flutter_platform_test.dart
View file @ d6f5767e
...@@ -10,7 +10,7 @@ import 'package:flutter_tools/src/base/io.dart'; ...@@ -10,7 +10,7 @@ import 'package:flutter_tools/src/base/io.dart';
import 'package:flutter_tools/src/build_info.dart'; import 'package:flutter_tools/src/build_info.dart';
import 'package:flutter_tools/src/device.dart'; import 'package:flutter_tools/src/device.dart';
import 'package:flutter_tools/src/test/flutter_platform.dart'; import 'package:flutter_tools/src/test/flutter_platform.dart';
import 'package:mockito/mockito.dart'; import 'package:test/fake.dart';
import 'package:test_core/backend.dart'; // ignore: deprecated_member_use import 'package:test_core/backend.dart'; // ignore: deprecated_member_use
import '../src/common.dart'; import '../src/common.dart';
...@@ -38,9 +38,9 @@ void main() { ...@@ -38,9 +38,9 @@ void main() {
), ),
enableObservatory: false, enableObservatory: false,
); );
flutterPlatform.loadChannel('test1.dart', MockSuitePlatform()); flutterPlatform.loadChannel('test1.dart', FakeSuitePlatform());
expect(() => flutterPlatform.loadChannel('test2.dart', MockSuitePlatform()), throwsToolExit()); expect(() => flutterPlatform.loadChannel('test2.dart', FakeSuitePlatform()), throwsToolExit());
}, overrides: <Type, Generator>{ }, overrides: <Type, Generator>{
FileSystem: () => fileSystem, FileSystem: () => fileSystem,
ProcessManager: () => FakeProcessManager.any(), ProcessManager: () => FakeProcessManager.any(),
...@@ -54,9 +54,9 @@ void main() { ...@@ -54,9 +54,9 @@ void main() {
precompiledDillPath: 'example.dill', precompiledDillPath: 'example.dill',
enableObservatory: false, enableObservatory: false,
); );
flutterPlatform.loadChannel('test1.dart', MockSuitePlatform()); flutterPlatform.loadChannel('test1.dart', FakeSuitePlatform());
expect(() => flutterPlatform.loadChannel('test2.dart', MockSuitePlatform()), throwsToolExit()); expect(() => flutterPlatform.loadChannel('test2.dart', FakeSuitePlatform()), throwsToolExit());
}, overrides: <Type, Generator>{ }, overrides: <Type, Generator>{
FileSystem: () => fileSystem, FileSystem: () => fileSystem,
ProcessManager: () => FakeProcessManager.any(), ProcessManager: () => FakeProcessManager.any(),
...@@ -122,7 +122,7 @@ void main() { ...@@ -122,7 +122,7 @@ void main() {
}); });
} }
class MockSuitePlatform extends Mock implements SuitePlatform {} class FakeSuitePlatform extends Fake implements SuitePlatform {}
// A FlutterPlatform with enough fields set to load and start a test. // A FlutterPlatform with enough fields set to load and start a test.
class TestFlutterPlatform extends FlutterPlatform { class TestFlutterPlatform extends FlutterPlatform {
......
packages/flutter_tools/test/general.shard/runner/flutter_command_test.dart
View file @ d6f5767e
...@@ -19,7 +19,6 @@ import 'package:flutter_tools/src/cache.dart'; ...@@ -19,7 +19,6 @@ import 'package:flutter_tools/src/cache.dart';
import 'package:flutter_tools/src/dart/pub.dart'; import 'package:flutter_tools/src/dart/pub.dart';
import 'package:flutter_tools/src/reporting/reporting.dart'; import 'package:flutter_tools/src/reporting/reporting.dart';
import 'package:flutter_tools/src/runner/flutter_command.dart'; import 'package:flutter_tools/src/runner/flutter_command.dart';
import 'package:flutter_tools/src/version.dart';
import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/globals.dart' as globals;
import 'package:mockito/mockito.dart'; import 'package:mockito/mockito.dart';
...@@ -624,7 +623,6 @@ class FakeReportingNullSafetyCommand extends FlutterCommand { ...@@ -624,7 +623,6 @@ class FakeReportingNullSafetyCommand extends FlutterCommand {
} }
} }
class MockVersion extends Mock implements FlutterVersion {}
class MockProcessInfo extends Mock implements ProcessInfo {} class MockProcessInfo extends Mock implements ProcessInfo {}
class MockIoProcessSignal extends Mock implements io.ProcessSignal {} class MockIoProcessSignal extends Mock implements io.ProcessSignal {}
......
packages/flutter_tools/test/src/fakes.dart
View file @ d6f5767e
...@@ -458,7 +458,8 @@ class FakeFlutterVersion implements FlutterVersion { ...@@ -458,7 +458,8 @@ class FakeFlutterVersion implements FlutterVersion {
this.frameworkRevision = '11111111111111111111', this.frameworkRevision = '11111111111111111111',
this.frameworkRevisionShort = '11111', this.frameworkRevisionShort = '11111',
this.frameworkAge = '0 hours ago', this.frameworkAge = '0 hours ago',
this.frameworkCommitDate = '12/01/01' this.frameworkCommitDate = '12/01/01',
this.gitTagVersion = const GitTagVersion.unknown(),
}); });
bool get didFetchTagsAndUpdate => _didFetchTagsAndUpdate; bool get didFetchTagsAndUpdate => _didFetchTagsAndUpdate;
...@@ -500,6 +501,9 @@ class FakeFlutterVersion implements FlutterVersion { ...@@ -500,6 +501,9 @@ class FakeFlutterVersion implements FlutterVersion {
@override @override
String get frameworkDate => frameworkCommitDate; String get frameworkDate => frameworkCommitDate;
@override
final GitTagVersion gitTagVersion;
@override @override
void fetchTagsAndUpdate() { void fetchTagsAndUpdate() {
_didFetchTagsAndUpdate = true; _didFetchTagsAndUpdate = true;
...@@ -515,11 +519,6 @@ class FakeFlutterVersion implements FlutterVersion { ...@@ -515,11 +519,6 @@ class FakeFlutterVersion implements FlutterVersion {
throw UnimplementedError(); throw UnimplementedError();
} }
@override
GitTagVersion get gitTagVersion {
throw UnimplementedError();
}
@override @override
Future<void> ensureVersionFile() async { } Future<void> ensureVersionFile() 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

HIAST - GitLab