Unverified Commit 8db51f66 authored by Jonah Williams's avatar Jonah Williams Committed by GitHub

[flutter_tools] remove mock android device from log reader test (#74995)

parent 6efe8e91
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
import 'dart:async'; import 'dart:async';
import 'package:flutter_tools/src/android/android_device.dart'; import 'package:flutter_tools/src/android/android_device.dart';
import 'package:mockito/mockito.dart'; import 'package:test/fake.dart';
import '../../src/common.dart'; import '../../src/common.dart';
import '../../src/context.dart'; import '../../src/context.dart';
...@@ -39,7 +39,7 @@ void main() { ...@@ -39,7 +39,7 @@ void main() {
) )
]); ]);
await AdbLogReader.createLogReader( await AdbLogReader.createLogReader(
createMockDevice(kLollipopVersionCode), createFakeDevice(kLollipopVersionCode),
processManager, processManager,
); );
...@@ -62,7 +62,7 @@ void main() { ...@@ -62,7 +62,7 @@ void main() {
) )
]); ]);
await AdbLogReader.createLogReader( await AdbLogReader.createLogReader(
createMockDevice(kLollipopVersionCode - 1), createFakeDevice(kLollipopVersionCode - 1),
processManager, processManager,
); );
...@@ -85,7 +85,7 @@ void main() { ...@@ -85,7 +85,7 @@ void main() {
) )
]); ]);
await AdbLogReader.createLogReader( await AdbLogReader.createLogReader(
createMockDevice(null), createFakeDevice(null),
processManager, processManager,
); );
...@@ -110,7 +110,7 @@ void main() { ...@@ -110,7 +110,7 @@ void main() {
) )
]); ]);
await AdbLogReader.createLogReader( await AdbLogReader.createLogReader(
createMockDevice(null), createFakeDevice(null),
processManager, processManager,
includePastLogs: true, includePastLogs: true,
); );
...@@ -136,7 +136,7 @@ void main() { ...@@ -136,7 +136,7 @@ void main() {
) )
]); ]);
final AdbLogReader logReader = await AdbLogReader.createLogReader( final AdbLogReader logReader = await AdbLogReader.createLogReader(
createMockDevice(null), createFakeDevice(null),
processManager, processManager,
); );
final Completer<void> onDone = Completer<void>.sync(); final Completer<void> onDone = Completer<void>.sync();
...@@ -170,7 +170,7 @@ void main() { ...@@ -170,7 +170,7 @@ void main() {
) )
]); ]);
final AdbLogReader logReader = await AdbLogReader.createLogReader( final AdbLogReader logReader = await AdbLogReader.createLogReader(
createMockDevice(null), createFakeDevice(null),
processManager, processManager,
); );
await expectLater(logReader.logLines, emitsInOrder(<String>[ await expectLater(logReader.logLines, emitsInOrder(<String>[
...@@ -183,16 +183,32 @@ void main() { ...@@ -183,16 +183,32 @@ void main() {
}); });
} }
MockAndroidDevice createMockDevice(int sdkLevel) { AndroidDevice createFakeDevice(int sdkLevel) {
final MockAndroidDevice mockAndroidDevice = MockAndroidDevice(); return FakeAndroidDevice(
when(mockAndroidDevice.apiVersion) sdkLevel.toString(),
.thenAnswer((Invocation invocation) async => sdkLevel.toString()); kLastLogcatTimestamp,
when(mockAndroidDevice.lastLogcatTimestamp()).thenAnswer((Invocation _) async => kLastLogcatTimestamp); );
when(mockAndroidDevice.adbCommandForDevice(any))
.thenAnswer((Invocation invocation) => <String>[
'adb', '-s', '1234', ...invocation.positionalArguments.first as List<String>
]);
return mockAndroidDevice;
} }
class MockAndroidDevice extends Mock implements AndroidDevice {} class FakeAndroidDevice extends Fake implements AndroidDevice {
FakeAndroidDevice(this._apiVersion, this._lastLogcatTimestamp);
final String _lastLogcatTimestamp;
final String _apiVersion;
@override
String get name => 'test-device';
@override
Future<String> get apiVersion => Future<String>.value(_apiVersion);
@override
Future<String> lastLogcatTimestamp() async => _lastLogcatTimestamp;
@override
List<String> adbCommandForDevice(List<String> command) {
return <String>[
'adb', '-s', '1234', ...command,
];
}
}
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