Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[flutter_tools] switch FakeCache to cache.test and NoopUsage to TestUsage #76802

Merged
merged 3 commits into from Feb 26, 2021
Merged

[flutter_tools] switch FakeCache to cache.test and NoopUsage to TestUsage #76802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f16f1a8
[flutter_tools] switch fakecache to cache.test and noop usage to test…
jonahwilliams Feb 25, 2021
b018d88
Add some defaults back
jonahwilliams Feb 26, 2021
2706144
Merge branch 'master' of github.com:flutter/flutter into remove_test_bed
jonahwilliams Feb 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 9 additions & 9 deletions packages/flutter_tools/test/commands.shard/hermetic/assemble_test.dart
View file
Open in desktop
Expand Up @@ -33,7 +33,7 @@ void main() {

expect(testLogger.traceText, contains('build succeeded.'));
}, overrides: <Type, Generator>{
Cache: () => FakeCache(),
Cache: () => Cache.test(processManager: FakeProcessManager.any()),
FileSystem: () => MemoryFileSystem.test(),
ProcessManager: () => FakeProcessManager.any(),
});
Expand All @@ -48,7 +48,7 @@ void main() {

expect(testLogger.traceText, contains('build succeeded.'));
}, overrides: <Type, Generator>{
Cache: () => FakeCache(),
Cache: () => Cache.test(processManager: FakeProcessManager.any()),
FileSystem: () => MemoryFileSystem.test(),
ProcessManager: () => FakeProcessManager.any(),
});
Expand All @@ -63,7 +63,7 @@ void main() {

expect(testLogger.traceText, contains('build succeeded.'));
}, overrides: <Type, Generator>{
Cache: () => FakeCache(),
Cache: () => Cache.test(processManager: FakeProcessManager.any()),
FileSystem: () => MemoryFileSystem.test(),
ProcessManager: () => FakeProcessManager.any(),
});
Expand All @@ -75,7 +75,7 @@ void main() {

expect(commandRunner.run(<String>['assemble', 'debug_macos_bundle_flutter_assets']), throwsToolExit());
}, overrides: <Type, Generator>{
Cache: () => FakeCache(),
Cache: () => Cache.test(processManager: FakeProcessManager.any()),
FileSystem: () => MemoryFileSystem.test(),
ProcessManager: () => FakeProcessManager.any(),
});
Expand All @@ -88,7 +88,7 @@ void main() {
expect(commandRunner.run(<String>['assemble', '-o Output', 'undefined']),
throwsToolExit());
}, overrides: <Type, Generator>{
Cache: () => FakeCache(),
Cache: () => Cache.test(processManager: FakeProcessManager.any()),
FileSystem: () => MemoryFileSystem.test(),
ProcessManager: () => FakeProcessManager.any(),
});
Expand All @@ -105,7 +105,7 @@ void main() {
expect(testLogger.errorText, isNot(contains('bar')));
expect(testLogger.errorText, isNot(contains(stackTrace.toString())));
}, overrides: <Type, Generator>{
Cache: () => FakeCache(),
Cache: () => Cache.test(processManager: FakeProcessManager.any()),
FileSystem: () => MemoryFileSystem.test(),
ProcessManager: () => FakeProcessManager.any(),
});
Expand Down Expand Up @@ -140,7 +140,7 @@ void main() {
)),
);
}, overrides: <Type, Generator>{
Cache: () => FakeCache(),
Cache: () => Cache.test(processManager: FakeProcessManager.any()),
FileSystem: () => MemoryFileSystem.test(),
ProcessManager: () => FakeProcessManager.any(),
});
Expand All @@ -154,7 +154,7 @@ void main() {
await commandRunner.run(<String>['assemble', '-o Output', 'debug_macos_bundle_flutter_assets']);
}, overrides: <Type, Generator>{
Artifacts: () => Artifacts.test(localEngine: 'out/host_release'),
Cache: () => FakeCache(),
Cache: () => Cache.test(processManager: FakeProcessManager.any()),
FileSystem: () => MemoryFileSystem.test(),
ProcessManager: () => FakeProcessManager.any(),
});
Expand Down Expand Up @@ -217,7 +217,7 @@ void main() {
expect(inputs.readAsStringSync(), contains('fizz'));
expect(inputs.lastModifiedSync(), isNot(theDistantPast));
}, overrides: <Type, Generator>{
Cache: () => FakeCache(),
Cache: () => Cache.test(processManager: FakeProcessManager.any()),
FileSystem: () => MemoryFileSystem.test(),
ProcessManager: () => FakeProcessManager.any(),
});
Expand Down
1 change: 1 addition & 0 deletions packages/flutter_tools/test/commands.shard/hermetic/build_fuchsia_test.dart
View file
Open in desktop
Expand Up @@ -22,6 +22,7 @@ import 'package:test/fake.dart';

