Make tests null safe

.github/workflows/deploy.yaml

@@ -40,7 +40,7 @@ jobs:
     env:
       PROPERTIES_PATH: "android/key.properties"
       JAVA_VERSION: "11.x"
-      FLUTTER_VERSION: "3.7.2"
+      FLUTTER_VERSION: "3.10.6"
     defaults:
       run:
         working-directory: ./uni

.github/workflows/format_lint_test.yaml

@@ -4,7 +4,7 @@ on:
     branches: [master, develop]
 
 env:
-  FLUTTER_VERSION: 3.7.2
+  FLUTTER_VERSION: 3.10.6
   JAVA_VERSION: 11.x
 
 jobs:
@@ -20,7 +20,7 @@ jobs:
         with:
           flutter-version: ${{ env.FLUTTER_VERSION }}
 
-      - run: dart format $(find . -type f -name "*.dart" -a -not -name "*.g.dart") --set-exit-if-changed
+      - run: dart format $(find . -type f -name "*.dart" -a -not -name "*.g.dart" -a -not -name "*.mocks.dart") --set-exit-if-changed
 
   lint:
     name: "Lint"

pre-commit-hook.sh

@@ -3,7 +3,7 @@ mkdir -p .git/hooks #it seems that are some cases where git will not create a ho
 tee .git/hooks/pre-commit << EOF
 #!/bin/sh
 
-FILES="\$(git diff --name-only --cached | grep .*\.dart | grep -v .*\.g\.dart)"
+FILES="\$(git diff --name-only --cached | grep .*\.dart | grep -v .*\.g\.dart | grep -v .*\.mocks\.dart)"
 
 [ -z "\$FILES" ] && exit 0
 

uni/README.md

