From e202149c3a1e5333364598ed2e1a6a0f638d1ca7 Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Mon, 20 Dec 2021 20:20:55 +0000
Subject: [PATCH] Improve `AbstractNoticeProcessorTest`
---
.../notice/processors/AbstractNoticeProcessorTest.kt | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/mirai-core/src/commonTest/kotlin/notice/processors/AbstractNoticeProcessorTest.kt b/mirai-core/src/commonTest/kotlin/notice/processors/AbstractNoticeProcessorTest.kt
index 93403ff90..89a5954f5 100644
--- a/mirai-core/src/commonTest/kotlin/notice/processors/AbstractNoticeProcessorTest.kt
+++ b/mirai-core/src/commonTest/kotlin/notice/processors/AbstractNoticeProcessorTest.kt
@@ -31,10 +31,7 @@ import net.mamoe.mirai.internal.network.protocol.packet.IncomingPacket
import net.mamoe.mirai.internal.utils.io.JceStruct
import net.mamoe.mirai.internal.utils.io.ProtocolStruct
import net.mamoe.mirai.internal.utils.io.serialization.tars.Tars
-import net.mamoe.mirai.utils.TypeSafeMap
-import net.mamoe.mirai.utils.cast
-import net.mamoe.mirai.utils.currentTimeSeconds
-import net.mamoe.mirai.utils.hexToUBytes
+import net.mamoe.mirai.utils.*
/**
@@ -45,7 +42,9 @@ internal abstract class AbstractNoticeProcessorTest : AbstractNettyNHTest(), Gro
System.setProperty("mirai.network.notice.pipeline.log.full", "true")
}
- protected object UseTestContext {
+ protected class UseTestContext(
+ val attributes: MutableTypeSafeMap
+ ) {
val EMPTY_BYTE_ARRAY get() = net.mamoe.mirai.utils.EMPTY_BYTE_ARRAY
fun String.hexToBytes() = hexToUBytes().toByteArray()
@@ -61,7 +60,8 @@ internal abstract class AbstractNoticeProcessorTest : AbstractNettyNHTest(), Gro
block: UseTestContext.() -> ProtocolStruct
): ProcessResult {
val handler = LoggingPacketHandlerAdapter(PacketLoggingStrategyImpl(bot), bot.logger)
- return pipeline.process(bot, block(UseTestContext), attributes).also { list ->
+ val context = UseTestContext(attributes.toMutableTypeSafeMap())
+ return pipeline.process(bot, block(context), context.attributes).also { list ->
for (packet in list) {
handler.handlePacket(IncomingPacket("test", packet))
}