firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Swap MockStdio to FakeStdio in tests (#74838)" (#74867)

Browse Source 
This reverts commit 547ed88ab37d50a9f7cc9aad42475db8e92126e7.
This commit is contained in:
Jenn Magder 2021-01-27 19:35:16 -08:00 committed by GitHub
parent 19f6e54d22
commit ff87150ba9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 53 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/flutter_tools/test/commands.shard/hermetic/run_test.dart
View File

@ -227,7 +227,7 @@ void main() {
FileSystem: () => MemoryFileSystem.test(),
ProcessManager: () => FakeProcessManager.any(),
DeviceManager: () => mockDeviceManager,
Stdio: () => FakeStdio(hasFakeTerminal: true),
Stdio: () => MockStdio(),
});
testUsingContext('shows unsupported devices when no supported devices are found', () async {

6
packages/flutter_tools/test/commands.shard/hermetic/symbolize_test.dart
View File

@ -17,12 +17,12 @@ import 'package:mockito/mockito.dart';
import '../../src/common.dart';
import '../../src/context.dart';
import '../../src/fakes.dart';
import '../../src/mocks.dart';
void main() {
MemoryFileSystem fileSystem;
FakeStdio stdio;
MockStdio stdio;
SymbolizeCommand command;
MockDwarfSymbolizationService mockDwarfSymbolizationService;
@ -32,7 +32,7 @@ void main() {
setUp(() {
fileSystem = MemoryFileSystem.test();
stdio = FakeStdio();
stdio = MockStdio();
mockDwarfSymbolizationService = MockDwarfSymbolizationService();
command = SymbolizeCommand(
stdio: stdio,

10
packages/flutter_tools/test/general.shard/analytics_test.dart
View File

@ -26,7 +26,7 @@ import 'package:usage/usage_io.dart';
import '../src/common.dart';
import '../src/context.dart';
import '../src/fakes.dart';
import '../src/mocks.dart';
void main() {
setUpAll(() {
@ -152,7 +152,7 @@ void main() {
group('analytics with mocks', () {
MemoryFileSystem memoryFileSystem;
FakeStdio fakeStdio;
MockStdio mockStdio;
Usage mockUsage;
SystemClock mockClock;
Doctor mockDoctor;
@ -160,7 +160,7 @@ void main() {
setUp(() {
memoryFileSystem = MemoryFileSystem.test();
fakeStdio = FakeStdio();
mockStdio = MockStdio();
mockUsage = MockUsage();
mockClock = MockClock();
mockDoctor = MockDoctor();
@ -266,7 +266,7 @@ void main() {
'FLUTTER_ANALYTICS_LOG_FILE': 'analytics.log',
},
),
Stdio: () => fakeStdio,
Stdio: () => mockStdio,
});
testUsingContext('event sends localtime', () async {
@ -296,7 +296,7 @@ void main() {
'FLUTTER_ANALYTICS_LOG_FILE': 'analytics.log',
},
),
Stdio: () => fakeStdio,
Stdio: () => mockStdio,
});
});

7
packages/flutter_tools/test/general.shard/android/android_workflow_test.dart
View File

@ -18,8 +18,7 @@ import 'package:mockito/mockito.dart';
import '../../src/common.dart';
import '../../src/context.dart';
import '../../src/fakes.dart';
import '../../src/mocks.dart' show MockAndroidSdk, MockProcess, MockProcessManager;
import '../../src/mocks.dart' show MockAndroidSdk, MockProcess, MockProcessManager, MockStdio;
import '../../src/testbed.dart';
class MockAndroidSdkVersion extends Mock implements AndroidSdkVersion {}
@ -30,7 +29,7 @@ void main() {
Logger logger;
MemoryFileSystem fileSystem;
MockProcessManager processManager;
FakeStdio stdio;
MockStdio stdio;
setUp(() {
sdk = MockAndroidSdk();
@ -38,7 +37,7 @@ void main() {
fileSystem.directory('/home/me').createSync(recursive: true);
logger = BufferLogger.test();
processManager = MockProcessManager();
stdio = FakeStdio();
stdio = MockStdio();
});
MockProcess Function(List<String>) processMetaFactory(List<String> stdout) {

4
packages/flutter_tools/test/general.shard/artifact_updater_test.dart
View File

@ -18,7 +18,7 @@ import 'package:flutter_tools/src/cache.dart';
import 'package:mockito/mockito.dart';
import '../src/common.dart';
import '../src/fakes.dart';
import '../src/mocks.dart';
final Platform testPlatform = FakePlatform(environment: const <String, String>{});
@ -171,7 +171,7 @@ void main() {
final MemoryFileSystem fileSystem = MemoryFileSystem.test();
final Logger logger = StdoutLogger(
terminal: Terminal.test(supportsColor: true),
stdio: FakeStdio(),
stdio: MockStdio(),
outputPreferences: OutputPreferences.test(),
);
final ArtifactUpdater artifactUpdater = ArtifactUpdater(

14
packages/flutter_tools/test/general.shard/base/bot_detector_test.dart
View File

@ -16,10 +16,12 @@ import 'package:mockito/mockito.dart';
import 'package:fake_async/fake_async.dart';
import '../../src/common.dart';
import '../../src/mocks.dart';
void main() {
group('BotDetector', () {
FakePlatform fakePlatform;
MockStdio mockStdio;
MockHttpClient mockHttpClient;
MockHttpClientRequest mockHttpClientRequest;
MockHttpHeaders mockHttpHeaders;
@ -28,6 +30,7 @@ void main() {
setUp(() {
fakePlatform = FakePlatform()..environment = <String, String>{};
mockStdio = MockStdio();
mockHttpClient = MockHttpClient();
mockHttpClientRequest = MockHttpClientRequest();
mockHttpHeaders = MockHttpHeaders();
@ -59,6 +62,17 @@ void main() {
expect(persistentToolState.isRunningOnBot, isFalse);
});
testWithoutContext('returns false with and without a terminal attached', () async {
when(mockHttpClient.getUrl(any)).thenAnswer((_) {
throw const SocketException('HTTP connection timed out');
});
mockStdio.stdout.hasTerminal = true;
expect(await botDetector.isRunningOnBot, isFalse);
mockStdio.stdout.hasTerminal = false;
expect(await botDetector.isRunningOnBot, isFalse);
expect(persistentToolState.isRunningOnBot, isFalse);
});
testWithoutContext('can test analytics outputs on bots when outputting to a file', () async {
fakePlatform.environment['TRAVIS'] = 'true';
fakePlatform.environment['FLUTTER_ANALYTICS_LOG_FILE'] = '/some/file';

4
packages/flutter_tools/test/general.shard/base/command_help_test.dart
View File

@ -11,7 +11,7 @@ import 'package:flutter_tools/src/base/terminal.dart' show AnsiTerminal, OutputP
import 'package:meta/meta.dart';
import '../../src/common.dart';
import '../../src/fakes.dart';
import '../../src/mocks.dart' show MockStdio;
CommandHelp _createCommandHelp({
@required bool ansi,
@ -23,7 +23,7 @@ CommandHelp _createCommandHelp({
return CommandHelp(
logger: BufferLogger.test(),
terminal: AnsiTerminal(
stdio: FakeStdio(),
stdio: MockStdio(),
platform: platform,
),
platform: platform,

4
packages/flutter_tools/test/general.shard/base/net_test.dart
View File

@ -18,7 +18,7 @@ import 'package:flutter_tools/src/base/terminal.dart';
import 'package:fake_async/fake_async.dart';
import '../../src/common.dart';
import '../../src/fakes.dart';
import '../../src/mocks.dart' show MockStdio;
void main() {
BufferLogger testLogger;
@ -26,7 +26,7 @@ void main() {
setUp(() {
testLogger = BufferLogger(
terminal: AnsiTerminal(
stdio: FakeStdio(),
stdio: MockStdio(),
platform: FakePlatform(stdoutSupportsAnsi: false),
),
outputPreferences: OutputPreferences.test(),

6
packages/flutter_tools/test/general.shard/base/process_test.dart
View File

@ -15,9 +15,9 @@ import 'package:mockito/mockito.dart';
import 'package:fake_async/fake_async.dart';
import '../../src/common.dart';
import '../../src/context.dart';
import '../../src/fakes.dart';
import '../../src/mocks.dart' show MockProcess,
MockProcessManager,
MockStdio,
flakyProcessFactory;
void main() {
@ -90,7 +90,7 @@ void main() {
mockProcessManager = MockProcessManager();
mockLogger = BufferLogger(
terminal: AnsiTerminal(
stdio: FakeStdio(),
stdio: MockStdio(),
platform: FakePlatform(stdoutSupportsAnsi: false),
),
outputPreferences: OutputPreferences(wrapText: true, wrapColumn: 40),
@ -280,7 +280,7 @@ void main() {
fakeProcessManager = FakeProcessManager.list(<FakeCommand>[]);
testLogger = BufferLogger(
terminal: AnsiTerminal(
stdio: FakeStdio(),
stdio: MockStdio(),
platform: FakePlatform(stdinSupportsAnsi: false),
),
outputPreferences: OutputPreferences(wrapText: true, wrapColumn: 40),

3
packages/flutter_tools/test/general.shard/build_system/targets/icon_tree_shaker_test.dart
View File

@ -22,7 +22,6 @@ import 'package:mockito/mockito.dart';
import '../../../src/common.dart';
import '../../../src/context.dart';
import '../../../src/fakes.dart';
import '../../../src/mocks.dart' as mocks;
final Platform kNoAnsiPlatform = FakePlatform(stdoutSupportsAnsi: false);
@ -91,7 +90,7 @@ void main() {
fileSystem = MemoryFileSystem.test();
logger = BufferLogger(
terminal: AnsiTerminal(
stdio: FakeStdio(),
stdio: mocks.MockStdio(),
platform: kNoAnsiPlatform,
),
outputPreferences: OutputPreferences.test(showColor: false),

18
packages/flutter_tools/test/general.shard/runner/flutter_command_runner_test.dart
View File

@ -20,7 +20,6 @@ import 'package:process/process.dart';
import '../../src/common.dart';
import '../../src/context.dart';
import '../../src/fakes.dart';
import 'utils.dart';
const String _kFlutterRoot = '/flutter/flutter';
@ -254,3 +253,20 @@ class FakeFlutterCommand extends FlutterCommand {
@override
String get name => 'fake';
}
class FakeStdio extends Stdio {
FakeStdio({this.hasFakeTerminal});
final bool hasFakeTerminal;
@override
bool get hasTerminal => hasFakeTerminal;
@override
int get terminalColumns => hasFakeTerminal ? 80 : null;
@override
int get terminalLines => hasFakeTerminal ? 24 : null;
@override
bool get supportsAnsiEscapes => hasFakeTerminal;
}

18
packages/flutter_tools/test/src/fakes.dart
View File

@ -7,7 +7,6 @@
import 'dart:async';
import 'package:flutter_tools/src/base/file_system.dart';
import 'package:flutter_tools/src/base/io.dart';
import 'package:flutter_tools/src/base/logger.dart';
import 'package:flutter_tools/src/base/os.dart';
import 'package:flutter_tools/src/cache.dart';
@ -66,20 +65,3 @@ class FakeDyldEnvironmentArtifact extends ArtifactSet {
Future<void> update(ArtifactUpdater artifactUpdater, Logger logger, FileSystem fileSystem, OperatingSystemUtils operatingSystemUtils) async {
}
}
class FakeStdio extends Stdio {
FakeStdio({this.hasFakeTerminal});
final bool hasFakeTerminal;
@override
bool get hasTerminal => hasFakeTerminal;
@override
int get terminalColumns => hasFakeTerminal ? 80 : null;
@override
int get terminalLines => hasFakeTerminal ? 24 : null;
@override
bool get supportsAnsiEscapes => hasFakeTerminal;
}