import '../../src/common.dart';
import '../../src/context.dart';
import '../../src/fakes.dart';
import '../../src/testbed.dart';

// Defined globally for fakes to use.
Expand Down
1 change: 1 addition & 0 deletions packages/flutter_tools/test/commands.shard/hermetic/build_linux_test.dart
View file
Open in desktop
Expand Up @@ -24,6 +24,7 @@ import 'package:test/fake.dart';

import '../../src/common.dart';
import '../../src/context.dart';
import '../../src/fakes.dart';
import '../../src/testbed.dart';

const String _kTestFlutterRoot = '/flutter';
Expand Down
1 change: 1 addition & 0 deletions packages/flutter_tools/test/commands.shard/hermetic/build_macos_test.dart
View file
Open in desktop
Expand Up @@ -24,6 +24,7 @@ import 'package:process/process.dart';

import '../../src/common.dart';
import '../../src/context.dart';
import '../../src/fakes.dart';
import '../../src/testbed.dart';

class FakeXcodeProjectInterpreterWithProfile extends FakeXcodeProjectInterpreter {
Expand Down
1 change: 1 addition & 0 deletions packages/flutter_tools/test/commands.shard/hermetic/build_windows_test.dart
View file
Open in desktop
Expand Up @@ -18,6 +18,7 @@ import 'package:process/process.dart';

import '../../src/common.dart';
import '../../src/context.dart';
import '../../src/fakes.dart';
import '../../src/testbed.dart';

const String flutterRoot = r'C:\flutter';
Expand Down
1 change: 1 addition & 0 deletions packages/flutter_tools/test/commands.shard/hermetic/doctor_test.dart
View file
Open in desktop
Expand Up @@ -34,6 +34,7 @@ import 'package:fake_async/fake_async.dart';

import '../../src/common.dart';
import '../../src/context.dart';
import '../../src/fakes.dart';
import '../../src/testbed.dart';

final Generator _kNoColorOutputPlatform = () => FakePlatform(
Expand Down
2 changes: 1 addition & 1 deletion packages/flutter_tools/test/commands.shard/hermetic/precache_test.dart
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@ import 'package:mockito/mockito.dart';

import '../../src/common.dart';
import '../../src/context.dart';
import '../../src/testbed.dart';
import '../../src/fakes.dart';

void main() {
MockCache cache;
Expand Down
14 changes: 7 additions & 7 deletions packages/flutter_tools/test/commands.shard/hermetic/test_test.dart
View file
Open in desktop
Expand Up @@ -100,7 +100,7 @@ void main() {
}, overrides: <Type, Generator>{
FileSystem: () => fs,
ProcessManager: () => FakeProcessManager.any(),
Cache: () => FakeCache(),
Cache: () => Cache.test(processManager: FakeProcessManager.any()),
});

group('shard-index and total-shards', () {
Expand All @@ -124,7 +124,7 @@ void main() {
}, overrides: <Type, Generator>{
FileSystem: () => fs,
ProcessManager: () => FakeProcessManager.any(),
Cache: () => FakeCache(),
Cache: () => Cache.test(processManager: FakeProcessManager.any()),
});

testUsingContext('without the params they not Piped to package:test',
Expand All @@ -145,7 +145,7 @@ void main() {
}, overrides: <Type, Generator>{
FileSystem: () => fs,
ProcessManager: () => FakeProcessManager.any(),
Cache: () => FakeCache(),
Cache: () => Cache.test(processManager: FakeProcessManager.any()),
});
});

Expand All @@ -168,7 +168,7 @@ void main() {
}, overrides: <Type, Generator>{
FileSystem: () => fs,
ProcessManager: () => FakeProcessManager.any(),
Cache: () => FakeCache(),
Cache: () => Cache.test(processManager: FakeProcessManager.any()),
});

testUsingContext('Pipes start-paused to package:test',
Expand All @@ -193,7 +193,7 @@ void main() {
}, overrides: <Type, Generator>{
FileSystem: () => fs,
ProcessManager: () => FakeProcessManager.any(),
Cache: () => FakeCache(),
Cache: () => Cache.test(processManager: FakeProcessManager.any()),
});

testUsingContext('Pipes run-skipped to package:test',
Expand All @@ -218,7 +218,7 @@ void main() {
}, overrides: <Type, Generator>{
FileSystem: () => fs,
ProcessManager: () => FakeProcessManager.any(),
Cache: () => FakeCache(),
Cache: () => Cache.test(processManager: FakeProcessManager.any()),
});

