diff --git a/app/src/androidTest/java/org/tasks/TestUtilities.java b/app/src/androidTest/java/org/tasks/TestUtilities.java index f978b2d93..336abe45d 100644 --- a/app/src/androidTest/java/org/tasks/TestUtilities.java +++ b/app/src/androidTest/java/org/tasks/TestUtilities.java @@ -10,6 +10,7 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.StringReader; import org.tasks.caldav.CaldavConverter; +import org.tasks.preferences.Preferences; public class TestUtilities { @@ -23,6 +24,10 @@ public class TestUtilities { } } + public static Preferences newPreferences(Context context) { + return new Preferences(context, "test_preferences"); + } + public static Task vtodo(String path) { Task task = new Task(); diff --git a/app/src/androidTest/java/org/tasks/caldav/CaldavClientTest.java b/app/src/androidTest/java/org/tasks/caldav/CaldavClientTest.java index 0d0f02304..fe1c3fa7d 100644 --- a/app/src/androidTest/java/org/tasks/caldav/CaldavClientTest.java +++ b/app/src/androidTest/java/org/tasks/caldav/CaldavClientTest.java @@ -1,6 +1,6 @@ package org.tasks.caldav; -import static org.tasks.injection.TestModule.newPreferences; +import static org.tasks.TestUtilities.newPreferences; import android.content.Context; import androidx.test.core.app.ApplicationProvider; diff --git a/app/src/androidTest/java/org/tasks/injection/TestModule.java b/app/src/androidTest/java/org/tasks/injection/TestModule.java index 1ca33618a..200d149dc 100644 --- a/app/src/androidTest/java/org/tasks/injection/TestModule.java +++ b/app/src/androidTest/java/org/tasks/injection/TestModule.java @@ -1,5 +1,7 @@ package org.tasks.injection; +import static org.tasks.TestUtilities.newPreferences; + import android.content.Context; import androidx.room.Room; import com.todoroo.astrid.dao.Database; @@ -10,27 +12,23 @@ import org.tasks.preferences.PermissivePermissionChecker; import org.tasks.preferences.Preferences; @Module(includes = ApplicationModule.class) -public class TestModule { - - public static Preferences newPreferences(Context context) { - return new Preferences(context, "test_preferences"); - } +class TestModule { @Provides @ApplicationScope - public Database getDatabase(@ForApplication Context context) { + Database getDatabase(@ForApplication Context context) { return Room.inMemoryDatabaseBuilder(context, Database.class) .fallbackToDestructiveMigration() .build(); } @Provides - public PermissionChecker getPermissionChecker(@ForApplication Context context) { + PermissionChecker getPermissionChecker(@ForApplication Context context) { return new PermissivePermissionChecker(context); } @Provides - public Preferences getPreferences(@ForApplication Context context) { + Preferences getPreferences(@ForApplication Context context) { return newPreferences(context); } } diff --git a/app/src/androidTest/java/org/tasks/preferences/PreferenceTests.java b/app/src/androidTest/java/org/tasks/preferences/PreferenceTests.java index ce0caf8c9..2180496b4 100644 --- a/app/src/androidTest/java/org/tasks/preferences/PreferenceTests.java +++ b/app/src/androidTest/java/org/tasks/preferences/PreferenceTests.java @@ -2,7 +2,7 @@ package org.tasks.preferences; import static androidx.test.core.app.ApplicationProvider.getApplicationContext; import static junit.framework.Assert.assertEquals; -import static org.tasks.injection.TestModule.newPreferences; +import static org.tasks.TestUtilities.newPreferences; import android.annotation.SuppressLint; import androidx.test.ext.junit.runners.AndroidJUnit4;