Skip to content

F
Front-End
Commit fba81d0f authored by Sam Rawlins's avatar Sam Rawlins Committed by Alexander Aprelev
Browse files
Options

Use anyNamed when mocking named arguments (#17996)

parent 59bb2dba
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 46 deletions
packages/flutter_tools/test/android/android_device_test.dart
View file @ fba81d0f
......@@ -88,7 +88,9 @@ Use the 'android' tool to install them:
setUp(() {
hardware = 'unknown';
buildCharacteristics = 'unused';
when(mockProcessManager.run(argThat(contains('getprop')), stderrEncoding: any, stdoutEncoding: any)).thenAnswer((_) {
when(mockProcessManager.run(argThat(contains('getprop')),
stderrEncoding: anyNamed('stderrEncoding'),
stdoutEncoding: anyNamed('stdoutEncoding'))).thenAnswer((_) {
final StringBuffer buf = new StringBuffer()
..writeln('[ro.hardware]: [$hardware]')
..writeln('[ro.build.characteristics]: [$buildCharacteristics]');
......
packages/flutter_tools/test/ios/cocoapods_test.dart
View file @ fba81d0f
......@@ -60,8 +60,8 @@ void main() {
fs.directory(fs.path.join(homeDirPath, '.cocoapods', 'repos', 'master')).createSync(recursive: true);
when(mockProcessManager.run(
<String>['pod', '--version'],
workingDirectory: any,
environment: any,
workingDirectory: anyNamed('workingDirectory'),
environment: anyNamed('environment'),
)).thenAnswer((_) => resultOfPodVersion());
when(mockProcessManager.run(
<String>['pod', 'install', '--verbose'],
......@@ -205,7 +205,7 @@ void main() {
);
verifyNever(mockProcessManager.run(
argThat(containsAllInOrder(<String>['pod', 'install'])),
workingDirectory: any,
workingDirectory: anyNamed('workingDirectory'),
environment: anyNamed('environment'),
));
expect(testLogger.errorText, contains('not installed'));
......@@ -227,7 +227,7 @@ void main() {
expect(e, const isInstanceOf<ToolExit>());
verifyNever(mockProcessManager.run(
argThat(containsAllInOrder(<String>['pod', 'install'])),
workingDirectory: any,
workingDirectory: anyNamed('workingDirectory'),
environment: anyNamed('environment'),
));
}
......@@ -438,7 +438,7 @@ Note: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by
expect(didInstall, isFalse);
verifyNever(mockProcessManager.run(
argThat(containsAllInOrder(<String>['pod', 'install'])),
workingDirectory: any,
workingDirectory: anyNamed('workingDirectory'),
environment: anyNamed('environment'),
));
}, overrides: <Type, Generator>{
......
packages/flutter_tools/test/ios/code_signing_test.dart
View file @ fba81d0f
......@@ -72,8 +72,10 @@ void main() {
when(mockProcessManager.runSync(<String>['which', 'openssl']))
.thenReturn(exitsHappy);
when(mockProcessManager.runSync(
argThat(contains('find-identity')), environment: any, workingDirectory: any)
).thenReturn(exitsHappy);
argThat(contains('find-identity')),
environment: anyNamed('environment'),
workingDirectory: anyNamed('workingDirectory'),
)).thenReturn(exitsHappy);
Map<String, String> signingConfigs;
try {
......@@ -94,7 +96,9 @@ void main() {
when(mockProcessManager.runSync(<String>['which', 'openssl']))
.thenReturn(exitsHappy);
when(mockProcessManager.runSync(
argThat(contains('find-identity')), environment: any, workingDirectory: any,
argThat(contains('find-identity')),
environment: anyNamed('environment'),
workingDirectory: anyNamed('workingDirectory'),
)).thenReturn(new ProcessResult(
1, // pid
0, // exitCode
......@@ -105,8 +109,8 @@ void main() {
));
when(mockProcessManager.runSync(
<String>['security', 'find-certificate', '-c', '1111AAAA11', '-p'],
environment: any,
workingDirectory: any,
environment: anyNamed('environment'),
workingDirectory: anyNamed('workingDirectory'),
)).thenReturn(new ProcessResult(
1, // pid
0, // exitCode
......@@ -119,7 +123,9 @@ void main() {
final MockStream mockStdErr = new MockStream();
when(mockProcessManager.start(
argThat(contains('openssl')), environment: any, workingDirectory: any,
argThat(contains('openssl')),
environment: anyNamed('environment'),
workingDirectory: anyNamed('workingDirectory'),
)).thenAnswer((Invocation invocation) => new Future<Process>.value(mockProcess));
when(mockProcess.stdin).thenReturn(mockStdIn);
......@@ -149,7 +155,9 @@ void main() {
when(mockProcessManager.runSync(<String>['which', 'openssl']))
.thenReturn(exitsHappy);
when(mockProcessManager.runSync(
argThat(contains('find-identity')), environment: any, workingDirectory: any,
argThat(contains('find-identity')),
environment: anyNamed('environment'),
workingDirectory: anyNamed('workingDirectory'),
)).thenReturn(new ProcessResult(
1, // pid
0, // exitCode
......@@ -160,8 +168,8 @@ void main() {
));
when(mockProcessManager.runSync(
<String>['security', 'find-certificate', '-c', '1111AAAA11', '-p'],
environment: any,
workingDirectory: any,
environment: anyNamed('environment'),
workingDirectory: anyNamed('workingDirectory'),
)).thenReturn(new ProcessResult(
1, // pid
0, // exitCode
......@@ -174,7 +182,9 @@ void main() {
final MockStream mockStdErr = new MockStream();
when(mockProcessManager.start(
argThat(contains('openssl')), environment: any, workingDirectory: any,
argThat(contains('openssl')),
environment: anyNamed('environment'),
workingDirectory: anyNamed('workingDirectory'),
)).thenAnswer((Invocation invocation) => new Future<Process>.value(mockProcess));
when(mockProcess.stdin).thenReturn(mockStdIn);
......@@ -208,7 +218,9 @@ void main() {
when(mockProcessManager.runSync(<String>['which', 'openssl']))
.thenReturn(exitsHappy);
when(mockProcessManager.runSync(
argThat(contains('find-identity')), environment: any, workingDirectory: any,
argThat(contains('find-identity')),
environment: anyNamed('environment'),
workingDirectory: anyNamed('workingDirectory'),
)).thenReturn(new ProcessResult(
1, // pid
0, // exitCode
......@@ -223,8 +235,8 @@ void main() {
new Stream<String>.fromFuture(new Future<String>.value('3'));
when(mockProcessManager.runSync(
<String>['security', 'find-certificate', '-c', '3333CCCC33', '-p'],
environment: any,
workingDirectory: any,
environment: anyNamed('environment'),
workingDirectory: anyNamed('workingDirectory'),
)).thenReturn(new ProcessResult(
1, // pid
0, // exitCode
......@@ -237,7 +249,9 @@ void main() {
final MockStream mockOpenSslStdErr = new MockStream();
when(mockProcessManager.start(
argThat(contains('openssl')), environment: any, workingDirectory: any,
argThat(contains('openssl')),
environment: anyNamed('environment'),
workingDirectory: anyNamed('workingDirectory'),
)).thenAnswer((Invocation invocation) => new Future<Process>.value(mockOpenSslProcess));
when(mockOpenSslProcess.stdin).thenReturn(mockOpenSslStdIn);
......@@ -278,7 +292,9 @@ void main() {
when(mockProcessManager.runSync(<String>['which', 'openssl']))
.thenReturn(exitsHappy);
when(mockProcessManager.runSync(
argThat(contains('find-identity')), environment: any, workingDirectory: any,
argThat(contains('find-identity')),
environment: anyNamed('environment'),
workingDirectory: anyNamed('workingDirectory'),
)).thenReturn(new ProcessResult(
1, // pid
0, // exitCode
......@@ -293,8 +309,8 @@ void main() {
new Stream<String>.fromFuture(new Future<String>.error(new Exception('Cannot read from StdIn')));
when(mockProcessManager.runSync(
<String>['security', 'find-certificate', '-c', '1111AAAA11', '-p'],
environment: any,
workingDirectory: any,
environment: anyNamed('environment'),
workingDirectory: anyNamed('workingDirectory'),
)).thenReturn(new ProcessResult(
1, // pid
0, // exitCode
......@@ -307,7 +323,9 @@ void main() {
final MockStream mockOpenSslStdErr = new MockStream();
when(mockProcessManager.start(
argThat(contains('openssl')), environment: any, workingDirectory: any,
argThat(contains('openssl')),
environment: anyNamed('environment'),
workingDirectory: anyNamed('workingDirectory'),
)).thenAnswer((Invocation invocation) => new Future<Process>.value(mockOpenSslProcess));
when(mockOpenSslProcess.stdin).thenReturn(mockOpenSslStdIn);
......@@ -342,7 +360,9 @@ void main() {
when(mockProcessManager.runSync(<String>['which', 'openssl']))
.thenReturn(exitsHappy);
when(mockProcessManager.runSync(
argThat(contains('find-identity')), environment: any, workingDirectory: any,
argThat(contains('find-identity')),
environment: anyNamed('environment'),
workingDirectory: anyNamed('workingDirectory'),
)).thenReturn(new ProcessResult(
1, // pid
0, // exitCode
......@@ -355,8 +375,8 @@ void main() {
));
when(mockProcessManager.runSync(
<String>['security', 'find-certificate', '-c', '3333CCCC33', '-p'],
environment: any,
workingDirectory: any,
environment: anyNamed('environment'),
workingDirectory: anyNamed('workingDirectory'),
)).thenReturn(new ProcessResult(
1, // pid
0, // exitCode
......@@ -369,7 +389,9 @@ void main() {
final MockStream mockOpenSslStdErr = new MockStream();
when(mockProcessManager.start(
argThat(contains('openssl')), environment: any, workingDirectory: any,
argThat(contains('openssl')),
environment: anyNamed('environment'),
workingDirectory: anyNamed('workingDirectory'),
)).thenAnswer((Invocation invocation) => new Future<Process>.value(mockOpenSslProcess));
when(mockOpenSslProcess.stdin).thenReturn(mockOpenSslStdIn);
......@@ -408,7 +430,9 @@ void main() {
when(mockProcessManager.runSync(<String>['which', 'openssl']))
.thenReturn(exitsHappy);
when(mockProcessManager.runSync(
argThat(contains('find-identity')), environment: any, workingDirectory: any,
argThat(contains('find-identity')),
environment: anyNamed('environment'),
workingDirectory: anyNamed('workingDirectory'),
)).thenReturn(new ProcessResult(
1, // pid
0, // exitCode
......@@ -423,8 +447,8 @@ void main() {
new Stream<String>.fromFuture(new Future<String>.value('3'));
when(mockProcessManager.runSync(
<String>['security', 'find-certificate', '-c', '3333CCCC33', '-p'],
environment: any,
workingDirectory: any,
environment: anyNamed('environment'),
workingDirectory: anyNamed('workingDirectory'),
)).thenReturn(new ProcessResult(
1, // pid
0, // exitCode
......@@ -438,7 +462,9 @@ void main() {
final MockStream mockOpenSslStdErr = new MockStream();
when(mockProcessManager.start(
argThat(contains('openssl')), environment: any, workingDirectory: any,
argThat(contains('openssl')),
environment: anyNamed('environment'),
workingDirectory: anyNamed('workingDirectory'),
)).thenAnswer((Invocation invocation) => new Future<Process>.value(mockOpenSslProcess));
when(mockOpenSslProcess.stdin).thenReturn(mockOpenSslStdIn);
......
packages/flutter_tools/test/version_test.dart
View file @ fba81d0f
......@@ -34,28 +34,28 @@ void main() {
when(mockProcessManager.runSync(
<String>['git', 'rev-parse', '--abbrev-ref', '--symbolic', '@{u}'],
workingDirectory: any,
environment: any,
workingDirectory: anyNamed('workingDirectory'),
environment: anyNamed('environment'),
)).thenReturn(new ProcessResult(101, 0, 'channel', ''));
when(mockProcessManager.runSync(
<String>['git', 'rev-parse', '--abbrev-ref', 'HEAD'],
workingDirectory: any,
environment: any,
workingDirectory: anyNamed('workingDirectory'),
environment: anyNamed('environment'),
)).thenReturn(new ProcessResult(102, 0, 'branch', ''));
when(mockProcessManager.runSync(
<String>['git', 'log', '-n', '1', '--pretty=format:%H'],
workingDirectory: any,
environment: any,
workingDirectory: anyNamed('workingDirectory'),
environment: anyNamed('environment'),
)).thenReturn(new ProcessResult(103, 0, '1234abcd', ''));
when(mockProcessManager.runSync(
<String>['git', 'log', '-n', '1', '--pretty=format:%ar'],
workingDirectory: any,
environment: any,
workingDirectory: anyNamed('workingDirectory'),
environment: anyNamed('environment'),
)).thenReturn(new ProcessResult(104, 0, '1 second ago', ''));
when(mockProcessManager.runSync(
<String>['git', 'describe', '--match', 'v*.*.*', '--first-parent', '--long', '--tags'],
workingDirectory: any,
environment: any,
workingDirectory: anyNamed('workingDirectory'),
environment: anyNamed('environment'),
)).thenReturn(new ProcessResult(105, 0, 'v0.1.2-3-1234abcd', ''));
});
......@@ -223,7 +223,7 @@ void main() {
testUsingContext('versions comparison', () async {
when(mockProcessManager.runSync(
<String>['git', 'merge-base', '--is-ancestor', 'abcdef', '123456'],
workingDirectory: any,
workingDirectory: anyNamed('workingDirectory'),
)).thenReturn(new ProcessResult(1, 0, '', ''));
expect(
......@@ -236,7 +236,7 @@ void main() {
verify(mockProcessManager.runSync(
<String>['git', 'merge-base', '--is-ancestor', 'abcdef', '123456'],
workingDirectory: any,
workingDirectory: anyNamed('workingDirectory'),
));
},
overrides: <Type, Generator>{
......@@ -424,8 +424,8 @@ void fakeData(
throw new StateError('Unexpected call to ProcessManager.run(${invocation.positionalArguments}, ${invocation.namedArguments})');
};
when(pm.runSync(any, workingDirectory: any)).thenAnswer(syncAnswer);
when(pm.run(any, workingDirectory: any)).thenAnswer((Invocation invocation) async {
when(pm.runSync(any, workingDirectory: anyNamed('workingDirectory'))).thenAnswer(syncAnswer);
when(pm.run(any, workingDirectory: anyNamed('workingDirectory'))).thenAnswer((Invocation invocation) async {
return syncAnswer(invocation);
});
}
......
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