Merge pull request #662 from Flutterando/fix_test

Fix test
Flutterando · Feb 21, 2022 · 269ed03 · 269ed03
2 parents 02e146f + d029e6e
commit 269ed03
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 16 deletions.
diff --git a/flutter_modular/example/lib/app/app_widget.dart b/flutter_modular/example/lib/app/app_widget.dart
@@ -9,12 +9,14 @@ class AppWidget extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return MaterialApp(
-      navigatorKey: alice.getNavigatorKey(),
+    Modular.routerDelegate.setNavigatorKey(alice.getNavigatorKey());
+    return MaterialApp.router(
       title: 'Flutter Slidy',
       theme: ThemeData(
         primarySwatch: Colors.blue,
       ),
-    ).modular();
+      routerDelegate: Modular.routerDelegate,
+      routeInformationParser: Modular.routeInformationParser,
+    );
   }
 }
diff --git a/flutter_modular/lib/flutter_modular.dart b/flutter_modular/lib/flutter_modular.dart
@@ -9,7 +9,6 @@ import 'src/domain/usecases/get_arguments.dart';
 import 'src/presenter/models/modular_navigator.dart';
 import 'src/presenter/modular_base.dart';
 import 'src/presenter/navigation/modular_page.dart';
-import 'src/presenter/navigation/modular_route_information_parser.dart';
 import 'src/presenter/navigation/modular_router_delegate.dart';
 import 'src/presenter/navigation/router_outlet_delegate.dart';
 
@@ -65,7 +64,7 @@ extension ModularExtensionMaterial on MaterialApp {
   ///...
   ///);
   ///```
-  @deprecated
+  @Deprecated('Use **MaterialApp.router** instead')
   MaterialApp modular() {
     injector
         .get<IModularNavigator>()
@@ -120,7 +119,7 @@ extension ModularExtensionCupertino on CupertinoApp {
   ///...
   ///);
   ///```
-  @deprecated
+  @Deprecated('Use CupertinoApp.router instead')
   CupertinoApp modular() {
     injector
         .get<IModularNavigator>()

diff --git a/flutter_modular/lib/src/presenter/navigation/modular_route_information_parser.dart b/flutter_modular/lib/src/presenter/navigation/modular_route_information_parser.dart
@@ -1,7 +1,6 @@
 import 'dart:async';
 
 import 'package:flutter/material.dart';
-
 import 'package:modular_core/modular_core.dart';
 
 import '../../../flutter_modular.dart';

diff --git a/flutter_modular/test/src/presenter/navigation/modular_router_delegate_test.dart b/flutter_modular/test/src/presenter/navigation/modular_router_delegate_test.dart
@@ -51,7 +51,10 @@ void main() {
     when(() => key.currentState).thenReturn(navigatorState);
     parser = ModularRouteInformationParserMock();
     delegate = ModularRouterDelegate(
-        parser: parser, navigatorKey: key, reportPop: reportPopMock);
+      parser: parser,
+      navigatorKey: key,
+      reportPop: reportPopMock,
+    );
   });
 
   test('setObserver', () {

diff --git a/modular_codegen/lib/src/custom_annotation_generator.dart b/modular_codegen/lib/src/custom_annotation_generator.dart
@@ -3,16 +3,19 @@ import 'package:analyzer/dart/element/element.dart';
 import 'package:build/build.dart';
 import 'package:source_gen/source_gen.dart';
 
-abstract class CustomGeneratorForAnnotatedField<AnnotationType> extends Generator {
+abstract class CustomGeneratorForAnnotatedField<AnnotationType>
+    extends Generator {
   /// Returns the annotation of type [AnnotationType] of the given [element],
   /// or [null] if it doesn't have any.
   DartObject? getAnnotation(Element element) {
-    final annotations = TypeChecker.fromRuntime(AnnotationType).annotationsOf(element);
+    final annotations =
+        TypeChecker.fromRuntime(AnnotationType).annotationsOf(element);
     if (annotations.isEmpty) {
       return null;
     }
     if (annotations.length > 1) {
-      throw Exception("You tried to add multiple @$AnnotationType() annotations to the "
+      throw Exception(
+          "You tried to add multiple @$AnnotationType() annotations to the "
           "same element (${element.name}), but that's not possible.");
     }
     return annotations.single;
@@ -39,5 +42,6 @@ abstract class CustomGeneratorForAnnotatedField<AnnotationType> extends Generato
     return values.join('/n/n');
   }
 
-  String generateForAnnotatedField(FieldElement field, ConstantReader annotation);
+  String generateForAnnotatedField(
+      FieldElement field, ConstantReader annotation);
 }
diff --git a/modular_codegen/pubspec.yaml b/modular_codegen/pubspec.yaml
@@ -1,6 +1,6 @@
 name: modular_codegen
 description: Code Generate for flutter_modular. Inject Automation. Annotation @Inject, @Param and @Data. 
-version: 3.0.3
+version: 3.0.4
 homepage: https://github.com/Flutterando/modular
 
 environment:

diff --git a/modular_core/lib/src/route/tracker.dart b/modular_core/lib/src/route/tracker.dart
@@ -113,6 +113,8 @@ class TrackerImpl implements Tracker {
         params[name] = result.namedGroup(name)!;
       }
       return params;
+    } else {
+      return null;
     }
   }
 

diff --git a/modular_interfaces/lib/src/di/bind.dart b/modular_interfaces/lib/src/di/bind.dart
@@ -28,7 +28,8 @@ abstract class BindContract<T extends Object> {
     this.export = false,
     this.isScoped = false,
     this.alwaysSerialized = false,
-  }) : assert((isSingleton || isLazy), r"'singleton' can't be false if 'lazy' is also false");
+  }) : assert((isSingleton || isLazy),
+            r"'singleton' can't be false if 'lazy' is also false");
 }
 
 /// For empty instance binds.

diff --git a/modular_test/lib/modular_test.dart b/modular_test/lib/modular_test.dart
@@ -2,7 +2,8 @@ library modular_test;
 
 import 'package:modular_core/modular_core.dart';
 
-void initModule(BindContext module, {List<BindContract> replaceBinds = const []}) {
+void initModule(BindContext module,
+    {List<BindContract> replaceBinds = const []}) {
   // ignore: invalid_use_of_visible_for_testing_member
   final bindModules = module.getProcessBinds();
 
@@ -18,7 +19,8 @@ void initModule(BindContext module, {List<BindContract> replaceBinds = const []}
   ModularTracker.injector.addBindContext(module);
 }
 
-void initModules(List<BindContext> modules, {List<BindContract> replaceBinds = const []}) {
+void initModules(List<BindContext> modules,
+    {List<BindContract> replaceBinds = const []}) {
   for (var module in modules) {
     initModule(module, replaceBinds: replaceBinds);
   }

diff --git a/shelf_modular/lib/src/presenter/utils/handlers.dart b/shelf_modular/lib/src/presenter/utils/handlers.dart
@@ -73,5 +73,7 @@ FutureOr<Response>? applyHandler(Function fn,
     return fn(injector, arguments, request);
   } else if (fn is HandlerThreeParams5) {
     return fn(injector, request, arguments);
+  } else {
+    return null;
   }
 }