refactor: simplify dio dependency injection

为什么之前没想到这么优雅的写法（；´д｀）ゞ
CCXXXI · Oct 25, 2021 · 9b9cb16 · 9b9cb16
1 parent cf7eaac
commit 9b9cb16
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 25 deletions.
diff --git a/lib/settings/settings_logic.dart b/lib/settings/settings_logic.dart
@@ -1,4 +1,3 @@
-import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:quiver/iterables.dart';
@@ -10,10 +9,6 @@ import '../utils/web.dart';
 import 'theme.dart';
 
 class SettingsLogic extends GetxController with L {
-  final Dio dio;
-
-  SettingsLogic({Dio? dio}) : dio = dio ?? defaultDio;
-
   void modeOnChanged(String v) {
     theme
       ..mode = v

diff --git a/lib/timetable/ecnu/ecnu_logic.dart b/lib/timetable/ecnu/ecnu_logic.dart
@@ -14,10 +14,6 @@ import 'des.dart';
 enum S { login, check }
 
 class EcnuLogic extends GetxController with L {
-  final Dio dio;
-
-  EcnuLogic({Dio? dio}) : dio = dio ?? defaultDio;
-
   final step = S.login.obs;
 
   final loginFormKey = GlobalKey<FormState>();

diff --git a/lib/toolbox/calendar/calendar_logic.dart b/lib/toolbox/calendar/calendar_logic.dart
@@ -1,15 +1,10 @@
-import 'package:dio/dio.dart';
 import 'package:get/get.dart';
 import 'package:universal_html/parsing.dart';
 
 import '../../utils/log.dart';
 import '../../utils/web.dart';
 
 class CalendarLogic extends GetxController with L {
-  final Dio dio;
-
-  CalendarLogic({Dio? dio}) : dio = dio ?? defaultDio;
-
   @override
   void onInit() {
     getCalendar();

diff --git a/lib/toolbox/toolbox_logic.dart b/lib/toolbox/toolbox_logic.dart
@@ -1,4 +1,3 @@
-import 'package:dio/dio.dart';
 import 'package:flutter/services.dart';
 import 'package:get/get.dart';
 
@@ -10,10 +9,6 @@ import 'cheater.dart';
 import 'juan/juan_view.dart';
 
 class ToolboxLogic extends GetxController with L {
-  final Dio dio;
-
-  ToolboxLogic({Dio? dio}) : dio = dio ?? defaultDio;
-
   @override
   void onInit() {
     super.onInit();

diff --git a/lib/utils/web.dart b/lib/utils/web.dart
@@ -24,6 +24,9 @@ final defaultDio = Dio()
     CookieManager(cookieJar),
   ]);
 
+/// Should be reassigned in and only in test code.
+var dio = defaultDio;
+
 extension Launch on String {
   void launch() => launcher.launch(this);
 }

diff --git a/test/settings/settings_logic_test.dart b/test/settings/settings_logic_test.dart
@@ -4,6 +4,7 @@ import 'package:dio/dio.dart';
 import 'package:ecnu_timetable/settings/settings_logic.dart';
 import 'package:ecnu_timetable/utils/database.dart';
 import 'package:ecnu_timetable/utils/string.dart';
+import 'package:ecnu_timetable/utils/web.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:get/get.dart' hide Response;
@@ -61,7 +62,9 @@ void main() {
   test('settings', () {
     // 这么简单的东西没必要测
     // 但是测了能让覆盖率好看一点 :)
-    final logic = Get.put(SettingsLogic(dio: FakeDio()));
+    dio = FakeDio();
+
+    final logic = Get.put(SettingsLogic());
 
     expect(theme.mode, '跟随系统');
     logic.modeOnChanged('开');
@@ -90,7 +93,9 @@ void main() {
   });
 
   test('fake version', () async {
-    final logic = Get.put(SettingsLogic(dio: FakeDio()));
+    dio = FakeDio();
+
+    final logic = Get.put(SettingsLogic());
 
     expect(logic.latestVer.value, isNull);
     expect(logic.updateAvailable, isFalse);
@@ -105,7 +110,9 @@ void main() {
   });
 
   test('error version', () async {
-    final logic = Get.put(SettingsLogic(dio: FakeErrorDio()));
+    dio = FakeErrorDio();
+
+    final logic = Get.put(SettingsLogic());
 
     expect(logic.latestVer.value, isNull);
     expect(logic.updateAvailable, isFalse);

diff --git a/test/timetable/ecnu/ecnu_logic_test.dart b/test/timetable/ecnu/ecnu_logic_test.dart
@@ -1,6 +1,7 @@
 import 'package:dio/dio.dart';
 import 'package:ecnu_timetable/timetable/ecnu/ecnu_logic.dart';
 import 'package:ecnu_timetable/utils/database.dart';
+import 'package:ecnu_timetable/utils/web.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:get/get.dart' hide Response;
 import 'package:hive_flutter/adapters.dart';
@@ -99,7 +100,9 @@ void main() {
   });
 
   test('years', () {
-    final logic = Get.put(EcnuLogic(dio: FakeDio()));
+    dio = FakeDio();
+
+    final logic = Get.put(EcnuLogic());
 
     logic.year.value = 2021;
     expect(logic.years, {

diff --git a/test/toolbox/calendar/calendar_logic_test.dart b/test/toolbox/calendar/calendar_logic_test.dart
@@ -1,5 +1,6 @@
 import 'package:dio/dio.dart';
 import 'package:ecnu_timetable/toolbox/calendar/calendar_logic.dart';
+import 'package:ecnu_timetable/utils/web.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:get/get.dart' hide Response;
@@ -43,7 +44,9 @@ void main() {
   runApp(const GetMaterialApp());
 
   test('fake calendar', () async {
-    final logic = Get.put(CalendarLogic(dio: FakeDio()));
+    dio = FakeDio();
+
+    final logic = Get.put(CalendarLogic());
 
     expect(logic.imgUrl.value, isEmpty);
 
@@ -54,7 +57,9 @@ void main() {
   });
 
   test('error calendar', () async {
-    final logic = Get.put(CalendarLogic(dio: FakeErrorDio()));
+    dio = FakeErrorDio();
+
+    final logic = Get.put(CalendarLogic());
 
     expect(logic.imgUrl.value, isEmpty);