Fix tests

app/src/androidTest/java/org/tasks/injection/TestModule.kt

@@ -2,7 +2,6 @@ package org.tasks.injection
 
 import android.content.Context
 import androidx.room.Room
-import org.tasks.data.db.Database
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -10,6 +9,7 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
 import org.mockito.Mockito.mock
 import org.tasks.TestUtilities
+import org.tasks.data.db.Database
 import org.tasks.jobs.WorkManager
 import org.tasks.location.LocationManager
 import org.tasks.location.MockLocationManager
@@ -25,7 +25,7 @@ class TestModule {
     @Singleton
     fun getDatabase(@ApplicationContext context: Context): Database {
         return Room.inMemoryDatabaseBuilder(context, Database::class.java)
-                .fallbackToDestructiveMigration()
+                .fallbackToDestructiveMigration(dropAllTables = true)
                 .build()
     }
 

app/src/test/java/com/todoroo/astrid/alarms/AlarmCalculatorTest.kt

@@ -1,7 +1,6 @@
 package com.todoroo.astrid.alarms
 
 import com.natpryce.makeiteasy.MakeItEasy.with
-import com.todoroo.andlib.utility.DateUtilities.ONE_WEEK
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull
@@ -32,6 +31,7 @@ import org.tasks.makers.TaskMaker.REMINDER_LAST
 import org.tasks.makers.TaskMaker.newTask
 import org.tasks.reminders.Random
 import org.tasks.time.DateTime
+import org.tasks.time.ONE_WEEK
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.TimeUnit.DAYS
 import java.util.concurrent.TimeUnit.MINUTES