From cc413c5ffa435a9e6118e49c688506c383c61d4d Mon Sep 17 00:00:00 2001 From: Valter Barbosa Date: Wed, 11 Aug 2021 13:53:31 -0300 Subject: [PATCH 01/21] Auto stash before rebase of "refs/heads/feature/upgrade" Upgrade Flutter SDK --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index dcdb532..2e601f8 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -4,7 +4,7 @@ description: TDD Clean Architecture for Flutter version: 1.0.0+1 environment: - sdk: '>=2.6.0 <3.0.0' + sdk: '>=2.13.0 <3.0.0' dependencies: flutter: From 66ef3b4f29b854e78d683fa0e89bf403767631df Mon Sep 17 00:00:00 2001 From: Valter Barbosa Date: Wed, 11 Aug 2021 13:57:02 -0300 Subject: [PATCH 02/21] Upgrade mockito --- .flutter-plugins-dependencies | 2 +- pubspec.lock | 283 ++++++++++++++++++++++++++++------ pubspec.yaml | 2 +- 3 files changed, 238 insertions(+), 49 deletions(-) diff --git a/.flutter-plugins-dependencies b/.flutter-plugins-dependencies index ee15714..67b4bb4 100644 --- a/.flutter-plugins-dependencies +++ b/.flutter-plugins-dependencies @@ -1 +1 @@ -{"_info":"// This is a generated file; do not edit or check into version control.","dependencyGraph":[{"name":"shared_preferences","dependencies":["shared_preferences_macos","shared_preferences_web"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]}]} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"shared_preferences","path":"/home/programmer/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.12+4/","dependencies":[]}],"android":[{"name":"shared_preferences","path":"/home/programmer/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.12+4/","dependencies":[]}],"macos":[{"name":"shared_preferences_macos","path":"/home/programmer/.pub-cache/hosted/pub.dartlang.org/shared_preferences_macos-0.0.1+11/","dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"/home/programmer/.pub-cache/hosted/pub.dartlang.org/path_provider_linux-0.0.1+2/","dependencies":[]},{"name":"shared_preferences_linux","path":"/home/programmer/.pub-cache/hosted/pub.dartlang.org/shared_preferences_linux-0.0.2+4/","dependencies":["path_provider_linux"]}],"windows":[{"name":"path_provider_windows","path":"/home/programmer/.pub-cache/hosted/pub.dartlang.org/path_provider_windows-0.0.5/","dependencies":[]},{"name":"shared_preferences_windows","path":"/home/programmer/.pub-cache/hosted/pub.dartlang.org/shared_preferences_windows-0.0.2+3/","dependencies":["path_provider_windows"]}],"web":[{"name":"shared_preferences_web","path":"/home/programmer/.pub-cache/hosted/pub.dartlang.org/shared_preferences_web-0.1.2+7/","dependencies":[]}]},"dependencyGraph":[{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_linux","shared_preferences_macos","shared_preferences_web","shared_preferences_windows"]},{"name":"shared_preferences_linux","dependencies":["path_provider_linux"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]},{"name":"shared_preferences_windows","dependencies":["path_provider_windows"]}],"date_created":"2021-08-11 13:56:40.956194","version":"2.5.0-6.0.pre.37"} \ No newline at end of file diff --git a/pubspec.lock b/pubspec.lock index 31a1964..56c7bdb 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1,27 +1,34 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: - archive: + _fe_analyzer_shared: dependency: transitive description: - name: archive + name: _fe_analyzer_shared url: "https://pub.dartlang.org" source: hosted - version: "2.0.11" + version: "23.0.0" + analyzer: + dependency: transitive + description: + name: analyzer + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.0" args: dependency: transitive description: name: args url: "https://pub.dartlang.org" source: hosted - version: "1.5.2" + version: "2.2.0" async: dependency: transitive description: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.4.0" + version: "2.8.1" bloc: dependency: transitive description: @@ -35,35 +42,91 @@ packages: name: boolean_selector url: "https://pub.dartlang.org" source: hosted - version: "1.0.5" + version: "2.1.0" + build: + dependency: transitive + description: + name: build + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.0" + built_collection: + dependency: transitive + description: + name: built_collection + url: "https://pub.dartlang.org" + source: hosted + version: "5.1.0" + built_value: + dependency: transitive + description: + name: built_value + url: "https://pub.dartlang.org" + source: hosted + version: "8.1.2" + characters: + dependency: transitive + description: + name: characters + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0" charcode: dependency: transitive description: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.1.2" + version: "1.3.1" + cli_util: + dependency: transitive + description: + name: cli_util + url: "https://pub.dartlang.org" + source: hosted + version: "0.3.3" + clock: + dependency: transitive + description: + name: clock + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0" + code_builder: + dependency: transitive + description: + name: code_builder + url: "https://pub.dartlang.org" + source: hosted + version: "4.1.0" collection: dependency: transitive description: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.14.11" + version: "1.15.0" convert: dependency: transitive description: name: convert url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" + version: "3.0.1" crypto: dependency: transitive description: name: crypto url: "https://pub.dartlang.org" source: hosted - version: "2.1.3" + version: "3.0.1" + dart_style: + dependency: transitive + description: + name: dart_style + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.3" dartz: dependency: "direct main" description: @@ -84,7 +147,35 @@ packages: name: equatable url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "1.2.6" + fake_async: + dependency: transitive + description: + name: fake_async + url: "https://pub.dartlang.org" + source: hosted + version: "1.2.0" + ffi: + dependency: transitive + description: + name: ffi + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.2" + file: + dependency: transitive + description: + name: file + url: "https://pub.dartlang.org" + source: hosted + version: "6.1.2" + fixnum: + dependency: transitive + description: + name: fixnum + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.0" flutter: dependency: "direct main" description: flutter @@ -96,7 +187,7 @@ packages: name: flutter_bloc url: "https://pub.dartlang.org" source: hosted - version: "3.0.0" + version: "3.2.0" flutter_test: dependency: "direct dev" description: flutter @@ -114,90 +205,146 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "3.1.0" + glob: + dependency: transitive + description: + name: glob + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.1" http: dependency: "direct main" description: name: http url: "https://pub.dartlang.org" source: hosted - version: "0.12.0+3" + version: "0.12.2" http_parser: dependency: transitive description: name: http_parser url: "https://pub.dartlang.org" source: hosted - version: "3.1.3" - image: + version: "3.1.4" + js: dependency: transitive description: - name: image + name: js url: "https://pub.dartlang.org" source: hosted - version: "2.1.4" + version: "0.6.3" + logging: + dependency: transitive + description: + name: logging + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.1" matcher: dependency: transitive description: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.6" + version: "0.12.10" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.1.8" + version: "1.7.0" mockito: dependency: "direct dev" description: name: mockito url: "https://pub.dartlang.org" source: hosted - version: "4.1.1" + version: "5.0.14" nested: dependency: transitive description: name: nested url: "https://pub.dartlang.org" source: hosted - version: "0.0.4" + version: "1.0.0" + package_config: + dependency: transitive + description: + name: package_config + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.0" path: dependency: transitive description: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.6.4" + version: "1.8.0" + path_provider_linux: + dependency: transitive + description: + name: path_provider_linux + url: "https://pub.dartlang.org" + source: hosted + version: "0.0.1+2" + path_provider_platform_interface: + dependency: transitive + description: + name: path_provider_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.4" + path_provider_windows: + dependency: transitive + description: + name: path_provider_windows + url: "https://pub.dartlang.org" + source: hosted + version: "0.0.5" pedantic: dependency: transitive description: name: pedantic url: "https://pub.dartlang.org" source: hosted - version: "1.8.0+1" - petitparser: + version: "1.11.1" + platform: + dependency: transitive + description: + name: platform + url: "https://pub.dartlang.org" + source: hosted + version: "3.0.0" + plugin_platform_interface: + dependency: transitive + description: + name: plugin_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.3" + process: dependency: transitive description: - name: petitparser + name: process url: "https://pub.dartlang.org" source: hosted - version: "2.4.0" + version: "4.2.3" provider: dependency: transitive description: name: provider url: "https://pub.dartlang.org" source: hosted - version: "4.0.1" - quiver: + version: "4.3.3" + pub_semver: dependency: transitive description: - name: quiver + name: pub_semver url: "https://pub.dartlang.org" source: hosted - version: "2.0.5" + version: "2.0.0" rxdart: dependency: transitive description: @@ -211,96 +358,138 @@ packages: name: shared_preferences url: "https://pub.dartlang.org" source: hosted - version: "0.5.6" + version: "0.5.12+4" + shared_preferences_linux: + dependency: transitive + description: + name: shared_preferences_linux + url: "https://pub.dartlang.org" + source: hosted + version: "0.0.2+4" shared_preferences_macos: dependency: transitive description: name: shared_preferences_macos url: "https://pub.dartlang.org" source: hosted - version: "0.0.1+3" + version: "0.0.1+11" shared_preferences_platform_interface: dependency: transitive description: name: shared_preferences_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "1.0.4" shared_preferences_web: dependency: transitive description: name: shared_preferences_web url: "https://pub.dartlang.org" source: hosted - version: "0.1.2+2" + version: "0.1.2+7" + shared_preferences_windows: + dependency: transitive + description: + name: shared_preferences_windows + url: "https://pub.dartlang.org" + source: hosted + version: "0.0.2+3" sky_engine: dependency: transitive description: flutter source: sdk version: "0.0.99" + source_gen: + dependency: transitive + description: + name: source_gen + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.5" source_span: dependency: transitive description: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.5.5" + version: "1.8.1" stack_trace: dependency: transitive description: name: stack_trace url: "https://pub.dartlang.org" source: hosted - version: "1.9.3" + version: "1.10.0" stream_channel: dependency: transitive description: name: stream_channel url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0" string_scanner: dependency: transitive description: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.0.5" + version: "1.1.0" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.2.0" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.11" + version: "0.4.2" typed_data: dependency: transitive description: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.1.6" + version: "1.3.0" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.0.8" - xml: + version: "2.1.0" + watcher: + dependency: transitive + description: + name: watcher + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.0" + win32: dependency: transitive description: - name: xml + name: win32 url: "https://pub.dartlang.org" source: hosted - version: "3.5.0" + version: "2.2.5" + xdg_directories: + dependency: transitive + description: + name: xdg_directories + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.2" + yaml: + dependency: transitive + description: + name: yaml + url: "https://pub.dartlang.org" + source: hosted + version: "3.1.0" sdks: - dart: ">=2.6.0 <3.0.0" - flutter: ">=1.12.13+hotfix.4 <2.0.0" + dart: ">=2.13.0 <3.0.0" + flutter: ">=1.20.0" diff --git a/pubspec.yaml b/pubspec.yaml index 2e601f8..4e98907 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -26,7 +26,7 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - mockito: ^4.1.1 + mockito: ^5.0.14 flutter: uses-material-design: true From 4817b8605ea6ba3b87278e47362fcf8fc639e637 Mon Sep 17 00:00:00 2001 From: Valter Barbosa Date: Wed, 11 Aug 2021 14:00:14 -0300 Subject: [PATCH 03/21] Using late for null-safety on tests --- test/core/network/network_info_test.dart | 4 ++-- test/core/util/input_converter_test.dart | 2 +- .../number_trivia_remote_data_source_test.dart | 4 ++-- .../repositories/number_trivia_repository_impl_test.dart | 8 ++++---- .../domain/usecases/get_concrete_number_trivia_test.dart | 4 ++-- .../domain/usecases/get_random_number_trivia_test.dart | 4 ++-- .../presentation/bloc/number_trivia_bloc_test.dart | 8 ++++---- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/test/core/network/network_info_test.dart b/test/core/network/network_info_test.dart index 3cb59e2..c1d7ec2 100644 --- a/test/core/network/network_info_test.dart +++ b/test/core/network/network_info_test.dart @@ -6,8 +6,8 @@ import 'package:data_connection_checker/data_connection_checker.dart'; class MockDataConnectionChecker extends Mock implements DataConnectionChecker {} void main() { - NetworkInfoImpl networkInfo; - MockDataConnectionChecker mockDataConnectionChecker; + late NetworkInfoImpl networkInfo; + late MockDataConnectionChecker mockDataConnectionChecker; setUp(() { mockDataConnectionChecker = MockDataConnectionChecker(); diff --git a/test/core/util/input_converter_test.dart b/test/core/util/input_converter_test.dart index 78c18e8..ee48cbb 100644 --- a/test/core/util/input_converter_test.dart +++ b/test/core/util/input_converter_test.dart @@ -3,7 +3,7 @@ import 'package:dartz/dartz.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { - InputConverter inputConverter; + late InputConverter inputConverter; setUp(() { inputConverter = InputConverter(); diff --git a/test/features/number_trivia/data/datasources/number_trivia_remote_data_source_test.dart b/test/features/number_trivia/data/datasources/number_trivia_remote_data_source_test.dart index 9e1e3f5..1408e04 100644 --- a/test/features/number_trivia/data/datasources/number_trivia_remote_data_source_test.dart +++ b/test/features/number_trivia/data/datasources/number_trivia_remote_data_source_test.dart @@ -13,8 +13,8 @@ import '../../../../fixtures/fixture_reader.dart'; class MockHttpClient extends Mock implements http.Client {} void main() { - NumberTriviaRemoteDataSourceImpl dataSource; - MockHttpClient mockHttpClient; + late NumberTriviaRemoteDataSourceImpl dataSource; + late MockHttpClient mockHttpClient; setUp(() { mockHttpClient = MockHttpClient(); diff --git a/test/features/number_trivia/data/repositories/number_trivia_repository_impl_test.dart b/test/features/number_trivia/data/repositories/number_trivia_repository_impl_test.dart index c4c9d61..66cb903 100644 --- a/test/features/number_trivia/data/repositories/number_trivia_repository_impl_test.dart +++ b/test/features/number_trivia/data/repositories/number_trivia_repository_impl_test.dart @@ -18,10 +18,10 @@ class MockLocalDataSource extends Mock implements NumberTriviaLocalDataSource {} class MockNetworkInfo extends Mock implements NetworkInfo {} void main() { - NumberTriviaRepositoryImpl repository; - MockRemoteDataSource mockRemoteDataSource; - MockLocalDataSource mockLocalDataSource; - MockNetworkInfo mockNetworkInfo; + late NumberTriviaRepositoryImpl repository; + late MockRemoteDataSource mockRemoteDataSource; + late MockLocalDataSource mockLocalDataSource; + late MockNetworkInfo mockNetworkInfo; setUp(() { mockRemoteDataSource = MockRemoteDataSource(); diff --git a/test/features/number_trivia/domain/usecases/get_concrete_number_trivia_test.dart b/test/features/number_trivia/domain/usecases/get_concrete_number_trivia_test.dart index 8e0297d..df174a3 100644 --- a/test/features/number_trivia/domain/usecases/get_concrete_number_trivia_test.dart +++ b/test/features/number_trivia/domain/usecases/get_concrete_number_trivia_test.dart @@ -9,8 +9,8 @@ class MockNumberTriviaRepository extends Mock implements NumberTriviaRepository {} void main() { - GetConcreteNumberTrivia usecase; - MockNumberTriviaRepository mockNumberTriviaRepository; + late GetConcreteNumberTrivia usecase; + late MockNumberTriviaRepository mockNumberTriviaRepository; setUp(() { mockNumberTriviaRepository = MockNumberTriviaRepository(); diff --git a/test/features/number_trivia/domain/usecases/get_random_number_trivia_test.dart b/test/features/number_trivia/domain/usecases/get_random_number_trivia_test.dart index f07116b..2e6a6f4 100644 --- a/test/features/number_trivia/domain/usecases/get_random_number_trivia_test.dart +++ b/test/features/number_trivia/domain/usecases/get_random_number_trivia_test.dart @@ -11,8 +11,8 @@ class MockNumberTriviaRepository extends Mock implements NumberTriviaRepository {} void main() { - GetRandomNumberTrivia usecase; - MockNumberTriviaRepository mockNumberTriviaRepository; + late GetRandomNumberTrivia usecase; + late MockNumberTriviaRepository mockNumberTriviaRepository; setUp(() { mockNumberTriviaRepository = MockNumberTriviaRepository(); diff --git a/test/features/number_trivia/presentation/bloc/number_trivia_bloc_test.dart b/test/features/number_trivia/presentation/bloc/number_trivia_bloc_test.dart index 87d9089..3e54679 100644 --- a/test/features/number_trivia/presentation/bloc/number_trivia_bloc_test.dart +++ b/test/features/number_trivia/presentation/bloc/number_trivia_bloc_test.dart @@ -17,10 +17,10 @@ class MockGetRandomNumberTrivia extends Mock implements GetRandomNumberTrivia {} class MockInputConverter extends Mock implements InputConverter {} void main() { - NumberTriviaBloc bloc; - MockGetConcreteNumberTrivia mockGetConcreteNumberTrivia; - MockGetRandomNumberTrivia mockGetRandomNumberTrivia; - MockInputConverter mockInputConverter; + late NumberTriviaBloc bloc; + late MockGetConcreteNumberTrivia mockGetConcreteNumberTrivia; + late MockGetRandomNumberTrivia mockGetRandomNumberTrivia; + late MockInputConverter mockInputConverter; setUp(() { mockGetConcreteNumberTrivia = MockGetConcreteNumberTrivia(); From 821a3975ed4358d00f65f2cb635f396e85cf2865 Mon Sep 17 00:00:00 2001 From: Valter Barbosa Date: Wed, 11 Aug 2021 14:01:02 -0300 Subject: [PATCH 04/21] Change @required to required --- .../data/datasources/number_trivia_local_data_source.dart | 2 +- .../data/datasources/number_trivia_remote_data_source.dart | 2 +- .../number_trivia/data/models/number_trivia_model.dart | 4 ++-- .../data/repositories/number_trivia_repository_impl.dart | 6 +++--- .../number_trivia/domain/entities/number_trivia.dart | 4 ++-- .../domain/usecases/get_concrete_number_trivia.dart | 2 +- .../number_trivia/presentation/bloc/number_trivia_bloc.dart | 6 +++--- .../presentation/bloc/number_trivia_state.dart | 4 ++-- .../number_trivia/presentation/widgets/message_display.dart | 2 +- .../number_trivia/presentation/widgets/trivia_display.dart | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/lib/features/number_trivia/data/datasources/number_trivia_local_data_source.dart b/lib/features/number_trivia/data/datasources/number_trivia_local_data_source.dart index 9a9bec4..7c219ff 100644 --- a/lib/features/number_trivia/data/datasources/number_trivia_local_data_source.dart +++ b/lib/features/number_trivia/data/datasources/number_trivia_local_data_source.dart @@ -21,7 +21,7 @@ const CACHED_NUMBER_TRIVIA = 'CACHED_NUMBER_TRIVIA'; class NumberTriviaLocalDataSourceImpl implements NumberTriviaLocalDataSource { final SharedPreferences sharedPreferences; - NumberTriviaLocalDataSourceImpl({@required this.sharedPreferences}); + NumberTriviaLocalDataSourceImpl({required this.sharedPreferences}); @override Future getLastNumberTrivia() { diff --git a/lib/features/number_trivia/data/datasources/number_trivia_remote_data_source.dart b/lib/features/number_trivia/data/datasources/number_trivia_remote_data_source.dart index 978c225..e02cf66 100644 --- a/lib/features/number_trivia/data/datasources/number_trivia_remote_data_source.dart +++ b/lib/features/number_trivia/data/datasources/number_trivia_remote_data_source.dart @@ -21,7 +21,7 @@ abstract class NumberTriviaRemoteDataSource { class NumberTriviaRemoteDataSourceImpl implements NumberTriviaRemoteDataSource { final http.Client client; - NumberTriviaRemoteDataSourceImpl({@required this.client}); + NumberTriviaRemoteDataSourceImpl({required this.client}); @override Future getConcreteNumberTrivia(int number) => diff --git a/lib/features/number_trivia/data/models/number_trivia_model.dart b/lib/features/number_trivia/data/models/number_trivia_model.dart index 240960a..143e1d3 100644 --- a/lib/features/number_trivia/data/models/number_trivia_model.dart +++ b/lib/features/number_trivia/data/models/number_trivia_model.dart @@ -3,8 +3,8 @@ import 'package:meta/meta.dart'; class NumberTriviaModel extends NumberTrivia { NumberTriviaModel({ - @required String text, - @required int number, + required String text, + required int number, }) : super(text: text, number: number); factory NumberTriviaModel.fromJson(Map json) { diff --git a/lib/features/number_trivia/data/repositories/number_trivia_repository_impl.dart b/lib/features/number_trivia/data/repositories/number_trivia_repository_impl.dart index eb79106..7eb96b8 100644 --- a/lib/features/number_trivia/data/repositories/number_trivia_repository_impl.dart +++ b/lib/features/number_trivia/data/repositories/number_trivia_repository_impl.dart @@ -17,9 +17,9 @@ class NumberTriviaRepositoryImpl implements NumberTriviaRepository { final NetworkInfo networkInfo; NumberTriviaRepositoryImpl({ - @required this.remoteDataSource, - @required this.localDataSource, - @required this.networkInfo, + required this.remoteDataSource, + required this.localDataSource, + required this.networkInfo, }); @override diff --git a/lib/features/number_trivia/domain/entities/number_trivia.dart b/lib/features/number_trivia/domain/entities/number_trivia.dart index 8e7e0ee..6908838 100644 --- a/lib/features/number_trivia/domain/entities/number_trivia.dart +++ b/lib/features/number_trivia/domain/entities/number_trivia.dart @@ -6,8 +6,8 @@ class NumberTrivia extends Equatable { final int number; NumberTrivia({ - @required this.text, - @required this.number, + required this.text, + required this.number, }); @override diff --git a/lib/features/number_trivia/domain/usecases/get_concrete_number_trivia.dart b/lib/features/number_trivia/domain/usecases/get_concrete_number_trivia.dart index 1128270..22d5079 100644 --- a/lib/features/number_trivia/domain/usecases/get_concrete_number_trivia.dart +++ b/lib/features/number_trivia/domain/usecases/get_concrete_number_trivia.dart @@ -21,7 +21,7 @@ class GetConcreteNumberTrivia implements UseCase { class Params extends Equatable { final int number; - Params({@required this.number}); + Params({required this.number}); @override List get props => [number]; diff --git a/lib/features/number_trivia/presentation/bloc/number_trivia_bloc.dart b/lib/features/number_trivia/presentation/bloc/number_trivia_bloc.dart index 03c80ff..388318d 100644 --- a/lib/features/number_trivia/presentation/bloc/number_trivia_bloc.dart +++ b/lib/features/number_trivia/presentation/bloc/number_trivia_bloc.dart @@ -23,9 +23,9 @@ class NumberTriviaBloc extends Bloc { final InputConverter inputConverter; NumberTriviaBloc({ - @required GetConcreteNumberTrivia concrete, - @required GetRandomNumberTrivia random, - @required this.inputConverter, + required GetConcreteNumberTrivia concrete, + required GetRandomNumberTrivia random, + required this.inputConverter, }) : assert(concrete != null), assert(random != null), assert(inputConverter != null), diff --git a/lib/features/number_trivia/presentation/bloc/number_trivia_state.dart b/lib/features/number_trivia/presentation/bloc/number_trivia_state.dart index 2cb1321..dc9d5e6 100644 --- a/lib/features/number_trivia/presentation/bloc/number_trivia_state.dart +++ b/lib/features/number_trivia/presentation/bloc/number_trivia_state.dart @@ -15,7 +15,7 @@ class Loading extends NumberTriviaState {} class Loaded extends NumberTriviaState { final NumberTrivia trivia; - Loaded({@required this.trivia}); + Loaded({required this.trivia}); @override List get props => [trivia]; @@ -24,7 +24,7 @@ class Loaded extends NumberTriviaState { class Error extends NumberTriviaState { final String message; - Error({@required this.message}); + Error({required this.message}); @override List get props => [message]; diff --git a/lib/features/number_trivia/presentation/widgets/message_display.dart b/lib/features/number_trivia/presentation/widgets/message_display.dart index 6e55f53..056faba 100644 --- a/lib/features/number_trivia/presentation/widgets/message_display.dart +++ b/lib/features/number_trivia/presentation/widgets/message_display.dart @@ -5,7 +5,7 @@ class MessageDisplay extends StatelessWidget { const MessageDisplay({ Key key, - @required this.message, + required this.message, }) : super(key: key); @override diff --git a/lib/features/number_trivia/presentation/widgets/trivia_display.dart b/lib/features/number_trivia/presentation/widgets/trivia_display.dart index 5174ac4..3e946ca 100644 --- a/lib/features/number_trivia/presentation/widgets/trivia_display.dart +++ b/lib/features/number_trivia/presentation/widgets/trivia_display.dart @@ -6,7 +6,7 @@ class TriviaDisplay extends StatelessWidget { const TriviaDisplay({ Key key, - @required this.numberTrivia, + required this.numberTrivia, }) : super(key: key); @override From 61f28f1e15f890c74dfb3a187cb4ac043c20998f Mon Sep 17 00:00:00 2001 From: Valter Barbosa Date: Wed, 11 Aug 2021 14:02:28 -0300 Subject: [PATCH 05/21] Nullable Keys --- .../number_trivia/presentation/widgets/trivia_controls.dart | 2 +- .../number_trivia/presentation/widgets/trivia_display.dart | 2 +- .../datasources/number_trivia_local_data_source_test.dart | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/features/number_trivia/presentation/widgets/trivia_controls.dart b/lib/features/number_trivia/presentation/widgets/trivia_controls.dart index 4774ea1..e2dbd77 100644 --- a/lib/features/number_trivia/presentation/widgets/trivia_controls.dart +++ b/lib/features/number_trivia/presentation/widgets/trivia_controls.dart @@ -4,7 +4,7 @@ import 'package:flutter_bloc/flutter_bloc.dart'; class TriviaControls extends StatefulWidget { const TriviaControls({ - Key key, + Key? key, }) : super(key: key); @override diff --git a/lib/features/number_trivia/presentation/widgets/trivia_display.dart b/lib/features/number_trivia/presentation/widgets/trivia_display.dart index 3e946ca..34291d8 100644 --- a/lib/features/number_trivia/presentation/widgets/trivia_display.dart +++ b/lib/features/number_trivia/presentation/widgets/trivia_display.dart @@ -5,7 +5,7 @@ class TriviaDisplay extends StatelessWidget { final NumberTrivia numberTrivia; const TriviaDisplay({ - Key key, + Key? key, required this.numberTrivia, }) : super(key: key); diff --git a/test/features/number_trivia/data/datasources/number_trivia_local_data_source_test.dart b/test/features/number_trivia/data/datasources/number_trivia_local_data_source_test.dart index 9ad69b1..42e744c 100644 --- a/test/features/number_trivia/data/datasources/number_trivia_local_data_source_test.dart +++ b/test/features/number_trivia/data/datasources/number_trivia_local_data_source_test.dart @@ -13,8 +13,8 @@ import '../../../../fixtures/fixture_reader.dart'; class MockSharedPreferences extends Mock implements SharedPreferences {} void main() { - NumberTriviaLocalDataSourceImpl dataSource; - MockSharedPreferences mockSharedPreferences; + late NumberTriviaLocalDataSourceImpl dataSource; + late MockSharedPreferences mockSharedPreferences; setUp(() { mockSharedPreferences = MockSharedPreferences(); From 9f45ec26856cb0888f0ff73dd693985de5defb67 Mon Sep 17 00:00:00 2001 From: Valter Barbosa Date: Wed, 11 Aug 2021 14:03:35 -0300 Subject: [PATCH 06/21] Nullable Keys --- .../number_trivia/presentation/widgets/loading_widget.dart | 2 +- .../number_trivia/presentation/widgets/message_display.dart | 2 +- .../number_trivia/presentation/widgets/trivia_controls.dart | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/features/number_trivia/presentation/widgets/loading_widget.dart b/lib/features/number_trivia/presentation/widgets/loading_widget.dart index a7b7506..56e806b 100644 --- a/lib/features/number_trivia/presentation/widgets/loading_widget.dart +++ b/lib/features/number_trivia/presentation/widgets/loading_widget.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; class LoadingWidget extends StatelessWidget { const LoadingWidget({ - Key key, + Key? key, }) : super(key: key); @override diff --git a/lib/features/number_trivia/presentation/widgets/message_display.dart b/lib/features/number_trivia/presentation/widgets/message_display.dart index 056faba..8d55e50 100644 --- a/lib/features/number_trivia/presentation/widgets/message_display.dart +++ b/lib/features/number_trivia/presentation/widgets/message_display.dart @@ -4,7 +4,7 @@ class MessageDisplay extends StatelessWidget { final String message; const MessageDisplay({ - Key key, + Key? key, required this.message, }) : super(key: key); diff --git a/lib/features/number_trivia/presentation/widgets/trivia_controls.dart b/lib/features/number_trivia/presentation/widgets/trivia_controls.dart index e2dbd77..de1e582 100644 --- a/lib/features/number_trivia/presentation/widgets/trivia_controls.dart +++ b/lib/features/number_trivia/presentation/widgets/trivia_controls.dart @@ -13,7 +13,7 @@ class TriviaControls extends StatefulWidget { class _TriviaControlsState extends State { final controller = TextEditingController(); - String inputStr; + late String inputStr; @override Widget build(BuildContext context) { From 6f3dbd93222a3bcd101b67986096670327054055 Mon Sep 17 00:00:00 2001 From: Valter Barbosa Date: Wed, 11 Aug 2021 14:30:18 -0300 Subject: [PATCH 07/21] Mockito Null Safety code generation --- .flutter-plugins-dependencies | 2 +- pubspec.lock | 138 +++++++++++++++++- pubspec.yaml | 3 +- .../number_trivia_local_data_source_test.dart | 9 +- ...r_trivia_local_data_source_test.mocks.dart | 91 ++++++++++++ .../number_trivia_repository_impl_test.dart | 24 ++- ...ber_trivia_repository_impl_test.mocks.dart | 85 +++++++++++ .../get_concrete_number_trivia_test.dart | 5 +- ...get_concrete_number_trivia_test.mocks.dart | 48 ++++++ .../get_random_number_trivia_test.dart | 5 +- .../get_random_number_trivia_test.mocks.dart | 48 ++++++ .../bloc/number_trivia_bloc_test.dart | 13 +- .../bloc/number_trivia_bloc_test.mocks.dart | 94 ++++++++++++ 13 files changed, 537 insertions(+), 28 deletions(-) create mode 100644 test/features/number_trivia/data/datasources/number_trivia_local_data_source_test.mocks.dart create mode 100644 test/features/number_trivia/data/repositories/number_trivia_repository_impl_test.mocks.dart create mode 100644 test/features/number_trivia/domain/usecases/get_concrete_number_trivia_test.mocks.dart create mode 100644 test/features/number_trivia/domain/usecases/get_random_number_trivia_test.mocks.dart create mode 100644 test/features/number_trivia/presentation/bloc/number_trivia_bloc_test.mocks.dart diff --git a/.flutter-plugins-dependencies b/.flutter-plugins-dependencies index 67b4bb4..66990a8 100644 --- a/.flutter-plugins-dependencies +++ b/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"shared_preferences","path":"/home/programmer/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.12+4/","dependencies":[]}],"android":[{"name":"shared_preferences","path":"/home/programmer/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.12+4/","dependencies":[]}],"macos":[{"name":"shared_preferences_macos","path":"/home/programmer/.pub-cache/hosted/pub.dartlang.org/shared_preferences_macos-0.0.1+11/","dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"/home/programmer/.pub-cache/hosted/pub.dartlang.org/path_provider_linux-0.0.1+2/","dependencies":[]},{"name":"shared_preferences_linux","path":"/home/programmer/.pub-cache/hosted/pub.dartlang.org/shared_preferences_linux-0.0.2+4/","dependencies":["path_provider_linux"]}],"windows":[{"name":"path_provider_windows","path":"/home/programmer/.pub-cache/hosted/pub.dartlang.org/path_provider_windows-0.0.5/","dependencies":[]},{"name":"shared_preferences_windows","path":"/home/programmer/.pub-cache/hosted/pub.dartlang.org/shared_preferences_windows-0.0.2+3/","dependencies":["path_provider_windows"]}],"web":[{"name":"shared_preferences_web","path":"/home/programmer/.pub-cache/hosted/pub.dartlang.org/shared_preferences_web-0.1.2+7/","dependencies":[]}]},"dependencyGraph":[{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_linux","shared_preferences_macos","shared_preferences_web","shared_preferences_windows"]},{"name":"shared_preferences_linux","dependencies":["path_provider_linux"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]},{"name":"shared_preferences_windows","dependencies":["path_provider_windows"]}],"date_created":"2021-08-11 13:56:40.956194","version":"2.5.0-6.0.pre.37"} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"shared_preferences","path":"/home/programmer/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.12+4/","dependencies":[]}],"android":[{"name":"shared_preferences","path":"/home/programmer/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.12+4/","dependencies":[]}],"macos":[{"name":"shared_preferences_macos","path":"/home/programmer/.pub-cache/hosted/pub.dartlang.org/shared_preferences_macos-0.0.1+11/","dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"/home/programmer/.pub-cache/hosted/pub.dartlang.org/path_provider_linux-0.0.1+2/","dependencies":[]},{"name":"shared_preferences_linux","path":"/home/programmer/.pub-cache/hosted/pub.dartlang.org/shared_preferences_linux-0.0.2+4/","dependencies":["path_provider_linux"]}],"windows":[{"name":"path_provider_windows","path":"/home/programmer/.pub-cache/hosted/pub.dartlang.org/path_provider_windows-0.0.5/","dependencies":[]},{"name":"shared_preferences_windows","path":"/home/programmer/.pub-cache/hosted/pub.dartlang.org/shared_preferences_windows-0.0.2+3/","dependencies":["path_provider_windows"]}],"web":[{"name":"shared_preferences_web","path":"/home/programmer/.pub-cache/hosted/pub.dartlang.org/shared_preferences_web-0.1.2+7/","dependencies":[]}]},"dependencyGraph":[{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_linux","shared_preferences_macos","shared_preferences_web","shared_preferences_windows"]},{"name":"shared_preferences_linux","dependencies":["path_provider_linux"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]},{"name":"shared_preferences_windows","dependencies":["path_provider_windows"]}],"date_created":"2021-08-11 14:15:52.331195","version":"2.5.0-6.0.pre.37"} \ No newline at end of file diff --git a/pubspec.lock b/pubspec.lock index 56c7bdb..423e139 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,14 +7,14 @@ packages: name: _fe_analyzer_shared url: "https://pub.dartlang.org" source: hosted - version: "23.0.0" + version: "22.0.0" analyzer: dependency: transitive description: name: analyzer url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "1.7.2" args: dependency: transitive description: @@ -49,7 +49,42 @@ packages: name: build url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.0.3" + build_config: + dependency: transitive + description: + name: build_config + url: "https://pub.dartlang.org" + source: hosted + version: "0.4.7" + build_daemon: + dependency: transitive + description: + name: build_daemon + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.10" + build_resolvers: + dependency: transitive + description: + name: build_resolvers + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.4" + build_runner: + dependency: "direct dev" + description: + name: build_runner + url: "https://pub.dartlang.org" + source: hosted + version: "1.12.2" + build_runner_core: + dependency: transitive + description: + name: build_runner_core + url: "https://pub.dartlang.org" + source: hosted + version: "6.1.12" built_collection: dependency: transitive description: @@ -78,6 +113,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.3.1" + checked_yaml: + dependency: transitive + description: + name: checked_yaml + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.1" cli_util: dependency: transitive description: @@ -98,7 +140,7 @@ packages: name: code_builder url: "https://pub.dartlang.org" source: hosted - version: "4.1.0" + version: "3.7.0" collection: dependency: transitive description: @@ -212,6 +254,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.0.1" + graphs: + dependency: transitive + description: + name: graphs + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.0" http: dependency: "direct main" description: @@ -219,6 +268,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.12.2" + http_multi_server: + dependency: transitive + description: + name: http_multi_server + url: "https://pub.dartlang.org" + source: hosted + version: "3.0.1" http_parser: dependency: transitive description: @@ -226,6 +282,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "3.1.4" + io: + dependency: transitive + description: + name: io + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.3" js: dependency: transitive description: @@ -233,6 +296,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.6.3" + json_annotation: + dependency: transitive + description: + name: json_annotation + url: "https://pub.dartlang.org" + source: hosted + version: "4.1.0" logging: dependency: transitive description: @@ -254,13 +324,20 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.7.0" + mime: + dependency: transitive + description: + name: mime + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.0" mockito: dependency: "direct dev" description: name: mockito url: "https://pub.dartlang.org" source: hosted - version: "5.0.14" + version: "5.0.7" nested: dependency: transitive description: @@ -324,6 +401,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.3" + pool: + dependency: transitive + description: + name: pool + url: "https://pub.dartlang.org" + source: hosted + version: "1.5.0" process: dependency: transitive description: @@ -345,6 +429,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.0.0" + pubspec_parse: + dependency: transitive + description: + name: pubspec_parse + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.0" rxdart: dependency: transitive description: @@ -394,6 +485,20 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.0.2+3" + shelf: + dependency: transitive + description: + name: shelf + url: "https://pub.dartlang.org" + source: hosted + version: "0.7.9" + shelf_web_socket: + dependency: transitive + description: + name: shelf_web_socket + url: "https://pub.dartlang.org" + source: hosted + version: "0.2.4+1" sky_engine: dependency: transitive description: flutter @@ -405,7 +510,7 @@ packages: name: source_gen url: "https://pub.dartlang.org" source: hosted - version: "1.0.5" + version: "1.0.3" source_span: dependency: transitive description: @@ -427,6 +532,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.1.0" + stream_transform: + dependency: transitive + description: + name: stream_transform + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.0" string_scanner: dependency: transitive description: @@ -448,6 +560,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.4.2" + timing: + dependency: transitive + description: + name: timing + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.0" typed_data: dependency: transitive description: @@ -469,6 +588,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.0" + web_socket_channel: + dependency: transitive + description: + name: web_socket_channel + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.0" win32: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 4e98907..ca1c1c5 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -26,7 +26,8 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - mockito: ^5.0.14 + mockito: ^5.0.7 + build_runner: ^1.12.2 flutter: uses-material-design: true diff --git a/test/features/number_trivia/data/datasources/number_trivia_local_data_source_test.dart b/test/features/number_trivia/data/datasources/number_trivia_local_data_source_test.dart index 42e744c..ef7af86 100644 --- a/test/features/number_trivia/data/datasources/number_trivia_local_data_source_test.dart +++ b/test/features/number_trivia/data/datasources/number_trivia_local_data_source_test.dart @@ -3,15 +3,18 @@ import 'dart:convert'; import 'package:clean_architecture_tdd_course/core/error/exceptions.dart'; import 'package:clean_architecture_tdd_course/features/number_trivia/data/datasources/number_trivia_local_data_source.dart'; import 'package:clean_architecture_tdd_course/features/number_trivia/data/models/number_trivia_model.dart'; +import 'package:mockito/annotations.dart'; import 'package:mockito/mockito.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:matcher/matcher.dart'; import '../../../../fixtures/fixture_reader.dart'; +import 'number_trivia_local_data_source_test.mocks.dart'; -class MockSharedPreferences extends Mock implements SharedPreferences {} +// class MockSharedPreferences extends Mock implements SharedPreferences {} +@GenerateMocks([SharedPreferences]) void main() { late NumberTriviaLocalDataSourceImpl dataSource; late MockSharedPreferences mockSharedPreferences; @@ -45,7 +48,9 @@ void main() { 'should throw a CacheExeption when there is not a cached value', () async { // arrange - when(mockSharedPreferences.getString(any)).thenReturn(null); + // Todo(v): Review this: + // when(mockSharedPreferences.getString(any)).thenReturn(null); + when(mockSharedPreferences.getString(any)).thenReturn(''); // act final call = dataSource.getLastNumberTrivia; // assert diff --git a/test/features/number_trivia/data/datasources/number_trivia_local_data_source_test.mocks.dart b/test/features/number_trivia/data/datasources/number_trivia_local_data_source_test.mocks.dart new file mode 100644 index 0000000..daffd2a --- /dev/null +++ b/test/features/number_trivia/data/datasources/number_trivia_local_data_source_test.mocks.dart @@ -0,0 +1,91 @@ +// Mocks generated by Mockito 5.0.7 from annotations +// in clean_architecture_tdd_course/test/features/number_trivia/data/datasources/number_trivia_local_data_source_test.dart. +// Do not manually edit this file. + +import 'dart:async' as _i3; + +import 'package:mockito/mockito.dart' as _i1; +import 'package:shared_preferences/shared_preferences.dart' as _i2; + +// ignore_for_file: comment_references +// ignore_for_file: unnecessary_parenthesis + +// ignore_for_file: prefer_const_constructors + +// ignore_for_file: avoid_redundant_argument_values + +/// A class which mocks [SharedPreferences]. +/// +/// See the documentation for Mockito's code generation for more information. +class MockSharedPreferences extends _i1.Mock implements _i2.SharedPreferences { + MockSharedPreferences() { + _i1.throwOnMissingStub(this); + } + + @override + Set getKeys() => (super.noSuchMethod(Invocation.method(#getKeys, []), + returnValue: {}) as Set); + @override + dynamic get(String? key) => + super.noSuchMethod(Invocation.method(#get, [key])); + @override + bool getBool(String? key) => (super + .noSuchMethod(Invocation.method(#getBool, [key]), returnValue: false) + as bool); + @override + int getInt(String? key) => + (super.noSuchMethod(Invocation.method(#getInt, [key]), returnValue: 0) + as int); + @override + double getDouble(String? key) => (super + .noSuchMethod(Invocation.method(#getDouble, [key]), returnValue: 0.0) + as double); + @override + String getString(String? key) => + (super.noSuchMethod(Invocation.method(#getString, [key]), returnValue: '') + as String); + @override + bool containsKey(String? key) => + (super.noSuchMethod(Invocation.method(#containsKey, [key]), + returnValue: false) as bool); + @override + List getStringList(String? key) => + (super.noSuchMethod(Invocation.method(#getStringList, [key]), + returnValue: []) as List); + @override + _i3.Future setBool(String? key, bool? value) => + (super.noSuchMethod(Invocation.method(#setBool, [key, value]), + returnValue: Future.value(false)) as _i3.Future); + @override + _i3.Future setInt(String? key, int? value) => + (super.noSuchMethod(Invocation.method(#setInt, [key, value]), + returnValue: Future.value(false)) as _i3.Future); + @override + _i3.Future setDouble(String? key, double? value) => + (super.noSuchMethod(Invocation.method(#setDouble, [key, value]), + returnValue: Future.value(false)) as _i3.Future); + @override + _i3.Future setString(String? key, String? value) => + (super.noSuchMethod(Invocation.method(#setString, [key, value]), + returnValue: Future.value(false)) as _i3.Future); + @override + _i3.Future setStringList(String? key, List? value) => + (super.noSuchMethod(Invocation.method(#setStringList, [key, value]), + returnValue: Future.value(false)) as _i3.Future); + @override + _i3.Future remove(String? key) => + (super.noSuchMethod(Invocation.method(#remove, [key]), + returnValue: Future.value(false)) as _i3.Future); + @override + _i3.Future commit() => + (super.noSuchMethod(Invocation.method(#commit, []), + returnValue: Future.value(false)) as _i3.Future); + @override + _i3.Future clear() => (super.noSuchMethod(Invocation.method(#clear, []), + returnValue: Future.value(false)) as _i3.Future); + @override + _i3.Future reload() => + (super.noSuchMethod(Invocation.method(#reload, []), + returnValue: Future.value(null), + returnValueForMissingStub: Future.value()) as _i3.Future); +} diff --git a/test/features/number_trivia/data/repositories/number_trivia_repository_impl_test.dart b/test/features/number_trivia/data/repositories/number_trivia_repository_impl_test.dart index 66cb903..87c3906 100644 --- a/test/features/number_trivia/data/repositories/number_trivia_repository_impl_test.dart +++ b/test/features/number_trivia/data/repositories/number_trivia_repository_impl_test.dart @@ -7,25 +7,33 @@ import 'package:clean_architecture_tdd_course/features/number_trivia/data/models import 'package:clean_architecture_tdd_course/features/number_trivia/data/repositories/number_trivia_repository_impl.dart'; import 'package:clean_architecture_tdd_course/features/number_trivia/domain/entities/number_trivia.dart'; import 'package:dartz/dartz.dart'; +import 'package:mockito/annotations.dart'; import 'package:mockito/mockito.dart'; import 'package:flutter_test/flutter_test.dart'; -class MockRemoteDataSource extends Mock - implements NumberTriviaRemoteDataSource {} +import 'number_trivia_repository_impl_test.mocks.dart'; -class MockLocalDataSource extends Mock implements NumberTriviaLocalDataSource {} +// class MockRemoteDataSource extends Mock +// implements {} MockNumberTriviaRemoteDataSource -class MockNetworkInfo extends Mock implements NetworkInfo {} +// class MockLocalDataSource extends Mock implements {} +// class MockNetworkInfo extends Mock implements {} + +@GenerateMocks([ + NumberTriviaRemoteDataSource, + NumberTriviaLocalDataSource, + NetworkInfo, +]) void main() { late NumberTriviaRepositoryImpl repository; - late MockRemoteDataSource mockRemoteDataSource; - late MockLocalDataSource mockLocalDataSource; + late MockNumberTriviaRemoteDataSource mockRemoteDataSource; + late MockNumberTriviaLocalDataSource mockLocalDataSource; late MockNetworkInfo mockNetworkInfo; setUp(() { - mockRemoteDataSource = MockRemoteDataSource(); - mockLocalDataSource = MockLocalDataSource(); + mockRemoteDataSource = MockNumberTriviaRemoteDataSource(); + mockLocalDataSource = MockNumberTriviaLocalDataSource(); mockNetworkInfo = MockNetworkInfo(); repository = NumberTriviaRepositoryImpl( remoteDataSource: mockRemoteDataSource, diff --git a/test/features/number_trivia/data/repositories/number_trivia_repository_impl_test.mocks.dart b/test/features/number_trivia/data/repositories/number_trivia_repository_impl_test.mocks.dart new file mode 100644 index 0000000..d9d6548 --- /dev/null +++ b/test/features/number_trivia/data/repositories/number_trivia_repository_impl_test.mocks.dart @@ -0,0 +1,85 @@ +// Mocks generated by Mockito 5.0.7 from annotations +// in clean_architecture_tdd_course/test/features/number_trivia/data/repositories/number_trivia_repository_impl_test.dart. +// Do not manually edit this file. + +import 'dart:async' as _i4; + +import 'package:clean_architecture_tdd_course/core/network/network_info.dart' + as _i6; +import 'package:clean_architecture_tdd_course/features/number_trivia/data/datasources/number_trivia_local_data_source.dart' + as _i5; +import 'package:clean_architecture_tdd_course/features/number_trivia/data/datasources/number_trivia_remote_data_source.dart' + as _i3; +import 'package:clean_architecture_tdd_course/features/number_trivia/data/models/number_trivia_model.dart' + as _i2; +import 'package:mockito/mockito.dart' as _i1; + +// ignore_for_file: comment_references +// ignore_for_file: unnecessary_parenthesis + +// ignore_for_file: prefer_const_constructors + +// ignore_for_file: avoid_redundant_argument_values + +class _FakeNumberTriviaModel extends _i1.Fake implements _i2.NumberTriviaModel { +} + +/// A class which mocks [NumberTriviaRemoteDataSource]. +/// +/// See the documentation for Mockito's code generation for more information. +class MockNumberTriviaRemoteDataSource extends _i1.Mock + implements _i3.NumberTriviaRemoteDataSource { + MockNumberTriviaRemoteDataSource() { + _i1.throwOnMissingStub(this); + } + + @override + _i4.Future<_i2.NumberTriviaModel> getConcreteNumberTrivia(int? number) => + (super.noSuchMethod(Invocation.method(#getConcreteNumberTrivia, [number]), + returnValue: + Future<_i2.NumberTriviaModel>.value(_FakeNumberTriviaModel())) + as _i4.Future<_i2.NumberTriviaModel>); + @override + _i4.Future<_i2.NumberTriviaModel> getRandomNumberTrivia() => + (super.noSuchMethod(Invocation.method(#getRandomNumberTrivia, []), + returnValue: + Future<_i2.NumberTriviaModel>.value(_FakeNumberTriviaModel())) + as _i4.Future<_i2.NumberTriviaModel>); +} + +/// A class which mocks [NumberTriviaLocalDataSource]. +/// +/// See the documentation for Mockito's code generation for more information. +class MockNumberTriviaLocalDataSource extends _i1.Mock + implements _i5.NumberTriviaLocalDataSource { + MockNumberTriviaLocalDataSource() { + _i1.throwOnMissingStub(this); + } + + @override + _i4.Future<_i2.NumberTriviaModel> getLastNumberTrivia() => + (super.noSuchMethod(Invocation.method(#getLastNumberTrivia, []), + returnValue: + Future<_i2.NumberTriviaModel>.value(_FakeNumberTriviaModel())) + as _i4.Future<_i2.NumberTriviaModel>); + @override + _i4.Future cacheNumberTrivia(_i2.NumberTriviaModel? triviaToCache) => + (super.noSuchMethod( + Invocation.method(#cacheNumberTrivia, [triviaToCache]), + returnValue: Future.value(null), + returnValueForMissingStub: Future.value()) as _i4.Future); +} + +/// A class which mocks [NetworkInfo]. +/// +/// See the documentation for Mockito's code generation for more information. +class MockNetworkInfo extends _i1.Mock implements _i6.NetworkInfo { + MockNetworkInfo() { + _i1.throwOnMissingStub(this); + } + + @override + _i4.Future get isConnected => + (super.noSuchMethod(Invocation.getter(#isConnected), + returnValue: Future.value(false)) as _i4.Future); +} diff --git a/test/features/number_trivia/domain/usecases/get_concrete_number_trivia_test.dart b/test/features/number_trivia/domain/usecases/get_concrete_number_trivia_test.dart index df174a3..a4cf669 100644 --- a/test/features/number_trivia/domain/usecases/get_concrete_number_trivia_test.dart +++ b/test/features/number_trivia/domain/usecases/get_concrete_number_trivia_test.dart @@ -2,12 +2,13 @@ import 'package:clean_architecture_tdd_course/features/number_trivia/domain/enti import 'package:clean_architecture_tdd_course/features/number_trivia/domain/repositories/number_trivia_repository.dart'; import 'package:clean_architecture_tdd_course/features/number_trivia/domain/usecases/get_concrete_number_trivia.dart'; import 'package:dartz/dartz.dart'; +import 'package:mockito/annotations.dart'; import 'package:mockito/mockito.dart'; import 'package:flutter_test/flutter_test.dart'; -class MockNumberTriviaRepository extends Mock - implements NumberTriviaRepository {} +import 'get_concrete_number_trivia_test.mocks.dart'; +@GenerateMocks([NumberTriviaRepository]) void main() { late GetConcreteNumberTrivia usecase; late MockNumberTriviaRepository mockNumberTriviaRepository; diff --git a/test/features/number_trivia/domain/usecases/get_concrete_number_trivia_test.mocks.dart b/test/features/number_trivia/domain/usecases/get_concrete_number_trivia_test.mocks.dart new file mode 100644 index 0000000..1cffd2f --- /dev/null +++ b/test/features/number_trivia/domain/usecases/get_concrete_number_trivia_test.mocks.dart @@ -0,0 +1,48 @@ +// Mocks generated by Mockito 5.0.7 from annotations +// in clean_architecture_tdd_course/test/features/number_trivia/domain/usecases/get_concrete_number_trivia_test.dart. +// Do not manually edit this file. + +import 'dart:async' as _i4; + +import 'package:clean_architecture_tdd_course/core/error/failures.dart' as _i5; +import 'package:clean_architecture_tdd_course/features/number_trivia/domain/entities/number_trivia.dart' + as _i6; +import 'package:clean_architecture_tdd_course/features/number_trivia/domain/repositories/number_trivia_repository.dart' + as _i3; +import 'package:dartz/dartz.dart' as _i2; +import 'package:mockito/mockito.dart' as _i1; + +// ignore_for_file: comment_references +// ignore_for_file: unnecessary_parenthesis + +// ignore_for_file: prefer_const_constructors + +// ignore_for_file: avoid_redundant_argument_values + +class _FakeEither extends _i1.Fake implements _i2.Either {} + +/// A class which mocks [NumberTriviaRepository]. +/// +/// See the documentation for Mockito's code generation for more information. +class MockNumberTriviaRepository extends _i1.Mock + implements _i3.NumberTriviaRepository { + MockNumberTriviaRepository() { + _i1.throwOnMissingStub(this); + } + + @override + _i4.Future<_i2.Either<_i5.Failure, _i6.NumberTrivia>> getConcreteNumberTrivia( + int? number) => + (super.noSuchMethod(Invocation.method(#getConcreteNumberTrivia, [number]), + returnValue: Future<_i2.Either<_i5.Failure, _i6.NumberTrivia>>.value( + _FakeEither<_i5.Failure, _i6.NumberTrivia>())) as _i4 + .Future<_i2.Either<_i5.Failure, _i6.NumberTrivia>>); + @override + _i4.Future<_i2.Either<_i5.Failure, _i6.NumberTrivia>> + getRandomNumberTrivia() => + (super.noSuchMethod(Invocation.method(#getRandomNumberTrivia, []), + returnValue: + Future<_i2.Either<_i5.Failure, _i6.NumberTrivia>>.value( + _FakeEither<_i5.Failure, _i6.NumberTrivia>())) + as _i4.Future<_i2.Either<_i5.Failure, _i6.NumberTrivia>>); +} diff --git a/test/features/number_trivia/domain/usecases/get_random_number_trivia_test.dart b/test/features/number_trivia/domain/usecases/get_random_number_trivia_test.dart index 2e6a6f4..a1469b3 100644 --- a/test/features/number_trivia/domain/usecases/get_random_number_trivia_test.dart +++ b/test/features/number_trivia/domain/usecases/get_random_number_trivia_test.dart @@ -4,12 +4,13 @@ import 'package:clean_architecture_tdd_course/features/number_trivia/domain/repo import 'package:clean_architecture_tdd_course/features/number_trivia/domain/usecases/get_concrete_number_trivia.dart'; import 'package:clean_architecture_tdd_course/features/number_trivia/domain/usecases/get_random_number_trivia.dart'; import 'package:dartz/dartz.dart'; +import 'package:mockito/annotations.dart'; import 'package:mockito/mockito.dart'; import 'package:flutter_test/flutter_test.dart'; -class MockNumberTriviaRepository extends Mock - implements NumberTriviaRepository {} +import 'get_random_number_trivia_test.mocks.dart'; +@GenerateMocks([NumberTriviaRepository]) void main() { late GetRandomNumberTrivia usecase; late MockNumberTriviaRepository mockNumberTriviaRepository; diff --git a/test/features/number_trivia/domain/usecases/get_random_number_trivia_test.mocks.dart b/test/features/number_trivia/domain/usecases/get_random_number_trivia_test.mocks.dart new file mode 100644 index 0000000..b8f2690 --- /dev/null +++ b/test/features/number_trivia/domain/usecases/get_random_number_trivia_test.mocks.dart @@ -0,0 +1,48 @@ +// Mocks generated by Mockito 5.0.7 from annotations +// in clean_architecture_tdd_course/test/features/number_trivia/domain/usecases/get_random_number_trivia_test.dart. +// Do not manually edit this file. + +import 'dart:async' as _i4; + +import 'package:clean_architecture_tdd_course/core/error/failures.dart' as _i5; +import 'package:clean_architecture_tdd_course/features/number_trivia/domain/entities/number_trivia.dart' + as _i6; +import 'package:clean_architecture_tdd_course/features/number_trivia/domain/repositories/number_trivia_repository.dart' + as _i3; +import 'package:dartz/dartz.dart' as _i2; +import 'package:mockito/mockito.dart' as _i1; + +// ignore_for_file: comment_references +// ignore_for_file: unnecessary_parenthesis + +// ignore_for_file: prefer_const_constructors + +// ignore_for_file: avoid_redundant_argument_values + +class _FakeEither extends _i1.Fake implements _i2.Either {} + +/// A class which mocks [NumberTriviaRepository]. +/// +/// See the documentation for Mockito's code generation for more information. +class MockNumberTriviaRepository extends _i1.Mock + implements _i3.NumberTriviaRepository { + MockNumberTriviaRepository() { + _i1.throwOnMissingStub(this); + } + + @override + _i4.Future<_i2.Either<_i5.Failure, _i6.NumberTrivia>> getConcreteNumberTrivia( + int? number) => + (super.noSuchMethod(Invocation.method(#getConcreteNumberTrivia, [number]), + returnValue: Future<_i2.Either<_i5.Failure, _i6.NumberTrivia>>.value( + _FakeEither<_i5.Failure, _i6.NumberTrivia>())) as _i4 + .Future<_i2.Either<_i5.Failure, _i6.NumberTrivia>>); + @override + _i4.Future<_i2.Either<_i5.Failure, _i6.NumberTrivia>> + getRandomNumberTrivia() => + (super.noSuchMethod(Invocation.method(#getRandomNumberTrivia, []), + returnValue: + Future<_i2.Either<_i5.Failure, _i6.NumberTrivia>>.value( + _FakeEither<_i5.Failure, _i6.NumberTrivia>())) + as _i4.Future<_i2.Either<_i5.Failure, _i6.NumberTrivia>>); +} diff --git a/test/features/number_trivia/presentation/bloc/number_trivia_bloc_test.dart b/test/features/number_trivia/presentation/bloc/number_trivia_bloc_test.dart index 3e54679..0f74ecf 100644 --- a/test/features/number_trivia/presentation/bloc/number_trivia_bloc_test.dart +++ b/test/features/number_trivia/presentation/bloc/number_trivia_bloc_test.dart @@ -8,14 +8,15 @@ import 'package:clean_architecture_tdd_course/features/number_trivia/presentatio import 'package:dartz/dartz.dart'; import 'package:mockito/mockito.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:mockito/annotations.dart'; -class MockGetConcreteNumberTrivia extends Mock - implements GetConcreteNumberTrivia {} - -class MockGetRandomNumberTrivia extends Mock implements GetRandomNumberTrivia {} - -class MockInputConverter extends Mock implements InputConverter {} +import 'number_trivia_bloc_test.mocks.dart'; +@GenerateMocks([ + GetConcreteNumberTrivia, + GetRandomNumberTrivia, + InputConverter, +]) void main() { late NumberTriviaBloc bloc; late MockGetConcreteNumberTrivia mockGetConcreteNumberTrivia; diff --git a/test/features/number_trivia/presentation/bloc/number_trivia_bloc_test.mocks.dart b/test/features/number_trivia/presentation/bloc/number_trivia_bloc_test.mocks.dart new file mode 100644 index 0000000..7102ce8 --- /dev/null +++ b/test/features/number_trivia/presentation/bloc/number_trivia_bloc_test.mocks.dart @@ -0,0 +1,94 @@ +// Mocks generated by Mockito 5.0.7 from annotations +// in clean_architecture_tdd_course/test/features/number_trivia/presentation/bloc/number_trivia_bloc_test.dart. +// Do not manually edit this file. + +import 'dart:async' as _i5; + +import 'package:clean_architecture_tdd_course/core/error/failures.dart' as _i6; +import 'package:clean_architecture_tdd_course/core/usecases/usecase.dart' + as _i9; +import 'package:clean_architecture_tdd_course/core/util/input_converter.dart' + as _i10; +import 'package:clean_architecture_tdd_course/features/number_trivia/domain/entities/number_trivia.dart' + as _i7; +import 'package:clean_architecture_tdd_course/features/number_trivia/domain/repositories/number_trivia_repository.dart' + as _i2; +import 'package:clean_architecture_tdd_course/features/number_trivia/domain/usecases/get_concrete_number_trivia.dart' + as _i4; +import 'package:clean_architecture_tdd_course/features/number_trivia/domain/usecases/get_random_number_trivia.dart' + as _i8; +import 'package:dartz/dartz.dart' as _i3; +import 'package:mockito/mockito.dart' as _i1; + +// ignore_for_file: comment_references +// ignore_for_file: unnecessary_parenthesis + +// ignore_for_file: prefer_const_constructors + +// ignore_for_file: avoid_redundant_argument_values + +class _FakeNumberTriviaRepository extends _i1.Fake + implements _i2.NumberTriviaRepository {} + +class _FakeEither extends _i1.Fake implements _i3.Either {} + +/// A class which mocks [GetConcreteNumberTrivia]. +/// +/// See the documentation for Mockito's code generation for more information. +class MockGetConcreteNumberTrivia extends _i1.Mock + implements _i4.GetConcreteNumberTrivia { + MockGetConcreteNumberTrivia() { + _i1.throwOnMissingStub(this); + } + + @override + _i2.NumberTriviaRepository get repository => + (super.noSuchMethod(Invocation.getter(#repository), + returnValue: _FakeNumberTriviaRepository()) + as _i2.NumberTriviaRepository); + @override + _i5.Future<_i3.Either<_i6.Failure, _i7.NumberTrivia>> call( + _i4.Params? params) => + (super.noSuchMethod(Invocation.method(#call, [params]), + returnValue: Future<_i3.Either<_i6.Failure, _i7.NumberTrivia>>.value( + _FakeEither<_i6.Failure, _i7.NumberTrivia>())) as _i5 + .Future<_i3.Either<_i6.Failure, _i7.NumberTrivia>>); +} + +/// A class which mocks [GetRandomNumberTrivia]. +/// +/// See the documentation for Mockito's code generation for more information. +class MockGetRandomNumberTrivia extends _i1.Mock + implements _i8.GetRandomNumberTrivia { + MockGetRandomNumberTrivia() { + _i1.throwOnMissingStub(this); + } + + @override + _i2.NumberTriviaRepository get repository => + (super.noSuchMethod(Invocation.getter(#repository), + returnValue: _FakeNumberTriviaRepository()) + as _i2.NumberTriviaRepository); + @override + _i5.Future<_i3.Either<_i6.Failure, _i7.NumberTrivia>> call( + _i9.NoParams? params) => + (super.noSuchMethod(Invocation.method(#call, [params]), + returnValue: Future<_i3.Either<_i6.Failure, _i7.NumberTrivia>>.value( + _FakeEither<_i6.Failure, _i7.NumberTrivia>())) as _i5 + .Future<_i3.Either<_i6.Failure, _i7.NumberTrivia>>); +} + +/// A class which mocks [InputConverter]. +/// +/// See the documentation for Mockito's code generation for more information. +class MockInputConverter extends _i1.Mock implements _i10.InputConverter { + MockInputConverter() { + _i1.throwOnMissingStub(this); + } + + @override + _i3.Either<_i6.Failure, int> stringToUnsignedInteger(String? str) => + (super.noSuchMethod(Invocation.method(#stringToUnsignedInteger, [str]), + returnValue: _FakeEither<_i6.Failure, int>()) + as _i3.Either<_i6.Failure, int>); +} From 4622730e3fd90a141aae5e23e4d2948830cc25e7 Mon Sep 17 00:00:00 2001 From: Valter Barbosa Date: Wed, 11 Aug 2021 14:31:48 -0300 Subject: [PATCH 08/21] BLoC builder and null safety --- .../number_trivia/presentation/pages/number_trivia_page.dart | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/features/number_trivia/presentation/pages/number_trivia_page.dart b/lib/features/number_trivia/presentation/pages/number_trivia_page.dart index d3332b1..1700f1c 100644 --- a/lib/features/number_trivia/presentation/pages/number_trivia_page.dart +++ b/lib/features/number_trivia/presentation/pages/number_trivia_page.dart @@ -43,6 +43,10 @@ class NumberTriviaPage extends StatelessWidget { return MessageDisplay( message: state.message, ); + } else { + return MessageDisplay( + message: 'Something wrong after Null-Safety upgrade!', + ); } }, ), From cd94b82a0c6c9501727f0916dc87ac6d0d78cc16 Mon Sep 17 00:00:00 2001 From: Valter Barbosa Date: Wed, 11 Aug 2021 14:33:48 -0300 Subject: [PATCH 09/21] NumberTrivia as NumberTriviaModel --- .../data/repositories/number_trivia_repository_impl.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/features/number_trivia/data/repositories/number_trivia_repository_impl.dart b/lib/features/number_trivia/data/repositories/number_trivia_repository_impl.dart index 7eb96b8..072c85b 100644 --- a/lib/features/number_trivia/data/repositories/number_trivia_repository_impl.dart +++ b/lib/features/number_trivia/data/repositories/number_trivia_repository_impl.dart @@ -1,3 +1,4 @@ +import 'package:clean_architecture_tdd_course/features/number_trivia/data/models/number_trivia_model.dart'; import 'package:dartz/dartz.dart'; import 'package:meta/meta.dart'; @@ -44,7 +45,7 @@ class NumberTriviaRepositoryImpl implements NumberTriviaRepository { if (await networkInfo.isConnected) { try { final remoteTrivia = await getConcreteOrRandom(); - localDataSource.cacheNumberTrivia(remoteTrivia); + localDataSource.cacheNumberTrivia(remoteTrivia as NumberTriviaModel); return Right(remoteTrivia); } on ServerException { return Left(ServerFailure()); From fb65182477c3dc4d122e161810c7ebffc1c517c9 Mon Sep 17 00:00:00 2001 From: Valter Barbosa Date: Wed, 11 Aug 2021 14:38:11 -0300 Subject: [PATCH 10/21] .gitignore update --- .flutter-plugins-dependencies | 1 - .gitignore | 4 ++++ ios/Flutter/flutter_export_environment.sh | 10 ---------- 3 files changed, 4 insertions(+), 11 deletions(-) delete mode 100644 .flutter-plugins-dependencies delete mode 100755 ios/Flutter/flutter_export_environment.sh diff --git a/.flutter-plugins-dependencies b/.flutter-plugins-dependencies deleted file mode 100644 index 66990a8..0000000 --- a/.flutter-plugins-dependencies +++ /dev/null @@ -1 +0,0 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"shared_preferences","path":"/home/programmer/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.12+4/","dependencies":[]}],"android":[{"name":"shared_preferences","path":"/home/programmer/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.12+4/","dependencies":[]}],"macos":[{"name":"shared_preferences_macos","path":"/home/programmer/.pub-cache/hosted/pub.dartlang.org/shared_preferences_macos-0.0.1+11/","dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"/home/programmer/.pub-cache/hosted/pub.dartlang.org/path_provider_linux-0.0.1+2/","dependencies":[]},{"name":"shared_preferences_linux","path":"/home/programmer/.pub-cache/hosted/pub.dartlang.org/shared_preferences_linux-0.0.2+4/","dependencies":["path_provider_linux"]}],"windows":[{"name":"path_provider_windows","path":"/home/programmer/.pub-cache/hosted/pub.dartlang.org/path_provider_windows-0.0.5/","dependencies":[]},{"name":"shared_preferences_windows","path":"/home/programmer/.pub-cache/hosted/pub.dartlang.org/shared_preferences_windows-0.0.2+3/","dependencies":["path_provider_windows"]}],"web":[{"name":"shared_preferences_web","path":"/home/programmer/.pub-cache/hosted/pub.dartlang.org/shared_preferences_web-0.1.2+7/","dependencies":[]}]},"dependencyGraph":[{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_linux","shared_preferences_macos","shared_preferences_web","shared_preferences_windows"]},{"name":"shared_preferences_linux","dependencies":["path_provider_linux"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]},{"name":"shared_preferences_windows","dependencies":["path_provider_windows"]}],"date_created":"2021-08-11 14:15:52.331195","version":"2.5.0-6.0.pre.37"} \ No newline at end of file diff --git a/.gitignore b/.gitignore index ac4a906..c6dfac3 100644 --- a/.gitignore +++ b/.gitignore @@ -70,3 +70,7 @@ !**/ios/**/default.pbxuser !**/ios/**/default.perspectivev3 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages + +.flutter-plugins-dependencies + +ios/Flutter/flutter_export_environment.sh diff --git a/ios/Flutter/flutter_export_environment.sh b/ios/Flutter/flutter_export_environment.sh deleted file mode 100755 index 047511c..0000000 --- a/ios/Flutter/flutter_export_environment.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -# This is a generated file; do not edit or check into version control. -export "FLUTTER_ROOT=C:\Flutter\flutter" -export "FLUTTER_APPLICATION_PATH=D:\Projects\Playground_and_Learning\flutter-tdd-clean-architecture-course" -export "FLUTTER_TARGET=lib\main.dart" -export "FLUTTER_BUILD_DIR=build" -export "SYMROOT=${SOURCE_ROOT}/../build\ios" -export "FLUTTER_FRAMEWORK_DIR=C:\Flutter\flutter\bin\cache\artifacts\engine\ios" -export "FLUTTER_BUILD_NAME=1.0.0" -export "FLUTTER_BUILD_NUMBER=1" From 3b9e93315811417426e2f4b4288abef98501673c Mon Sep 17 00:00:00 2001 From: Valter Barbosa Date: Wed, 11 Aug 2021 14:47:37 -0300 Subject: [PATCH 11/21] Upgrading pre 1.12 Android project --- .gitignore | 54 +++------- .metadata | 4 +- .vscode/extensions.json | 5 + analysis_options.yaml | 29 +++++ android/.gitignore | 13 +++ android/app/build.gradle | 23 ++-- android/app/src/debug/AndroidManifest.xml | 2 +- android/app/src/main/AndroidManifest.xml | 31 +++--- .../MainActivity.kt | 6 ++ .../MainActivity.kt | 13 --- .../res/drawable-v21/launch_background.xml | 12 +++ .../app/src/main/res/values-night/styles.xml | 18 ++++ android/app/src/main/res/values/styles.xml | 12 ++- android/app/src/profile/AndroidManifest.xml | 2 +- android/build.gradle | 10 +- android/gradle.properties | 4 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- android/settings.gradle | 18 ++-- ios/.gitignore | 33 ++++++ ios/Flutter/AppFrameworkInfo.plist | 4 +- ios/Runner.xcodeproj/project.pbxproj | 82 +++----------- .../contents.xcworkspacedata | 2 +- .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++ .../xcshareddata/WorkspaceSettings.xcsettings | 8 ++ .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++ .../xcshareddata/WorkspaceSettings.xcsettings | 8 ++ ios/Runner/AppDelegate.swift | 2 +- .../Icon-App-1024x1024@1x.png | Bin 11112 -> 10932 bytes ios/Runner/Runner-Bridging-Header.h | 2 +- web/favicon.png | Bin 0 -> 917 bytes web/icons/Icon-192.png | Bin 0 -> 5292 bytes web/icons/Icon-512.png | Bin 0 -> 8252 bytes web/icons/Icon-maskable-192.png | Bin 0 -> 5594 bytes web/icons/Icon-maskable-512.png | Bin 0 -> 20998 bytes web/index.html | 101 ++++++++++++++++++ web/manifest.json | 35 ++++++ 36 files changed, 373 insertions(+), 178 deletions(-) create mode 100644 .vscode/extensions.json create mode 100644 analysis_options.yaml create mode 100644 android/.gitignore create mode 100644 android/app/src/main/kotlin/com/example/clean_architecture_tdd_course/MainActivity.kt delete mode 100644 android/app/src/main/kotlin/com/resocoder/clean_architecture_tdd_course/MainActivity.kt create mode 100644 android/app/src/main/res/drawable-v21/launch_background.xml create mode 100644 android/app/src/main/res/values-night/styles.xml create mode 100644 ios/.gitignore create mode 100644 ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings create mode 100644 ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings create mode 100644 web/favicon.png create mode 100644 web/icons/Icon-192.png create mode 100644 web/icons/Icon-512.png create mode 100644 web/icons/Icon-maskable-192.png create mode 100644 web/icons/Icon-maskable-512.png create mode 100644 web/index.html create mode 100644 web/manifest.json diff --git a/.gitignore b/.gitignore index c6dfac3..0fa6b67 100644 --- a/.gitignore +++ b/.gitignore @@ -22,55 +22,25 @@ # Flutter/Dart/Pub related **/doc/api/ +**/ios/Flutter/.last_build_id .dart_tool/ .flutter-plugins +.flutter-plugins-dependencies .packages .pub-cache/ .pub/ /build/ -# Android related -**/android/**/gradle-wrapper.jar -**/android/.gradle -**/android/captures/ -**/android/gradlew -**/android/gradlew.bat -**/android/local.properties -**/android/**/GeneratedPluginRegistrant.java - -# iOS/XCode related -**/ios/**/*.mode1v3 -**/ios/**/*.mode2v3 -**/ios/**/*.moved-aside -**/ios/**/*.pbxuser -**/ios/**/*.perspectivev3 -**/ios/**/*sync/ -**/ios/**/.sconsign.dblite -**/ios/**/.tags* -**/ios/**/.vagrant/ -**/ios/**/DerivedData/ -**/ios/**/Icon? -**/ios/**/Pods/ -**/ios/**/.symlinks/ -**/ios/**/profile -**/ios/**/xcuserdata -**/ios/.generated/ -**/ios/Flutter/App.framework -**/ios/Flutter/Flutter.framework -**/ios/Flutter/Generated.xcconfig -**/ios/Flutter/app.flx -**/ios/Flutter/app.zip -**/ios/Flutter/flutter_assets/ -**/ios/ServiceDefinitions.json -**/ios/Runner/GeneratedPluginRegistrant.* +# Web related +lib/generated_plugin_registrant.dart -# Exceptions to above rules. -!**/ios/**/default.mode1v3 -!**/ios/**/default.mode2v3 -!**/ios/**/default.pbxuser -!**/ios/**/default.perspectivev3 -!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages +# Symbolication related +app.*.symbols -.flutter-plugins-dependencies +# Obfuscation related +app.*.map.json -ios/Flutter/flutter_export_environment.sh +# Android Studio will place build artifacts here +/android/app/debug +/android/app/profile +/android/app/release diff --git a/.metadata b/.metadata index e023651..f2ba8ee 100644 --- a/.metadata +++ b/.metadata @@ -4,7 +4,7 @@ # This file should be version controlled and should not be manually edited. version: - revision: 20e59316b8b8474554b38493b8ca888794b0234a - channel: stable + revision: 4c7af3b12335178daff9db3c9062a603876a53db + channel: master project_type: app diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 0000000..2d0e144 --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,5 @@ +{ + "recommendations": [ + "dart-code.flutter" + ] +} \ No newline at end of file diff --git a/analysis_options.yaml b/analysis_options.yaml new file mode 100644 index 0000000..61b6c4d --- /dev/null +++ b/analysis_options.yaml @@ -0,0 +1,29 @@ +# This file configures the analyzer, which statically analyzes Dart code to +# check for errors, warnings, and lints. +# +# The issues identified by the analyzer are surfaced in the UI of Dart-enabled +# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be +# invoked from the command line by running `flutter analyze`. + +# The following line activates a set of recommended lints for Flutter apps, +# packages, and plugins designed to encourage good coding practices. +include: package:flutter_lints/flutter.yaml + +linter: + # The lint rules applied to this project can be customized in the + # section below to disable rules from the `package:flutter_lints/flutter.yaml` + # included above or to enable additional rules. A list of all available lints + # and their documentation is published at + # https://dart-lang.github.io/linter/lints/index.html. + # + # Instead of disabling a lint rule for the entire project in the + # section below, it can also be suppressed for a single line of code + # or a specific dart file by using the `// ignore: name_of_lint` and + # `// ignore_for_file: name_of_lint` syntax on the line or in the file + # producing the lint. + rules: + # avoid_print: false # Uncomment to disable the `avoid_print` rule + # prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule + +# Additional information about this file can be found at +# https://dart.dev/guides/language/analysis-options diff --git a/android/.gitignore b/android/.gitignore new file mode 100644 index 0000000..6f56801 --- /dev/null +++ b/android/.gitignore @@ -0,0 +1,13 @@ +gradle-wrapper.jar +/.gradle +/captures/ +/gradlew +/gradlew.bat +/local.properties +GeneratedPluginRegistrant.java + +# Remember to never publicly share your keystore. +# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app +key.properties +**/*.keystore +**/*.jks diff --git a/android/app/build.gradle b/android/app/build.gradle index aa4832c..162a1f0 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -26,24 +26,28 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 28 + compileSdkVersion 30 - sourceSets { - main.java.srcDirs += 'src/main/kotlin' + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + kotlinOptions { + jvmTarget = '1.8' } - lintOptions { - disable 'InvalidPackage' + sourceSets { + main.java.srcDirs += 'src/main/kotlin' } defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "com.resocoder.clean_architecture_tdd_course" + applicationId "com.example.clean_architecture_tdd_course" minSdkVersion 16 - targetSdkVersion 28 + targetSdkVersion 30 versionCode flutterVersionCode.toInteger() versionName flutterVersionName - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { @@ -61,7 +65,4 @@ flutter { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - testImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' } diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml index b0c7163..278848b 100644 --- a/android/app/src/debug/AndroidManifest.xml +++ b/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.example.clean_architecture_tdd_course"> diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 9a07a92..e499976 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,33 +1,32 @@ - - - + - + + android:name="io.flutter.embedding.android.NormalTheme" + android:resource="@style/NormalTheme" + /> + + diff --git a/android/app/src/main/kotlin/com/example/clean_architecture_tdd_course/MainActivity.kt b/android/app/src/main/kotlin/com/example/clean_architecture_tdd_course/MainActivity.kt new file mode 100644 index 0000000..6a61e87 --- /dev/null +++ b/android/app/src/main/kotlin/com/example/clean_architecture_tdd_course/MainActivity.kt @@ -0,0 +1,6 @@ +package com.example.clean_architecture_tdd_course + +import io.flutter.embedding.android.FlutterActivity + +class MainActivity: FlutterActivity() { +} diff --git a/android/app/src/main/kotlin/com/resocoder/clean_architecture_tdd_course/MainActivity.kt b/android/app/src/main/kotlin/com/resocoder/clean_architecture_tdd_course/MainActivity.kt deleted file mode 100644 index 27bc908..0000000 --- a/android/app/src/main/kotlin/com/resocoder/clean_architecture_tdd_course/MainActivity.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.resocoder.clean_architecture_tdd_course - -import android.os.Bundle - -import io.flutter.app.FlutterActivity -import io.flutter.plugins.GeneratedPluginRegistrant - -class MainActivity: FlutterActivity() { - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - GeneratedPluginRegistrant.registerWith(this) - } -} diff --git a/android/app/src/main/res/drawable-v21/launch_background.xml b/android/app/src/main/res/drawable-v21/launch_background.xml new file mode 100644 index 0000000..f74085f --- /dev/null +++ b/android/app/src/main/res/drawable-v21/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/android/app/src/main/res/values-night/styles.xml b/android/app/src/main/res/values-night/styles.xml new file mode 100644 index 0000000..449a9f9 --- /dev/null +++ b/android/app/src/main/res/values-night/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml index 00fa441..d74aa35 100644 --- a/android/app/src/main/res/values/styles.xml +++ b/android/app/src/main/res/values/styles.xml @@ -1,8 +1,18 @@ - + + diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml index b0c7163..278848b 100644 --- a/android/app/src/profile/AndroidManifest.xml +++ b/android/app/src/profile/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.example.clean_architecture_tdd_course"> diff --git a/android/build.gradle b/android/build.gradle index b7faad8..ed45c65 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.2.71' + ext.kotlin_version = '1.3.50' repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:4.1.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -14,15 +14,13 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } rootProject.buildDir = '../build' subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" -} -subprojects { project.evaluationDependsOn(':app') } diff --git a/android/gradle.properties b/android/gradle.properties index 1441b1d..94adc3a 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,3 +1,3 @@ org.gradle.jvmargs=-Xmx1536M - -android.enableR8=true +android.useAndroidX=true +android.enableJetifier=true diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 2819f02..bc6a58a 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip diff --git a/android/settings.gradle b/android/settings.gradle index 5a2f14f..44e62bc 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1,15 +1,11 @@ include ':app' -def flutterProjectRoot = rootProject.projectDir.parentFile.toPath() +def localPropertiesFile = new File(rootProject.projectDir, "local.properties") +def properties = new Properties() -def plugins = new Properties() -def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins') -if (pluginsFile.exists()) { - pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) } -} +assert localPropertiesFile.exists() +localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } -plugins.each { name, path -> - def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile() - include ":$name" - project(":$name").projectDir = pluginDirectory -} +def flutterSdkPath = properties.getProperty("flutter.sdk") +assert flutterSdkPath != null, "flutter.sdk not set in local.properties" +apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" diff --git a/ios/.gitignore b/ios/.gitignore new file mode 100644 index 0000000..151026b --- /dev/null +++ b/ios/.gitignore @@ -0,0 +1,33 @@ +*.mode1v3 +*.mode2v3 +*.moved-aside +*.pbxuser +*.perspectivev3 +**/*sync/ +.sconsign.dblite +.tags* +**/.vagrant/ +**/DerivedData/ +Icon? +**/Pods/ +**/.symlinks/ +profile +xcuserdata +**/.generated/ +Flutter/App.framework +Flutter/Flutter.framework +Flutter/Flutter.podspec +Flutter/Generated.xcconfig +Flutter/ephemeral/ +Flutter/app.flx +Flutter/app.zip +Flutter/flutter_assets/ +Flutter/flutter_export_environment.sh +ServiceDefinitions.json +Runner/GeneratedPluginRegistrant.* + +# Exceptions to above rules. +!default.mode1v3 +!default.mode2v3 +!default.pbxuser +!default.perspectivev3 diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist index 6b4c0f7..8d4492f 100644 --- a/ios/Flutter/AppFrameworkInfo.plist +++ b/ios/Flutter/AppFrameworkInfo.plist @@ -3,7 +3,7 @@ CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) + en CFBundleExecutable App CFBundleIdentifier @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 8.0 + 9.0 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 504199c..080e4c2 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -9,12 +9,7 @@ /* Begin PBXBuildFile section */ 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; - 3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; }; - 3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; - 9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; }; - 9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB21CF90195004384FC /* Debug.xcconfig */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; @@ -27,8 +22,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */, - 9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -39,13 +32,11 @@ 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; - 9740EEBA1CF902C7004384FC /* Flutter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Flutter.framework; path = Flutter/Flutter.framework; sourceTree = ""; }; 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; 97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; @@ -58,8 +49,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */, - 3B80C3941E831B6300D905FE /* App.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -69,9 +58,7 @@ 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( - 3B80C3931E831B6300D905FE /* App.framework */, 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */, - 9740EEBA1CF902C7004384FC /* Flutter.framework */, 9740EEB21CF90195004384FC /* Debug.xcconfig */, 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, 9740EEB31CF90195004384FC /* Generated.xcconfig */, @@ -103,7 +90,6 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */, 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, 97C147021CF9000F007C117D /* Info.plist */, - 97C146F11CF9000F007C117D /* Supporting Files */, 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */, 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */, 74858FAE1ED2DC5600515810 /* AppDelegate.swift */, @@ -112,13 +98,6 @@ path = Runner; sourceTree = ""; }; - 97C146F11CF9000F007C117D /* Supporting Files */ = { - isa = PBXGroup; - children = ( - ); - name = "Supporting Files"; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -149,16 +128,16 @@ isa = PBXProject; attributes = { LastUpgradeCheck = 1020; - ORGANIZATIONNAME = "The Chromium Authors"; + ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { CreatedOnToolsVersion = 7.3.1; - LastSwiftMigration = 0910; + LastSwiftMigration = 1100; }; }; }; buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */; - compatibilityVersion = "Xcode 3.2"; + compatibilityVersion = "Xcode 9.3"; developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( @@ -182,7 +161,6 @@ files = ( 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */, 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, - 9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */, 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, ); @@ -203,7 +181,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin"; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; @@ -255,7 +233,6 @@ /* Begin XCBuildConfiguration section */ 249021D3217E4FDB00AE95B9 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -295,9 +272,10 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; }; @@ -308,30 +286,21 @@ baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - DEVELOPMENT_TEAM = S8QB4VV633; ENABLE_BITCODE = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); - PRODUCT_BUNDLE_IDENTIFIER = com.resocoder.cleanArchitectureTddCourse; + PRODUCT_BUNDLE_IDENTIFIER = com.example.cleanArchitectureTddCourse; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; }; name = Profile; }; 97C147031CF9000F007C117D /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -377,7 +346,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -387,7 +356,6 @@ }; 97C147041CF9000F007C117D /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -427,9 +395,10 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; @@ -444,22 +413,13 @@ CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; ENABLE_BITCODE = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); - PRODUCT_BUNDLE_IDENTIFIER = com.resocoder.cleanArchitectureTddCourse; + PRODUCT_BUNDLE_IDENTIFIER = com.example.cleanArchitectureTddCourse; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_SWIFT3_OBJC_INFERENCE = On; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; }; name = Debug; @@ -472,21 +432,12 @@ CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; ENABLE_BITCODE = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); - PRODUCT_BUNDLE_IDENTIFIER = com.resocoder.cleanArchitectureTddCourse; + PRODUCT_BUNDLE_IDENTIFIER = com.example.cleanArchitectureTddCourse; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; - SWIFT_SWIFT3_OBJC_INFERENCE = On; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; }; name = Release; @@ -515,7 +466,6 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ - }; rootObject = 97C146E61CF9000F007C117D /* Project object */; } diff --git a/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 1d526a1..919434a 100644 --- a/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:"> diff --git a/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..f9b0d7c --- /dev/null +++ b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..f9b0d7c --- /dev/null +++ b/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift index 71cc41e..70693e4 100644 --- a/ios/Runner/AppDelegate.swift +++ b/ios/Runner/AppDelegate.swift @@ -5,7 +5,7 @@ import Flutter @objc class AppDelegate: FlutterAppDelegate { override func application( _ application: UIApplication, - didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]? + didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? ) -> Bool { GeneratedPluginRegistrant.register(with: self) return super.application(application, didFinishLaunchingWithOptions: launchOptions) diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png index 3d43d11e66f4de3da27ed045ca4fe38ad8b48094..dc9ada4725e9b0ddb1deab583e5b5102493aa332 100644 GIT binary patch literal 10932 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 P-1+_A+?hGkL;m(J7kc&K diff --git a/ios/Runner/Runner-Bridging-Header.h b/ios/Runner/Runner-Bridging-Header.h index 7335fdf..308a2a5 100644 --- a/ios/Runner/Runner-Bridging-Header.h +++ b/ios/Runner/Runner-Bridging-Header.h @@ -1 +1 @@ -#import "GeneratedPluginRegistrant.h" \ No newline at end of file +#import "GeneratedPluginRegistrant.h" diff --git a/web/favicon.png b/web/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..8aaa46ac1ae21512746f852a42ba87e4165dfdd1 GIT binary patch literal 917 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|I14-?iy0X7 zltGxWVyS%@P(fs7NJL45ua8x7ey(0(N`6wRUPW#JP&EUCO@$SZnVVXYs8ErclUHn2 zVXFjIVFhG^g!Ppaz)DK8ZIvQ?0~DO|i&7O#^-S~(l1AfjnEK zjFOT9D}DX)@^Za$W4-*MbbUihOG|wNBYh(yU7!lx;>x^|#0uTKVr7USFmqf|i<65o z3raHc^AtelCMM;Vme?vOfh>Xph&xL%(-1c06+^uR^q@XSM&D4+Kp$>4P^%3{)XKjo zGZknv$b36P8?Z_gF{nK@`XI}Z90TzwSQO}0J1!f2c(B=V`5aP@1P1a|PZ!4!3&Gl8 zTYqUsf!gYFyJnXpu0!n&N*SYAX-%d(5gVjrHJWqXQshj@!Zm{!01WsQrH~9=kTxW#6SvuapgMqt>$=j#%eyGrQzr zP{L-3gsMA^$I1&gsBAEL+vxi1*Igl=8#8`5?A-T5=z-sk46WA1IUT)AIZHx1rdUrf zVJrJn<74DDw`j)Ki#gt}mIT-Q`XRa2-jQXQoI%w`nb|XblvzK${ZzlV)m-XcwC(od z71_OEC5Bt9GEXosOXaPTYOia#R4ID2TiU~`zVMl08TV_C%DnU4^+HE>9(CE4D6?Fz oujB08i7adh9xk7*FX66dWH6F5TM;?E2b5PlUHx3vIVCg!0Dx9vYXATM literal 0 HcmV?d00001 diff --git a/web/icons/Icon-192.png b/web/icons/Icon-192.png new file mode 100644 index 0000000000000000000000000000000000000000..b749bfef07473333cf1dd31e9eed89862a5d52aa GIT binary patch literal 5292 zcmZ`-2T+sGz6~)*FVZ`aW+(v>MIm&M-g^@e2u-B-DoB?qO+b1Tq<5uCCv>ESfRum& zp%X;f!~1{tzL__3=gjVJ=j=J>+nMj%ncXj1Q(b|Ckbw{Y0FWpt%4y%$uD=Z*c-x~o zE;IoE;xa#7Ll5nj-e4CuXB&G*IM~D21rCP$*xLXAK8rIMCSHuSu%bL&S3)8YI~vyp@KBu9Ph7R_pvKQ@xv>NQ`dZp(u{Z8K3yOB zn7-AR+d2JkW)KiGx0hosml;+eCXp6+w%@STjFY*CJ?udJ64&{BCbuebcuH;}(($@@ znNlgBA@ZXB)mcl9nbX#F!f_5Z=W>0kh|UVWnf!At4V*LQP%*gPdCXd6P@J4Td;!Ur z<2ZLmwr(NG`u#gDEMP19UcSzRTL@HsK+PnIXbVBT@oHm53DZr?~V(0{rsalAfwgo zEh=GviaqkF;}F_5-yA!1u3!gxaR&Mj)hLuj5Q-N-@Lra{%<4ONja8pycD90&>yMB` zchhd>0CsH`^|&TstH-8+R`CfoWqmTTF_0?zDOY`E`b)cVi!$4xA@oO;SyOjJyP^_j zx^@Gdf+w|FW@DMdOi8=4+LJl$#@R&&=UM`)G!y%6ZzQLoSL%*KE8IO0~&5XYR9 z&N)?goEiWA(YoRfT{06&D6Yuu@Qt&XVbuW@COb;>SP9~aRc+z`m`80pB2o%`#{xD@ zI3RAlukL5L>px6b?QW1Ac_0>ew%NM!XB2(H+1Y3AJC?C?O`GGs`331Nd4ZvG~bMo{lh~GeL zSL|tT*fF-HXxXYtfu5z+T5Mx9OdP7J4g%@oeC2FaWO1D{=NvL|DNZ}GO?O3`+H*SI z=grGv=7dL{+oY0eJFGO!Qe(e2F?CHW(i!!XkGo2tUvsQ)I9ev`H&=;`N%Z{L zO?vV%rDv$y(@1Yj@xfr7Kzr<~0{^T8wM80xf7IGQF_S-2c0)0D6b0~yD7BsCy+(zL z#N~%&e4iAwi4F$&dI7x6cE|B{f@lY5epaDh=2-(4N05VO~A zQT3hanGy_&p+7Fb^I#ewGsjyCEUmSCaP6JDB*=_()FgQ(-pZ28-{qx~2foO4%pM9e z*_63RT8XjgiaWY|*xydf;8MKLd{HnfZ2kM%iq}fstImB-K6A79B~YoPVa@tYN@T_$ zea+9)<%?=Fl!kd(Y!G(-o}ko28hg2!MR-o5BEa_72uj7Mrc&{lRh3u2%Y=Xk9^-qa zBPWaD=2qcuJ&@Tf6ue&)4_V*45=zWk@Z}Q?f5)*z)-+E|-yC4fs5CE6L_PH3=zI8p z*Z3!it{1e5_^(sF*v=0{`U9C741&lub89gdhKp|Y8CeC{_{wYK-LSbp{h)b~9^j!s z7e?Y{Z3pZv0J)(VL=g>l;<}xk=T*O5YR|hg0eg4u98f2IrA-MY+StQIuK-(*J6TRR z|IM(%uI~?`wsfyO6Tgmsy1b3a)j6M&-jgUjVg+mP*oTKdHg?5E`!r`7AE_#?Fc)&a z08KCq>Gc=ne{PCbRvs6gVW|tKdcE1#7C4e`M|j$C5EYZ~Y=jUtc zj`+?p4ba3uy7><7wIokM79jPza``{Lx0)zGWg;FW1^NKY+GpEi=rHJ+fVRGfXO zPHV52k?jxei_!YYAw1HIz}y8ZMwdZqU%ESwMn7~t zdI5%B;U7RF=jzRz^NuY9nM)&<%M>x>0(e$GpU9th%rHiZsIT>_qp%V~ILlyt^V`=d z!1+DX@ah?RnB$X!0xpTA0}lN@9V-ePx>wQ?-xrJr^qDlw?#O(RsXeAvM%}rg0NT#t z!CsT;-vB=B87ShG`GwO;OEbeL;a}LIu=&@9cb~Rsx(ZPNQ!NT7H{@j0e(DiLea>QD zPmpe90gEKHEZ8oQ@6%E7k-Ptn#z)b9NbD@_GTxEhbS+}Bb74WUaRy{w;E|MgDAvHw zL)ycgM7mB?XVh^OzbC?LKFMotw3r@i&VdUV%^Efdib)3@soX%vWCbnOyt@Y4swW925@bt45y0HY3YI~BnnzZYrinFy;L?2D3BAL`UQ zEj))+f>H7~g8*VuWQ83EtGcx`hun$QvuurSMg3l4IP8Fe`#C|N6mbYJ=n;+}EQm;< z!!N=5j1aAr_uEnnzrEV%_E|JpTb#1p1*}5!Ce!R@d$EtMR~%9# zd;h8=QGT)KMW2IKu_fA_>p_und#-;Q)p%%l0XZOXQicfX8M~7?8}@U^ihu;mizj)t zgV7wk%n-UOb z#!P5q?Ex+*Kx@*p`o$q8FWL*E^$&1*!gpv?Za$YO~{BHeGY*5%4HXUKa_A~~^d z=E*gf6&+LFF^`j4$T~dR)%{I)T?>@Ma?D!gi9I^HqvjPc3-v~=qpX1Mne@*rzT&Xw zQ9DXsSV@PqpEJO-g4A&L{F&;K6W60D!_vs?Vx!?w27XbEuJJP&);)^+VF1nHqHBWu z^>kI$M9yfOY8~|hZ9WB!q-9u&mKhEcRjlf2nm_@s;0D#c|@ED7NZE% zzR;>P5B{o4fzlfsn3CkBK&`OSb-YNrqx@N#4CK!>bQ(V(D#9|l!e9(%sz~PYk@8zt zPN9oK78&-IL_F zhsk1$6p;GqFbtB^ZHHP+cjMvA0(LqlskbdYE_rda>gvQLTiqOQ1~*7lg%z*&p`Ry& zRcG^DbbPj_jOKHTr8uk^15Boj6>hA2S-QY(W-6!FIq8h$<>MI>PYYRenQDBamO#Fv zAH5&ImqKBDn0v5kb|8i0wFhUBJTpT!rB-`zK)^SNnRmLraZcPYK7b{I@+}wXVdW-{Ps17qdRA3JatEd?rPV z4@}(DAMf5EqXCr4-B+~H1P#;t@O}B)tIJ(W6$LrK&0plTmnPpb1TKn3?f?Kk``?D+ zQ!MFqOX7JbsXfQrz`-M@hq7xlfNz;_B{^wbpG8des56x(Q)H)5eLeDwCrVR}hzr~= zM{yXR6IM?kXxauLza#@#u?Y|o;904HCqF<8yT~~c-xyRc0-vxofnxG^(x%>bj5r}N zyFT+xnn-?B`ohA>{+ZZQem=*Xpqz{=j8i2TAC#x-m;;mo{{sLB_z(UoAqD=A#*juZ zCv=J~i*O8;F}A^Wf#+zx;~3B{57xtoxC&j^ie^?**T`WT2OPRtC`xj~+3Kprn=rVM zVJ|h5ux%S{dO}!mq93}P+h36mZ5aZg1-?vhL$ke1d52qIiXSE(llCr5i=QUS?LIjc zV$4q=-)aaR4wsrQv}^shL5u%6;`uiSEs<1nG^?$kl$^6DL z43CjY`M*p}ew}}3rXc7Xck@k41jx}c;NgEIhKZ*jsBRZUP-x2cm;F1<5$jefl|ppO zmZd%%?gMJ^g9=RZ^#8Mf5aWNVhjAS^|DQO+q$)oeob_&ZLFL(zur$)); zU19yRm)z<4&4-M}7!9+^Wl}Uk?`S$#V2%pQ*SIH5KI-mn%i;Z7-)m$mN9CnI$G7?# zo`zVrUwoSL&_dJ92YhX5TKqaRkfPgC4=Q&=K+;_aDs&OU0&{WFH}kKX6uNQC6%oUH z2DZa1s3%Vtk|bglbxep-w)PbFG!J17`<$g8lVhqD2w;Z0zGsh-r zxZ13G$G<48leNqR!DCVt9)@}(zMI5w6Wo=N zpP1*3DI;~h2WDWgcKn*f!+ORD)f$DZFwgKBafEZmeXQMAsq9sxP9A)7zOYnkHT9JU zRA`umgmP9d6=PHmFIgx=0$(sjb>+0CHG)K@cPG{IxaJ&Ueo8)0RWgV9+gO7+Bl1(F z7!BslJ2MP*PWJ;x)QXbR$6jEr5q3 z(3}F@YO_P1NyTdEXRLU6fp?9V2-S=E+YaeLL{Y)W%6`k7$(EW8EZSA*(+;e5@jgD^I zaJQ2|oCM1n!A&-8`;#RDcZyk*+RPkn_r8?Ak@agHiSp*qFNX)&i21HE?yuZ;-C<3C zwJGd1lx5UzViP7sZJ&|LqH*mryb}y|%AOw+v)yc`qM)03qyyrqhX?ub`Cjwx2PrR! z)_z>5*!*$x1=Qa-0uE7jy0z`>|Ni#X+uV|%_81F7)b+nf%iz=`fF4g5UfHS_?PHbr zB;0$bK@=di?f`dS(j{l3-tSCfp~zUuva+=EWxJcRfp(<$@vd(GigM&~vaYZ0c#BTs z3ijkxMl=vw5AS&DcXQ%eeKt!uKvh2l3W?&3=dBHU=Gz?O!40S&&~ei2vg**c$o;i89~6DVns zG>9a*`k5)NI9|?W!@9>rzJ;9EJ=YlJTx1r1BA?H`LWijk(rTax9(OAu;q4_wTj-yj z1%W4GW&K4T=uEGb+E!>W0SD_C0RR91 literal 0 HcmV?d00001 diff --git a/web/icons/Icon-512.png b/web/icons/Icon-512.png new file mode 100644 index 0000000000000000000000000000000000000000..88cfd48dff1169879ba46840804b412fe02fefd6 GIT binary patch literal 8252 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 literal 0 HcmV?d00001 diff --git a/web/icons/Icon-maskable-192.png b/web/icons/Icon-maskable-192.png new file mode 100644 index 0000000000000000000000000000000000000000..eb9b4d76e525556d5d89141648c724331630325d GIT binary patch literal 5594 zcmdT|`#%%j|KDb2V@0DPm$^(Lx5}lO%Yv(=e*7hl@QqKS50#~#^IQPxBmuh|i9sXnt4ch@VT0F7% zMtrs@KWIOo+QV@lSs66A>2pz6-`9Jk=0vv&u?)^F@HZ)-6HT=B7LF;rdj zskUyBfbojcX#CS>WrIWo9D=DIwcXM8=I5D{SGf$~=gh-$LwY?*)cD%38%sCc?5OsX z-XfkyL-1`VavZ?>(pI-xp-kYq=1hsnyP^TLb%0vKRSo^~r{x?ISLY1i7KjSp z*0h&jG(Rkkq2+G_6eS>n&6>&Xk+ngOMcYrk<8KrukQHzfx675^^s$~<@d$9X{VBbg z2Fd4Z%g`!-P}d#`?B4#S-9x*eNlOVRnDrn#jY@~$jfQ-~3Od;A;x-BI1BEDdvr`pI z#D)d)!2_`GiZOUu1crb!hqH=ezs0qk<_xDm_Kkw?r*?0C3|Io6>$!kyDl;eH=aqg$B zsH_|ZD?jP2dc=)|L>DZmGyYKa06~5?C2Lc0#D%62p(YS;%_DRCB1k(+eLGXVMe+=4 zkKiJ%!N6^mxqM=wq`0+yoE#VHF%R<{mMamR9o_1JH8jfnJ?NPLs$9U!9!dq8 z0B{dI2!M|sYGH&9TAY34OlpIsQ4i5bnbG>?cWwat1I13|r|_inLE?FS@Hxdxn_YZN z3jfUO*X9Q@?HZ>Q{W0z60!bbGh557XIKu1?)u|cf%go`pwo}CD=0tau-}t@R2OrSH zQzZr%JfYa`>2!g??76=GJ$%ECbQh7Q2wLRp9QoyiRHP7VE^>JHm>9EqR3<$Y=Z1K^SHuwxCy-5@z3 zVM{XNNm}yM*pRdLKp??+_2&!bp#`=(Lh1vR{~j%n;cJv~9lXeMv)@}Odta)RnK|6* zC+IVSWumLo%{6bLDpn)Gz>6r&;Qs0^+Sz_yx_KNz9Dlt^ax`4>;EWrIT#(lJ_40<= z750fHZ7hI{}%%5`;lwkI4<_FJw@!U^vW;igL0k+mK)-j zYuCK#mCDK3F|SC}tC2>m$ZCqNB7ac-0UFBJ|8RxmG@4a4qdjvMzzS&h9pQmu^x&*= zGvapd1#K%Da&)8f?<9WN`2H^qpd@{7In6DNM&916TRqtF4;3`R|Nhwbw=(4|^Io@T zIjoR?tB8d*sO>PX4vaIHF|W;WVl6L1JvSmStgnRQq zTX4(>1f^5QOAH{=18Q2Vc1JI{V=yOr7yZJf4Vpfo zeHXdhBe{PyY;)yF;=ycMW@Kb>t;yE>;f79~AlJ8k`xWucCxJfsXf2P72bAavWL1G#W z;o%kdH(mYCM{$~yw4({KatNGim49O2HY6O07$B`*K7}MvgI=4x=SKdKVb8C$eJseA$tmSFOztFd*3W`J`yIB_~}k%Sd_bPBK8LxH)?8#jM{^%J_0|L z!gFI|68)G}ex5`Xh{5pB%GtlJ{Z5em*e0sH+sU1UVl7<5%Bq+YrHWL7?X?3LBi1R@_)F-_OqI1Zv`L zb6^Lq#H^2@d_(Z4E6xA9Z4o3kvf78ZDz!5W1#Mp|E;rvJz&4qj2pXVxKB8Vg0}ek%4erou@QM&2t7Cn5GwYqy%{>jI z)4;3SAgqVi#b{kqX#$Mt6L8NhZYgonb7>+r#BHje)bvaZ2c0nAvrN3gez+dNXaV;A zmyR0z@9h4@6~rJik-=2M-T+d`t&@YWhsoP_XP-NsVO}wmo!nR~QVWU?nVlQjNfgcTzE-PkfIX5G z1?&MwaeuzhF=u)X%Vpg_e@>d2yZwxl6-r3OMqDn8_6m^4z3zG##cK0Fsgq8fcvmhu z{73jseR%X%$85H^jRAcrhd&k!i^xL9FrS7qw2$&gwAS8AfAk#g_E_tP;x66fS`Mn@SNVrcn_N;EQm z`Mt3Z%rw%hDqTH-s~6SrIL$hIPKL5^7ejkLTBr46;pHTQDdoErS(B>``t;+1+M zvU&Se9@T_BeK;A^p|n^krIR+6rH~BjvRIugf`&EuX9u69`9C?9ANVL8l(rY6#mu^i z=*5Q)-%o*tWl`#b8p*ZH0I}hn#gV%|jt6V_JanDGuekR*-wF`u;amTCpGG|1;4A5$ zYbHF{?G1vv5;8Ph5%kEW)t|am2_4ik!`7q{ymfHoe^Z99c|$;FAL+NbxE-_zheYbV z3hb0`uZGTsgA5TG(X|GVDSJyJxsyR7V5PS_WSnYgwc_D60m7u*x4b2D79r5UgtL18 zcCHWk+K6N1Pg2c;0#r-)XpwGX?|Iv)^CLWqwF=a}fXUSM?n6E;cCeW5ER^om#{)Jr zJR81pkK?VoFm@N-s%hd7@hBS0xuCD0-UDVLDDkl7Ck=BAj*^ps`393}AJ+Ruq@fl9 z%R(&?5Nc3lnEKGaYMLmRzKXow1+Gh|O-LG7XiNxkG^uyv zpAtLINwMK}IWK65hOw&O>~EJ}x@lDBtB`yKeV1%GtY4PzT%@~wa1VgZn7QRwc7C)_ zpEF~upeDRg_<#w=dLQ)E?AzXUQpbKXYxkp>;c@aOr6A|dHA?KaZkL0svwB^U#zmx0 zzW4^&G!w7YeRxt<9;d@8H=u(j{6+Uj5AuTluvZZD4b+#+6Rp?(yJ`BC9EW9!b&KdPvzJYe5l7 zMJ9aC@S;sA0{F0XyVY{}FzW0Vh)0mPf_BX82E+CD&)wf2!x@{RO~XBYu80TONl3e+ zA7W$ra6LcDW_j4s-`3tI^VhG*sa5lLc+V6ONf=hO@q4|p`CinYqk1Ko*MbZ6_M05k zSwSwkvu;`|I*_Vl=zPd|dVD0lh&Ha)CSJJvV{AEdF{^Kn_Yfsd!{Pc1GNgw}(^~%)jk5~0L~ms|Rez1fiK~s5t(p1ci5Gq$JC#^JrXf?8 z-Y-Zi_Hvi>oBzV8DSRG!7dm|%IlZg3^0{5~;>)8-+Nk&EhAd(}s^7%MuU}lphNW9Q zT)DPo(ob{tB7_?u;4-qGDo!sh&7gHaJfkh43QwL|bbFVi@+oy;i;M zM&CP^v~lx1U`pi9PmSr&Mc<%HAq0DGH?Ft95)WY`P?~7O z`O^Nr{Py9M#Ls4Y7OM?e%Y*Mvrme%=DwQaye^Qut_1pOMrg^!5u(f9p(D%MR%1K>% zRGw%=dYvw@)o}Fw@tOtPjz`45mfpn;OT&V(;z75J*<$52{sB65$gDjwX3Xa!x_wE- z!#RpwHM#WrO*|~f7z}(}o7US(+0FYLM}6de>gQdtPazXz?OcNv4R^oYLJ_BQOd_l172oSK$6!1r@g+B@0ofJ4*{>_AIxfe-#xp>(1 z@Y3Nfd>fmqvjL;?+DmZk*KsfXJf<%~(gcLwEez%>1c6XSboURUh&k=B)MS>6kw9bY z{7vdev7;A}5fy*ZE23DS{J?8at~xwVk`pEwP5^k?XMQ7u64;KmFJ#POzdG#np~F&H ze-BUh@g54)dsS%nkBb}+GuUEKU~pHcYIg4vSo$J(J|U36bs0Use+3A&IMcR%6@jv$ z=+QI+@wW@?iu}Hpyzlvj-EYeop{f65GX0O%>w#0t|V z1-svWk`hU~m`|O$kw5?Yn5UhI%9P-<45A(v0ld1n+%Ziq&TVpBcV9n}L9Tus-TI)f zd_(g+nYCDR@+wYNQm1GwxhUN4tGMLCzDzPqY$~`l<47{+l<{FZ$L6(>J)|}!bi<)| zE35dl{a2)&leQ@LlDxLQOfUDS`;+ZQ4ozrleQwaR-K|@9T{#hB5Z^t#8 zC-d_G;B4;F#8A2EBL58s$zF-=SCr`P#z zNCTnHF&|X@q>SkAoYu>&s9v@zCpv9lLSH-UZzfhJh`EZA{X#%nqw@@aW^vPcfQrlPs(qQxmC|4tp^&sHy!H!2FH5eC{M@g;ElWNzlb-+ zxpfc0m4<}L){4|RZ>KReag2j%Ot_UKkgpJN!7Y_y3;Ssz{9 z!K3isRtaFtQII5^6}cm9RZd5nTp9psk&u1C(BY`(_tolBwzV_@0F*m%3G%Y?2utyS zY`xM0iDRT)yTyYukFeGQ&W@ReM+ADG1xu@ruq&^GK35`+2r}b^V!m1(VgH|QhIPDE X>c!)3PgKfL&lX^$Z>Cpu&6)6jvi^Z! literal 0 HcmV?d00001 diff --git a/web/icons/Icon-maskable-512.png b/web/icons/Icon-maskable-512.png new file mode 100644 index 0000000000000000000000000000000000000000..d69c56691fbdb0b7efa65097c7cc1edac12a6d3e GIT binary patch literal 20998 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 MPgg&ebxsLQ025IeI{*Lx literal 0 HcmV?d00001 diff --git a/web/index.html b/web/index.html new file mode 100644 index 0000000..ce9855b --- /dev/null +++ b/web/index.html @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + clean_architecture_tdd_course + + + + + + + diff --git a/web/manifest.json b/web/manifest.json new file mode 100644 index 0000000..7098217 --- /dev/null +++ b/web/manifest.json @@ -0,0 +1,35 @@ +{ + "name": "clean_architecture_tdd_course", + "short_name": "clean_architecture_tdd_course", + "start_url": ".", + "display": "standalone", + "background_color": "#0175C2", + "theme_color": "#0175C2", + "description": "A new Flutter project.", + "orientation": "portrait-primary", + "prefer_related_applications": false, + "icons": [ + { + "src": "icons/Icon-192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "icons/Icon-512.png", + "sizes": "512x512", + "type": "image/png" + }, + { + "src": "icons/Icon-maskable-192.png", + "sizes": "192x192", + "type": "image/png", + "purpose": "maskable" + }, + { + "src": "icons/Icon-maskable-512.png", + "sizes": "512x512", + "type": "image/png", + "purpose": "maskable" + } + ] +} From 1556efb49635e2c2a6028ceeb6bf5ac20cc76d52 Mon Sep 17 00:00:00 2001 From: Valter Barbosa Date: Wed, 11 Aug 2021 15:17:10 -0300 Subject: [PATCH 12/21] Mock http.Client --- .gitignore | 3 + .../presentation/bloc/number_trivia_bloc.dart | 8 +- pubspec.lock | 74 ++++++------ pubspec.yaml | 16 +-- ...r_trivia_local_data_source_test.mocks.dart | 47 ++++---- ...number_trivia_remote_data_source_test.dart | 11 +- ..._trivia_remote_data_source_test.mocks.dart | 108 ++++++++++++++++++ ...ber_trivia_repository_impl_test.mocks.dart | 37 +++--- ...get_concrete_number_trivia_test.mocks.dart | 19 +-- .../get_random_number_trivia_test.mocks.dart | 19 +-- .../bloc/number_trivia_bloc_test.mocks.dart | 31 +++-- 11 files changed, 252 insertions(+), 121 deletions(-) create mode 100644 test/features/number_trivia/data/datasources/number_trivia_remote_data_source_test.mocks.dart diff --git a/.gitignore b/.gitignore index 0fa6b67..466c1e5 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,6 @@ app.*.map.json /android/app/debug /android/app/profile /android/app/release + +# Build Runner +.dart_tool/build \ No newline at end of file diff --git a/lib/features/number_trivia/presentation/bloc/number_trivia_bloc.dart b/lib/features/number_trivia/presentation/bloc/number_trivia_bloc.dart index 388318d..e2d986f 100644 --- a/lib/features/number_trivia/presentation/bloc/number_trivia_bloc.dart +++ b/lib/features/number_trivia/presentation/bloc/number_trivia_bloc.dart @@ -26,11 +26,9 @@ class NumberTriviaBloc extends Bloc { required GetConcreteNumberTrivia concrete, required GetRandomNumberTrivia random, required this.inputConverter, - }) : assert(concrete != null), - assert(random != null), - assert(inputConverter != null), - getConcreteNumberTrivia = concrete, - getRandomNumberTrivia = random; + }) : getConcreteNumberTrivia = concrete, + getRandomNumberTrivia = random, + super(Empty()); @override NumberTriviaState get initialState => Empty(); diff --git a/pubspec.lock b/pubspec.lock index 423e139..cfbf3ab 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -35,7 +35,7 @@ packages: name: bloc url: "https://pub.dartlang.org" source: hosted - version: "3.0.0" + version: "7.0.0" boolean_selector: dependency: transitive description: @@ -49,21 +49,21 @@ packages: name: build url: "https://pub.dartlang.org" source: hosted - version: "2.0.3" + version: "2.1.0" build_config: dependency: transitive description: name: build_config url: "https://pub.dartlang.org" source: hosted - version: "0.4.7" + version: "1.0.0" build_daemon: dependency: transitive description: name: build_daemon url: "https://pub.dartlang.org" source: hosted - version: "2.1.10" + version: "3.0.0" build_resolvers: dependency: transitive description: @@ -77,14 +77,14 @@ packages: name: build_runner url: "https://pub.dartlang.org" source: hosted - version: "1.12.2" + version: "2.1.1" build_runner_core: dependency: transitive description: name: build_runner_core url: "https://pub.dartlang.org" source: hosted - version: "6.1.12" + version: "7.1.0" built_collection: dependency: transitive description: @@ -140,7 +140,7 @@ packages: name: code_builder url: "https://pub.dartlang.org" source: hosted - version: "3.7.0" + version: "4.1.0" collection: dependency: transitive description: @@ -175,7 +175,7 @@ packages: name: dartz url: "https://pub.dartlang.org" source: hosted - version: "0.8.9" + version: "0.10.0-nullsafety.2" data_connection_checker: dependency: "direct main" description: @@ -189,7 +189,7 @@ packages: name: equatable url: "https://pub.dartlang.org" source: hosted - version: "1.2.6" + version: "2.0.3" fake_async: dependency: transitive description: @@ -229,7 +229,7 @@ packages: name: flutter_bloc url: "https://pub.dartlang.org" source: hosted - version: "3.2.0" + version: "7.1.0" flutter_test: dependency: "direct dev" description: flutter @@ -240,13 +240,20 @@ packages: description: flutter source: sdk version: "0.0.0" + frontend_server_client: + dependency: transitive + description: + name: frontend_server_client + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.0" get_it: dependency: "direct main" description: name: get_it url: "https://pub.dartlang.org" source: hosted - version: "3.1.0" + version: "7.2.0" glob: dependency: transitive description: @@ -260,14 +267,14 @@ packages: name: graphs url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "2.0.0" http: dependency: "direct main" description: name: http url: "https://pub.dartlang.org" source: hosted - version: "0.12.2" + version: "0.13.3" http_multi_server: dependency: transitive description: @@ -281,7 +288,7 @@ packages: name: http_parser url: "https://pub.dartlang.org" source: hosted - version: "3.1.4" + version: "4.0.0" io: dependency: transitive description: @@ -337,7 +344,7 @@ packages: name: mockito url: "https://pub.dartlang.org" source: hosted - version: "5.0.7" + version: "5.0.14" nested: dependency: transitive description: @@ -365,21 +372,21 @@ packages: name: path_provider_linux url: "https://pub.dartlang.org" source: hosted - version: "0.0.1+2" + version: "2.0.2" path_provider_platform_interface: dependency: transitive description: name: path_provider_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "1.0.4" + version: "2.0.1" path_provider_windows: dependency: transitive description: name: path_provider_windows url: "https://pub.dartlang.org" source: hosted - version: "0.0.5" + version: "2.0.3" pedantic: dependency: transitive description: @@ -400,7 +407,7 @@ packages: name: plugin_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "1.0.3" + version: "2.0.1" pool: dependency: transitive description: @@ -421,7 +428,7 @@ packages: name: provider url: "https://pub.dartlang.org" source: hosted - version: "4.3.3" + version: "5.0.0" pub_semver: dependency: transitive description: @@ -436,69 +443,62 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.0" - rxdart: - dependency: transitive - description: - name: rxdart - url: "https://pub.dartlang.org" - source: hosted - version: "0.23.1" shared_preferences: dependency: "direct main" description: name: shared_preferences url: "https://pub.dartlang.org" source: hosted - version: "0.5.12+4" + version: "2.0.6" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux url: "https://pub.dartlang.org" source: hosted - version: "0.0.2+4" + version: "2.0.2" shared_preferences_macos: dependency: transitive description: name: shared_preferences_macos url: "https://pub.dartlang.org" source: hosted - version: "0.0.1+11" + version: "2.0.2" shared_preferences_platform_interface: dependency: transitive description: name: shared_preferences_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "1.0.4" + version: "2.0.0" shared_preferences_web: dependency: transitive description: name: shared_preferences_web url: "https://pub.dartlang.org" source: hosted - version: "0.1.2+7" + version: "2.0.1" shared_preferences_windows: dependency: transitive description: name: shared_preferences_windows url: "https://pub.dartlang.org" source: hosted - version: "0.0.2+3" + version: "2.0.2" shelf: dependency: transitive description: name: shelf url: "https://pub.dartlang.org" source: hosted - version: "0.7.9" + version: "1.2.0" shelf_web_socket: dependency: transitive description: name: shelf_web_socket url: "https://pub.dartlang.org" source: hosted - version: "0.2.4+1" + version: "1.0.1" sky_engine: dependency: transitive description: flutter @@ -608,7 +608,7 @@ packages: name: xdg_directories url: "https://pub.dartlang.org" source: hosted - version: "0.1.2" + version: "0.2.0" yaml: dependency: transitive description: @@ -618,4 +618,4 @@ packages: version: "3.1.0" sdks: dart: ">=2.13.0 <3.0.0" - flutter: ">=1.20.0" + flutter: ">=2.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index ca1c1c5..2fc8278 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -10,24 +10,24 @@ dependencies: flutter: sdk: flutter # Service locator - get_it: ^3.1.0 + get_it: ^7.2.0 # Bloc for state management - flutter_bloc: ^3.0.0 + flutter_bloc: ^7.1.0 # Value equality - equatable: ^1.0.1 + equatable: ^2.0.3 # Functional programming thingies - dartz: ^0.8.9 + dartz: ^0.10.0-nullsafety.2 # Remote API data_connection_checker: ^0.3.4 - http: ^0.12.0+3 + http: ^0.13.3 # Local cache - shared_preferences: ^0.5.6 + shared_preferences: ^2.0.6 dev_dependencies: flutter_test: sdk: flutter - mockito: ^5.0.7 - build_runner: ^1.12.2 + mockito: ^5.0.14 + build_runner: ^2.1.1 flutter: uses-material-design: true diff --git a/test/features/number_trivia/data/datasources/number_trivia_local_data_source_test.mocks.dart b/test/features/number_trivia/data/datasources/number_trivia_local_data_source_test.mocks.dart index daffd2a..594d295 100644 --- a/test/features/number_trivia/data/datasources/number_trivia_local_data_source_test.mocks.dart +++ b/test/features/number_trivia/data/datasources/number_trivia_local_data_source_test.mocks.dart @@ -1,4 +1,4 @@ -// Mocks generated by Mockito 5.0.7 from annotations +// Mocks generated by Mockito 5.0.14 from annotations // in clean_architecture_tdd_course/test/features/number_trivia/data/datasources/number_trivia_local_data_source_test.dart. // Do not manually edit this file. @@ -7,12 +7,13 @@ import 'dart:async' as _i3; import 'package:mockito/mockito.dart' as _i1; import 'package:shared_preferences/shared_preferences.dart' as _i2; +// ignore_for_file: avoid_redundant_argument_values +// ignore_for_file: avoid_setters_without_getters // ignore_for_file: comment_references -// ignore_for_file: unnecessary_parenthesis - +// ignore_for_file: implementation_imports +// ignore_for_file: invalid_use_of_visible_for_testing_member // ignore_for_file: prefer_const_constructors - -// ignore_for_file: avoid_redundant_argument_values +// ignore_for_file: unnecessary_parenthesis /// A class which mocks [SharedPreferences]. /// @@ -26,32 +27,28 @@ class MockSharedPreferences extends _i1.Mock implements _i2.SharedPreferences { Set getKeys() => (super.noSuchMethod(Invocation.method(#getKeys, []), returnValue: {}) as Set); @override - dynamic get(String? key) => - super.noSuchMethod(Invocation.method(#get, [key])); + Object? get(String? key) => + (super.noSuchMethod(Invocation.method(#get, [key])) as Object?); @override - bool getBool(String? key) => (super - .noSuchMethod(Invocation.method(#getBool, [key]), returnValue: false) - as bool); + bool? getBool(String? key) => + (super.noSuchMethod(Invocation.method(#getBool, [key])) as bool?); @override - int getInt(String? key) => - (super.noSuchMethod(Invocation.method(#getInt, [key]), returnValue: 0) - as int); + int? getInt(String? key) => + (super.noSuchMethod(Invocation.method(#getInt, [key])) as int?); @override - double getDouble(String? key) => (super - .noSuchMethod(Invocation.method(#getDouble, [key]), returnValue: 0.0) - as double); + double? getDouble(String? key) => + (super.noSuchMethod(Invocation.method(#getDouble, [key])) as double?); @override - String getString(String? key) => - (super.noSuchMethod(Invocation.method(#getString, [key]), returnValue: '') - as String); + String? getString(String? key) => + (super.noSuchMethod(Invocation.method(#getString, [key])) as String?); @override bool containsKey(String? key) => (super.noSuchMethod(Invocation.method(#containsKey, [key]), returnValue: false) as bool); @override - List getStringList(String? key) => - (super.noSuchMethod(Invocation.method(#getStringList, [key]), - returnValue: []) as List); + List? getStringList(String? key) => + (super.noSuchMethod(Invocation.method(#getStringList, [key])) + as List?); @override _i3.Future setBool(String? key, bool? value) => (super.noSuchMethod(Invocation.method(#setBool, [key, value]), @@ -86,6 +83,8 @@ class MockSharedPreferences extends _i1.Mock implements _i2.SharedPreferences { @override _i3.Future reload() => (super.noSuchMethod(Invocation.method(#reload, []), - returnValue: Future.value(null), - returnValueForMissingStub: Future.value()) as _i3.Future); + returnValue: Future.value(), + returnValueForMissingStub: Future.value()) as _i3.Future); + @override + String toString() => super.toString(); } diff --git a/test/features/number_trivia/data/datasources/number_trivia_remote_data_source_test.dart b/test/features/number_trivia/data/datasources/number_trivia_remote_data_source_test.dart index 1408e04..d4e0727 100644 --- a/test/features/number_trivia/data/datasources/number_trivia_remote_data_source_test.dart +++ b/test/features/number_trivia/data/datasources/number_trivia_remote_data_source_test.dart @@ -3,21 +3,24 @@ import 'dart:convert'; import 'package:clean_architecture_tdd_course/core/error/exceptions.dart'; import 'package:clean_architecture_tdd_course/features/number_trivia/data/datasources/number_trivia_remote_data_source.dart'; import 'package:clean_architecture_tdd_course/features/number_trivia/data/models/number_trivia_model.dart'; +import 'package:mockito/annotations.dart'; import 'package:mockito/mockito.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:matcher/matcher.dart'; import 'package:http/http.dart' as http; import '../../../../fixtures/fixture_reader.dart'; +import 'number_trivia_remote_data_source_test.mocks.dart'; -class MockHttpClient extends Mock implements http.Client {} +// class MockHttpClient extends Mock implements http.Client {} +@GenerateMocks([http.Client]) void main() { late NumberTriviaRemoteDataSourceImpl dataSource; - late MockHttpClient mockHttpClient; + late MockClient mockHttpClient; setUp(() { - mockHttpClient = MockHttpClient(); + mockHttpClient = MockClient(); dataSource = NumberTriviaRemoteDataSourceImpl(client: mockHttpClient); }); @@ -46,7 +49,7 @@ void main() { dataSource.getConcreteNumberTrivia(tNumber); // assert verify(mockHttpClient.get( - 'http://numbersapi.com/$tNumber', + Uri.parse('http://numbersapi.com/$tNumber'), headers: { 'Content-Type': 'application/json', }, diff --git a/test/features/number_trivia/data/datasources/number_trivia_remote_data_source_test.mocks.dart b/test/features/number_trivia/data/datasources/number_trivia_remote_data_source_test.mocks.dart new file mode 100644 index 0000000..3ad3e27 --- /dev/null +++ b/test/features/number_trivia/data/datasources/number_trivia_remote_data_source_test.mocks.dart @@ -0,0 +1,108 @@ +// Mocks generated by Mockito 5.0.14 from annotations +// in clean_architecture_tdd_course/test/features/number_trivia/data/datasources/number_trivia_remote_data_source_test.dart. +// Do not manually edit this file. + +import 'dart:async' as _i5; +import 'dart:convert' as _i6; +import 'dart:typed_data' as _i7; + +import 'package:http/src/base_request.dart' as _i8; +import 'package:http/src/client.dart' as _i4; +import 'package:http/src/response.dart' as _i2; +import 'package:http/src/streamed_response.dart' as _i3; +import 'package:mockito/mockito.dart' as _i1; + +// ignore_for_file: avoid_redundant_argument_values +// ignore_for_file: avoid_setters_without_getters +// ignore_for_file: comment_references +// ignore_for_file: implementation_imports +// ignore_for_file: invalid_use_of_visible_for_testing_member +// ignore_for_file: prefer_const_constructors +// ignore_for_file: unnecessary_parenthesis + +class _FakeResponse_0 extends _i1.Fake implements _i2.Response {} + +class _FakeStreamedResponse_1 extends _i1.Fake implements _i3.StreamedResponse { +} + +/// A class which mocks [Client]. +/// +/// See the documentation for Mockito's code generation for more information. +class MockClient extends _i1.Mock implements _i4.Client { + MockClient() { + _i1.throwOnMissingStub(this); + } + + @override + _i5.Future<_i2.Response> head(Uri? url, {Map? headers}) => + (super.noSuchMethod(Invocation.method(#head, [url], {#headers: headers}), + returnValue: Future<_i2.Response>.value(_FakeResponse_0())) + as _i5.Future<_i2.Response>); + @override + _i5.Future<_i2.Response> get(Uri? url, {Map? headers}) => + (super.noSuchMethod(Invocation.method(#get, [url], {#headers: headers}), + returnValue: Future<_i2.Response>.value(_FakeResponse_0())) + as _i5.Future<_i2.Response>); + @override + _i5.Future<_i2.Response> post(Uri? url, + {Map? headers, + Object? body, + _i6.Encoding? encoding}) => + (super.noSuchMethod( + Invocation.method(#post, [url], + {#headers: headers, #body: body, #encoding: encoding}), + returnValue: Future<_i2.Response>.value(_FakeResponse_0())) + as _i5.Future<_i2.Response>); + @override + _i5.Future<_i2.Response> put(Uri? url, + {Map? headers, + Object? body, + _i6.Encoding? encoding}) => + (super.noSuchMethod( + Invocation.method(#put, [url], + {#headers: headers, #body: body, #encoding: encoding}), + returnValue: Future<_i2.Response>.value(_FakeResponse_0())) + as _i5.Future<_i2.Response>); + @override + _i5.Future<_i2.Response> patch(Uri? url, + {Map? headers, + Object? body, + _i6.Encoding? encoding}) => + (super.noSuchMethod( + Invocation.method(#patch, [url], + {#headers: headers, #body: body, #encoding: encoding}), + returnValue: Future<_i2.Response>.value(_FakeResponse_0())) + as _i5.Future<_i2.Response>); + @override + _i5.Future<_i2.Response> delete(Uri? url, + {Map? headers, + Object? body, + _i6.Encoding? encoding}) => + (super.noSuchMethod( + Invocation.method(#delete, [url], + {#headers: headers, #body: body, #encoding: encoding}), + returnValue: Future<_i2.Response>.value(_FakeResponse_0())) + as _i5.Future<_i2.Response>); + @override + _i5.Future read(Uri? url, {Map? headers}) => + (super.noSuchMethod(Invocation.method(#read, [url], {#headers: headers}), + returnValue: Future.value('')) as _i5.Future); + @override + _i5.Future<_i7.Uint8List> readBytes(Uri? url, + {Map? headers}) => + (super.noSuchMethod( + Invocation.method(#readBytes, [url], {#headers: headers}), + returnValue: Future<_i7.Uint8List>.value(_i7.Uint8List(0))) + as _i5.Future<_i7.Uint8List>); + @override + _i5.Future<_i3.StreamedResponse> send(_i8.BaseRequest? request) => + (super.noSuchMethod(Invocation.method(#send, [request]), + returnValue: + Future<_i3.StreamedResponse>.value(_FakeStreamedResponse_1())) + as _i5.Future<_i3.StreamedResponse>); + @override + void close() => super.noSuchMethod(Invocation.method(#close, []), + returnValueForMissingStub: null); + @override + String toString() => super.toString(); +} diff --git a/test/features/number_trivia/data/repositories/number_trivia_repository_impl_test.mocks.dart b/test/features/number_trivia/data/repositories/number_trivia_repository_impl_test.mocks.dart index d9d6548..128bd4a 100644 --- a/test/features/number_trivia/data/repositories/number_trivia_repository_impl_test.mocks.dart +++ b/test/features/number_trivia/data/repositories/number_trivia_repository_impl_test.mocks.dart @@ -1,4 +1,4 @@ -// Mocks generated by Mockito 5.0.7 from annotations +// Mocks generated by Mockito 5.0.14 from annotations // in clean_architecture_tdd_course/test/features/number_trivia/data/repositories/number_trivia_repository_impl_test.dart. // Do not manually edit this file. @@ -14,15 +14,16 @@ import 'package:clean_architecture_tdd_course/features/number_trivia/data/models as _i2; import 'package:mockito/mockito.dart' as _i1; +// ignore_for_file: avoid_redundant_argument_values +// ignore_for_file: avoid_setters_without_getters // ignore_for_file: comment_references -// ignore_for_file: unnecessary_parenthesis - +// ignore_for_file: implementation_imports +// ignore_for_file: invalid_use_of_visible_for_testing_member // ignore_for_file: prefer_const_constructors +// ignore_for_file: unnecessary_parenthesis -// ignore_for_file: avoid_redundant_argument_values - -class _FakeNumberTriviaModel extends _i1.Fake implements _i2.NumberTriviaModel { -} +class _FakeNumberTriviaModel_0 extends _i1.Fake + implements _i2.NumberTriviaModel {} /// A class which mocks [NumberTriviaRemoteDataSource]. /// @@ -36,15 +37,17 @@ class MockNumberTriviaRemoteDataSource extends _i1.Mock @override _i4.Future<_i2.NumberTriviaModel> getConcreteNumberTrivia(int? number) => (super.noSuchMethod(Invocation.method(#getConcreteNumberTrivia, [number]), - returnValue: - Future<_i2.NumberTriviaModel>.value(_FakeNumberTriviaModel())) + returnValue: Future<_i2.NumberTriviaModel>.value( + _FakeNumberTriviaModel_0())) as _i4.Future<_i2.NumberTriviaModel>); @override _i4.Future<_i2.NumberTriviaModel> getRandomNumberTrivia() => (super.noSuchMethod(Invocation.method(#getRandomNumberTrivia, []), - returnValue: - Future<_i2.NumberTriviaModel>.value(_FakeNumberTriviaModel())) + returnValue: Future<_i2.NumberTriviaModel>.value( + _FakeNumberTriviaModel_0())) as _i4.Future<_i2.NumberTriviaModel>); + @override + String toString() => super.toString(); } /// A class which mocks [NumberTriviaLocalDataSource]. @@ -59,15 +62,17 @@ class MockNumberTriviaLocalDataSource extends _i1.Mock @override _i4.Future<_i2.NumberTriviaModel> getLastNumberTrivia() => (super.noSuchMethod(Invocation.method(#getLastNumberTrivia, []), - returnValue: - Future<_i2.NumberTriviaModel>.value(_FakeNumberTriviaModel())) + returnValue: Future<_i2.NumberTriviaModel>.value( + _FakeNumberTriviaModel_0())) as _i4.Future<_i2.NumberTriviaModel>); @override _i4.Future cacheNumberTrivia(_i2.NumberTriviaModel? triviaToCache) => (super.noSuchMethod( Invocation.method(#cacheNumberTrivia, [triviaToCache]), - returnValue: Future.value(null), - returnValueForMissingStub: Future.value()) as _i4.Future); + returnValue: Future.value(), + returnValueForMissingStub: Future.value()) as _i4.Future); + @override + String toString() => super.toString(); } /// A class which mocks [NetworkInfo]. @@ -82,4 +87,6 @@ class MockNetworkInfo extends _i1.Mock implements _i6.NetworkInfo { _i4.Future get isConnected => (super.noSuchMethod(Invocation.getter(#isConnected), returnValue: Future.value(false)) as _i4.Future); + @override + String toString() => super.toString(); } diff --git a/test/features/number_trivia/domain/usecases/get_concrete_number_trivia_test.mocks.dart b/test/features/number_trivia/domain/usecases/get_concrete_number_trivia_test.mocks.dart index 1cffd2f..f53ea3b 100644 --- a/test/features/number_trivia/domain/usecases/get_concrete_number_trivia_test.mocks.dart +++ b/test/features/number_trivia/domain/usecases/get_concrete_number_trivia_test.mocks.dart @@ -1,4 +1,4 @@ -// Mocks generated by Mockito 5.0.7 from annotations +// Mocks generated by Mockito 5.0.14 from annotations // in clean_architecture_tdd_course/test/features/number_trivia/domain/usecases/get_concrete_number_trivia_test.dart. // Do not manually edit this file. @@ -12,14 +12,15 @@ import 'package:clean_architecture_tdd_course/features/number_trivia/domain/repo import 'package:dartz/dartz.dart' as _i2; import 'package:mockito/mockito.dart' as _i1; +// ignore_for_file: avoid_redundant_argument_values +// ignore_for_file: avoid_setters_without_getters // ignore_for_file: comment_references -// ignore_for_file: unnecessary_parenthesis - +// ignore_for_file: implementation_imports +// ignore_for_file: invalid_use_of_visible_for_testing_member // ignore_for_file: prefer_const_constructors +// ignore_for_file: unnecessary_parenthesis -// ignore_for_file: avoid_redundant_argument_values - -class _FakeEither extends _i1.Fake implements _i2.Either {} +class _FakeEither_0 extends _i1.Fake implements _i2.Either {} /// A class which mocks [NumberTriviaRepository]. /// @@ -35,7 +36,7 @@ class MockNumberTriviaRepository extends _i1.Mock int? number) => (super.noSuchMethod(Invocation.method(#getConcreteNumberTrivia, [number]), returnValue: Future<_i2.Either<_i5.Failure, _i6.NumberTrivia>>.value( - _FakeEither<_i5.Failure, _i6.NumberTrivia>())) as _i4 + _FakeEither_0<_i5.Failure, _i6.NumberTrivia>())) as _i4 .Future<_i2.Either<_i5.Failure, _i6.NumberTrivia>>); @override _i4.Future<_i2.Either<_i5.Failure, _i6.NumberTrivia>> @@ -43,6 +44,8 @@ class MockNumberTriviaRepository extends _i1.Mock (super.noSuchMethod(Invocation.method(#getRandomNumberTrivia, []), returnValue: Future<_i2.Either<_i5.Failure, _i6.NumberTrivia>>.value( - _FakeEither<_i5.Failure, _i6.NumberTrivia>())) + _FakeEither_0<_i5.Failure, _i6.NumberTrivia>())) as _i4.Future<_i2.Either<_i5.Failure, _i6.NumberTrivia>>); + @override + String toString() => super.toString(); } diff --git a/test/features/number_trivia/domain/usecases/get_random_number_trivia_test.mocks.dart b/test/features/number_trivia/domain/usecases/get_random_number_trivia_test.mocks.dart index b8f2690..2c073da 100644 --- a/test/features/number_trivia/domain/usecases/get_random_number_trivia_test.mocks.dart +++ b/test/features/number_trivia/domain/usecases/get_random_number_trivia_test.mocks.dart @@ -1,4 +1,4 @@ -// Mocks generated by Mockito 5.0.7 from annotations +// Mocks generated by Mockito 5.0.14 from annotations // in clean_architecture_tdd_course/test/features/number_trivia/domain/usecases/get_random_number_trivia_test.dart. // Do not manually edit this file. @@ -12,14 +12,15 @@ import 'package:clean_architecture_tdd_course/features/number_trivia/domain/repo import 'package:dartz/dartz.dart' as _i2; import 'package:mockito/mockito.dart' as _i1; +// ignore_for_file: avoid_redundant_argument_values +// ignore_for_file: avoid_setters_without_getters // ignore_for_file: comment_references -// ignore_for_file: unnecessary_parenthesis - +// ignore_for_file: implementation_imports +// ignore_for_file: invalid_use_of_visible_for_testing_member // ignore_for_file: prefer_const_constructors +// ignore_for_file: unnecessary_parenthesis -// ignore_for_file: avoid_redundant_argument_values - -class _FakeEither extends _i1.Fake implements _i2.Either {} +class _FakeEither_0 extends _i1.Fake implements _i2.Either {} /// A class which mocks [NumberTriviaRepository]. /// @@ -35,7 +36,7 @@ class MockNumberTriviaRepository extends _i1.Mock int? number) => (super.noSuchMethod(Invocation.method(#getConcreteNumberTrivia, [number]), returnValue: Future<_i2.Either<_i5.Failure, _i6.NumberTrivia>>.value( - _FakeEither<_i5.Failure, _i6.NumberTrivia>())) as _i4 + _FakeEither_0<_i5.Failure, _i6.NumberTrivia>())) as _i4 .Future<_i2.Either<_i5.Failure, _i6.NumberTrivia>>); @override _i4.Future<_i2.Either<_i5.Failure, _i6.NumberTrivia>> @@ -43,6 +44,8 @@ class MockNumberTriviaRepository extends _i1.Mock (super.noSuchMethod(Invocation.method(#getRandomNumberTrivia, []), returnValue: Future<_i2.Either<_i5.Failure, _i6.NumberTrivia>>.value( - _FakeEither<_i5.Failure, _i6.NumberTrivia>())) + _FakeEither_0<_i5.Failure, _i6.NumberTrivia>())) as _i4.Future<_i2.Either<_i5.Failure, _i6.NumberTrivia>>); + @override + String toString() => super.toString(); } diff --git a/test/features/number_trivia/presentation/bloc/number_trivia_bloc_test.mocks.dart b/test/features/number_trivia/presentation/bloc/number_trivia_bloc_test.mocks.dart index 7102ce8..bc50140 100644 --- a/test/features/number_trivia/presentation/bloc/number_trivia_bloc_test.mocks.dart +++ b/test/features/number_trivia/presentation/bloc/number_trivia_bloc_test.mocks.dart @@ -1,4 +1,4 @@ -// Mocks generated by Mockito 5.0.7 from annotations +// Mocks generated by Mockito 5.0.14 from annotations // in clean_architecture_tdd_course/test/features/number_trivia/presentation/bloc/number_trivia_bloc_test.dart. // Do not manually edit this file. @@ -20,17 +20,18 @@ import 'package:clean_architecture_tdd_course/features/number_trivia/domain/usec import 'package:dartz/dartz.dart' as _i3; import 'package:mockito/mockito.dart' as _i1; +// ignore_for_file: avoid_redundant_argument_values +// ignore_for_file: avoid_setters_without_getters // ignore_for_file: comment_references -// ignore_for_file: unnecessary_parenthesis - +// ignore_for_file: implementation_imports +// ignore_for_file: invalid_use_of_visible_for_testing_member // ignore_for_file: prefer_const_constructors +// ignore_for_file: unnecessary_parenthesis -// ignore_for_file: avoid_redundant_argument_values - -class _FakeNumberTriviaRepository extends _i1.Fake +class _FakeNumberTriviaRepository_0 extends _i1.Fake implements _i2.NumberTriviaRepository {} -class _FakeEither extends _i1.Fake implements _i3.Either {} +class _FakeEither_1 extends _i1.Fake implements _i3.Either {} /// A class which mocks [GetConcreteNumberTrivia]. /// @@ -44,15 +45,17 @@ class MockGetConcreteNumberTrivia extends _i1.Mock @override _i2.NumberTriviaRepository get repository => (super.noSuchMethod(Invocation.getter(#repository), - returnValue: _FakeNumberTriviaRepository()) + returnValue: _FakeNumberTriviaRepository_0()) as _i2.NumberTriviaRepository); @override _i5.Future<_i3.Either<_i6.Failure, _i7.NumberTrivia>> call( _i4.Params? params) => (super.noSuchMethod(Invocation.method(#call, [params]), returnValue: Future<_i3.Either<_i6.Failure, _i7.NumberTrivia>>.value( - _FakeEither<_i6.Failure, _i7.NumberTrivia>())) as _i5 + _FakeEither_1<_i6.Failure, _i7.NumberTrivia>())) as _i5 .Future<_i3.Either<_i6.Failure, _i7.NumberTrivia>>); + @override + String toString() => super.toString(); } /// A class which mocks [GetRandomNumberTrivia]. @@ -67,15 +70,17 @@ class MockGetRandomNumberTrivia extends _i1.Mock @override _i2.NumberTriviaRepository get repository => (super.noSuchMethod(Invocation.getter(#repository), - returnValue: _FakeNumberTriviaRepository()) + returnValue: _FakeNumberTriviaRepository_0()) as _i2.NumberTriviaRepository); @override _i5.Future<_i3.Either<_i6.Failure, _i7.NumberTrivia>> call( _i9.NoParams? params) => (super.noSuchMethod(Invocation.method(#call, [params]), returnValue: Future<_i3.Either<_i6.Failure, _i7.NumberTrivia>>.value( - _FakeEither<_i6.Failure, _i7.NumberTrivia>())) as _i5 + _FakeEither_1<_i6.Failure, _i7.NumberTrivia>())) as _i5 .Future<_i3.Either<_i6.Failure, _i7.NumberTrivia>>); + @override + String toString() => super.toString(); } /// A class which mocks [InputConverter]. @@ -89,6 +94,8 @@ class MockInputConverter extends _i1.Mock implements _i10.InputConverter { @override _i3.Either<_i6.Failure, int> stringToUnsignedInteger(String? str) => (super.noSuchMethod(Invocation.method(#stringToUnsignedInteger, [str]), - returnValue: _FakeEither<_i6.Failure, int>()) + returnValue: _FakeEither_1<_i6.Failure, int>()) as _i3.Either<_i6.Failure, int>); + @override + String toString() => super.toString(); } From 1c24e6f7eb88749c137829b88634db8b2c5c98ac Mon Sep 17 00:00:00 2001 From: Valter Barbosa Date: Wed, 11 Aug 2021 15:26:33 -0300 Subject: [PATCH 13/21] Replace the unsafe data_connection_checker with connectivity_plus --- lib/core/network/network_info.dart | 8 ++- .../number_trivia_remote_data_source.dart | 2 +- lib/injection_container.dart | 4 +- pubspec.lock | 64 +++++++++++++++++-- pubspec.yaml | 2 +- test/core/network/network_info_test.dart | 12 ++-- ...number_trivia_remote_data_source_test.dart | 2 +- 7 files changed, 78 insertions(+), 16 deletions(-) diff --git a/lib/core/network/network_info.dart b/lib/core/network/network_info.dart index adabbe3..2ec0fed 100644 --- a/lib/core/network/network_info.dart +++ b/lib/core/network/network_info.dart @@ -1,14 +1,16 @@ -import 'package:data_connection_checker/data_connection_checker.dart'; +import 'package:connectivity_plus/connectivity_plus.dart'; abstract class NetworkInfo { Future get isConnected; } class NetworkInfoImpl implements NetworkInfo { - final DataConnectionChecker connectionChecker; + final Connectivity connectionChecker; NetworkInfoImpl(this.connectionChecker); @override - Future get isConnected => connectionChecker.hasConnection; + Future get isConnected => connectionChecker + .checkConnectivity() + .then((value) => value != ConnectivityResult.none); } diff --git a/lib/features/number_trivia/data/datasources/number_trivia_remote_data_source.dart b/lib/features/number_trivia/data/datasources/number_trivia_remote_data_source.dart index e02cf66..2ed8352 100644 --- a/lib/features/number_trivia/data/datasources/number_trivia_remote_data_source.dart +++ b/lib/features/number_trivia/data/datasources/number_trivia_remote_data_source.dart @@ -33,7 +33,7 @@ class NumberTriviaRemoteDataSourceImpl implements NumberTriviaRemoteDataSource { Future _getTriviaFromUrl(String url) async { final response = await client.get( - url, + Uri.parse(url), headers: { 'Content-Type': 'application/json', }, diff --git a/lib/injection_container.dart b/lib/injection_container.dart index 20b6e22..19e124e 100644 --- a/lib/injection_container.dart +++ b/lib/injection_container.dart @@ -1,4 +1,4 @@ -import 'package:data_connection_checker/data_connection_checker.dart'; +import 'package:connectivity_plus/connectivity_plus.dart'; import 'package:get_it/get_it.dart'; import 'package:http/http.dart' as http; import 'package:shared_preferences/shared_preferences.dart'; @@ -56,5 +56,5 @@ Future init() async { final sharedPreferences = await SharedPreferences.getInstance(); sl.registerLazySingleton(() => sharedPreferences); sl.registerLazySingleton(() => http.Client()); - sl.registerLazySingleton(() => DataConnectionChecker()); + sl.registerLazySingleton(() => Connectivity()); } diff --git a/pubspec.lock b/pubspec.lock index cfbf3ab..fc367cd 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -148,6 +148,48 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.15.0" + connectivity_plus: + dependency: "direct main" + description: + name: connectivity_plus + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.6" + connectivity_plus_linux: + dependency: transitive + description: + name: connectivity_plus_linux + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.3" + connectivity_plus_macos: + dependency: transitive + description: + name: connectivity_plus_macos + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.2" + connectivity_plus_platform_interface: + dependency: transitive + description: + name: connectivity_plus_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.2" + connectivity_plus_web: + dependency: transitive + description: + name: connectivity_plus_web + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.2" + connectivity_plus_windows: + dependency: transitive + description: + name: connectivity_plus_windows + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.2" convert: dependency: transitive description: @@ -176,13 +218,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.10.0-nullsafety.2" - data_connection_checker: - dependency: "direct main" + dbus: + dependency: transitive description: - name: data_connection_checker + name: dbus url: "https://pub.dartlang.org" source: hosted - version: "0.3.4" + version: "0.5.4" equatable: dependency: "direct main" description: @@ -394,6 +436,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.11.1" + petitparser: + dependency: transitive + description: + name: petitparser + url: "https://pub.dartlang.org" + source: hosted + version: "4.2.0" platform: dependency: transitive description: @@ -609,6 +658,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.2.0" + xml: + dependency: transitive + description: + name: xml + url: "https://pub.dartlang.org" + source: hosted + version: "5.1.2" yaml: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 2fc8278..a3f097f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -18,7 +18,7 @@ dependencies: # Functional programming thingies dartz: ^0.10.0-nullsafety.2 # Remote API - data_connection_checker: ^0.3.4 + connectivity_plus: ^1.0.6 http: ^0.13.3 # Local cache shared_preferences: ^2.0.6 diff --git a/test/core/network/network_info_test.dart b/test/core/network/network_info_test.dart index c1d7ec2..201455c 100644 --- a/test/core/network/network_info_test.dart +++ b/test/core/network/network_info_test.dart @@ -1,9 +1,9 @@ import 'package:clean_architecture_tdd_course/core/network/network_info.dart'; import 'package:mockito/mockito.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:data_connection_checker/data_connection_checker.dart'; +import 'package:connectivity_plus/connectivity_plus.dart'; -class MockDataConnectionChecker extends Mock implements DataConnectionChecker {} +class MockDataConnectionChecker extends Mock implements Connectivity {} void main() { late NetworkInfoImpl networkInfo; @@ -21,12 +21,16 @@ void main() { // arrange final tHasConnectionFuture = Future.value(true); - when(mockDataConnectionChecker.hasConnection) + when(mockDataConnectionChecker + .checkConnectivity() + .then((value) => value != ConnectivityResult.none)) .thenAnswer((_) => tHasConnectionFuture); // act final result = networkInfo.isConnected; // assert - verify(mockDataConnectionChecker.hasConnection); + verify(mockDataConnectionChecker + .checkConnectivity() + .then((value) => value != ConnectivityResult.none)); expect(result, tHasConnectionFuture); }, ); diff --git a/test/features/number_trivia/data/datasources/number_trivia_remote_data_source_test.dart b/test/features/number_trivia/data/datasources/number_trivia_remote_data_source_test.dart index d4e0727..2d10bcb 100644 --- a/test/features/number_trivia/data/datasources/number_trivia_remote_data_source_test.dart +++ b/test/features/number_trivia/data/datasources/number_trivia_remote_data_source_test.dart @@ -96,7 +96,7 @@ void main() { dataSource.getRandomNumberTrivia(); // assert verify(mockHttpClient.get( - 'http://numbersapi.com/random', + Uri.parse('http://numbersapi.com/random'), headers: { 'Content-Type': 'application/json', }, From 8040bdaf90f62d7c43d89d6a2e59b1a57ea8c510 Mon Sep 17 00:00:00 2001 From: Valter Barbosa Date: Wed, 11 Aug 2021 15:55:04 -0300 Subject: [PATCH 14/21] Network info test --- lib/core/network/network_info.dart | 4 +- test/core/network/network_info_test.dart | 28 +++++++------ .../core/network/network_info_test.mocks.dart | 41 +++++++++++++++++++ 3 files changed, 58 insertions(+), 15 deletions(-) create mode 100644 test/core/network/network_info_test.mocks.dart diff --git a/lib/core/network/network_info.dart b/lib/core/network/network_info.dart index 2ec0fed..f78ce67 100644 --- a/lib/core/network/network_info.dart +++ b/lib/core/network/network_info.dart @@ -10,7 +10,7 @@ class NetworkInfoImpl implements NetworkInfo { NetworkInfoImpl(this.connectionChecker); @override - Future get isConnected => connectionChecker + Future get isConnected => Future.value(connectionChecker .checkConnectivity() - .then((value) => value != ConnectivityResult.none); + .then((value) => value != ConnectivityResult.none)); } diff --git a/test/core/network/network_info_test.dart b/test/core/network/network_info_test.dart index 201455c..6cef4b1 100644 --- a/test/core/network/network_info_test.dart +++ b/test/core/network/network_info_test.dart @@ -1,16 +1,20 @@ import 'package:clean_architecture_tdd_course/core/network/network_info.dart'; +import 'package:mockito/annotations.dart'; import 'package:mockito/mockito.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:connectivity_plus/connectivity_plus.dart'; -class MockDataConnectionChecker extends Mock implements Connectivity {} +import 'network_info_test.mocks.dart'; +// class MockDataConnectionChecker extends Mock implements Connectivity {} + +@GenerateMocks([Connectivity]) void main() { late NetworkInfoImpl networkInfo; - late MockDataConnectionChecker mockDataConnectionChecker; + late MockConnectivity mockDataConnectionChecker; setUp(() { - mockDataConnectionChecker = MockDataConnectionChecker(); + mockDataConnectionChecker = MockConnectivity(); networkInfo = NetworkInfoImpl(mockDataConnectionChecker); }); @@ -19,19 +23,17 @@ void main() { 'should forward the call to DataConnectionChecker.hasConnection', () async { // arrange - final tHasConnectionFuture = Future.value(true); - when(mockDataConnectionChecker - .checkConnectivity() - .then((value) => value != ConnectivityResult.none)) - .thenAnswer((_) => tHasConnectionFuture); + when(mockDataConnectionChecker.checkConnectivity()) + .thenAnswer((_) => Future.value(ConnectivityResult.mobile)); + // act - final result = networkInfo.isConnected; + final result = await networkInfo.isConnected; + // assert - verify(mockDataConnectionChecker - .checkConnectivity() - .then((value) => value != ConnectivityResult.none)); - expect(result, tHasConnectionFuture); + verify(mockDataConnectionChecker.checkConnectivity()); + + expect(result, true); }, ); }); diff --git a/test/core/network/network_info_test.mocks.dart b/test/core/network/network_info_test.mocks.dart new file mode 100644 index 0000000..a8851d7 --- /dev/null +++ b/test/core/network/network_info_test.mocks.dart @@ -0,0 +1,41 @@ +// Mocks generated by Mockito 5.0.14 from annotations +// in clean_architecture_tdd_course/test/core/network/network_info_test.dart. +// Do not manually edit this file. + +import 'dart:async' as _i3; + +import 'package:connectivity_plus/connectivity_plus.dart' as _i2; +import 'package:connectivity_plus_platform_interface/connectivity_plus_platform_interface.dart' + as _i4; +import 'package:mockito/mockito.dart' as _i1; + +// ignore_for_file: avoid_redundant_argument_values +// ignore_for_file: avoid_setters_without_getters +// ignore_for_file: comment_references +// ignore_for_file: implementation_imports +// ignore_for_file: invalid_use_of_visible_for_testing_member +// ignore_for_file: prefer_const_constructors +// ignore_for_file: unnecessary_parenthesis + +/// A class which mocks [Connectivity]. +/// +/// See the documentation for Mockito's code generation for more information. +class MockConnectivity extends _i1.Mock implements _i2.Connectivity { + MockConnectivity() { + _i1.throwOnMissingStub(this); + } + + @override + _i3.Stream<_i4.ConnectivityResult> get onConnectivityChanged => + (super.noSuchMethod(Invocation.getter(#onConnectivityChanged), + returnValue: Stream<_i4.ConnectivityResult>.empty()) + as _i3.Stream<_i4.ConnectivityResult>); + @override + _i3.Future<_i4.ConnectivityResult> checkConnectivity() => (super.noSuchMethod( + Invocation.method(#checkConnectivity, []), + returnValue: + Future<_i4.ConnectivityResult>.value(_i4.ConnectivityResult.wifi)) + as _i3.Future<_i4.ConnectivityResult>); + @override + String toString() => super.toString(); +} From 3fcbc1c3dd3e68516ef4f9b4468fb801cd35ad8e Mon Sep 17 00:00:00 2001 From: Valter Barbosa Date: Wed, 11 Aug 2021 16:20:49 -0300 Subject: [PATCH 15/21] Adding When to SharedPreferences.setString --- .../datasources/number_trivia_local_data_source.dart | 4 ++-- .../number_trivia_local_data_source_test.dart | 12 ++++++++---- .../number_trivia_repository_impl_test.mocks.dart | 5 ++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/lib/features/number_trivia/data/datasources/number_trivia_local_data_source.dart b/lib/features/number_trivia/data/datasources/number_trivia_local_data_source.dart index 7c219ff..72e8d2a 100644 --- a/lib/features/number_trivia/data/datasources/number_trivia_local_data_source.dart +++ b/lib/features/number_trivia/data/datasources/number_trivia_local_data_source.dart @@ -13,7 +13,7 @@ abstract class NumberTriviaLocalDataSource { /// Throws [CacheException] if no cached data is present. Future getLastNumberTrivia(); - Future cacheNumberTrivia(NumberTriviaModel triviaToCache); + Future cacheNumberTrivia(NumberTriviaModel triviaToCache); } const CACHED_NUMBER_TRIVIA = 'CACHED_NUMBER_TRIVIA'; @@ -34,7 +34,7 @@ class NumberTriviaLocalDataSourceImpl implements NumberTriviaLocalDataSource { } @override - Future cacheNumberTrivia(NumberTriviaModel triviaToCache) { + Future cacheNumberTrivia(NumberTriviaModel triviaToCache) { return sharedPreferences.setString( CACHED_NUMBER_TRIVIA, json.encode(triviaToCache.toJson()), diff --git a/test/features/number_trivia/data/datasources/number_trivia_local_data_source_test.dart b/test/features/number_trivia/data/datasources/number_trivia_local_data_source_test.dart index ef7af86..ee7ed06 100644 --- a/test/features/number_trivia/data/datasources/number_trivia_local_data_source_test.dart +++ b/test/features/number_trivia/data/datasources/number_trivia_local_data_source_test.dart @@ -14,7 +14,10 @@ import 'number_trivia_local_data_source_test.mocks.dart'; // class MockSharedPreferences extends Mock implements SharedPreferences {} -@GenerateMocks([SharedPreferences]) +@GenerateMocks( + [SharedPreferences], + // customMocks: [MockSpec(returnNullOnMissingStub: true)], +) void main() { late NumberTriviaLocalDataSourceImpl dataSource; late MockSharedPreferences mockSharedPreferences; @@ -48,9 +51,7 @@ void main() { 'should throw a CacheExeption when there is not a cached value', () async { // arrange - // Todo(v): Review this: - // when(mockSharedPreferences.getString(any)).thenReturn(null); - when(mockSharedPreferences.getString(any)).thenReturn(''); + when(mockSharedPreferences.getString(any)).thenReturn(null); // act final call = dataSource.getLastNumberTrivia; // assert @@ -66,6 +67,9 @@ void main() { test( 'should call SharedPreferences to cache the data', () async { + //Arrange + when(mockSharedPreferences.setString(any, any)) + .thenAnswer((_) => Future.value(true)); // act dataSource.cacheNumberTrivia(tNumberTriviaModel); // assert diff --git a/test/features/number_trivia/data/repositories/number_trivia_repository_impl_test.mocks.dart b/test/features/number_trivia/data/repositories/number_trivia_repository_impl_test.mocks.dart index 128bd4a..822997c 100644 --- a/test/features/number_trivia/data/repositories/number_trivia_repository_impl_test.mocks.dart +++ b/test/features/number_trivia/data/repositories/number_trivia_repository_impl_test.mocks.dart @@ -66,11 +66,10 @@ class MockNumberTriviaLocalDataSource extends _i1.Mock _FakeNumberTriviaModel_0())) as _i4.Future<_i2.NumberTriviaModel>); @override - _i4.Future cacheNumberTrivia(_i2.NumberTriviaModel? triviaToCache) => + _i4.Future cacheNumberTrivia(_i2.NumberTriviaModel? triviaToCache) => (super.noSuchMethod( Invocation.method(#cacheNumberTrivia, [triviaToCache]), - returnValue: Future.value(), - returnValueForMissingStub: Future.value()) as _i4.Future); + returnValue: Future.value(false)) as _i4.Future); @override String toString() => super.toString(); } From b3f0223c5902140448ed5727c52e69068f19fdd1 Mon Sep 17 00:00:00 2001 From: Valter Barbosa Date: Wed, 11 Aug 2021 16:29:46 -0300 Subject: [PATCH 16/21] Adapt bloc.stream should emit [Loading, Error] --- .../presentation/bloc/number_trivia_bloc_test.dart | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/features/number_trivia/presentation/bloc/number_trivia_bloc_test.dart b/test/features/number_trivia/presentation/bloc/number_trivia_bloc_test.dart index 0f74ecf..ef67cb3 100644 --- a/test/features/number_trivia/presentation/bloc/number_trivia_bloc_test.dart +++ b/test/features/number_trivia/presentation/bloc/number_trivia_bloc_test.dart @@ -213,11 +213,10 @@ void main() { .thenAnswer((_) async => Left(CacheFailure())); // assert later final expected = [ - Empty(), Loading(), Error(message: CACHE_FAILURE_MESSAGE), ]; - expectLater(bloc, emitsInOrder(expected)); + expectLater(bloc.stream, emitsInOrder(expected)); // act bloc.add(GetTriviaForRandomNumber()); }, From 14fb54d49315ab0f3f539f6cd255f8a371e0c565 Mon Sep 17 00:00:00 2001 From: Valter Barbosa Date: Wed, 11 Aug 2021 16:32:48 -0300 Subject: [PATCH 17/21] Bloc upgrade on tests validations --- .../bloc/number_trivia_bloc_test.dart | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/test/features/number_trivia/presentation/bloc/number_trivia_bloc_test.dart b/test/features/number_trivia/presentation/bloc/number_trivia_bloc_test.dart index ef67cb3..8b9f6de 100644 --- a/test/features/number_trivia/presentation/bloc/number_trivia_bloc_test.dart +++ b/test/features/number_trivia/presentation/bloc/number_trivia_bloc_test.dart @@ -70,10 +70,9 @@ void main() { .thenReturn(Left(InvalidInputFailure())); // assert later final expected = [ - Empty(), Error(message: INVALID_INPUT_FAILURE_MESSAGE), ]; - expectLater(bloc, emitsInOrder(expected)); + expectLater(bloc.stream, emitsInOrder(expected)); // act bloc.add(GetTriviaForConcreteNumber(tNumberString)); }, @@ -103,11 +102,10 @@ void main() { .thenAnswer((_) async => Right(tNumberTrivia)); // assert later final expected = [ - Empty(), Loading(), Loaded(trivia: tNumberTrivia), ]; - expectLater(bloc, emitsInOrder(expected)); + expectLater(bloc.stream, emitsInOrder(expected)); // act bloc.add(GetTriviaForConcreteNumber(tNumberString)); }, @@ -122,11 +120,10 @@ void main() { .thenAnswer((_) async => Left(ServerFailure())); // assert later final expected = [ - Empty(), Loading(), Error(message: SERVER_FAILURE_MESSAGE), ]; - expectLater(bloc, emitsInOrder(expected)); + expectLater(bloc.stream, emitsInOrder(expected)); // act bloc.add(GetTriviaForConcreteNumber(tNumberString)); }, @@ -141,11 +138,10 @@ void main() { .thenAnswer((_) async => Left(CacheFailure())); // assert later final expected = [ - Empty(), Loading(), Error(message: CACHE_FAILURE_MESSAGE), ]; - expectLater(bloc, emitsInOrder(expected)); + expectLater(bloc.stream, emitsInOrder(expected)); // act bloc.add(GetTriviaForConcreteNumber(tNumberString)); }, @@ -177,11 +173,10 @@ void main() { .thenAnswer((_) async => Right(tNumberTrivia)); // assert later final expected = [ - Empty(), Loading(), Loaded(trivia: tNumberTrivia), ]; - expectLater(bloc, emitsInOrder(expected)); + expectLater(bloc.stream, emitsInOrder(expected)); // act bloc.add(GetTriviaForRandomNumber()); }, @@ -195,11 +190,10 @@ void main() { .thenAnswer((_) async => Left(ServerFailure())); // assert later final expected = [ - Empty(), Loading(), Error(message: SERVER_FAILURE_MESSAGE), ]; - expectLater(bloc, emitsInOrder(expected)); + expectLater(bloc.stream, emitsInOrder(expected)); // act bloc.add(GetTriviaForRandomNumber()); }, From cde1c18297f60af919b7cff8993dc1e6dd18e363 Mon Sep 17 00:00:00 2001 From: Valter Barbosa Date: Wed, 11 Aug 2021 17:15:38 -0300 Subject: [PATCH 18/21] Todo: Review this --- .../number_trivia_repository_impl_test.dart | 7 +- ...ber_trivia_repository_impl_test.mocks.dart | 60 ++++++------- .../bloc/number_trivia_bloc_test.dart | 18 ++++ .../bloc/number_trivia_bloc_test.mocks.dart | 84 ++++++++++++------- 4 files changed, 106 insertions(+), 63 deletions(-) diff --git a/test/features/number_trivia/data/repositories/number_trivia_repository_impl_test.dart b/test/features/number_trivia/data/repositories/number_trivia_repository_impl_test.dart index 87c3906..569efbf 100644 --- a/test/features/number_trivia/data/repositories/number_trivia_repository_impl_test.dart +++ b/test/features/number_trivia/data/repositories/number_trivia_repository_impl_test.dart @@ -20,11 +20,8 @@ import 'number_trivia_repository_impl_test.mocks.dart'; // class MockNetworkInfo extends Mock implements {} -@GenerateMocks([ - NumberTriviaRemoteDataSource, - NumberTriviaLocalDataSource, - NetworkInfo, -]) +@GenerateMocks( + [NumberTriviaLocalDataSource, NetworkInfo, NumberTriviaRemoteDataSource]) void main() { late NumberTriviaRepositoryImpl repository; late MockNumberTriviaRemoteDataSource mockRemoteDataSource; diff --git a/test/features/number_trivia/data/repositories/number_trivia_repository_impl_test.mocks.dart b/test/features/number_trivia/data/repositories/number_trivia_repository_impl_test.mocks.dart index 822997c..62c3a86 100644 --- a/test/features/number_trivia/data/repositories/number_trivia_repository_impl_test.mocks.dart +++ b/test/features/number_trivia/data/repositories/number_trivia_repository_impl_test.mocks.dart @@ -5,11 +5,11 @@ import 'dart:async' as _i4; import 'package:clean_architecture_tdd_course/core/network/network_info.dart' - as _i6; -import 'package:clean_architecture_tdd_course/features/number_trivia/data/datasources/number_trivia_local_data_source.dart' as _i5; -import 'package:clean_architecture_tdd_course/features/number_trivia/data/datasources/number_trivia_remote_data_source.dart' +import 'package:clean_architecture_tdd_course/features/number_trivia/data/datasources/number_trivia_local_data_source.dart' as _i3; +import 'package:clean_architecture_tdd_course/features/number_trivia/data/datasources/number_trivia_remote_data_source.dart' + as _i6; import 'package:clean_architecture_tdd_course/features/number_trivia/data/models/number_trivia_model.dart' as _i2; import 'package:mockito/mockito.dart' as _i1; @@ -25,36 +25,11 @@ import 'package:mockito/mockito.dart' as _i1; class _FakeNumberTriviaModel_0 extends _i1.Fake implements _i2.NumberTriviaModel {} -/// A class which mocks [NumberTriviaRemoteDataSource]. -/// -/// See the documentation for Mockito's code generation for more information. -class MockNumberTriviaRemoteDataSource extends _i1.Mock - implements _i3.NumberTriviaRemoteDataSource { - MockNumberTriviaRemoteDataSource() { - _i1.throwOnMissingStub(this); - } - - @override - _i4.Future<_i2.NumberTriviaModel> getConcreteNumberTrivia(int? number) => - (super.noSuchMethod(Invocation.method(#getConcreteNumberTrivia, [number]), - returnValue: Future<_i2.NumberTriviaModel>.value( - _FakeNumberTriviaModel_0())) - as _i4.Future<_i2.NumberTriviaModel>); - @override - _i4.Future<_i2.NumberTriviaModel> getRandomNumberTrivia() => - (super.noSuchMethod(Invocation.method(#getRandomNumberTrivia, []), - returnValue: Future<_i2.NumberTriviaModel>.value( - _FakeNumberTriviaModel_0())) - as _i4.Future<_i2.NumberTriviaModel>); - @override - String toString() => super.toString(); -} - /// A class which mocks [NumberTriviaLocalDataSource]. /// /// See the documentation for Mockito's code generation for more information. class MockNumberTriviaLocalDataSource extends _i1.Mock - implements _i5.NumberTriviaLocalDataSource { + implements _i3.NumberTriviaLocalDataSource { MockNumberTriviaLocalDataSource() { _i1.throwOnMissingStub(this); } @@ -77,7 +52,7 @@ class MockNumberTriviaLocalDataSource extends _i1.Mock /// A class which mocks [NetworkInfo]. /// /// See the documentation for Mockito's code generation for more information. -class MockNetworkInfo extends _i1.Mock implements _i6.NetworkInfo { +class MockNetworkInfo extends _i1.Mock implements _i5.NetworkInfo { MockNetworkInfo() { _i1.throwOnMissingStub(this); } @@ -89,3 +64,28 @@ class MockNetworkInfo extends _i1.Mock implements _i6.NetworkInfo { @override String toString() => super.toString(); } + +/// A class which mocks [NumberTriviaRemoteDataSource]. +/// +/// See the documentation for Mockito's code generation for more information. +class MockNumberTriviaRemoteDataSource extends _i1.Mock + implements _i6.NumberTriviaRemoteDataSource { + MockNumberTriviaRemoteDataSource() { + _i1.throwOnMissingStub(this); + } + + @override + _i4.Future<_i2.NumberTriviaModel> getConcreteNumberTrivia(int? number) => + (super.noSuchMethod(Invocation.method(#getConcreteNumberTrivia, [number]), + returnValue: Future<_i2.NumberTriviaModel>.value( + _FakeNumberTriviaModel_0())) + as _i4.Future<_i2.NumberTriviaModel>); + @override + _i4.Future<_i2.NumberTriviaModel> getRandomNumberTrivia() => + (super.noSuchMethod(Invocation.method(#getRandomNumberTrivia, []), + returnValue: Future<_i2.NumberTriviaModel>.value( + _FakeNumberTriviaModel_0())) + as _i4.Future<_i2.NumberTriviaModel>); + @override + String toString() => super.toString(); +} diff --git a/test/features/number_trivia/presentation/bloc/number_trivia_bloc_test.dart b/test/features/number_trivia/presentation/bloc/number_trivia_bloc_test.dart index 8b9f6de..e954e99 100644 --- a/test/features/number_trivia/presentation/bloc/number_trivia_bloc_test.dart +++ b/test/features/number_trivia/presentation/bloc/number_trivia_bloc_test.dart @@ -2,6 +2,7 @@ import 'package:clean_architecture_tdd_course/core/error/failures.dart'; import 'package:clean_architecture_tdd_course/core/usecases/usecase.dart'; import 'package:clean_architecture_tdd_course/core/util/input_converter.dart'; import 'package:clean_architecture_tdd_course/features/number_trivia/domain/entities/number_trivia.dart'; +import 'package:clean_architecture_tdd_course/features/number_trivia/domain/repositories/number_trivia_repository.dart'; import 'package:clean_architecture_tdd_course/features/number_trivia/domain/usecases/get_concrete_number_trivia.dart'; import 'package:clean_architecture_tdd_course/features/number_trivia/domain/usecases/get_random_number_trivia.dart'; import 'package:clean_architecture_tdd_course/features/number_trivia/presentation/bloc/bloc.dart'; @@ -13,20 +14,24 @@ import 'package:mockito/annotations.dart'; import 'number_trivia_bloc_test.mocks.dart'; @GenerateMocks([ + NumberTriviaRepository, GetConcreteNumberTrivia, GetRandomNumberTrivia, InputConverter, ]) void main() { late NumberTriviaBloc bloc; + late MockGetConcreteNumberTrivia mockGetConcreteNumberTrivia; late MockGetRandomNumberTrivia mockGetRandomNumberTrivia; late MockInputConverter mockInputConverter; + late MockNumberTriviaRepository mockNumberTriviaRepository; setUp(() { mockGetConcreteNumberTrivia = MockGetConcreteNumberTrivia(); mockGetRandomNumberTrivia = MockGetRandomNumberTrivia(); mockInputConverter = MockInputConverter(); + mockNumberTriviaRepository = MockNumberTriviaRepository(); bloc = NumberTriviaBloc( concrete: mockGetConcreteNumberTrivia, @@ -54,6 +59,19 @@ void main() { () async { // arrange setUpMockInputConverterSuccess(); + + when(mockNumberTriviaRepository.getConcreteNumberTrivia(any)) + .thenAnswer((_) async => Right(tNumberTrivia)); + + when(mockNumberTriviaRepository.getRandomNumberTrivia()) + .thenAnswer((_) async => Right(tNumberTrivia)); + + when(mockGetConcreteNumberTrivia.call(any)).thenAnswer((_) async => + mockNumberTriviaRepository.getConcreteNumberTrivia(tNumberParsed)); + + when(mockGetRandomNumberTrivia.call(any)).thenAnswer( + (_) async => mockNumberTriviaRepository.getRandomNumberTrivia()); + // act bloc.add(GetTriviaForConcreteNumber(tNumberString)); await untilCalled(mockInputConverter.stringToUnsignedInteger(any)); diff --git a/test/features/number_trivia/presentation/bloc/number_trivia_bloc_test.mocks.dart b/test/features/number_trivia/presentation/bloc/number_trivia_bloc_test.mocks.dart index bc50140..aad7dc4 100644 --- a/test/features/number_trivia/presentation/bloc/number_trivia_bloc_test.mocks.dart +++ b/test/features/number_trivia/presentation/bloc/number_trivia_bloc_test.mocks.dart @@ -2,22 +2,22 @@ // in clean_architecture_tdd_course/test/features/number_trivia/presentation/bloc/number_trivia_bloc_test.dart. // Do not manually edit this file. -import 'dart:async' as _i5; +import 'dart:async' as _i4; -import 'package:clean_architecture_tdd_course/core/error/failures.dart' as _i6; +import 'package:clean_architecture_tdd_course/core/error/failures.dart' as _i5; import 'package:clean_architecture_tdd_course/core/usecases/usecase.dart' as _i9; import 'package:clean_architecture_tdd_course/core/util/input_converter.dart' as _i10; import 'package:clean_architecture_tdd_course/features/number_trivia/domain/entities/number_trivia.dart' - as _i7; + as _i6; import 'package:clean_architecture_tdd_course/features/number_trivia/domain/repositories/number_trivia_repository.dart' - as _i2; + as _i3; import 'package:clean_architecture_tdd_course/features/number_trivia/domain/usecases/get_concrete_number_trivia.dart' - as _i4; + as _i7; import 'package:clean_architecture_tdd_course/features/number_trivia/domain/usecases/get_random_number_trivia.dart' as _i8; -import 'package:dartz/dartz.dart' as _i3; +import 'package:dartz/dartz.dart' as _i2; import 'package:mockito/mockito.dart' as _i1; // ignore_for_file: avoid_redundant_argument_values @@ -28,32 +28,60 @@ import 'package:mockito/mockito.dart' as _i1; // ignore_for_file: prefer_const_constructors // ignore_for_file: unnecessary_parenthesis -class _FakeNumberTriviaRepository_0 extends _i1.Fake - implements _i2.NumberTriviaRepository {} +class _FakeEither_0 extends _i1.Fake implements _i2.Either {} -class _FakeEither_1 extends _i1.Fake implements _i3.Either {} +class _FakeNumberTriviaRepository_1 extends _i1.Fake + implements _i3.NumberTriviaRepository {} + +/// A class which mocks [NumberTriviaRepository]. +/// +/// See the documentation for Mockito's code generation for more information. +class MockNumberTriviaRepository extends _i1.Mock + implements _i3.NumberTriviaRepository { + MockNumberTriviaRepository() { + _i1.throwOnMissingStub(this); + } + + @override + _i4.Future<_i2.Either<_i5.Failure, _i6.NumberTrivia>> getConcreteNumberTrivia( + int? number) => + (super.noSuchMethod(Invocation.method(#getConcreteNumberTrivia, [number]), + returnValue: Future<_i2.Either<_i5.Failure, _i6.NumberTrivia>>.value( + _FakeEither_0<_i5.Failure, _i6.NumberTrivia>())) as _i4 + .Future<_i2.Either<_i5.Failure, _i6.NumberTrivia>>); + @override + _i4.Future<_i2.Either<_i5.Failure, _i6.NumberTrivia>> + getRandomNumberTrivia() => + (super.noSuchMethod(Invocation.method(#getRandomNumberTrivia, []), + returnValue: + Future<_i2.Either<_i5.Failure, _i6.NumberTrivia>>.value( + _FakeEither_0<_i5.Failure, _i6.NumberTrivia>())) + as _i4.Future<_i2.Either<_i5.Failure, _i6.NumberTrivia>>); + @override + String toString() => super.toString(); +} /// A class which mocks [GetConcreteNumberTrivia]. /// /// See the documentation for Mockito's code generation for more information. class MockGetConcreteNumberTrivia extends _i1.Mock - implements _i4.GetConcreteNumberTrivia { + implements _i7.GetConcreteNumberTrivia { MockGetConcreteNumberTrivia() { _i1.throwOnMissingStub(this); } @override - _i2.NumberTriviaRepository get repository => + _i3.NumberTriviaRepository get repository => (super.noSuchMethod(Invocation.getter(#repository), - returnValue: _FakeNumberTriviaRepository_0()) - as _i2.NumberTriviaRepository); + returnValue: _FakeNumberTriviaRepository_1()) + as _i3.NumberTriviaRepository); @override - _i5.Future<_i3.Either<_i6.Failure, _i7.NumberTrivia>> call( - _i4.Params? params) => + _i4.Future<_i2.Either<_i5.Failure, _i6.NumberTrivia>> call( + _i7.Params? params) => (super.noSuchMethod(Invocation.method(#call, [params]), - returnValue: Future<_i3.Either<_i6.Failure, _i7.NumberTrivia>>.value( - _FakeEither_1<_i6.Failure, _i7.NumberTrivia>())) as _i5 - .Future<_i3.Either<_i6.Failure, _i7.NumberTrivia>>); + returnValue: Future<_i2.Either<_i5.Failure, _i6.NumberTrivia>>.value( + _FakeEither_0<_i5.Failure, _i6.NumberTrivia>())) as _i4 + .Future<_i2.Either<_i5.Failure, _i6.NumberTrivia>>); @override String toString() => super.toString(); } @@ -68,17 +96,17 @@ class MockGetRandomNumberTrivia extends _i1.Mock } @override - _i2.NumberTriviaRepository get repository => + _i3.NumberTriviaRepository get repository => (super.noSuchMethod(Invocation.getter(#repository), - returnValue: _FakeNumberTriviaRepository_0()) - as _i2.NumberTriviaRepository); + returnValue: _FakeNumberTriviaRepository_1()) + as _i3.NumberTriviaRepository); @override - _i5.Future<_i3.Either<_i6.Failure, _i7.NumberTrivia>> call( + _i4.Future<_i2.Either<_i5.Failure, _i6.NumberTrivia>> call( _i9.NoParams? params) => (super.noSuchMethod(Invocation.method(#call, [params]), - returnValue: Future<_i3.Either<_i6.Failure, _i7.NumberTrivia>>.value( - _FakeEither_1<_i6.Failure, _i7.NumberTrivia>())) as _i5 - .Future<_i3.Either<_i6.Failure, _i7.NumberTrivia>>); + returnValue: Future<_i2.Either<_i5.Failure, _i6.NumberTrivia>>.value( + _FakeEither_0<_i5.Failure, _i6.NumberTrivia>())) as _i4 + .Future<_i2.Either<_i5.Failure, _i6.NumberTrivia>>); @override String toString() => super.toString(); } @@ -92,10 +120,10 @@ class MockInputConverter extends _i1.Mock implements _i10.InputConverter { } @override - _i3.Either<_i6.Failure, int> stringToUnsignedInteger(String? str) => + _i2.Either<_i5.Failure, int> stringToUnsignedInteger(String? str) => (super.noSuchMethod(Invocation.method(#stringToUnsignedInteger, [str]), - returnValue: _FakeEither_1<_i6.Failure, int>()) - as _i3.Either<_i6.Failure, int>); + returnValue: _FakeEither_0<_i5.Failure, int>()) + as _i2.Either<_i5.Failure, int>); @override String toString() => super.toString(); } From 5e42ee7f3689da9735f314ebd0b60909d5c502a3 Mon Sep 17 00:00:00 2001 From: Valter Barbosa Date: Wed, 11 Aug 2021 17:29:54 -0300 Subject: [PATCH 19/21] Add When to dataSources --- .../number_trivia_repository_impl_test.dart | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/test/features/number_trivia/data/repositories/number_trivia_repository_impl_test.dart b/test/features/number_trivia/data/repositories/number_trivia_repository_impl_test.dart index 569efbf..83dcf09 100644 --- a/test/features/number_trivia/data/repositories/number_trivia_repository_impl_test.dart +++ b/test/features/number_trivia/data/repositories/number_trivia_repository_impl_test.dart @@ -20,8 +20,11 @@ import 'number_trivia_repository_impl_test.mocks.dart'; // class MockNetworkInfo extends Mock implements {} -@GenerateMocks( - [NumberTriviaLocalDataSource, NetworkInfo, NumberTriviaRemoteDataSource]) +@GenerateMocks([ + NumberTriviaLocalDataSource, + NumberTriviaRemoteDataSource, + NetworkInfo, +]) void main() { late NumberTriviaRepositoryImpl repository; late MockNumberTriviaRemoteDataSource mockRemoteDataSource; @@ -165,6 +168,13 @@ void main() { () async { // arrange when(mockNetworkInfo.isConnected).thenAnswer((_) async => true); + + when(mockRemoteDataSource.getRandomNumberTrivia()) + .thenAnswer((_) async => tNumberTriviaModel); + + when(mockLocalDataSource.cacheNumberTrivia(any)) + .thenAnswer((_) async => false); + // act repository.getRandomNumberTrivia(); // assert From ea8acea88bbd2f7403f42c1addf86d7e86d02612 Mon Sep 17 00:00:00 2001 From: Valter Barbosa Date: Wed, 11 Aug 2021 17:43:53 -0300 Subject: [PATCH 20/21] Problem: No tests match regular expression -> device is online tests --- .../number_trivia_repository_impl_test.dart | 2 + ...ber_trivia_repository_impl_test.mocks.dart | 38 +++++++++---------- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/test/features/number_trivia/data/repositories/number_trivia_repository_impl_test.dart b/test/features/number_trivia/data/repositories/number_trivia_repository_impl_test.dart index 83dcf09..28e38bc 100644 --- a/test/features/number_trivia/data/repositories/number_trivia_repository_impl_test.dart +++ b/test/features/number_trivia/data/repositories/number_trivia_repository_impl_test.dart @@ -189,6 +189,8 @@ void main() { // arrange when(mockRemoteDataSource.getRandomNumberTrivia()) .thenAnswer((_) async => tNumberTriviaModel); + when(mockLocalDataSource.cacheNumberTrivia(any)) + .thenAnswer((_) async => false); // act final result = await repository.getRandomNumberTrivia(); // assert diff --git a/test/features/number_trivia/data/repositories/number_trivia_repository_impl_test.mocks.dart b/test/features/number_trivia/data/repositories/number_trivia_repository_impl_test.mocks.dart index 62c3a86..2fbcd38 100644 --- a/test/features/number_trivia/data/repositories/number_trivia_repository_impl_test.mocks.dart +++ b/test/features/number_trivia/data/repositories/number_trivia_repository_impl_test.mocks.dart @@ -5,11 +5,11 @@ import 'dart:async' as _i4; import 'package:clean_architecture_tdd_course/core/network/network_info.dart' - as _i5; + as _i6; import 'package:clean_architecture_tdd_course/features/number_trivia/data/datasources/number_trivia_local_data_source.dart' as _i3; import 'package:clean_architecture_tdd_course/features/number_trivia/data/datasources/number_trivia_remote_data_source.dart' - as _i6; + as _i5; import 'package:clean_architecture_tdd_course/features/number_trivia/data/models/number_trivia_model.dart' as _i2; import 'package:mockito/mockito.dart' as _i1; @@ -49,27 +49,11 @@ class MockNumberTriviaLocalDataSource extends _i1.Mock String toString() => super.toString(); } -/// A class which mocks [NetworkInfo]. -/// -/// See the documentation for Mockito's code generation for more information. -class MockNetworkInfo extends _i1.Mock implements _i5.NetworkInfo { - MockNetworkInfo() { - _i1.throwOnMissingStub(this); - } - - @override - _i4.Future get isConnected => - (super.noSuchMethod(Invocation.getter(#isConnected), - returnValue: Future.value(false)) as _i4.Future); - @override - String toString() => super.toString(); -} - /// A class which mocks [NumberTriviaRemoteDataSource]. /// /// See the documentation for Mockito's code generation for more information. class MockNumberTriviaRemoteDataSource extends _i1.Mock - implements _i6.NumberTriviaRemoteDataSource { + implements _i5.NumberTriviaRemoteDataSource { MockNumberTriviaRemoteDataSource() { _i1.throwOnMissingStub(this); } @@ -89,3 +73,19 @@ class MockNumberTriviaRemoteDataSource extends _i1.Mock @override String toString() => super.toString(); } + +/// A class which mocks [NetworkInfo]. +/// +/// See the documentation for Mockito's code generation for more information. +class MockNetworkInfo extends _i1.Mock implements _i6.NetworkInfo { + MockNetworkInfo() { + _i1.throwOnMissingStub(this); + } + + @override + _i4.Future get isConnected => + (super.noSuchMethod(Invocation.getter(#isConnected), + returnValue: Future.value(false)) as _i4.Future); + @override + String toString() => super.toString(); +} From f1abe2c62d03b5e4f9440789cfa133a144fe0533 Mon Sep 17 00:00:00 2001 From: Valter Barbosa Date: Wed, 11 Aug 2021 18:02:09 -0300 Subject: [PATCH 21/21] All tests passing --- .../number_trivia_repository_impl_test.dart | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/test/features/number_trivia/data/repositories/number_trivia_repository_impl_test.dart b/test/features/number_trivia/data/repositories/number_trivia_repository_impl_test.dart index 28e38bc..af12c03 100644 --- a/test/features/number_trivia/data/repositories/number_trivia_repository_impl_test.dart +++ b/test/features/number_trivia/data/repositories/number_trivia_repository_impl_test.dart @@ -72,6 +72,10 @@ void main() { 'should check if the device is online', () async { // arrange + when(mockLocalDataSource.cacheNumberTrivia(any)) + .thenAnswer((_) async => false); + when(mockRemoteDataSource.getConcreteNumberTrivia(any)) + .thenAnswer((_) async => tNumberTriviaModel); when(mockNetworkInfo.isConnected).thenAnswer((_) async => true); // act repository.getConcreteNumberTrivia(tNumber); @@ -87,6 +91,8 @@ void main() { // arrange when(mockRemoteDataSource.getConcreteNumberTrivia(any)) .thenAnswer((_) async => tNumberTriviaModel); + when(mockLocalDataSource.cacheNumberTrivia(any)) + .thenAnswer((_) async => false); // act final result = await repository.getConcreteNumberTrivia(tNumber); // assert @@ -101,6 +107,8 @@ void main() { // arrange when(mockRemoteDataSource.getConcreteNumberTrivia(any)) .thenAnswer((_) async => tNumberTriviaModel); + when(mockLocalDataSource.cacheNumberTrivia(any)) + .thenAnswer((_) async => false); // act await repository.getConcreteNumberTrivia(tNumber); // assert @@ -205,6 +213,8 @@ void main() { // arrange when(mockRemoteDataSource.getRandomNumberTrivia()) .thenAnswer((_) async => tNumberTriviaModel); + when(mockLocalDataSource.cacheNumberTrivia(any)) + .thenAnswer((_) async => false); // act await repository.getRandomNumberTrivia(); // assert