WIP: Tests

lib/src/models/animated_list.dart

@@ -8,7 +8,7 @@ typedef RemovedItemBuilder<T> = Widget Function(
   Animation<double> animation,
 );
 
-abstract class AnimatedListModel<E> {
+abstract class AnimatedListModel<E> extends Iterable<E> {
   AnimatedListModel({
     required this.listKey,
     required this.removedItemBuilder,
@@ -54,13 +54,16 @@ abstract class AnimatedListModel<E> {
     }
   }
 
+  @override
   bool get isNotEmpty => _items.isNotEmpty;
 
+  @override
   int get length => _items.length;
 
   E operator [](int index) => _items[index];
 
-  int indexOf(E item) => _items.indexOf(item);
+  @override
+  Iterator<E> get iterator => _items.iterator;
 }
 
 class AnimatedTimerList extends AnimatedListModel<Timer> {

lib/src/models/app_authentication.dart

@@ -21,12 +21,14 @@ class AppAuthentication extends Equatable {
       ..responseType = ResponseType.plain;
 
     if (isSelfSignedCertificate) {
+      // coverage:ignore-start
       authenticatedClient.httpClientAdapter = IOHttpClientAdapter(
         onHttpClientCreate: (client) {
           client.badCertificateCallback = (cert, host, port) => true;
           return client;
         },
       );
+      // coverage:ignore-end
     }
   }
 

lib/src/models/image_response.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/foundation.dart';
 
+// coverage:ignore-start
 class ImageResponse {
   const ImageResponse({
     required this.data,
@@ -8,3 +9,4 @@ class ImageResponse {
   final Uint8List data;
   final bool isSvg;
 }
+// coverage:ignore-end

lib/src/models/recipe.dart

@@ -1,43 +1,43 @@
 import 'package:nc_cookbook_api/nc_cookbook_api.dart';
 
-extension RecipeExtension on Recipe {
-  Map<String, String> get nutritionList {
+extension NutritionExtension on Nutrition {
+  Map<String, String> get asMap {
     final items = <String, String>{};
-    if (nutrition.calories != null) {
-      items['calories'] = nutrition.calories!;
+    if (calories != null) {
+      items['calories'] = calories!;
     }
-    if (nutrition.carbohydrateContent != null) {
-      items['carbohydrateContent'] = nutrition.carbohydrateContent!;
+    if (carbohydrateContent != null) {
+      items['carbohydrateContent'] = carbohydrateContent!;
     }
-    if (nutrition.cholesterolContent != null) {
-      items['cholesterolContent'] = nutrition.cholesterolContent!;
+    if (cholesterolContent != null) {
+      items['cholesterolContent'] = cholesterolContent!;
     }
-    if (nutrition.fatContent != null) {
-      items['fatContent'] = nutrition.fatContent!;
+    if (fatContent != null) {
+      items['fatContent'] = fatContent!;
     }
-    if (nutrition.fiberContent != null) {
-      items['fiberContent'] = nutrition.fiberContent!;
+    if (fiberContent != null) {
+      items['fiberContent'] = fiberContent!;
     }
-    if (nutrition.proteinContent != null) {
-      items['proteinContent'] = nutrition.proteinContent!;
+    if (proteinContent != null) {
+      items['proteinContent'] = proteinContent!;
     }
-    if (nutrition.saturatedFatContent != null) {
-      items['saturatedFatContent'] = nutrition.saturatedFatContent!;
+    if (saturatedFatContent != null) {
+      items['saturatedFatContent'] = saturatedFatContent!;
     }
-    if (nutrition.servingSize != null) {
-      items['servingSize'] = nutrition.servingSize!;
+    if (servingSize != null) {
+      items['servingSize'] = servingSize!;
     }
-    if (nutrition.sodiumContent != null) {
-      items['sodiumContent'] = nutrition.sodiumContent!;
+    if (sodiumContent != null) {
+      items['sodiumContent'] = sodiumContent!;
     }
-    if (nutrition.sugarContent != null) {
-      items['sugarContent'] = nutrition.sugarContent!;
+    if (sugarContent != null) {
+      items['sugarContent'] = sugarContent!;
     }
-    if (nutrition.transFatContent != null) {
-      items['transFatContent'] = nutrition.transFatContent!;
+    if (transFatContent != null) {
+      items['transFatContent'] = transFatContent!;
     }
-    if (nutrition.unsaturatedFatContent != null) {
-      items['unsaturatedFatContent'] = nutrition.unsaturatedFatContent!;
+    if (unsaturatedFatContent != null) {
+      items['unsaturatedFatContent'] = unsaturatedFatContent!;
     }
 
     return items;

lib/src/models/timer.dart

@@ -56,8 +56,8 @@ class Timer {
   }
   @visibleForTesting
   @JsonKey(
-    toJson: _recipeToJson,
-    fromJson: _recipeFromJson,
+    toJson: recipeToJson,
+    fromJson: recipeFromJson,
   )
   final Recipe? recipe;
   final DateTime done;
@@ -114,10 +114,18 @@ class Timer {
         duration,
         recipeId,
       );
+  // coverage:ignore-start
+  @override
+  String toString() =>
+      'Timer(done: $done, id: $id, title: $title, body: $body, duration: $duration, recipeId: $recipeId)';
+  // coverage:ignore-end
 }
 
-Recipe _recipeFromJson(String data) =>
-    standardSerializers.fromJson<Recipe>(Recipe.serializer, data)!;
-
-String? _recipeToJson(Object? data) =>
-    data != null ? standardSerializers.toJson(Recipe.serializer, data) : null;
+@visibleForTesting
+Recipe recipeFromJson(Map<String, dynamic>? data) =>
+    standardSerializers.deserializeWith<Recipe>(Recipe.serializer, data)!;
+@visibleForTesting
+Map<String, dynamic>? recipeToJson(Object? data) => data != null
+    ? standardSerializers.serializeWith(Recipe.serializer, data)
+        as Map<String, dynamic>?
+    : null;

lib/src/screens/recipe_screen.dart

@@ -132,7 +132,8 @@ class _RecipeScreenBodyState extends State<RecipeScreenBody> {
   @override
   Widget build(BuildContext context) {
     final list = [
-      if (recipe.nutritionList.isNotEmpty) NutritionList(recipe.nutritionList),
+      if (recipe.nutrition.asMap.isNotEmpty)
+        NutritionList(recipe.nutrition.asMap),
       if (recipe.recipeIngredient.isNotEmpty) IngredientList(recipe),
       InstructionList(recipe),
     ];

lib/src/services/api_provider.dart

@@ -1,7 +1,13 @@
 part of 'services.dart';
 
 class ApiProvider {
-  factory ApiProvider() => _apiProvider;
+  factory ApiProvider() => _apiProvider ??= ApiProvider._();
+
+  // coverage:ignore-start
+  @visibleForTesting
+  factory ApiProvider.mocked(ApiProvider mock) => _apiProvider ??= mock;
+  // coverage:ignore-end
+
   ApiProvider._() {
     final auth = UserRepository().currentAppAuthentication;
 
@@ -37,7 +43,7 @@ class ApiProvider {
     miscApi = ncCookbookApi.getMiscApi();
     tagsApi = ncCookbookApi.getTagsApi();
   }
-  static final ApiProvider _apiProvider = ApiProvider._();
+  static ApiProvider? _apiProvider;
 
   late NcCookbookApi ncCookbookApi;
   late RecipesApi recipeApi;

lib/src/services/authentication_provider.dart

@@ -1,5 +1,6 @@
 part of 'services.dart';
 
+// coverage:ignore-start
 class AuthenticationProvider {
   final FlutterSecureStorage _secureStorage = const FlutterSecureStorage();
   final String _appAuthenticationKey = 'appAuthentication';
@@ -241,3 +242,4 @@ class AuthenticationProvider {
     await _secureStorage.delete(key: _appAuthenticationKey);
   }
 }
+// coverage:ignore-end

lib/src/services/data_repository.dart

@@ -1,16 +1,22 @@
 part of 'services.dart';
 
 class DataRepository {
-  factory DataRepository() => _dataRepository;
+  factory DataRepository() => _dataRepository ??= const DataRepository._();
 
-  DataRepository._();
+  // coverage:ignore-start
+  @visibleForTesting
+  factory DataRepository.mocked(DataRepository mock) =>
+      _dataRepository ??= mock;
+  // coverage:ignore-end
+
+  const DataRepository._();
   // Singleton
-  static final DataRepository _dataRepository = DataRepository._();
+  static DataRepository? _dataRepository;
 
   // Provider List
-  final ApiProvider api = ApiProvider();
+  static final api = ApiProvider();
 
-  final NextcloudMetadataApi _nextcloudMetadataApi = NextcloudMetadataApi();
+  static final _nextcloudMetadataApi = NextcloudMetadataApi();
 
   // Data
   static final String categoryAll = translate('categories.all_categories');
@@ -108,16 +114,11 @@ class DataRepository {
   }
 
   Future<RecipeStub?> _fetchCategoryMainRecipe(Category category) async {
-    try {
-      final categoryRecipes = await fetchRecipesShort(category: category.name);
-      if (categoryRecipes != null && categoryRecipes.isNotEmpty) {
-        return categoryRecipes.first;
-      }
-    } catch (e) {
-      log('Could not load main recipe of Category!');
-      rethrow;
-    }
+    final categoryRecipes = await fetchRecipesShort(category: category.name);
 
+    if (categoryRecipes != null && categoryRecipes.isNotEmpty) {
+      return categoryRecipes.first;
+    }
     return null;
   }
 

lib/src/services/intent_repository.dart

@@ -1,11 +1,18 @@
 part of 'services.dart';
 
 class IntentRepository {
-  factory IntentRepository() => _intentRepository;
+  factory IntentRepository() =>
+      _intentRepository ??= const IntentRepository._();
 
-  IntentRepository._();
+  // coverage:ignore-start
+  @visibleForTesting
+  factory IntentRepository.mocked(IntentRepository mock) =>
+      _intentRepository ??= mock;
+  // coverage:ignore-end
+
+  const IntentRepository._();
   // Singleton Pattern
-  static final IntentRepository _intentRepository = IntentRepository._();
+  static IntentRepository? _intentRepository;
 
   static final _navigationKey = GlobalKey<NavigatorState>();
   static const platform = MethodChannel('app.channel.shared.data');

lib/src/services/net/nextcloud_metadata_api.dart

@@ -1,5 +1,6 @@
 part of '../services.dart';
 
+// coverage:ignore-start
 class NextcloudMetadataApi {
   factory NextcloudMetadataApi() => NextcloudMetadataApi._(
         UserRepository().currentAppAuthentication,
@@ -11,3 +12,4 @@ class NextcloudMetadataApi {
   String getUserAvatarUrl() =>
       '${_appAuthentication.server}/avatar/${_appAuthentication.loginName}/80';
 }
+// coverage:ignore-end

lib/src/services/notification_provider.dart

@@ -17,11 +17,18 @@ final FlutterLocalNotificationsPlugin _localNotifications =
     FlutterLocalNotificationsPlugin();
 
 class NotificationService {
-  factory NotificationService() => _notificationService;
+
+  factory NotificationService() =>
+      _notificationService ??= NotificationService._();
+
+  // coverage:ignore-start
+  @visibleForTesting
+  factory NotificationService.mocked(NotificationService mock) =>
+      _notificationService ??= mock;
+  // coverage:ignore-end
 
   NotificationService._();
-  static final NotificationService _notificationService =
-      NotificationService._();
+  static NotificationService? _notificationService;
   int curId = 0;
 
   Future<void> init() async {

lib/src/services/services.dart

@@ -1,6 +1,5 @@
 import 'dart:async';
 import 'dart:convert';
-import 'dart:developer';
 
 import 'package:dio/dio.dart' as dio;
 import 'package:dio/dio.dart';

lib/src/services/timer_repository.dart

@@ -1,10 +1,15 @@
 part of 'services.dart';
 
 class TimerList {
-  factory TimerList() => _instance;
+  factory TimerList() => _instance ??= TimerList._();
+
+  // coverage:ignore-start
+  @visibleForTesting
+  factory TimerList.mocked(TimerList mock) => _instance ??= mock;
+  // coverage:ignore-end
 
   TimerList._() : _timers = <Timer>[];
-  static final TimerList _instance = TimerList._();
+  static TimerList? _instance;
   final List<Timer> _timers;
 
   List<Timer> get timers => _timers;

lib/src/services/user_repository.dart

@@ -1,13 +1,19 @@
 part of 'services.dart';
 
 class UserRepository {
-  factory UserRepository() => _userRepository;
+  factory UserRepository() => _userRepository ??= const UserRepository._();
 
-  UserRepository._();
+  // coverage:ignore-start
+  @visibleForTesting
+  factory UserRepository.mocked(UserRepository mock) =>
+      _userRepository ??= mock;
+  // coverage:ignore-end
+
+  const UserRepository._();
   // Singleton
-  static final UserRepository _userRepository = UserRepository._();
+  static UserRepository? _userRepository;
 
-  AuthenticationProvider authenticationProvider = AuthenticationProvider();
+  static final authenticationProvider = AuthenticationProvider();
 
   Future<AppAuthentication> authenticate(
     String serverUrl,

lib/src/util/theme_data.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 
+// coverage:ignore-start
 class AppTheme {
   const AppTheme._();
 
@@ -90,3 +91,4 @@ class SnackBarThemes extends ThemeExtension<SnackBarThemes> {
   @override
   String toString() => 'SnackBarThemes(colorScheme: $colorScheme)';
 }
+// coverage:ignore-end

pubspec.yaml

@@ -109,6 +109,7 @@ dev_dependencies:
     sdk: flutter
 
   lint: ^2.0.0
+  mocktail: ^0.3.0
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec