Remove CaldavCalendarMaker

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

@@ -4,7 +4,6 @@ import com.natpryce.makeiteasy.MakeItEasy.with
 import com.natpryce.makeiteasy.PropertyValue
 import com.todoroo.astrid.api.GtasksFilter
 import com.todoroo.astrid.dao.TaskDao
-import org.tasks.data.entity.Task
 import com.todoroo.astrid.service.TaskMover
 import dagger.hilt.android.testing.HiltAndroidTest
 import dagger.hilt.android.testing.UninstallModules
@@ -14,14 +13,14 @@ import org.junit.Before
 import org.junit.Test
 import org.tasks.LocalBroadcastManager
 import org.tasks.R
-import org.tasks.data.dao.CaldavDao
-import org.tasks.data.dao.GoogleTaskDao
 import org.tasks.data.TaskContainer
 import org.tasks.data.TaskListQuery.getQuery
+import org.tasks.data.dao.CaldavDao
+import org.tasks.data.dao.GoogleTaskDao
+import org.tasks.data.entity.CaldavCalendar
+import org.tasks.data.entity.Task
 import org.tasks.injection.InjectingTestCase
 import org.tasks.injection.ProductionModule
-import org.tasks.makers.CaldavCalendarMaker
-import org.tasks.makers.CaldavCalendarMaker.newCaldavCalendar
 import org.tasks.makers.CaldavTaskMaker.CALENDAR
 import org.tasks.makers.CaldavTaskMaker.TASK
 import org.tasks.makers.CaldavTaskMaker.newCaldavTask
@@ -42,7 +41,7 @@ class GoogleTaskManualSortAdapterTest : InjectingTestCase() {
 
     private lateinit var adapter: GoogleTaskManualSortAdapter
     private val tasks = ArrayList<TaskContainer>()
-    private val filter = GtasksFilter(newCaldavCalendar(with(CaldavCalendarMaker.UUID, "1234")))
+    private val filter = GtasksFilter(CaldavCalendar(uuid = "1234"))
     private val dataSource = object : TaskAdapterDataSource {
         override fun getItem(position: Int) = tasks[position]
 

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

@@ -11,15 +11,12 @@ import org.junit.Assert.assertNull
 import org.junit.Before
 import org.junit.Test
 import org.tasks.LocalBroadcastManager
-import org.tasks.data.entity.CaldavAccount
 import org.tasks.data.dao.CaldavDao
 import org.tasks.data.dao.GoogleTaskListDao
+import org.tasks.data.entity.CaldavAccount
+import org.tasks.data.entity.CaldavCalendar
 import org.tasks.injection.InjectingTestCase
 import org.tasks.injection.ProductionModule
-import org.tasks.makers.CaldavCalendarMaker.ID
-import org.tasks.makers.CaldavCalendarMaker.NAME
-import org.tasks.makers.CaldavCalendarMaker.UUID
-import org.tasks.makers.CaldavCalendarMaker.newCaldavCalendar
 import org.tasks.makers.RemoteGtaskListMaker
 import org.tasks.makers.RemoteGtaskListMaker.newRemoteList
 import javax.inject.Inject
@@ -46,13 +43,14 @@ class GtasksListServiceTest : InjectingTestCase() {
                 newRemoteList(
                         with(RemoteGtaskListMaker.REMOTE_ID, "1"), with(RemoteGtaskListMaker.NAME, "Default")))
         assertEquals(
-                newCaldavCalendar(with(ID, 1L), with(UUID, "1"), with(NAME, "Default")),
+            CaldavCalendar(id = 1, account = "account", uuid = "1", name = "Default"),
-                googleTaskListDao.getById(1L))
+            googleTaskListDao.getById(1L)
+        )
     }
 
     @Test
     fun testGetListByRemoteId() = runBlocking {
-        val list = newCaldavCalendar(with(UUID, "1"))
+        val list = CaldavCalendar(uuid = "1")
         list.id = googleTaskListDao.insertOrReplace(list)
         assertEquals(list, googleTaskListDao.getByRemoteId("1"))
     }