testUsingContext('Pipes enable-observatory', () async {
Expand Down Expand Up @@ -266,7 +266,7 @@ void main() {
}, overrides: <Type, Generator>{
FileSystem: () => fs,
ProcessManager: () => FakeProcessManager.any(),
Cache: () => FakeCache(),
Cache: () => Cache.test(processManager: FakeProcessManager.any()),
});
}

Expand Down
1 change: 1 addition & 0 deletions packages/flutter_tools/test/commands.shard/permeable/create_test.dart
View file
Open in desktop
Expand Up @@ -31,6 +31,7 @@ import 'package:pubspec_parse/pubspec_parse.dart';
import '../../src/common.dart';
import '../../src/context.dart';
import '../../src/fake_http_client.dart';
import '../../src/fakes.dart';
import '../../src/pubspec_schema.dart';
import '../../src/testbed.dart';

Expand Down
1 change: 1 addition & 0 deletions packages/flutter_tools/test/commands.shard/permeable/devices_test.dart
View file
Open in desktop
Expand Up @@ -20,6 +20,7 @@ import 'package:mockito/mockito.dart';

import '../../src/common.dart';
import '../../src/context.dart';
import '../../src/fakes.dart';
import '../../src/testbed.dart';

void main() {
Expand Down
2 changes: 1 addition & 1 deletion packages/flutter_tools/test/general.shard/android/android_device_discovery_test.dart
View file
Open in desktop
Expand Up @@ -17,7 +17,7 @@ import 'package:test/fake.dart';
import '../../src/common.dart';
import '../../src/context.dart';
import '../../src/fake_process_manager.dart';
import '../../src/testbed.dart';
import '../../src/fakes.dart';

void main() {
AndroidWorkflow androidWorkflow;
Expand Down
1 change: 0 additions & 1 deletion packages/flutter_tools/test/general.shard/android/android_workflow_test.dart
View file
Open in desktop
Expand Up @@ -21,7 +21,6 @@ import '../../src/common.dart';
import '../../src/context.dart';
import '../../src/fakes.dart';
import '../../src/mocks.dart' show MockAndroidSdk, MockProcessManager;
import '../../src/testbed.dart';

class MockAndroidSdkVersion extends Mock implements AndroidSdkVersion {}

Expand Down
1 change: 1 addition & 0 deletions packages/flutter_tools/test/general.shard/doctor.dart
View file
Open in desktop
Expand Up @@ -11,6 +11,7 @@ import 'package:flutter_tools/src/web/web_validator.dart';
import 'package:flutter_tools/src/windows/visual_studio_validator.dart';

import '../src/common.dart';
import '../src/fakes.dart';
import '../src/testbed.dart';

void main() {
Expand Down
1 change: 1 addition & 0 deletions packages/flutter_tools/test/general.shard/emulator_test.dart
View file
Open in desktop
Expand Up @@ -16,6 +16,7 @@ import 'package:mockito/mockito.dart';

import '../src/common.dart';
import '../src/context.dart';
import '../src/fakes.dart';
import '../src/mocks.dart';
import '../src/testbed.dart';

Expand Down
2 changes: 1 addition & 1 deletion packages/flutter_tools/test/general.shard/fuchsia/fuchsia_workflow_test.dart
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@ import 'package:flutter_tools/src/fuchsia/fuchsia_sdk.dart';
import 'package:flutter_tools/src/fuchsia/fuchsia_workflow.dart';

import '../../src/common.dart';
import '../../src/testbed.dart';
import '../../src/fakes.dart';

void main() {
final FileSystem fileSystem = MemoryFileSystem.test();
Expand Down
6 changes: 3 additions & 3 deletions packages/flutter_tools/test/general.shard/ios/ios_device_logger_test.dart
View file
Open in desktop
Expand Up @@ -9,6 +9,7 @@ import 'dart:async';
import 'package:flutter_tools/src/artifacts.dart';
import 'package:flutter_tools/src/base/logger.dart';
import 'package:flutter_tools/src/build_info.dart';
import 'package:flutter_tools/src/cache.dart';
import 'package:flutter_tools/src/convert.dart';
import 'package:flutter_tools/src/device.dart';
import 'package:flutter_tools/src/ios/devices.dart';
Expand All @@ -20,18 +21,17 @@ import 'package:vm_service/vm_service.dart';

import '../../src/common.dart';
import '../../src/context.dart';
import '../../src/testbed.dart';

void main() {
FakeProcessManager processManager;
Artifacts artifacts;
FakeCache fakeCache;
Cache fakeCache;
BufferLogger logger;
String ideviceSyslogPath;

setUp(() {
processManager = FakeProcessManager.list(<FakeCommand>[]);
fakeCache = FakeCache();
fakeCache = Cache.test();
artifacts = Artifacts.test();
logger = BufferLogger.test();
ideviceSyslogPath = artifacts.getArtifactPath(Artifact.idevicesyslog, platform: TargetPlatform.ios);
Expand Down
2 changes: 1 addition & 1 deletion packages/flutter_tools/test/general.shard/ios/ios_workflow_test.dart
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@ import 'package:flutter_tools/src/macos/xcode.dart';

import '../../src/common.dart';
import '../../src/context.dart';
import '../../src/testbed.dart';
import '../../src/fakes.dart';

void main() {
testWithoutContext('iOS workflow is disabled if feature is disabled', () {
Expand Down
2 changes: 1 addition & 1 deletion packages/flutter_tools/test/general.shard/linux/linux_device_test.dart
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@ import 'package:mockito/mockito.dart';

import '../../src/common.dart';
import '../../src/context.dart';
import '../../src/testbed.dart';
import '../../src/fakes.dart';

final FakePlatform linux = FakePlatform(
operatingSystem: 'linux',
Expand Down
2 changes: 1 addition & 1 deletion packages/flutter_tools/test/general.shard/linux/linux_workflow_test.dart
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@ import 'package:flutter_tools/src/features.dart';
import 'package:flutter_tools/src/linux/linux_workflow.dart';

import '../../src/common.dart';
import '../../src/testbed.dart';
import '../../src/fakes.dart';

void main() {
final Platform linux = FakePlatform(
Expand Down
2 changes: 1 addition & 1 deletion packages/flutter_tools/test/general.shard/macos/macos_device_test.dart
View file
Open in desktop
Expand Up @@ -20,7 +20,7 @@ import 'package:mockito/mockito.dart';

import '../../src/common.dart';
import '../../src/context.dart';
import '../../src/testbed.dart';
import '../../src/fakes.dart';

final FakePlatform macOS = FakePlatform(
operatingSystem: 'macos',
Expand Down
2 changes: 1 addition & 1 deletion packages/flutter_tools/test/general.shard/macos/macos_workflow_test.dart
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@ import 'package:flutter_tools/src/base/platform.dart';
import 'package:flutter_tools/src/macos/macos_workflow.dart';

import '../../src/common.dart';
import '../../src/testbed.dart';
import '../../src/fakes.dart';

final FakePlatform macOS = FakePlatform(
operatingSystem: 'macos',
Expand Down
1 change: 1 addition & 0 deletions packages/flutter_tools/test/general.shard/plugins_test.dart
View file
Open in desktop
Expand Up @@ -28,6 +28,7 @@ import 'package:yaml/yaml.dart';

import '../src/common.dart';
import '../src/context.dart';
import '../src/fakes.dart';
import '../src/pubspec_schema.dart';
import '../src/testbed.dart';

Expand Down
1 change: 1 addition & 0 deletions packages/flutter_tools/test/general.shard/resident_runner_test.dart
View file
Open in desktop
Expand Up @@ -38,6 +38,7 @@ import 'package:mockito/mockito.dart';

import '../src/common.dart';
import '../src/context.dart';
import '../src/fakes.dart';
import '../src/testbed.dart';

final vm_service.Isolate fakeUnpausedIsolate = vm_service.Isolate(
Expand Down
2 changes: 1 addition & 1 deletion packages/flutter_tools/test/general.shard/web/devices_test.dart
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@ import 'package:mockito/mockito.dart';

import '../../src/common.dart';
import '../../src/context.dart';
import '../../src/testbed.dart';
import '../../src/fakes.dart';

void main() {
testWithoutContext('No web devices listed if feature is disabled', () async {
Expand Down
2 changes: 1 addition & 1 deletion packages/flutter_tools/test/general.shard/web/workflow_test.dart
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@ import 'package:flutter_tools/src/base/platform.dart';
import 'package:flutter_tools/src/web/workflow.dart';

import '../../src/common.dart';
import '../../src/testbed.dart';
import '../../src/fakes.dart';

void main() {
testWithoutContext('WebWorkflow applies on Linux', () {
Expand Down
2 changes: 1 addition & 1 deletion packages/flutter_tools/test/general.shard/windows/windows_device_test.dart
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@ import 'package:test/fake.dart';

import '../../src/common.dart';
import '../../src/context.dart';
import '../../src/testbed.dart';
import '../../src/fakes.dart';

void main() {
testWithoutContext('WindowsDevice defaults', () async {
Expand Down
2 changes: 1 addition & 1 deletion packages/flutter_tools/test/general.shard/windows/windows_workflow_test.dart
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@ import 'package:flutter_tools/src/base/platform.dart';
import 'package:flutter_tools/src/windows/windows_workflow.dart';

import '../../src/common.dart';
import '../../src/testbed.dart';
import '../../src/fakes.dart';

void main() {
final FakePlatform windows = FakePlatform(operatingSystem: 'windows');
Expand Down