@@ -30,6 +30,34 @@ In order to remove it, is it as simple as running the following command, from th
  rm .git/hooks/pre-commit
 ```
 
+### Generated files
+
+Flutter doesn't support runtime reflection, in order to circumvent these limitations, we use **automatic code generation** or **static metaprogramming** for things like **mocks** and other possible usecases. By convention, you should **always commit** the generated `.dart` files into the repository. 
+
+Dart leverages annotations to signal the `build_runner` that it should generate some code. They look something like this:
+```dart
+  import 'package:mockito/annotations.dart'
+
+  class Cat{
+  }
+
+  @GenerateNiceMocks([MockSpec<Cat>()])
+  void main(){
+
+  }
+```
+In this case, `build_runner` will dectect that `GenerateNiceMocks` is a generator function from `mockito` and will generate code to a different file.
+
+In order to run the `build_runner` once:
+```sh
+dart run build_runner build
+```
+
+But you can also watch for changes in `.dart` files and automatically run the `build_runner` on those file changes (useful if you find yourself need to generate code very frequently):
+```sh
+dart run build_runner watch
+```
+
 ## Project structure
 
 ### Overview

uni/analysis_options.yaml

@@ -4,6 +4,7 @@ analyzer:
   # Exclude auto-generated files from dart analysis
   exclude:
     - "**.g.dart"
+    - "**.mocks.dart"
 
 # Custom linter rules. A list of all rules can be found at
 # https://dart-lang.github.io/linter/lints/options/options.html

uni/build.yaml

@@ -0,0 +1,7 @@
+targets:
+  $default:
+      builders:
+        mockito|mockBuilder:
+          options:
+            build_extensions:
+              '^test/{{}}.dart': 'test/mocks/{{}}.mocks.dart'

uni/lib/controller/local_storage/app_bus_stop_database.dart

@@ -38,8 +38,7 @@ class AppBusStopDatabase extends AppDatabase {
     }
 
     final stops = <String, BusStopData>{};
-    groupBy(buses, (stop) => (stop! as Map<String, dynamic>)['stopCode'])
-        .forEach(
+    groupBy(buses, (stop) => stop['stopCode']).forEach(
       (stopCode, busCodeList) => stops[stopCode as String] = BusStopData(
         configuredBuses: Set<String>.from(
           busCodeList.map((busEntry) => busEntry['busCode']),

uni/lib/model/providers/lazy/bus_stop_provider.dart

@@ -51,7 +51,7 @@ class BusStopProvider extends StateProviderNotifier {
 
   Future<void> addUserBusStop(String stopCode, BusStopData stopData) async {
     if (_configuredBusStops.containsKey(stopCode)) {
-      (_configuredBusStops[stopCode]!.configuredBuses).clear();
+      _configuredBusStops[stopCode]!.configuredBuses.clear();
       _configuredBusStops[stopCode]!
           .configuredBuses
           .addAll(stopData.configuredBuses);

uni/lib/model/providers/lazy/lecture_provider.dart

@@ -63,7 +63,7 @@ class LectureProvider extends StateProviderNotifier {
     Session session,
     Profile profile,
   ) =>
-      (fetcher?.getLectures(session, profile)) ?? getLectures(session, profile);
+      fetcher?.getLectures(session, profile) ?? getLectures(session, profile);
 
   Future<List<Lecture>> getLectures(Session session, Profile profile) {
     return ScheduleFetcherApi()

uni/lib/view/bug_report/widgets/form.dart

@@ -61,7 +61,7 @@ class BugReportFormState extends State<BugReportForm> {
 
     bugDescriptions.forEach(
       (int key, Tuple2<String, String> tup) =>
-          {bugList.add(DropdownMenuItem(value: key, child: Text(tup.item1)))},
+          bugList.add(DropdownMenuItem(value: key, child: Text(tup.item1))),
     );
   }
 
@@ -117,9 +117,9 @@ class BugReportFormState extends State<BugReportForm> {
   Widget bugReportTitle(BuildContext context) {
     return Container(
       margin: const EdgeInsets.symmetric(vertical: 10),
-      child: Row(
+      child: const Row(
         mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-        children: const <Widget>[
+        children: <Widget>[
           Icon(Icons.bug_report, size: 40),
           PageTitle(name: 'Bugs e Sugestões', center: false),
           Icon(Icons.bug_report, size: 40),
@@ -172,7 +172,7 @@ class BugReportFormState extends State<BugReportForm> {
                   value: _selectedBug,
                   onChanged: (value) {
                     setState(() {
-                      _selectedBug = value! as int;
+                      _selectedBug = value!;
                     });
                   },
                   isExpanded: true,

uni/lib/view/exams/widgets/exam_page_title.dart

@@ -10,9 +10,9 @@ class ExamPageTitle extends StatelessWidget {
     return Container(
       padding: const EdgeInsets.fromLTRB(20, 20, 20, 10),
       alignment: Alignment.center,
-      child: Row(
+      child: const Row(
         mainAxisAlignment: MainAxisAlignment.spaceBetween,
-        children: const [
+        children: [
           PageTitle(name: 'Exames', center: false, pad: false),
           Material(child: ExamFilterMenu()),
         ],

uni/lib/view/login/login.dart

@@ -81,7 +81,7 @@ class LoginPageViewState extends State<LoginPageView> {
 
   /// Tracks if the user wants to keep signed in (has a
   /// checkmark on the button).
-  void _setKeepSignedIn(bool? value) {
+  void _setKeepSignedIn({bool? value}) {
     if (value == null) return;
     setState(() {
       _keepSignedIn = value;

uni/lib/view/login/widgets/inputs.dart

@@ -68,12 +68,12 @@ Widget createPasswordInput(
 
 /// Creates the widget for the user to keep signed in (save his data).
 Widget createSaveDataCheckBox(
-  void Function(bool?)? setKeepSignedIn, {
+  void Function({bool? value})? setKeepSignedIn, {
   required bool keepSignedIn,
 }) {
   return CheckboxListTile(
     value: keepSignedIn,
-    onChanged: setKeepSignedIn,
+    onChanged: (value) => setKeepSignedIn?.call(value: value),
     title: const Text(
       'Manter sessão iniciada',
       textAlign: TextAlign.center,

uni/lib/view/restaurant/restaurant_page_view.dart

@@ -131,9 +131,9 @@ class RestaurantDay extends StatelessWidget {
       return Container(
         margin: const EdgeInsets.only(top: 10, bottom: 5),
         key: Key('restaurant-page-day-column-$day'),
-        child: Column(
+        child: const Column(
           mainAxisSize: MainAxisSize.min,
-          children: const [
+          children: [
             SizedBox(height: 10),
             Center(
               child: Text('Não há informação disponível sobre refeições'),

uni/lib/view/useful_info/widgets/other_links_card.dart

@@ -9,8 +9,8 @@ class OtherLinksCard extends GenericExpansionCard {
 
   @override
   Widget buildCardContent(BuildContext context) {
-    return Column(
-      children: const [
+    return const Column(
+      children: [
         // LinkButton(title: 'Impressão', link: 'https://print.up.pt'),
         // TODO(Process-ing): Get fixed link
         LinkButton(

uni/lib/view/useful_info/widgets/sigarra_links_card.dart

@@ -9,8 +9,8 @@ class SigarraLinksCard extends GenericExpansionCard {
 
   @override
   Widget buildCardContent(BuildContext context) {
-    return Column(
-      children: const [
+    return const Column(
+      children: [
         LinkButton(
           title: 'Notícias',
           link: 'https://sigarra.up.pt/feup/pt/noticias_geral.lista_noticias',

uni/pubspec.yaml

@@ -10,8 +10,8 @@ publish_to: 'none' # We do not publish to pub.dev
 version: 1.5.54+172
 
 environment:
-  sdk: ">=2.17.1 <3.0.0"
-  flutter: 3.7.2
+  sdk: '>=3.0.0 <4.0.0'
+  flutter: 3.10.6
 
 # Dependencies specify other packages that the application needs in order to work.
 # Major versions and critical security upgrades are managed by dependabot, and
@@ -59,10 +59,16 @@ dependencies:
 
 
 dev_dependencies:
+  build_runner: ^2.4.6
   flutter_launcher_icons: ^0.13.1
   flutter_test:
     sdk: flutter
-  mockito: ^5.2.0
+  # FIXME(luisd): Update mockito to a release version when 5.4.3 or above
+  # is launched
+  mockito:
+    git:
+      url: https://github.com/dart-lang/mockito.git
+      ref: "e54a006"
   test: any
   very_good_analysis: ^4.0.0+1
 

uni/test/integration/src/exams_page_test.dart

@@ -1,10 +1,9 @@
-// @dart=2.10
-
 import 'dart:io';
 
 import 'package:flutter/material.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:tuple/tuple.dart';
@@ -18,12 +17,10 @@ import 'package:uni/model/entities/session.dart';
 import 'package:uni/model/providers/lazy/exam_provider.dart';
 import 'package:uni/view/exams/exams.dart';
 
+import '../../mocks/integration/src/exams_page_test.mocks.dart';
 import '../../test_widget.dart';
 
-class MockClient extends Mock implements http.Client {}
-
-class MockResponse extends Mock implements http.Response {}
-
+@GenerateNiceMocks([MockSpec<http.Client>(), MockSpec<http.Response>()])
 void main() {
   group('ExamsPage Integration Tests', () {
     final mockClient = MockClient();

uni/test/integration/src/schedule_page_test.dart

@@ -1,11 +1,10 @@
-// @dart=2.10
-
 import 'dart:convert';
 import 'dart:io';
 
 import 'package:flutter/material.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:tuple/tuple.dart';
@@ -17,22 +16,22 @@ import 'package:uni/model/providers/lazy/lecture_provider.dart';
 import 'package:uni/model/providers/startup/session_provider.dart';
 import 'package:uni/view/schedule/schedule.dart';
 
+import '../../mocks/integration/src/schedule_page_test.mocks.dart';
 import '../../test_widget.dart';
 import '../../unit/view/Widgets/schedule_slot_test.dart';
 
-class MockClient extends Mock implements http.Client {}
-
-class MockResponse extends Mock implements http.Response {}
-
-class MockSessionProvider extends Mock implements SessionProvider {}
-
 class UriMatcher extends CustomMatcher {
   UriMatcher(Matcher matcher) : super('Uri that has', 'string', matcher);
 
   @override
   Object featureValueOf(dynamic actual) => (actual as Uri).toString();
 }
 
+@GenerateNiceMocks([
+  MockSpec<http.Client>(),
+  MockSpec<http.Response>(),
+  MockSpec<SessionProvider>()
+])
 void main() {
   group('SchedulePage Integration Tests', () {
     final mockClient = MockClient();