From 9d554b391dfd59cc439d64aa2651cd76b0bd891f Mon Sep 17 00:00:00 2001
From: Roland Geider <roland@geider.net>
Date: Tue, 10 May 2022 17:07:06 +0200
Subject: [PATCH] Some further fixes for migration to exercise bases

---
 integration_test/app_test.dart     | 33 +++++++++++++++++++-----------
 lib/widgets/dashboard/widgets.dart |  4 +++-
 test_data/exercises.dart           | 13 +++++++++++-
 3 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/integration_test/app_test.dart b/integration_test/app_test.dart
index 135e7ffe..f40161d1 100644
--- a/integration_test/app_test.dart
+++ b/integration_test/app_test.dart
@@ -194,51 +194,60 @@ void main() {
   Widget createGymModeScreen({locale = 'en'}) {
     final key = GlobalKey<NavigatorState>();
     final client = MockClient();
+    final bases = getTestExerciseBases();
 
-    final squats = Exercise(
+    final squats = bases[0];
+    final squatsEn = Exercise(
       id: 1,
       uuid: 'uuid',
       creationDate: DateTime(2021, 1, 15),
       name: 'Squats',
       description: 'add clever text',
-      baseId: tBase1,
+      baseId: tBase1.id,
       language: tLanguage1,
     );
+    squats.exercises = [squatsEn];
 
-    final benchPress = Exercise(
+    final benchPress = bases[1];
+    final benchPressEn = Exercise(
       id: 1,
       uuid: 'uuid',
       creationDate: DateTime(2021, 1, 15),
       name: 'Bench press',
       description: 'add clever text',
-      baseId: tBase1,
+      baseId: tBase1.id,
       language: tLanguage1,
     );
+    benchPress.exercises = [benchPressEn];
 
-    final deadLift = Exercise(
+    final deadLift = bases[2];
+    final deadLiftEn = Exercise(
       id: 1,
       uuid: 'uuid',
       creationDate: DateTime(2021, 1, 15),
-      name: 'deadLift',
+      name: 'Dead Lift',
       description: 'add clever text',
-      baseId: tBase1,
+      baseId: tBase1.id,
       language: tLanguage1,
     );
+    deadLift.exercises = [deadLiftEn];
 
-    final crunches = Exercise(
+    final crunches = bases[3];
+    final crunchesEn = Exercise(
       id: 1,
       uuid: 'uuid',
       creationDate: DateTime(2021, 1, 15),
       name: 'Crunches',
       description: 'add clever text',
-      baseId: tBase1,
+      baseId: tBase1.id,
       language: tLanguage1,
     );
+    crunches.exercises = [crunchesEn];
 
     final mockExerciseProvider = MockExercisesProvider();
-    when(mockExerciseProvider.findExerciseById(1)).thenReturn(squats);
-    when(mockExerciseProvider.findExerciseById(2)).thenReturn(benchPress);
-    when(mockExerciseProvider.findExerciseById(3)).thenReturn(crunches);
+    when(mockExerciseProvider.findExerciseBaseById(1)).thenReturn(squats);
+    when(mockExerciseProvider.findExerciseBaseById(2)).thenReturn(benchPress);
+    when(mockExerciseProvider.findExerciseBaseById(3)).thenReturn(crunches);
 
     final setting1 = Setting(
       setId: 1,
diff --git a/lib/widgets/dashboard/widgets.dart b/lib/widgets/dashboard/widgets.dart
index c4a644da..5471259b 100644
--- a/lib/widgets/dashboard/widgets.dart
+++ b/lib/widgets/dashboard/widgets.dart
@@ -382,7 +382,9 @@ class _DashboardWorkoutWidgetState extends State<DashboardWorkoutWidget> {
                           Row(
                             crossAxisAlignment: CrossAxisAlignment.start,
                             children: [
-                              Text(s.exerciseBaseObj.name),
+                              Text(s.exerciseBaseObj
+                                  .getExercise(Localizations.localeOf(context).languageCode)
+                                  .name),
                               const SizedBox(width: 10),
                               MutedText(set.getSmartRepr(s.exerciseBaseObj).join('\n')),
                             ],
diff --git a/test_data/exercises.dart b/test_data/exercises.dart
index 8b634269..e0995ecc 100644
--- a/test_data/exercises.dart
+++ b/test_data/exercises.dart
@@ -73,6 +73,17 @@ final tBase3 = ExerciseBase(
   musclesSecondary: const [tMuscle2],
 );
 
+final tBase4 = ExerciseBase(
+  id: 4,
+  uuid: '361f024c-fdf8-4146-b7d7-0c1b67c58141',
+  creationDate: DateTime(2021, 08, 01),
+  updateDate: DateTime(2021, 08, 01),
+  category: tCategory3,
+  equipment: const [tEquipment2],
+  muscles: const [tMuscle1],
+  musclesSecondary: const [tMuscle2],
+);
+
 final tExercise1 = Exercise(
   id: 1,
   uuid: 'f4cc326b-e497-4bd7-a71d-0eb1db522743',
@@ -142,5 +153,5 @@ List<ExerciseBase> getTestExerciseBases() {
   tBase2.exercises = [tExercise4, tExercise5];
   tBase3.exercises = [tExercise6];
 
-  return [tBase1, tBase2, tBase3];
+  return [tBase1, tBase2, tBase3, tBase4];
 }