Fix tests

Author: rolandgeider

lib/helpers/consts.dart

@@ -60,7 +60,6 @@ const PREFS_LAST_UPDATED_MUSCLES = 'lastUpdatedMuscles';
 const PREFS_LAST_UPDATED_EQUIPMENT = 'lastUpdatedEquipment';
 const PREFS_LAST_UPDATED_CATEGORIES = 'lastUpdatedCategories';
 const PREFS_LAST_UPDATED_LANGUAGES = 'lastUpdatedLanguages';
-const PREFS_EXERCISE_CACHE_VERSION = 'cacheVersion';
 const PREFS_INGREDIENTS = 'ingredientData';
 const PREFS_WORKOUT_UNITS = 'workoutUnits';
 const PREFS_USER = 'userData';

lib/providers/nutrition.dart

@@ -312,11 +312,12 @@ class NutritionPlansProvider with ChangeNotifier {
       // Try to fetch from local db
       if (ingredientDb != null) {
         ingredient = Ingredient.fromJson(jsonDecode(ingredientDb.data));
+        log("Loaded ingredient '${ingredient.name}' from db cache");
 
         // Prune old entries
         if (DateTime.now()
             .isAfter(ingredientDb.lastFetched.add(const Duration(days: DAYS_TO_CACHE)))) {
-          (database.delete(database.ingredients)..where((i) => i.id.isValue(ingredientId))).go();
+          (database.delete(database.ingredients)..where((i) => i.id.equals(ingredientId))).go();
         }
       } else {
         final data = await baseProvider.fetch(

test/nutrition/nutrition_provider_test.dart

@@ -1,7 +1,9 @@
 import 'dart:convert';
 
+import 'package:drift/native.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/mockito.dart';
+import 'package:wger/database/ingredients/ingredients_database.dart';
 import 'package:wger/models/nutrition/ingredient.dart';
 import 'package:wger/providers/nutrition.dart';
 
@@ -14,7 +16,11 @@ void main() {
 
   setUp(() {
     mockWgerBaseProvider = MockWgerBaseProvider();
-    nutritionProvider = NutritionPlansProvider(mockWgerBaseProvider, []);
+    nutritionProvider = NutritionPlansProvider(
+      mockWgerBaseProvider,
+      [],
+      database: IngredientDatabase.inMemory(NativeDatabase.memory()),
+    );
 
     const String planInfoUrl = 'nutritionplaninfo';
     const String planUrl = 'nutritionplan';

test/nutrition/nutritional_plan_screen_test.dart

@@ -16,18 +16,21 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import 'package:drift/native.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:golden_toolkit/golden_toolkit.dart';
 import 'package:http/http.dart' as http;
 import 'package:mockito/annotations.dart';
 import 'package:provider/provider.dart';
+import 'package:wger/database/ingredients/ingredients_database.dart';
 import 'package:wger/providers/auth.dart';
 import 'package:wger/providers/base_provider.dart';
 import 'package:wger/providers/body_weight.dart';
 import 'package:wger/providers/nutrition.dart';
 import 'package:wger/screens/nutritional_plan_screen.dart';
+
 import '../../test_data/nutritional_plans.dart';
 import 'nutritional_plan_screen_test.mocks.dart';
 
@@ -42,7 +45,11 @@ void main() {
     return MultiProvider(
       providers: [
         ChangeNotifierProvider<NutritionPlansProvider>(
-          create: (context) => NutritionPlansProvider(mockBaseProvider, []),
+          create: (context) => NutritionPlansProvider(
+            mockBaseProvider,
+            [],
+            database: IngredientDatabase.inMemory(NativeDatabase.memory()),
+          ),
         ),
         ChangeNotifierProvider<BodyWeightProvider>(
           create: (context) => BodyWeightProvider(mockBaseProvider),

test/nutrition/nutritional_plans_screen_test.dart

@@ -16,13 +16,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import 'package:drift/native.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:http/http.dart' as http;
 import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
 import 'package:provider/provider.dart';
+import 'package:wger/database/ingredients/ingredients_database.dart';
 import 'package:wger/models/nutrition/nutritional_plan.dart';
 import 'package:wger/providers/auth.dart';
 import 'package:wger/providers/base_provider.dart';
@@ -66,6 +68,7 @@ void main() {
             creationDate: DateTime(2021, 01, 10),
           ),
         ],
+        database: IngredientDatabase.inMemory(NativeDatabase.memory()),
       ),
       child: MaterialApp(
         locale: Locale(locale),