@@ -64,18 +62,19 @@ class GtasksListServiceTest : InjectingTestCase() {
 
     @Test
     fun testDeleteMissingList() = runBlocking {
-        googleTaskListDao.insertOrReplace(newCaldavCalendar(with(ID, 1L), with(UUID, "1")))
+        googleTaskListDao.insertOrReplace(CaldavCalendar(id = 1, account = "account", uuid = "1"))
         val taskList = newRemoteList(with(RemoteGtaskListMaker.REMOTE_ID, "2"))
         setLists(taskList)
         assertEquals(
-                listOf(newCaldavCalendar(with(ID, 2L), with(UUID, "2"), with(NAME, "Default"))),
+            listOf(CaldavCalendar(id = 2, account = "account", uuid = "2", name = "Default")),
-                googleTaskListDao.getLists("account"))
+            googleTaskListDao.getLists("account")
+        )
     }
 
     @Test
     fun testUpdateListName() = runBlocking {
         googleTaskListDao.insertOrReplace(
-                newCaldavCalendar(with(ID, 1L), with(UUID, "1"), with(NAME, "oldName"))
+                CaldavCalendar(id = 1, uuid = "1", name = "oldName", account = "account")
         )
         setLists(
                 newRemoteList(

app/src/androidTest/java/com/todoroo/astrid/service/TaskMoverTest.kt

@@ -11,18 +11,15 @@ import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
+import org.tasks.data.dao.CaldavDao
+import org.tasks.data.dao.GoogleTaskDao
 import org.tasks.data.entity.CaldavAccount
 import org.tasks.data.entity.CaldavAccount.Companion.TYPE_CALDAV
 import org.tasks.data.entity.CaldavAccount.Companion.TYPE_GOOGLE_TASKS
 import org.tasks.data.entity.CaldavCalendar
-import org.tasks.data.dao.CaldavDao
-import org.tasks.data.dao.GoogleTaskDao
 import org.tasks.injection.InjectingTestCase
 import org.tasks.injection.ProductionModule
 import org.tasks.jobs.WorkManager
-import org.tasks.makers.CaldavCalendarMaker
-import org.tasks.makers.CaldavCalendarMaker.ACCOUNT
-import org.tasks.makers.CaldavCalendarMaker.newCaldavCalendar
 import org.tasks.makers.CaldavTaskMaker.CALENDAR
 import org.tasks.makers.CaldavTaskMaker.REMOTE_ID
 import org.tasks.makers.CaldavTaskMaker.REMOTE_PARENT
@@ -46,8 +43,8 @@ class TaskMoverTest : InjectingTestCase() {
     @Before
     fun setup() {
         runBlocking {
-            caldavDao.insert(newCaldavCalendar(with(CaldavCalendarMaker.UUID, "1"), with(ACCOUNT, "account1")))
+            caldavDao.insert(CaldavCalendar(uuid = "1", account = "account1"))
-            caldavDao.insert(newCaldavCalendar(with(CaldavCalendarMaker.UUID, "2"), with(ACCOUNT, "account2")))
+            caldavDao.insert(CaldavCalendar(uuid = "2", account = "account2"))
         }
     }
 
@@ -309,7 +306,7 @@ class TaskMoverTest : InjectingTestCase() {
     }
 
     private suspend fun moveToGoogleTasks(list: String, vararg tasks: Long) {
-        taskMover.move(tasks.toList(), GtasksFilter(newCaldavCalendar(with(CaldavCalendarMaker.UUID, list))))
+        taskMover.move(tasks.toList(), GtasksFilter(CaldavCalendar(uuid = list)))
     }
 
     private suspend fun moveToCaldavList(calendar: String, vararg tasks: Long) {

app/src/androidTest/java/com/todoroo/astrid/service/Upgrade_11_3_Test.kt

@@ -3,7 +3,6 @@
 package com.todoroo.astrid.service
 
 import com.natpryce.makeiteasy.MakeItEasy.with
-import org.tasks.data.entity.Task
 import dagger.hilt.android.testing.HiltAndroidTest
 import dagger.hilt.android.testing.UninstallModules
 import kotlinx.coroutines.runBlocking
@@ -12,12 +11,12 @@ import org.junit.Test
 import org.tasks.SuspendFreeze.Companion.freezeAt
 import org.tasks.TestUtilities.assertEquals
 import org.tasks.caldav.VtodoCache
-import org.tasks.data.entity.CaldavCalendar
 import org.tasks.data.dao.CaldavDao
 import org.tasks.data.dao.TaskDao
+import org.tasks.data.entity.CaldavCalendar
+import org.tasks.data.entity.Task
 import org.tasks.injection.InjectingTestCase
 import org.tasks.injection.ProductionModule
-import org.tasks.makers.CaldavCalendarMaker.newCaldavCalendar
 import org.tasks.makers.CaldavTaskMaker.CALENDAR
 import org.tasks.makers.CaldavTaskMaker.REMOTE_ID
 import org.tasks.makers.CaldavTaskMaker.TASK
@@ -44,7 +43,7 @@ class Upgrade_11_3_Test : InjectingTestCase() {
     @Before
     override fun setUp() {
         super.setUp()
-        calendar = newCaldavCalendar()
+        calendar = CaldavCalendar()
         runBlocking {
             caldavDao.insert(calendar)
         }

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

@@ -9,15 +9,15 @@ import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull
 import org.junit.Before
 import org.junit.Test
-import org.tasks.data.entity.CaldavAccount.Companion.TYPE_GOOGLE_TASKS
 import org.tasks.data.dao.CaldavDao
 import org.tasks.data.dao.GoogleTaskDao
 import org.tasks.data.dao.GoogleTaskListDao
 import org.tasks.data.entity.CaldavAccount
+import org.tasks.data.entity.CaldavAccount.Companion.TYPE_GOOGLE_TASKS
+import org.tasks.data.entity.CaldavCalendar
 import org.tasks.data.entity.CaldavTask
 import org.tasks.injection.InjectingTestCase
 import org.tasks.injection.ProductionModule
-import org.tasks.makers.CaldavCalendarMaker.newCaldavCalendar
 import org.tasks.makers.CaldavTaskMaker.CALENDAR
 import org.tasks.makers.CaldavTaskMaker.REMOTE_ID
 import org.tasks.makers.CaldavTaskMaker.REMOTE_PARENT
@@ -39,7 +39,7 @@ class GoogleTaskDaoTests : InjectingTestCase() {
         super.setUp()
         runBlocking {
             caldavDao.insert(CaldavAccount(uuid = "account", accountType = TYPE_GOOGLE_TASKS))
-            caldavDao.insert(newCaldavCalendar())
+            caldavDao.insert(CaldavCalendar(account = "account", uuid = "calendar"))
         }
     }
 

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

@@ -13,10 +13,9 @@ import org.tasks.R
 import org.tasks.data.dao.CaldavDao
 import org.tasks.data.dao.GoogleTaskDao
 import org.tasks.data.entity.CaldavAccount
+import org.tasks.data.entity.CaldavCalendar
 import org.tasks.injection.InjectingTestCase
 import org.tasks.injection.ProductionModule
-import org.tasks.makers.CaldavCalendarMaker.UUID
-import org.tasks.makers.CaldavCalendarMaker.newCaldavCalendar
 import org.tasks.makers.CaldavTaskMaker.CALENDAR
 import org.tasks.makers.CaldavTaskMaker.TASK
 import org.tasks.makers.CaldavTaskMaker.newCaldavTask
@@ -41,7 +40,7 @@ class ManualGoogleTaskQueryTest : InjectingTestCase() {
         super.setUp()
         preferences.clear()
         preferences.setBoolean(R.string.p_manual_sort, true)
-        val calendar = newCaldavCalendar(with(UUID, "1234"))
+        val calendar = CaldavCalendar(uuid = "1234")
         runBlocking {
             caldavDao.insert(CaldavAccount())
             caldavDao.insert(calendar)

app/src/test/java/org/tasks/makers/CaldavCalendarMaker.kt

@@ -1,28 +0,0 @@
-package org.tasks.makers
-
-import com.natpryce.makeiteasy.Instantiator
-import com.natpryce.makeiteasy.Property
-import com.natpryce.makeiteasy.Property.newProperty
-import com.natpryce.makeiteasy.PropertyValue
-import org.tasks.data.entity.CaldavCalendar
-import org.tasks.makers.Maker.make
-
-object CaldavCalendarMaker {
-    val ID: Property<CaldavCalendar, Long> = newProperty()
-    val ACCOUNT: Property<CaldavCalendar, String> = newProperty()
-    val NAME: Property<CaldavCalendar, String> = newProperty()
-    val UUID: Property<CaldavCalendar, String> = newProperty()
-
-    private val instantiator = Instantiator { lookup ->
-        CaldavCalendar(
-            id = lookup.valueOf(ID, 0L),
-            name = lookup.valueOf(NAME, null as String?),
-            account = lookup.valueOf(ACCOUNT, "account"),
-            uuid = lookup.valueOf(UUID, "calendar"),
-        )
-    }
-
-    fun newCaldavCalendar(vararg properties: PropertyValue<in CaldavCalendar?, *>): CaldavCalendar {
-        return make(instantiator, *properties)
-    }
-}