From 1548b67c1628b65de8e52928f9783979f9518f0b Mon Sep 17 00:00:00 2001 From: SadAndBroken Date: Fri, 17 Nov 2023 09:06:47 +0100 Subject: [PATCH 1/2] Changed the test 1168 and 1216 to not fail on mondays. The test was made in such a way, that the pumpandsettle method would change a needed state on mondays. --- test/screens/weekplan_screen_test.dart | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/test/screens/weekplan_screen_test.dart b/test/screens/weekplan_screen_test.dart index 3758f783e..7b73bb146 100644 --- a/test/screens/weekplan_screen_test.dart +++ b/test/screens/weekplan_screen_test.dart @@ -1170,17 +1170,20 @@ void main() { (WidgetTester tester) async { await tester.runAsync(() async { final Completer checkCompleted = Completer(); - + int i = 0; + if(DateTime.now().toString() == DateTime.monday.toString()){ + i++; + } mockActivities[2].state = ActivityState.Normal; mockActivities[2].timer.paused = true; mockActivities[2].timer.fullLength = 100; - mockWeek.days[0].activities.add(mockActivities[2]); + mockWeek.days[i].activities.add(mockActivities[2]); authBloc.setMode(WeekplanMode.citizen); final WeekplanScreen weekplanScreen = WeekplanScreen(mockWeek, user); await tester.pumpWidget(MaterialApp(home: weekplanScreen)); await tester.pumpAndSettle(); - await tester.tap(find.byKey(Key(mockWeek.days[0].day.index.toString() + + await tester.tap(find.byKey(Key(mockWeek.days[i].day.index.toString() + mockActivities[2].id.toString()))); await tester.pumpAndSettle(); @@ -1218,17 +1221,20 @@ void main() { (WidgetTester tester) async { await tester.runAsync(() async { final Completer checkCompleted = Completer(); - + int i = 0; + if(DateTime.now().toString() == DateTime.monday.toString()){ + i++; + } mockActivities[2].state = ActivityState.Normal; mockActivities[2].timer.paused = true; mockActivities[2].timer.fullLength = 100; - mockWeek.days[0].activities.add(mockActivities[2]); + mockWeek.days[i].activities.add(mockActivities[2]); authBloc.setMode(WeekplanMode.citizen); final WeekplanScreen weekplanScreen = WeekplanScreen(mockWeek, user); await tester.pumpWidget(MaterialApp(home: weekplanScreen)); await tester.pumpAndSettle(); - await tester.tap(find.byKey(Key(mockWeek.days[0].day.index.toString() + await tester.tap(find.byKey(Key(mockWeek.days[i].day.index.toString() + mockActivities[2].id.toString()))); await tester.pumpAndSettle(); From 8200bcdefb76b17b8ae721e28d94f9f2d35f2372 Mon Sep 17 00:00:00 2001 From: SadAndBroken Date: Thu, 7 Dec 2023 11:13:29 +0100 Subject: [PATCH 2/2] =?UTF-8?q?Sorry,=20det=20gammel=20kode=20som=20k?= =?UTF-8?q?=C3=B8rte=20p=C3=A5=20flutter=203.3.8,=20og=20ikke=20Flutter=20?= =?UTF-8?q?3.16.3...=20Nullables=20er=20blvet=20lavet=20for=20alt=20:/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/screens/weekplan_screen_test.dart | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/test/screens/weekplan_screen_test.dart b/test/screens/weekplan_screen_test.dart index 8fc5989cb..24904bb69 100644 --- a/test/screens/weekplan_screen_test.dart +++ b/test/screens/weekplan_screen_test.dart @@ -1263,15 +1263,15 @@ void main() { i++; } mockActivities[2].state = ActivityState.Normal; - mockActivities[2].timer.paused = true; - mockActivities[2].timer.fullLength = 100; - mockWeek.days[i].activities.add(mockActivities[2]); + mockActivities[2].timer!.paused = true; + mockActivities[2].timer!.fullLength = 100; + mockWeek.days![i].activities!.add(mockActivities[2]); authBloc.setMode(WeekplanMode.citizen); - final WeekplanScreen weekplanScreen = WeekplanScreen(mockWeek, user); + final WeekplanScreen weekplanScreen = WeekplanScreen(mockWeek, user, key: UniqueKey()); await tester.pumpWidget(MaterialApp(home: weekplanScreen)); await tester.pumpAndSettle(); - await tester.tap(find.byKey(Key(mockWeek.days[i].day.index.toString() + + await tester.tap(find.byKey(Key(mockWeek.days![i].day!.index.toString() + mockActivities[2].id.toString()))); await tester.pumpAndSettle(); @@ -1313,15 +1313,15 @@ void main() { i++; } mockActivities[2].state = ActivityState.Normal; - mockActivities[2].timer.paused = true; - mockActivities[2].timer.fullLength = 100; - mockWeek.days[i].activities.add(mockActivities[2]); + mockActivities[2].timer!.paused = true; + mockActivities[2].timer!.fullLength = 100; + mockWeek.days![i].activities!.add(mockActivities[2]); authBloc.setMode(WeekplanMode.citizen); final WeekplanScreen weekplanScreen = WeekplanScreen(mockWeek, user, key: UniqueKey()); await tester.pumpWidget(MaterialApp(home: weekplanScreen)); await tester.pumpAndSettle(); - await tester.tap(find.byKey(Key(mockWeek.days[i].day.index.toString() + await tester.tap(find.byKey(Key(mockWeek.days![i].day!.index.toString() + mockActivities[2].id.toString()))); await tester.pumpAndSettle();