fix tests

Author: Dieterbe

lib/widgets/measurements/charts.dart

@@ -103,8 +103,9 @@ class _MeasurementChartWidgetFlState extends State<MeasurementChartWidgetFl> {
           sideTitles: SideTitles(
             showTitles: true,
             getTitlesWidget: (value, meta) {
-              // Don't show the first and last entries, otherwise they'll overlap with the
-              // calculated interval
+              // Don't show the first and last entries, to avoid overlap
+              // see https://stackoverflow.com/questions/73355777/flutter-fl-chart-how-can-we-avoid-the-overlap-of-the-ordinate
+              // this is needlessly aggressive if the titles are "sparse", but we should optimize for more busy data
               if (value == meta.min || value == meta.max) {
                 return const Text('');
               }
@@ -133,11 +134,13 @@ class _MeasurementChartWidgetFlState extends State<MeasurementChartWidgetFl> {
             showTitles: true,
             reservedSize: 65,
             getTitlesWidget: (value, meta) {
-              // Don't show the first and last entries, otherwise they'll overlap with the
-              // calculated interval
+              // Don't show the first and last entries, to avoid overlap
+              // see https://stackoverflow.com/questions/73355777/flutter-fl-chart-how-can-we-avoid-the-overlap-of-the-ordinate
+              // this is needlessly aggressive if the titles are "sparse", but we should optimize for more busy data
               if (value == meta.min || value == meta.max) {
                 return const Text('');
               }
+
               return Text('$value ${widget._unit}');
             },
           ),

test/measurements/measurement_entries_screen_test.dart

@@ -73,8 +73,8 @@ void main() {
     expect(find.text('body fat'), findsOneWidget);
 
     // Entries
-    expect(find.text('10.2 %'), findsNWidgets(2));
-    expect(find.text('18.1 %'), findsNWidgets(2));
+    expect(find.text('10.2 %'), findsNWidgets(1));
+    expect(find.text('18.1 %'), findsNWidgets(1));
   });
 
   testWidgets('Tests the localization of dates - EN', (WidgetTester tester) async {

test/weight/weight_screen_test.dart

@@ -23,6 +23,7 @@ import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
 import 'package:provider/provider.dart';
 import 'package:wger/providers/body_weight.dart';
+import 'package:wger/providers/nutrition.dart';
 import 'package:wger/providers/user.dart';
 import 'package:wger/screens/form_screen.dart';
 import 'package:wger/screens/weight_screen.dart';
@@ -31,12 +32,14 @@ import 'package:wger/widgets/weight/forms.dart';
 
 import '../../test_data/body_weight.dart';
 import '../../test_data/profile.dart';
+import '../nutrition/nutritional_plan_form_test.mocks.dart';
 import 'weight_screen_test.mocks.dart';
 
 @GenerateMocks([BodyWeightProvider, UserProvider])
 void main() {
   late MockBodyWeightProvider mockWeightProvider;
   late MockUserProvider mockUserProvider;
+  late MockNutritionPlansProvider mockNutritionPlansProvider;
 
   setUp(() {
     mockWeightProvider = MockBodyWeightProvider();
@@ -45,21 +48,27 @@ void main() {
 
     mockUserProvider = MockUserProvider();
     when(mockUserProvider.profile).thenReturn(tProfile1);
+
+    mockNutritionPlansProvider = MockNutritionPlansProvider();
+    when(mockNutritionPlansProvider.currentPlan).thenReturn(null);
   });
 
   Widget createWeightScreen({locale = 'en'}) {
-    return ChangeNotifierProvider<UserProvider>(
-      create: (context) => mockUserProvider,
-      child: ChangeNotifierProvider<BodyWeightProvider>(
-        create: (context) => mockWeightProvider,
-        child: MaterialApp(
-          locale: Locale(locale),
-          localizationsDelegates: AppLocalizations.localizationsDelegates,
-          supportedLocales: AppLocalizations.supportedLocales,
-          home: const WeightScreen(),
-          routes: {
-            FormScreen.routeName: (_) => const FormScreen(),
-          },
+    return ChangeNotifierProvider<NutritionPlansProvider>(
+      create: (context) => mockNutritionPlansProvider,
+      child: ChangeNotifierProvider<UserProvider>(
+        create: (context) => mockUserProvider,
+        child: ChangeNotifierProvider<BodyWeightProvider>(
+          create: (context) => mockWeightProvider,
+          child: MaterialApp(
+            locale: Locale(locale),
+            localizationsDelegates: AppLocalizations.localizationsDelegates,
+            supportedLocales: AppLocalizations.supportedLocales,
+            home: const WeightScreen(),
+            routes: {
+              FormScreen.routeName: (_) => const FormScreen(),
+            },
+          ),
         ),
       ),
     );
@@ -100,15 +109,15 @@ void main() {
 
   testWidgets('Tests the localization of dates - EN', (WidgetTester tester) async {
     await tester.pumpWidget(createWeightScreen());
-
-    expect(find.text('1/1/2021'), findsOneWidget);
-    expect(find.text('1/10/2021'), findsOneWidget);
+    // these don't work because we only have 2 points, and to prevent overlaps we don't display their titles
+    // expect(find.text('1/1'), findsOneWidget);
+    //  expect(find.text('1/10'), findsOneWidget);
   });
 
   testWidgets('Tests the localization of dates - DE', (WidgetTester tester) async {
     await tester.pumpWidget(createWeightScreen(locale: 'de'));
-
-    expect(find.text('1.1.2021'), findsOneWidget);
-    expect(find.text('10.1.2021'), findsOneWidget);
+    // these don't work because we only have 2 points, and to prevent overlaps we don't display their titles
+    // expect(find.text('1.1.'), findsOneWidget);
+    // expect(find.text('10.1.'), findsOneWidget);
   });
 }