Bläddra i källkod

[mock] Fix modules plus-ing

Karlatemp 3 år sedan
förälder
incheckning
495542d2a2

+ 8 - 8
mirai-core-mock/src/internal/msgsrc/OnlineMsgSrc.kt

@@ -110,7 +110,7 @@ internal class OnlineMsgSrcToGroup(
 ) : OnlineMessageSource.Outgoing.ToGroup() {
 ) : OnlineMessageSource.Outgoing.ToGroup() {
     override val isOriginalMessageInitialized: Boolean get() = true
     override val isOriginalMessageInitialized: Boolean get() = true
 
 
-    object Serializer : KSerializer<MessageSource> by MessageSourceSerializerImpl("OnlineMessageSourceToGroup")
+    object Serializer : KSerializer<MessageSource> by MessageSourceSerializerImpl("Mock_OnlineMessageSourceToGroup")
 
 
 }
 }
 
 
@@ -127,7 +127,7 @@ internal class OnlineMsgSrcToFriend(
 ) : OnlineMessageSource.Outgoing.ToFriend() {
 ) : OnlineMessageSource.Outgoing.ToFriend() {
     override val isOriginalMessageInitialized: Boolean get() = true
     override val isOriginalMessageInitialized: Boolean get() = true
 
 
-    object Serializer : KSerializer<MessageSource> by MessageSourceSerializerImpl("OnlineMessageSourceToFriend")
+    object Serializer : KSerializer<MessageSource> by MessageSourceSerializerImpl("Mock_OnlineMessageSourceToFriend")
 
 
 }
 }
 
 
@@ -145,7 +145,7 @@ internal class OnlineMsgSrcToStranger(
 ) : OnlineMessageSource.Outgoing.ToStranger() {
 ) : OnlineMessageSource.Outgoing.ToStranger() {
     override val isOriginalMessageInitialized: Boolean get() = true
     override val isOriginalMessageInitialized: Boolean get() = true
 
 
-    object Serializer : KSerializer<MessageSource> by MessageSourceSerializerImpl("OnlineMessageSourceToStranger")
+    object Serializer : KSerializer<MessageSource> by MessageSourceSerializerImpl("Mock_OnlineMessageSourceToStranger")
 }
 }
 
 
 @Suppress("SERIALIZER_TYPE_INCOMPATIBLE")
 @Suppress("SERIALIZER_TYPE_INCOMPATIBLE")
@@ -161,7 +161,7 @@ internal class OnlineMsgSrcToTemp(
 ) : OnlineMessageSource.Outgoing.ToTemp() {
 ) : OnlineMessageSource.Outgoing.ToTemp() {
     override val isOriginalMessageInitialized: Boolean get() = true
     override val isOriginalMessageInitialized: Boolean get() = true
 
 
-    object Serializer : KSerializer<MessageSource> by MessageSourceSerializerImpl("OnlineMessageSourceToTemp")
+    object Serializer : KSerializer<MessageSource> by MessageSourceSerializerImpl("Mock_OnlineMessageSourceToTemp")
 }
 }
 
 
 
 
@@ -177,7 +177,7 @@ internal class OnlineMsgSrcFromFriend(
 ) : OnlineMessageSource.Incoming.FromFriend() {
 ) : OnlineMessageSource.Incoming.FromFriend() {
     override val isOriginalMessageInitialized: Boolean get() = true
     override val isOriginalMessageInitialized: Boolean get() = true
 
 
-    object Serializer : KSerializer<MessageSource> by MessageSourceSerializerImpl("OnlineMessageSourceFromFriend")
+    object Serializer : KSerializer<MessageSource> by MessageSourceSerializerImpl("Mock_OnlineMessageSourceFromFriend")
 }
 }
 
 
 @Suppress("SERIALIZER_TYPE_INCOMPATIBLE")
 @Suppress("SERIALIZER_TYPE_INCOMPATIBLE")
@@ -192,7 +192,7 @@ internal class OnlineMsgSrcFromStranger(
 ) : OnlineMessageSource.Incoming.FromStranger() {
 ) : OnlineMessageSource.Incoming.FromStranger() {
     override val isOriginalMessageInitialized: Boolean get() = true
     override val isOriginalMessageInitialized: Boolean get() = true
 
 
-    object Serializer : KSerializer<MessageSource> by MessageSourceSerializerImpl("OnlineMessageSourceFromStranger")
+    object Serializer : KSerializer<MessageSource> by MessageSourceSerializerImpl("Mock_OnlineMessageSourceFromStranger")
 }
 }
 
 
 @Suppress("SERIALIZER_TYPE_INCOMPATIBLE")
 @Suppress("SERIALIZER_TYPE_INCOMPATIBLE")
@@ -207,7 +207,7 @@ internal class OnlineMsgSrcFromTemp(
 ) : OnlineMessageSource.Incoming.FromTemp() {
 ) : OnlineMessageSource.Incoming.FromTemp() {
     override val isOriginalMessageInitialized: Boolean get() = true
     override val isOriginalMessageInitialized: Boolean get() = true
 
 
-    object Serializer : KSerializer<MessageSource> by MessageSourceSerializerImpl("OnlineMessageSourceFromTemp")
+    object Serializer : KSerializer<MessageSource> by MessageSourceSerializerImpl("Mock_OnlineMessageSourceFromTemp")
 
 
 }
 }
 
 
@@ -223,7 +223,7 @@ internal class OnlineMsgSrcFromGroup(
 ) : OnlineMessageSource.Incoming.FromGroup() {
 ) : OnlineMessageSource.Incoming.FromGroup() {
     override val isOriginalMessageInitialized: Boolean get() = true
     override val isOriginalMessageInitialized: Boolean get() = true
 
 
-    object Serializer : KSerializer<MessageSource> by MessageSourceSerializerImpl("OnlineMessageSourceFromGroup")
+    object Serializer : KSerializer<MessageSource> by MessageSourceSerializerImpl("Mock_OnlineMessageSourceFromGroup")
 
 
 }
 }
 
 

+ 6 - 0
mirai-core-mock/test/mock/MessageSerializationTest.kt

@@ -11,6 +11,8 @@ package net.mamoe.mirai.mock.test.mock
 
 
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.Json
+import kotlinx.serialization.modules.EmptySerializersModule
+import kotlinx.serialization.modules.plus
 import kotlinx.serialization.serializer
 import kotlinx.serialization.serializer
 import net.mamoe.mirai.message.MessageSerializers
 import net.mamoe.mirai.message.MessageSerializers
 import net.mamoe.mirai.message.data.*
 import net.mamoe.mirai.message.data.*
@@ -99,6 +101,10 @@ internal class MessageSerializationTest : MockBotTestBase() {
         assertEquals(t.originalMessage, deserialized.originalMessage, msg)
         assertEquals(t.originalMessage, deserialized.originalMessage, msg)
     }
     }
 
 
+    @Test
+    fun testSerializersModulePlus() {
+        MessageSerializers.serializersModule + EmptySerializersModule
+    }
 
 
     @Test
     @Test
     fun testMockMessageSources() = runTest {
     fun testMockMessageSources() = runTest {