github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-04-25 04:50:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ensure tests are consistent on all platforms, ensure order of MessageProtocols are consistent.

Browse Source
This commit is contained in:
Him188 2022-06-04 12:26:54 +01:00
parent dfcc503951
commit 8674573094
No known key found for this signature in database
GPG Key ID: BA439CDDCF652375
3 changed files with 12 additions and 12 deletions
mirai-core/src
commonTest/kotlin
message/protocol/impl
QuoteReplyProtocolTest.kt
notice/processors
MessageTest.kt
nativeMain/kotlin/utils
MiraiCoreServices.kt

3
mirai-core/src/commonTest/kotlin/message/protocol/impl/QuoteReplyProtocolTest.kt
View File

@ -18,6 +18,7 @@ import net.mamoe.mirai.message.data.MessageSource.Key.quote
import net.mamoe.mirai.message.data.PlainText
import net.mamoe.mirai.message.data.QuoteReply
import net.mamoe.mirai.message.data.messageChainOf
import net.mamoe.mirai.utils.EMPTY_BYTE_ARRAY
import net.mamoe.mirai.utils.hexToBytes
import kotlin.test.Test
@ -86,6 +87,7 @@ internal class QuoteReplyProtocolTest : AbstractMessageProtocolTest() {
),
),
),
srcMsg = EMPTY_BYTE_ARRAY
// mirai's OfflineMessageSource has no enough information to create 'srcMsg'
),
),
@ -319,6 +321,7 @@ internal class QuoteReplyProtocolTest : AbstractMessageProtocolTest() {
),
),
),
srcMsg = EMPTY_BYTE_ARRAY
// mirai's OfflineMessageSource has no enough information to create 'srcMsg'
),
),

13
mirai-core/src/commonTest/kotlin/notice/processors/MessageTest.kt
View File

@ -19,10 +19,7 @@ import net.mamoe.mirai.event.events.GroupMessageEvent
import net.mamoe.mirai.event.events.GroupTempMessageEvent
import net.mamoe.mirai.internal.network.components.NoticePipelineContext.Companion.KEY_FROM_SYNC
import net.mamoe.mirai.internal.test.runBlockingUnit
import net.mamoe.mirai.message.data.MessageSource
import net.mamoe.mirai.message.data.OnlineMessageSource
import net.mamoe.mirai.message.data.PlainText
import net.mamoe.mirai.message.data.content
import net.mamoe.mirai.message.data.*
import kotlin.test.Test
import kotlin.test.assertContentEquals
import kotlin.test.assertEquals
@ -124,7 +121,7 @@ internal class MessageTest : AbstractNoticeProcessorTest() {
assertEquals(1630, time)
assertEquals(1230001, fromId)
assertEquals(2230203, targetId)
assertEquals(event.message.filterNot { it is MessageSource }, originalMessage)
assertEquals(event.message.filterNot { it is MessageSource }.toMessageChain(), originalMessage)
}
assertIs<PlainText>(get(1))
assertEquals("hello", get(1).content)
@ -205,7 +202,7 @@ internal class MessageTest : AbstractNoticeProcessorTest() {
assertEquals(1630, time)
assertEquals(1230001, fromId)
assertEquals(1230003, targetId)
assertEquals(event.message.filterNot { it is MessageSource }, originalMessage)
assertEquals(event.message.filterNot { it is MessageSource }.toMessageChain(), originalMessage)
}
assertIs<PlainText>(get(1))
assertEquals("123", get(1).content)
@ -298,7 +295,7 @@ internal class MessageTest : AbstractNoticeProcessorTest() {
assertEquals(1630, time)
assertEquals(1230001, fromId)
assertEquals(1230003, targetId)
assertEquals(event.message.filterNot { it is MessageSource }, originalMessage)
assertEquals(event.message.filterNot { it is MessageSource }.toMessageChain(), originalMessage)
}
assertIs<PlainText>(get(1))
assertEquals("hello", get(1).content)
@ -392,7 +389,7 @@ internal class MessageTest : AbstractNoticeProcessorTest() {
assertEquals(1630, time)
assertEquals(1230001, fromId)
assertEquals(1230003, targetId)
assertEquals(event.message.filterNot { it is MessageSource }, originalMessage)
assertEquals(event.message.filterNot { it is MessageSource }.toMessageChain(), originalMessage)
}
assertIs<PlainText>(get(1))
assertEquals("hello", get(1).content)

8
mirai-core/src/nativeMain/kotlin/utils/MiraiCoreServices.kt
View File

@ -28,14 +28,14 @@ internal object MiraiCoreServices {
val msgProtocol = "net.mamoe.mirai.internal.message.protocol.MessageProtocol"
Services.register(
msgProtocol,
"net.mamoe.mirai.internal.message.protocol.impl.CustomMessageProtocol"
) { net.mamoe.mirai.internal.message.protocol.impl.CustomMessageProtocol() }
Services.register(
msgProtocol,
"net.mamoe.mirai.internal.message.protocol.impl.AudioProtocol"
) { net.mamoe.mirai.internal.message.protocol.impl.AudioProtocol() }
Services.register(
msgProtocol,
"net.mamoe.mirai.internal.message.protocol.impl.CustomMessageProtocol"
) { net.mamoe.mirai.internal.message.protocol.impl.CustomMessageProtocol() }
Services.register(
msgProtocol,
"net.mamoe.mirai.internal.message.protocol.impl.FaceProtocol"