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

refactor: make all mock class to private #838

Merged
merged 5 commits into from
Oct 6, 2023
Merged

refactor: make all mock class to private #838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4f9e7a4
refactor: make all mock class to private
droidbg Oct 4, 2023
229a0b1
Merge branch 'main' into mock_class_to_private
droidbg Oct 4, 2023
d42819b
Merge branch 'main' into mock_class_to_private
droidbg Oct 4, 2023
0149930
Merge branch 'main' into mock_class_to_private
alestiago Oct 4, 2023
c80a26e
Merge branch 'main' into mock_class_to_private
droidbg Oct 6, 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
12 changes: 6 additions & 6 deletions test/helpers/command_helper.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import 'package:mocktail/mocktail.dart';
import 'package:pub_updater/pub_updater.dart';
import 'package:very_good_cli/src/command_runner.dart';

class MockLogger extends Mock implements Logger {}
class _MockLogger extends Mock implements Logger {}

class MockProgress extends Mock implements Progress {}
class _MockProgress extends Mock implements Progress {}

class MockPubUpdater extends Mock implements PubUpdater {}
class _MockPubUpdater extends Mock implements PubUpdater {}

void Function() _overridePrint(void Function(List<String>) fn) {
return () {
Expand All @@ -35,9 +35,9 @@ void Function() withRunner(
) runnerFn,
) {
return _overridePrint((printLogs) async {
final logger = MockLogger();
final progress = MockProgress();
final pubUpdater = MockPubUpdater();
final logger = _MockLogger();
final progress = _MockProgress();
final pubUpdater = _MockPubUpdater();
final progressLogs = <String>[];
final commandRunner = VeryGoodCommandRunner(
logger: logger,
Expand Down
12 changes: 6 additions & 6 deletions test/src/command_runner_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import 'package:test/test.dart';
import 'package:very_good_cli/src/command_runner.dart';
import 'package:very_good_cli/src/version.dart';

class MockLogger extends Mock implements Logger {}
class _MockLogger extends Mock implements Logger {}

class MockPubUpdater extends Mock implements PubUpdater {}
class _MockPubUpdater extends Mock implements PubUpdater {}

class MockProgress extends Mock implements Progress {}
class _MockProgress extends Mock implements Progress {}

const expectedUsage = [
'🦄 A Very Good Command-Line Interface\n'
Expand Down Expand Up @@ -60,13 +60,13 @@ void main() {
late VeryGoodCommandRunner commandRunner;

setUp(() {
pubUpdater = MockPubUpdater();
pubUpdater = _MockPubUpdater();

when(
() => pubUpdater.getLatestVersion(any()),
).thenAnswer((_) async => packageVersion);

logger = MockLogger();
logger = _MockLogger();

commandRunner = VeryGoodCommandRunner(
logger: logger,
Expand Down Expand Up @@ -107,7 +107,7 @@ void main() {
currentVersion: any(named: 'currentVersion'),
),
).thenAnswer((_) => Future.value(true));
final progress = MockProgress();
final progress = _MockProgress();
final progressLogs = <String>[];
when(() => progress.complete(any())).thenAnswer((_) {
final message = _.positionalArguments.elementAt(0) as String?;
Expand Down
28 changes: 15 additions & 13 deletions test/src/commands/create/commands/dart_cli_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,19 @@ import 'package:very_good_cli/src/commands/commands.dart';

import '../../../../helpers/helpers.dart';

class MockLogger extends Mock implements Logger {}
class _MockLogger extends Mock implements Logger {}

class MockMasonGenerator extends Mock implements MasonGenerator {}
class _MockProgress extends Mock implements Progress {}

class MockGeneratorHooks extends Mock implements GeneratorHooks {}
class _MockMasonGenerator extends Mock implements MasonGenerator {}

class MockArgResults extends Mock implements ArgResults {}
class _MockGeneratorHooks extends Mock implements GeneratorHooks {}

class FakeLogger extends Fake implements Logger {}
class _MockArgResults extends Mock implements ArgResults {}

class FakeDirectoryGeneratorTarget extends Fake
class _FakeLogger extends Fake implements Logger {}

class _FakeDirectoryGeneratorTarget extends Fake
implements DirectoryGeneratorTarget {}

final expectedUsage = [
Expand Down Expand Up @@ -47,14 +49,14 @@ void main() {
late Logger logger;

setUpAll(() {
registerFallbackValue(FakeDirectoryGeneratorTarget());
registerFallbackValue(FakeLogger());
registerFallbackValue(_FakeDirectoryGeneratorTarget());
registerFallbackValue(_FakeLogger());
});

setUp(() {
logger = MockLogger();
logger = _MockLogger();

final progress = MockProgress();
final progress = _MockProgress();

when(() => logger.progress(any())).thenReturn(progress);
});
Expand Down Expand Up @@ -104,8 +106,8 @@ void main() {
late MasonGenerator generator;

setUp(() {
hooks = MockGeneratorHooks();
generator = MockMasonGenerator();
hooks = _MockGeneratorHooks();
generator = _MockMasonGenerator();

when(() => generator.hooks).thenReturn(hooks);
when(
Expand Down Expand Up @@ -155,7 +157,7 @@ void main() {
final tempDirectory = Directory.systemTemp.createTempSync();
addTearDown(() => tempDirectory.deleteSync(recursive: true));

final argResults = MockArgResults();
final argResults = _MockArgResults();
final command = CreateDartCLI(
logger: logger,
generatorFromBundle: (_) async => throw Exception('oops'),
Expand Down
28 changes: 15 additions & 13 deletions test/src/commands/create/commands/dart_package_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,19 @@ import 'package:very_good_cli/src/commands/commands.dart';

import '../../../../helpers/helpers.dart';

class MockLogger extends Mock implements Logger {}
class _MockLogger extends Mock implements Logger {}

class MockMasonGenerator extends Mock implements MasonGenerator {}
class _MockMasonGenerator extends Mock implements MasonGenerator {}

class MockGeneratorHooks extends Mock implements GeneratorHooks {}
class _MockProgress extends Mock implements Progress {}

class MockArgResults extends Mock implements ArgResults {}
class _MockGeneratorHooks extends Mock implements GeneratorHooks {}

class FakeLogger extends Fake implements Logger {}
class _MockArgResults extends Mock implements ArgResults {}

class FakeDirectoryGeneratorTarget extends Fake
class _FakeLogger extends Fake implements Logger {}

class _FakeDirectoryGeneratorTarget extends Fake
implements DirectoryGeneratorTarget {}

final expectedUsage = [
Expand All @@ -46,14 +48,14 @@ void main() {
late Logger logger;

setUpAll(() {
registerFallbackValue(FakeDirectoryGeneratorTarget());
registerFallbackValue(FakeLogger());
registerFallbackValue(_FakeDirectoryGeneratorTarget());
registerFallbackValue(_FakeLogger());
});

setUp(() {
logger = MockLogger();
logger = _MockLogger();

final progress = MockProgress();
final progress = _MockProgress();

when(() => logger.progress(any())).thenReturn(progress);
});
Expand Down Expand Up @@ -104,8 +106,8 @@ void main() {
late MasonGenerator generator;

setUp(() {
hooks = MockGeneratorHooks();
generator = MockMasonGenerator();
hooks = _MockGeneratorHooks();
generator = _MockMasonGenerator();

when(() => generator.hooks).thenReturn(hooks);
when(
Expand Down Expand Up @@ -155,7 +157,7 @@ void main() {
final tempDirectory = Directory.systemTemp.createTempSync();
addTearDown(() => tempDirectory.deleteSync(recursive: true));

final argResults = MockArgResults();
final argResults = _MockArgResults();
final command = CreateDartPackage(
logger: logger,
generatorFromBundle: (_) async => throw Exception('oops'),
Expand Down
28 changes: 15 additions & 13 deletions test/src/commands/create/commands/docs_site_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,19 @@ import 'package:very_good_cli/src/commands/commands.dart';

import '../../../../helpers/helpers.dart';

class MockLogger extends Mock implements Logger {}
class _MockLogger extends Mock implements Logger {}

class MockMasonGenerator extends Mock implements MasonGenerator {}
class _MockProgress extends Mock implements Progress {}

class MockGeneratorHooks extends Mock implements GeneratorHooks {}
class _MockMasonGenerator extends Mock implements MasonGenerator {}

class MockArgResults extends Mock implements ArgResults {}
class _MockGeneratorHooks extends Mock implements GeneratorHooks {}

class FakeLogger extends Fake implements Logger {}
class _MockArgResults extends Mock implements ArgResults {}

class FakeDirectoryGeneratorTarget extends Fake
class _FakeLogger extends Fake implements Logger {}

class _FakeDirectoryGeneratorTarget extends Fake
implements DirectoryGeneratorTarget {}

final expectedUsage = [
Expand Down Expand Up @@ -47,14 +49,14 @@ void main() {
late Logger logger;

setUpAll(() {
registerFallbackValue(FakeDirectoryGeneratorTarget());
registerFallbackValue(FakeLogger());
registerFallbackValue(_FakeDirectoryGeneratorTarget());
registerFallbackValue(_FakeLogger());
});

setUp(() {
logger = MockLogger();
logger = _MockLogger();

final progress = MockProgress();
final progress = _MockProgress();

when(() => logger.progress(any())).thenReturn(progress);
});
Expand Down Expand Up @@ -103,8 +105,8 @@ void main() {
late MasonGenerator generator;

setUp(() {
hooks = MockGeneratorHooks();
generator = MockMasonGenerator();
hooks = _MockGeneratorHooks();
generator = _MockMasonGenerator();

when(() => generator.hooks).thenReturn(hooks);
when(
Expand Down Expand Up @@ -154,7 +156,7 @@ void main() {
final tempDirectory = Directory.systemTemp.createTempSync();
addTearDown(() => tempDirectory.deleteSync(recursive: true));

final argResults = MockArgResults();
final argResults = _MockArgResults();
final command = CreateDocsSite(
logger: logger,
generatorFromBundle: (_) async => throw Exception('oops'),
Expand Down
28 changes: 15 additions & 13 deletions test/src/commands/create/commands/flame_game_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,19 @@ import 'package:very_good_cli/src/commands/create/commands/flame_game.dart';

import '../../../../helpers/helpers.dart';

class MockLogger extends Mock implements Logger {}
class _MockLogger extends Mock implements Logger {}

class MockMasonGenerator extends Mock implements MasonGenerator {}
class _MockProgress extends Mock implements Progress {}

class MockGeneratorHooks extends Mock implements GeneratorHooks {}
class _MockMasonGenerator extends Mock implements MasonGenerator {}

class MockArgResults extends Mock implements ArgResults {}
class _MockGeneratorHooks extends Mock implements GeneratorHooks {}

class FakeLogger extends Fake implements Logger {}
class _MockArgResults extends Mock implements ArgResults {}

class FakeDirectoryGeneratorTarget extends Fake
class _FakeLogger extends Fake implements Logger {}

class _FakeDirectoryGeneratorTarget extends Fake
implements DirectoryGeneratorTarget {}

final expectedUsage = [
Expand Down Expand Up @@ -49,16 +51,16 @@ void main() {
late Logger logger;

setUpAll(() {
registerFallbackValue(FakeDirectoryGeneratorTarget());
registerFallbackValue(FakeLogger());
registerFallbackValue(_FakeDirectoryGeneratorTarget());
registerFallbackValue(_FakeLogger());
});

setUp(() {
progressLogs = <String>[];

logger = MockLogger();
logger = _MockLogger();

final progress = MockProgress();
final progress = _MockProgress();
when(() => progress.complete(any())).thenAnswer((_) {
final message = _.positionalArguments.elementAt(0) as String?;
if (message != null) progressLogs.add(message);
Expand Down Expand Up @@ -109,8 +111,8 @@ void main() {
late MasonGenerator generator;

setUp(() {
hooks = MockGeneratorHooks();
generator = MockMasonGenerator();
hooks = _MockGeneratorHooks();
generator = _MockMasonGenerator();

when(() => generator.hooks).thenReturn(hooks);
when(
Expand Down Expand Up @@ -160,7 +162,7 @@ void main() {
final tempDirectory = Directory.systemTemp.createTempSync();
addTearDown(() => tempDirectory.deleteSync(recursive: true));

final argResults = MockArgResults();
final argResults = _MockArgResults();
final command = CreateFlameGame(
logger: logger,
generatorFromBundle: (_) async => throw Exception('oops'),
Expand Down
24 changes: 13 additions & 11 deletions test/src/commands/create/commands/flutter_app_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,17 @@ import 'package:very_good_cli/src/commands/create/commands/flutter_app.dart';

import '../../../../helpers/helpers.dart';

class MockLogger extends Mock implements Logger {}
class _MockLogger extends Mock implements Logger {}

class MockMasonGenerator extends Mock implements MasonGenerator {}
class _MockProgress extends Mock implements Progress {}

class MockGeneratorHooks extends Mock implements GeneratorHooks {}
class _MockMasonGenerator extends Mock implements MasonGenerator {}

class FakeLogger extends Fake implements Logger {}
class _MockGeneratorHooks extends Mock implements GeneratorHooks {}

class FakeDirectoryGeneratorTarget extends Fake
class _FakeLogger extends Fake implements Logger {}

class _FakeDirectoryGeneratorTarget extends Fake
implements DirectoryGeneratorTarget {}

final expectedUsage = [
Expand Down Expand Up @@ -54,16 +56,16 @@ void main() {
final generatedFiles = List.filled(10, const GeneratedFile.created(path: ''));

setUpAll(() {
registerFallbackValue(FakeDirectoryGeneratorTarget());
registerFallbackValue(FakeLogger());
registerFallbackValue(_FakeDirectoryGeneratorTarget());
registerFallbackValue(_FakeLogger());
});

setUp(() {
progressLogs = <String>[];

logger = MockLogger();
logger = _MockLogger();

final progress = MockProgress();
final progress = _MockProgress();
when(() => progress.complete(any())).thenAnswer((_) {
final message = _.positionalArguments.elementAt(0) as String?;
if (message != null) progressLogs.add(message);
Expand Down Expand Up @@ -112,8 +114,8 @@ void main() {
late MasonGenerator generator;

setUp(() {
hooks = MockGeneratorHooks();
generator = MockMasonGenerator();
hooks = _MockGeneratorHooks();
generator = _MockMasonGenerator();

when(() => generator.hooks).thenReturn(hooks);
when(
Expand Down
Loading