Fix test compile

pull/996/head
Alex Baker 5 years ago
parent 65272291bc
commit 33966506de

@ -10,6 +10,7 @@ import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.io.StringReader; import java.io.StringReader;
import org.tasks.caldav.CaldavConverter; import org.tasks.caldav.CaldavConverter;
import org.tasks.preferences.Preferences;
public class TestUtilities { 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) { public static Task vtodo(String path) {
Task task = new Task(); Task task = new Task();

@ -1,6 +1,6 @@
package org.tasks.caldav; package org.tasks.caldav;
import static org.tasks.injection.TestModule.newPreferences; import static org.tasks.TestUtilities.newPreferences;
import android.content.Context; import android.content.Context;
import androidx.test.core.app.ApplicationProvider; import androidx.test.core.app.ApplicationProvider;

@ -1,5 +1,7 @@
package org.tasks.injection; package org.tasks.injection;
import static org.tasks.TestUtilities.newPreferences;
import android.content.Context; import android.content.Context;
import androidx.room.Room; import androidx.room.Room;
import com.todoroo.astrid.dao.Database; import com.todoroo.astrid.dao.Database;
@ -10,27 +12,23 @@ import org.tasks.preferences.PermissivePermissionChecker;
import org.tasks.preferences.Preferences; import org.tasks.preferences.Preferences;
@Module(includes = ApplicationModule.class) @Module(includes = ApplicationModule.class)
public class TestModule { class TestModule {
public static Preferences newPreferences(Context context) {
return new Preferences(context, "test_preferences");
}
@Provides @Provides
@ApplicationScope @ApplicationScope
public Database getDatabase(@ForApplication Context context) { Database getDatabase(@ForApplication Context context) {
return Room.inMemoryDatabaseBuilder(context, Database.class) return Room.inMemoryDatabaseBuilder(context, Database.class)
.fallbackToDestructiveMigration() .fallbackToDestructiveMigration()
.build(); .build();
} }
@Provides @Provides
public PermissionChecker getPermissionChecker(@ForApplication Context context) { PermissionChecker getPermissionChecker(@ForApplication Context context) {
return new PermissivePermissionChecker(context); return new PermissivePermissionChecker(context);
} }
@Provides @Provides
public Preferences getPreferences(@ForApplication Context context) { Preferences getPreferences(@ForApplication Context context) {
return newPreferences(context); return newPreferences(context);
} }
} }

@ -2,7 +2,7 @@ package org.tasks.preferences;
import static androidx.test.core.app.ApplicationProvider.getApplicationContext; import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertEquals;
import static org.tasks.injection.TestModule.newPreferences; import static org.tasks.TestUtilities.newPreferences;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;

Loading…
Cancel
Save