buzzert/Kordophone
Private
Public Access
1
0
Fork 0
Code Packages Activity

BackendTests: Fix Backend Tests.

Browse Source
This commit is contained in:
James Magahern
2024-03-01 21:46:14 -08:00
parent 077b12b1ac
commit 222ec84855
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/test/java/net/buzzert/kordophone/backend/BackendTests.kt
View File

@@ -89,7 +89,7 @@ class BackendTests {
val guid = repository.enqueueOutgoingMessage(outgoingMessage, conversation) val guid = repository.enqueueOutgoingMessage(outgoingMessage, conversation)
val event = repository.messageDeliveredChannel.first() val event = repository.messageDeliveredChannel.first()
assertEquals(event.guid, guid) assertEquals(event.requestGuid, guid)
assertEquals(event.message.text, outgoingMessage.text) assertEquals(event.message.text, outgoingMessage.text)
repository.close() repository.close()

22
backend/src/test/java/net/buzzert/kordophone/backend/MockServer.kt
View File

@@ -15,6 +15,7 @@ import net.buzzert.kordophone.backend.model.UpdateItem
import net.buzzert.kordophone.backend.server.APIClient import net.buzzert.kordophone.backend.server.APIClient
import net.buzzert.kordophone.backend.server.APIInterface import net.buzzert.kordophone.backend.server.APIInterface
import net.buzzert.kordophone.backend.server.SendMessageRequest import net.buzzert.kordophone.backend.server.SendMessageRequest
import net.buzzert.kordophone.backend.server.SendMessageResponse
import net.buzzert.kordophone.backend.server.authenticatedWebSocketURL import net.buzzert.kordophone.backend.server.authenticatedWebSocketURL
import okhttp3.HttpUrl import okhttp3.HttpUrl
import okhttp3.MediaType.Companion.toMediaType import okhttp3.MediaType.Companion.toMediaType
@@ -128,11 +129,18 @@ class MockServer {
return testMessages return testMessages
} }
fun markConversationAsRead(guid: GUID) {
val conversation = conversations.first { it.guid == guid }
conversation.unreadCount = 0
updateConversation(conversation)
}
internal fun getMessagesForConversationGUID(guid: GUID): List<Message>? { internal fun getMessagesForConversationGUID(guid: GUID): List<Message>? {
return messages[guid]?.toList() return messages[guid]?.toList()
} }
internal fun sendMessage(body: String, toConversationGUID: GUID) { internal fun sendMessage(body: String, toConversationGUID: GUID): Message {
val conversation = conversations.first { it.guid == toConversationGUID } val conversation = conversations.first { it.guid == toConversationGUID }
val message = Message( val message = Message(
@@ -144,6 +152,7 @@ class MockServer {
) )
addMessagesToConversation(conversation, listOf(message)) addMessagesToConversation(conversation, listOf(message))
return message
} }
} }
@@ -237,8 +246,15 @@ class MockServerInterface(private val server: MockServer): APIInterface {
} }
} }
override suspend fun sendMessage(request: SendMessageRequest): Response<Void> { override suspend fun sendMessage(request: SendMessageRequest): Response<SendMessageResponse> {
server.sendMessage(request.body, request.conversationGUID) val message = server.sendMessage(request.body, request.conversationGUID)
val response = SendMessageResponse(message.guid)
return Response.success(response)
}
override suspend fun markConversation(conversationGUID: String): Response<Void> {
server.markConversationAsRead(conversationGUID)
return Response.success(null) return Response.success(null)
} }
} }