Merge pull request #81 from opatry/task-repository-sync-test-improvem…

…ents Improve sync test linked to network availability & fix `Post` request response
opatry · Oct 28, 2024 · a2e18d9 · a2e18d9
2 parents 7f4684a + 1e27070
commit a2e18d9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/tasks-app-shared/src/commonTest/kotlin/net/opatry/tasks/data/TaskRepositorySyncTest.kt b/tasks-app-shared/src/commonTest/kotlin/net/opatry/tasks/data/TaskRepositorySyncTest.kt
@@ -29,6 +29,7 @@ import io.ktor.http.HttpStatusCode
 import kotlinx.coroutines.flow.firstOrNull
 import net.opatry.tasks.data.model.TaskListDataModel
 import net.opatry.tasks.data.util.respondNoNetwork
+import net.opatry.tasks.data.util.respondWithTaskList
 import net.opatry.tasks.data.util.respondWithTaskLists
 import net.opatry.tasks.data.util.respondWithTasks
 import net.opatry.tasks.data.util.runTaskRepositoryTest
@@ -105,36 +106,32 @@ class TaskRepositorySyncTest {
 
     @Test
     fun `local only tasks are synced at next sync`() {
-        var requestCount = 0
+        var isNetworkAvailable = true
         MockEngine { request ->
-            ++requestCount
             when {
-                requestCount == 1
-                        && request.method == HttpMethod.Post
-                        && request.url.encodedPath == "/tasks/v1/users/@me/lists"
-                -> respondNoNetwork()
+                !isNetworkAvailable -> respondNoNetwork()
 
-                requestCount == 2
-                        && request.method == HttpMethod.Get
+                request.method == HttpMethod.Get
                         && request.url.encodedPath == "/tasks/v1/users/@me/lists"
                 -> respondWithTaskLists()
 
-                requestCount == 3
-                        && request.method == HttpMethod.Post
+                request.method == HttpMethod.Post
                         && request.url.encodedPath == "/tasks/v1/users/@me/lists"
-                -> respondWithTaskLists("MTAwNDEyMDI1NDY0NDEwNzQ0NDI6MDow" to "Task list")
+                -> respondWithTaskList("MTAwNDEyMDI1NDY0NDEwNzQ0NDI6MDow", "Task list")
 
                 else -> fail("Unexpected request: $request")
             }
         }.use { mockEngine ->
             runTaskRepositoryTest(mockEngine) { repository ->
                 // for first request, no network
+                isNetworkAvailable = false
                 repository.createTaskList("Task list")
                 val taskList = repository.getTaskLists().firstOrNull()?.firstOrNull()
                 assertNotNull(taskList)
                 assertEquals(0, mockEngine.responseHistory.size)
 
                 // network is considered back, sync should trigger fetch & push requests
+                isNetworkAvailable = true
                 repository.sync()
                 assertEquals(2, mockEngine.responseHistory.size)
             }

diff --git a/tasks-app-shared/src/commonTest/kotlin/net/opatry/tasks/data/util/taskResponses.kt b/tasks-app-shared/src/commonTest/kotlin/net/opatry/tasks/data/util/taskResponses.kt
@@ -55,6 +55,14 @@ fun MockRequestHandleScope.respondWithTaskLists(vararg idToTitles: Pair<String,
     )
 }
 
+fun MockRequestHandleScope.respondWithTaskList(id: String, title: String): HttpResponseData {
+    return respond(
+        content = Json.encodeToString(TaskList(id = id, title = title)),
+        status = HttpStatusCode.OK,
+        headers = headersOf(HttpHeaders.ContentType, ContentType.Application.Json.toString())
+    )
+}
+
 fun MockRequestHandleScope.respondWithTasks(vararg idToTitles: Pair<String, String>): HttpResponseData {
     val tasks = idToTitles.map { Task(id = it.first, title = it.second) }
     val tasksResponse = ResourceListResponse(