Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

[flutter_plugin_tests] Split analyze out of xctest #4161

Merged
stuartmorgan-g merged 10 commits into from
Jul 21, 2021
Merged

[flutter_plugin_tests] Split analyze out of xctest #4161

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3611f35
Add more options to control what runs
stuartmorgan-g Jul 15, 2021
47e9d90
Report skip, not fail, when analyze is off and there are no tests
stuartmorgan-g Jul 15, 2021
33940f5
Extract a helper for Xcode commands, and add tests for it
stuartmorgan-g Jul 15, 2021
aba3199
Migrate xctest to the Xcode class
stuartmorgan-g Jul 15, 2021
fd1958a
Split out xcode-analyze
stuartmorgan-g Jul 16, 2021
b27265a
Comment fix
stuartmorgan-g Jul 16, 2021
1a357e5
Remove unnecessary process mocking
stuartmorgan-g Jul 16, 2021
02945c9
Skip, rather than failing, when a package doesn't have a requested te…
stuartmorgan-g Jul 16, 2021
b4be22c
Merge branch 'master' into xctest-refactor
stuartmorgan-g Jul 20, 2021
be1596a
Filter out unavailable via simctl
stuartmorgan-g Jul 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove unnecessary process mocking
  • Loading branch information
@stuartmorgan-g
stuartmorgan-g committed Jul 16, 2021
commit 1a357e534a538d85fee663f4ec27329a376d2a2d
41 changes: 1 addition & 40 deletions script/tool/test/xctest_command_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,6 @@ void main() {
final Directory pluginExampleDirectory =
pluginDirectory1.childDirectory('example');

processRunner.processToReturn = MockProcess.succeeding();
processRunner.resultStdout =
'{"project":{"targets":["bar_scheme", "foo_scheme"]}}';
final List<String> output = await runCapturingPrint(runner, <String>[
'xctest',
'--macos',
Expand Down Expand Up @@ -144,10 +141,6 @@ void main() {
// Exit code 66 from testing indicates no tests.
final MockProcess noTestsProcessResult = MockProcess();
noTestsProcessResult.exitCodeCompleter.complete(66);

processRunner.processToReturn = MockProcess.succeeding();
processRunner.resultStdout =
'{"project":{"targets":["bar_scheme", "foo_scheme"]}}';
processRunner.mockProcessesForExecutable['xcrun'] = <io.Process>[
noTestsProcessResult,
];
Expand Down Expand Up @@ -216,9 +209,6 @@ void main() {
final Directory pluginExampleDirectory =
pluginDirectory.childDirectory('example');

processRunner.processToReturn = MockProcess.succeeding();
processRunner.resultStdout =
'{"project":{"targets":["bar_scheme", "foo_scheme"]}}';
Copy link
Contributor Author

@stuartmorgan-g stuartmorgan-g Jul 16, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Opportunistic cleanup; I'm assuming that this is from an earlier version of xctest_command, because nothing currently uses this output.

final List<String> output = await runCapturingPrint(runner, <String>[
'xctest',
'--ios',
Expand Down Expand Up @@ -265,16 +255,8 @@ void main() {
final Directory pluginExampleDirectory =
pluginDirectory.childDirectory('example');

final Map<String, dynamic> schemeCommandResult = <String, dynamic>{
'project': <String, dynamic>{
'targets': <String>['bar_scheme', 'foo_scheme']
}
};
processRunner.processToReturn = MockProcess.succeeding();
// For simplicity of the test, we combine all the mock results into a single mock result, each internal command
// will get this result and they should still be able to parse them correctly.
processRunner.resultStdout =
jsonEncode(schemeCommandResult..addAll(_kDeviceListMap));
processRunner.resultStdout = jsonEncode(_kDeviceListMap);
await runCapturingPrint(runner, <String>['xctest', '--ios']);

expect(
Expand Down Expand Up @@ -307,9 +289,6 @@ void main() {
kPlatformIos: PlatformSupport.inline
});

processRunner.processToReturn = MockProcess.succeeding();
processRunner.resultStdout =
'{"project":{"targets":["bar_scheme", "foo_scheme"]}}';
processRunner.mockProcessesForExecutable['xcrun'] = <io.Process>[
MockProcess.failing()
];
Expand Down Expand Up @@ -376,9 +355,6 @@ void main() {
final Directory pluginExampleDirectory =
pluginDirectory1.childDirectory('example');

processRunner.processToReturn = MockProcess.succeeding();
processRunner.resultStdout =
'{"project":{"targets":["bar_scheme", "foo_scheme"]}}';
final List<String> output = await runCapturingPrint(runner, <String>[
'xctest',
'--macos',
Expand Down Expand Up @@ -415,9 +391,6 @@ void main() {
kPlatformMacos: PlatformSupport.inline,
});

processRunner.processToReturn = MockProcess.succeeding();
processRunner.resultStdout =
'{"project":{"targets":["bar_scheme", "foo_scheme"]}}';
processRunner.mockProcessesForExecutable['xcrun'] = <io.Process>[
MockProcess.failing()
];
Expand Down Expand Up @@ -451,9 +424,6 @@ void main() {
final Directory pluginExampleDirectory =
pluginDirectory1.childDirectory('example');

processRunner.processToReturn = MockProcess.succeeding();
processRunner.resultStdout =
'{"project":{"targets":["bar_scheme", "foo_scheme"]}}';
final List<String> output = await runCapturingPrint(runner, <String>[
'xctest',
'--ios',
Expand Down Expand Up @@ -515,9 +485,6 @@ void main() {
final Directory pluginExampleDirectory =
pluginDirectory1.childDirectory('example');

processRunner.processToReturn = MockProcess.succeeding();
processRunner.resultStdout =
'{"project":{"targets":["bar_scheme", "foo_scheme"]}}';
final List<String> output = await runCapturingPrint(runner, <String>[
'xctest',
'--ios',
Expand Down Expand Up @@ -562,9 +529,6 @@ void main() {
final Directory pluginExampleDirectory =
pluginDirectory.childDirectory('example');

processRunner.processToReturn = MockProcess.succeeding();
processRunner.resultStdout =
'{"project":{"targets":["bar_scheme", "foo_scheme"]}}';
final List<String> output = await runCapturingPrint(runner, <String>[
'xctest',
'--ios',
Expand Down Expand Up @@ -605,9 +569,6 @@ void main() {
test('skips when neither are supported', () async {
createFakePlugin('plugin', packagesDir);

processRunner.processToReturn = MockProcess.succeeding();
processRunner.resultStdout =
'{"project":{"targets":["bar_scheme", "foo_scheme"]}}';
final List<String> output = await runCapturingPrint(runner, <String>[
'xctest',
'--ios',
Expand Down