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

refactor: Use relative path instead of absolute when running test #920

Merged
merged 7 commits into from
Dec 15, 2023
Merged

refactor: Use relative path instead of absolute when running test #920

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9dce965
feat: use relative path when printing to console for flutter test
mrgnhnt96 Dec 13, 2023
bce6675
fix: add . for current directory
mrgnhnt96 Dec 13, 2023
fe6b50c
feat: update variable name to be more meaningful
mrgnhnt96 Dec 13, 2023
3e4029a
feat: add space between progress dots. Add check for root to display …
mrgnhnt96 Dec 14, 2023
bd1f0f2
Merge branch 'main' into test-paths
alestiago Dec 14, 2023
af197e8
refactor: remove uncessary variable declaration
mrgnhnt96 Dec 14, 2023
569a668
Merge branch 'main' into test-paths
alestiago Dec 15, 2023
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
10 changes: 8 additions & 2 deletions lib/src/cli/flutter_cli.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,8 @@ class Flutter {
FlutterTestRunner testRunner = flutterTest,
GeneratorBuilder buildGenerator = MasonGenerator.fromBundle,
}) async {
final initialCwd = cwd;

return _runCommand<int>(
cmd: (cwd) async {
final lcovPath = p.join(cwd, 'coverage', 'lcov.info');
Expand All @@ -165,14 +167,18 @@ class Flutter {
void noop(String? _) {}
final target = DirectoryGeneratorTarget(Directory(p.normalize(cwd)));
final workingDirectory = target.dir.absolute.path;
final relativePath = p.relative(workingDirectory, from: initialCwd);
alestiago marked this conversation as resolved.
Show resolved Hide resolved
final relativePathPrefix = '.${p.context.separator}';
final path =
relativePath == '.' ? '.' : '$relativePathPrefix$relativePath';
alestiago marked this conversation as resolved.
Show resolved Hide resolved

stdout?.call(
'Running "flutter test" in ${p.dirname(workingDirectory)}...\n',
'Running "flutter test" in $path ...\n',
);

if (!Directory(p.join(target.dir.absolute.path, 'test')).existsSync()) {
stdout?.call(
'No test folder found in ${target.dir.absolute.path}\n',
'No test folder found in $path\n',
);
return ExitCode.success.code;
}
Expand Down
48 changes: 30 additions & 18 deletions test/src/cli/flutter_cli_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,8 +394,8 @@ void main() {
expect(
stdoutLogs,
equals([
'Running "flutter test" in ${p.dirname(tempDirectory.path)}...\n',
'No test folder found in ${tempDirectory.absolute.path}\n',
'Running "flutter test" in . ...\n',
'No test folder found in .\n',
]),
);
});
Expand Down Expand Up @@ -431,7 +431,7 @@ void main() {
expect(
stdoutLogs,
equals([
'Running "flutter test" in ${p.dirname(tempDirectory.path)}...\n',
'Running "flutter test" in . ...\n',
'\x1B[2K\r00:00 ...',
contains('All tests passed!'),
]),
Expand Down Expand Up @@ -462,7 +462,7 @@ void main() {
expect(
stdoutLogs,
equals([
'Running "flutter test" in ${p.dirname(tempDirectory.path)}...\n',
'Running "flutter test" in . ...\n',
'\x1B[2K\r00:02 +1: CounterCubit initial state is 0',
'''\x1B[2K\r00:02 +2: CounterCubit emits [1] when increment is called''',
'''\x1B[2K\r00:02 +3: CounterCubit emits [-1] when decrement is called''',
Expand Down Expand Up @@ -504,7 +504,7 @@ void main() {
expect(
stdoutLogs,
equals([
'Running "flutter test" in ${p.dirname(tempDirectory.path)}...\n',
'Running "flutter test" in . ...\n',
'''\x1B[2K\r\x1B[90m00:02\x1B[0m \x1B[92m+1\x1B[0m: CounterCubit initial state is 0''',
'''\x1B[2K\r\x1B[90m00:02\x1B[0m \x1B[92m+2\x1B[0m: CounterCubit emits [1] when increment is called''',
'''\x1B[2K\r\x1B[90m00:02\x1B[0m \x1B[92m+3\x1B[0m: CounterCubit emits [-1] when decrement is called''',
Expand Down Expand Up @@ -544,7 +544,7 @@ void main() {
expect(
stdoutLogs,
equals([
'Running "flutter test" in ${p.dirname(tempDirectory.path)}...\n',
'Running "flutter test" in . ...\n',
'\x1B[2K\r00:11 -1: CounterCubit initial state is 0',
'''\x1B[2K\r00:11 +1 -1: CounterCubit emits [1] when increment is called''',
'''\x1B[2K\r00:11 +2 -1: CounterCubit emits [-1] when decrement is called''',
Expand Down Expand Up @@ -599,7 +599,7 @@ void main() {
expect(
stdoutLogs,
equals([
'Running "flutter test" in ${p.dirname(tempDirectory.path)}...\n',
'Running "flutter test" in . ...\n',
'\x1B[2K\rSkip: currently failing (see issue 1234)\n',
'\x1B[2K\r(suite) ${tempDirectory.path}/test/counter/view/other_test.dart (SKIPPED)\n',
'\x1B[2K\r00:00 ~1: (suite)',
Expand Down Expand Up @@ -846,7 +846,7 @@ void main() {
expect(
stdoutLogs,
equals([
'Running "flutter test" in ${p.dirname(tempDirectory.path)}...\n',
'Running "flutter test" in . ...\n',
contains('All tests passed!'),
]),
);
Expand Down Expand Up @@ -882,7 +882,7 @@ void main() {
expect(
stdoutLogs,
equals([
'Running "flutter test" in ${p.dirname(tempDirectory.path)}...\n',
'Running "flutter test" in . ...\n',
'Shuffling test order with --test-randomize-ordering-seed=$seed\n',
contains('All tests passed!'),
]),
Expand Down Expand Up @@ -928,7 +928,7 @@ void main() {
expect(
stdoutLogs,
equals([
'Running "flutter test" in ${p.dirname(tempDirectory.path)}...\n',
'Running "flutter test" in . ...\n',
contains('All tests passed!'),
]),
);
Expand Down Expand Up @@ -969,7 +969,7 @@ void main() {
expect(
stdoutLogs,
equals([
'Running "flutter test" in ${p.dirname(tempDirectory.path)}...\n',
'Running "flutter test" in . ...\n',
contains('All tests passed!'),
]),
);
Expand Down Expand Up @@ -1016,7 +1016,7 @@ void main() {
expect(
stdoutLogs,
equals([
'Running "flutter test" in ${p.dirname(tempDirectory.path)}...\n',
'Running "flutter test" in . ...\n',
contains('All tests passed!'),
]),
);
Expand Down Expand Up @@ -1061,7 +1061,7 @@ void main() {
expect(
stdoutLogs,
equals([
'Running "flutter test" in ${p.dirname(tempDirectory.path)}...\n',
'Running "flutter test" in . ...\n',
contains('All tests passed!'),
]),
);
Expand Down Expand Up @@ -1114,13 +1114,19 @@ void main() {
completion(equals([ExitCode.success.code, ExitCode.success.code])),
);

final nestedRelativePath = p.relative(
tempNestedDirectory.path,
from: tempDirectory.path,
);
final relativePathPrefix = '.${p.context.separator}';

expect(
stdoutLogs,
unorderedEquals([
'Running "flutter test" in '
'${p.dirname(tempNestedDirectory.path)}...\n',
'$relativePathPrefix$nestedRelativePath ...\n',
contains('All tests passed!'),
'Running "flutter test" in ${p.dirname(tempDirectory.path)}...\n',
'Running "flutter test" in . ...\n',
contains('All tests passed!'),
]),
);
Expand Down Expand Up @@ -1179,14 +1185,20 @@ void main() {
),
);

final nestedRelativePath = p.relative(
tempNestedDirectory.path,
from: tempDirectory.path,
);
final relativePathPrefix = '.${p.context.separator}';

expect(
stdoutLogs,
unorderedEquals([
'Running "flutter test" in '
'${p.dirname(tempDirectory.path)}...\n',
'. ...\n',
contains('All tests passed!'),
'Running "flutter test" in '
'${p.dirname(tempNestedDirectory.path)}...\n',
'$relativePathPrefix$nestedRelativePath ...\n',
contains('All tests passed!'),
]),
);
Expand Down Expand Up @@ -1242,7 +1254,7 @@ void main() {
expect(
stdoutLogs,
equals([
'Running "flutter test" in ${p.dirname(tempDirectory.path)}...\n',
'Running "flutter test" in . ...\n',
contains('All tests passed!'),
]),
);
Expand Down