Clear preferences before offline subtask tests

app/src/androidTest/java/com/todoroo/astrid/adapter/OfflineSubtaskTest.kt

@@ -39,6 +39,7 @@ class OfflineSubtaskTest : InjectingTestCase() {
     @Before
     override fun setUp() {
         super.setUp()
+        preferences.clear()
         tasks.clear()
         adapter = TaskAdapter()
         adapter.setDataSource(dataSource)

app/src/androidTest/java/com/todoroo/astrid/gtasks/GtasksMetadataServiceTest.kt

@@ -52,7 +52,7 @@ class GtasksMetadataServiceTest : InjectingTestCase() {
 
     // --- helpers
     private fun whenSearchForMetadata() {
-        metadata = googleTaskDao.getByTaskId(task!!.id!!)
+        metadata = googleTaskDao.getByTaskId(task!!.id)
     }
 
     private fun taskWithMetadata(id: String?): Task {

app/src/androidTest/java/com/todoroo/astrid/model/TaskTest.kt

@@ -21,7 +21,7 @@ class TaskTest : InjectingTestCase() {
         Freeze.freezeClock {
             val task = Task()
             taskDao.createNew(task)
-            assertEquals(DateTimeUtils.currentTimeMillis(), task.creationDate as Long)
+            assertEquals(DateTimeUtils.currentTimeMillis(), task.creationDate)
         }
     }
 

app/src/androidTest/java/org/tasks/data/DeletionDaoTests.kt

@@ -35,8 +35,8 @@ class DeletionDaoTests : InjectingTestCase() {
         taskDao.createNew(task)
         deletionDao.markDeleted(listOf(task.id))
         task = taskDao.fetch(task.id)!!
-        assertTrue(task.modificationDate!! > task.creationDate!!)
+        assertTrue(task.modificationDate > task.creationDate)
-        assertTrue(task.modificationDate!! < DateTimeUtils.currentTimeMillis())
+        assertTrue(task.modificationDate < DateTimeUtils.currentTimeMillis())
     }
 
     @Test
@@ -45,8 +45,8 @@ class DeletionDaoTests : InjectingTestCase() {
         taskDao.createNew(task)
         deletionDao.markDeleted(listOf(task.id))
         task = taskDao.fetch(task.id)!!
-        assertTrue(task.deletionDate!! > task.creationDate!!)
+        assertTrue(task.deletionDate > task.creationDate)
-        assertTrue(task.deletionDate!! < DateTimeUtils.currentTimeMillis())
+        assertTrue(task.deletionDate < DateTimeUtils.currentTimeMillis())
     }
 
     override fun inject(component: TestComponent) = component.inject(this)

app/src/androidTest/java/org/tasks/data/TagDataDaoTest.kt

@@ -73,7 +73,7 @@ class TagDataDaoTest : InjectingTestCase() {
         tagDataDao.createNew(tagTwo)
         tagDao.insert(newTag(with(TAGDATA, tagOne), with(TASK, taskOne)))
         tagDao.insert(newTag(with(TAGDATA, tagTwo), with(TASK, taskTwo)))
-        assertEquals(listOf(tagOne), tagDataDao.getTagDataForTask(taskOne.id!!))
+        assertEquals(listOf(tagOne), tagDataDao.getTagDataForTask(taskOne.id))
     }
 
     @Test

app/src/commonTest/java/org/tasks/makers/TagMaker.kt

@@ -19,7 +19,7 @@ object TagMaker {
         val tag = Tag()
         val task = lookup.valueOf(TASK, null as Task?)!!
         tag.task = task.id
-        tag.setTaskUid(task.uuid!!)
+        tag.setTaskUid(task.uuid)
         tag.tagUid = lookup.valueOf(TAGUID, null as String?)
         val tagData = lookup.valueOf(TAGDATA, null as TagData?)
         if (tagData != null) {