From 4b81ff5d559279c439b571ee2a15d135055540b9 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Sun, 5 Jan 2025 10:45:18 -0600
Subject: [PATCH] Fix tests

---
 .../java/org/tasks/ui/editviewmodel/ReminderTests.kt       | 7 ++++---
 app/src/main/java/org/tasks/ui/TaskEditViewModel.kt        | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/src/androidTest/java/org/tasks/ui/editviewmodel/ReminderTests.kt b/app/src/androidTest/java/org/tasks/ui/editviewmodel/ReminderTests.kt
index 5cd7030ca..88d8f5771 100644
--- a/app/src/androidTest/java/org/tasks/ui/editviewmodel/ReminderTests.kt
+++ b/app/src/androidTest/java/org/tasks/ui/editviewmodel/ReminderTests.kt
@@ -4,6 +4,7 @@ import com.natpryce.makeiteasy.MakeItEasy.with
 import com.todoroo.astrid.service.TaskCreator.Companion.setDefaultReminders
 import dagger.hilt.android.testing.HiltAndroidTest
 import dagger.hilt.android.testing.UninstallModules
+import kotlinx.collections.immutable.persistentSetOf
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
@@ -38,7 +39,7 @@ class ReminderTests : BaseTaskEditViewModelTest() {
         setup(task)
 
         assertEquals(
-            listOf(Alarm(type = Alarm.TYPE_REL_START)),
+            persistentSetOf(Alarm(type = Alarm.TYPE_REL_START)),
             viewModel.viewState.value.alarms
         )
     }
@@ -55,7 +56,7 @@ class ReminderTests : BaseTaskEditViewModelTest() {
         setup(task)
 
         assertEquals(
-            listOf(Alarm(type = Alarm.TYPE_REL_END)),
+            persistentSetOf(Alarm(type = Alarm.TYPE_REL_END)),
             viewModel.viewState.value.alarms
         )
     }
@@ -72,7 +73,7 @@ class ReminderTests : BaseTaskEditViewModelTest() {
         setup(task)
 
         assertEquals(
-            listOf(whenOverdue(0)),
+            persistentSetOf(whenOverdue(0)),
             viewModel.viewState.value.alarms
         )
     }
diff --git a/app/src/main/java/org/tasks/ui/TaskEditViewModel.kt b/app/src/main/java/org/tasks/ui/TaskEditViewModel.kt
index fa7eacec1..816e6527f 100644
--- a/app/src/main/java/org/tasks/ui/TaskEditViewModel.kt
+++ b/app/src/main/java/org/tasks/ui/TaskEditViewModel.kt
@@ -139,7 +139,7 @@ class TaskEditViewModel @Inject constructor(
     private var cleared = false
 
     private val task: Task = savedStateHandle.get<Task>(TaskEditFragment.EXTRA_TASK)
-        ?.let { it.copy(notes = it.notes?.stripCarriageReturns()) }
+        ?.apply { notes = notes?.stripCarriageReturns() } // copying here broke tests 🙄
         ?: throw IllegalArgumentException("task is null")
 
     private var _originalState: ViewState