[DI] Remove test env

proninyaroslav · Sep 9, 2024 · fa69fc1 · fa69fc1
1 parent 12fdc7f
commit fa69fc1
Show file tree

Hide file tree

Showing 13 changed files with 66 additions and 166 deletions.
diff --git a/lib/core/crash_report/crash_report_builder.dart b/lib/core/crash_report/crash_report_builder.dart
@@ -118,7 +118,6 @@ class DevCrashReportBuilder extends CrashReportBuilderImpl {
   String get _email => '[email protected]';
 }
 
-@Injectable(as: CrashReportBuilder, env: [Env.test])
 class TestCrashReportBuilder extends DevCrashReportBuilder {
   TestCrashReportBuilder(
     super.platform,

diff --git a/lib/core/model/request_factory.dart b/lib/core/model/request_factory.dart
@@ -42,7 +42,7 @@ class RequestFactoryImpl implements RequestFactory {
       _mapServiceToBuilder(info: info, authData: authData);
 }
 
-@Injectable(as: RequestFactory, env: [Env.dev, Env.test])
+@Injectable(as: RequestFactory, env: [Env.dev])
 class DevRequestFactoryImpl implements RequestFactory {
   @override
   RequestBuilder builderOf({

diff --git a/lib/core/work_manager/work_manager.dart b/lib/core/work_manager/work_manager.dart
@@ -75,7 +75,7 @@ class WorkManagerImpl extends _WorkManagerImpl {
         );
 }
 
-@Singleton(as: WorkManager, env: [Env.dev, Env.test])
+@Singleton(as: WorkManager, env: [Env.dev])
 class DebugWorkManagerImpl extends _WorkManagerImpl {
   DebugWorkManagerImpl(
     WorkManagerRepository repo,

diff --git a/lib/di/app_database_module.dart b/lib/di/app_database_module.dart
@@ -20,19 +20,13 @@ import 'dart:async';
 
 import 'package:injectable/injectable.dart';
 import 'package:libretrack/core/storage/database.dart';
-import 'package:libretrack/env.dart';
 
 @module
 abstract class AppDatabaseModule {
-  @Singleton(env: [Env.prod, Env.dev])
+  @singleton
   @preResolve
   Future<AppDatabase> get db async => $FloorAppDatabase
       .databaseBuilder('libretrack.db')
       .addMigrations(migrations)
       .build();
-
-  @Singleton(env: [Env.test])
-  @preResolve
-  Future<AppDatabase> get inMemoryDb async =>
-      $FloorAppDatabase.inMemoryDatabaseBuilder().build();
 }
diff --git a/lib/di/flutter_secure_storage_module.dart b/lib/di/flutter_secure_storage_module.dart
@@ -18,14 +18,9 @@
 
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:injectable/injectable.dart';
-import 'package:libretrack/core/storage/service_auth_storage.dart';
-import 'package:libretrack/env.dart';
 
 @module
 abstract class FlutterSecureStorageModule {
-  @Injectable(env: [Env.prod, Env.dev])
+  @injectable
   FlutterSecureStorage get storage => const FlutterSecureStorage();
-
-  @Injectable(env: [Env.test])
-  FlutterSecureStorage get testStorage => TestFlutterSecureStorage();
 }
diff --git a/lib/di/shared_preferences_module.dart b/lib/di/shared_preferences_module.dart
@@ -17,19 +17,17 @@
 // along with LibreTrack.  If not, see <http://www.gnu.org/licenses/>.
 
 import 'package:injectable/injectable.dart';
-import 'package:libretrack/core/settings/settings.dart';
 import 'package:libretrack/core/settings/shared_pref_migrator.dart';
-import 'package:libretrack/env.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 @module
 abstract class SharedPreferencesModule {
-  @Singleton(env: [Env.prod, Env.dev])
+  @singleton
   @preResolve
   Future<SharedPreferences> get prefOld async =>
       SharedPreferences.getInstance();
 
-  @Singleton(env: [Env.prod, Env.dev])
+  @singleton
   @preResolve
   Future<SharedPreferencesAsync> pref(SharedPreferences prefOld) async {
     final pref = SharedPreferencesAsync();
@@ -41,17 +39,4 @@ abstract class SharedPreferencesModule {
 
     return pref;
   }
-
-  @Singleton(env: [Env.test])
-  @preResolve
-  Future<SharedPreferencesAsync> get testPref async =>
-      TestSharedPreferencesAsync();
-
-  @Singleton(env: [Env.test])
-  @preResolve
-  Future<SharedPreferences> get testOldPref async {
-    // ignore: invalid_use_of_visible_for_testing_member
-    SharedPreferences.setMockInitialValues({});
-    return SharedPreferences.getInstance();
-  }
 }
diff --git a/lib/env.dart b/lib/env.dart
@@ -19,5 +19,4 @@
 abstract class Env {
   static const String prod = 'prod';
   static const String dev = 'dev';
-  static const String test = 'test';
 }
diff --git a/lib/injector.config.dart b/lib/injector.config.dart
diff --git a/test/crash_report/crash_report_id_generator_test.dart b/test/crash_report/crash_report_id_generator_test.dart
@@ -19,16 +19,13 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:libretrack/core/crash_report/crash_report_id_generator.dart';
 import 'package:libretrack/core/crash_report/crash_report_manager.dart';
-import 'package:libretrack/env.dart';
-import 'package:libretrack/injector.dart';
 
 void main() {
   group('Crash report ID generator |', () {
     late CrashReportIdGenerator generator;
 
     setUpAll(() async {
-      await initInjector(Env.test);
-      generator = getIt<CrashReportIdGenerator>();
+      generator = CrashReportIdGeneratorImpl();
     });
 
     test('Random', () {