From 0a8fc3486b2eee10d93e95c08a2cd96f376fc963 Mon Sep 17 00:00:00 2001 From: Him188 Date: Mon, 13 Jun 2022 20:22:35 +0100 Subject: [PATCH] Add `addOtherClient` for GroupExtensions for tests, add other clients before running tests for MessageSyncEvent --- .../processors/AbstractNoticeProcessorTest.kt | 17 +++++++++++++---- .../kotlin/notice/processors/MessageSyncTest.kt | 2 ++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/mirai-core/src/commonTest/kotlin/notice/processors/AbstractNoticeProcessorTest.kt b/mirai-core/src/commonTest/kotlin/notice/processors/AbstractNoticeProcessorTest.kt index 4e01582c16b..e2f68f8cf71 100644 --- a/mirai-core/src/commonTest/kotlin/notice/processors/AbstractNoticeProcessorTest.kt +++ b/mirai-core/src/commonTest/kotlin/notice/processors/AbstractNoticeProcessorTest.kt @@ -16,10 +16,8 @@ import net.mamoe.mirai.Mirai import net.mamoe.mirai.contact.* import net.mamoe.mirai.internal.BotAccount import net.mamoe.mirai.internal.QQAndroidBot -import net.mamoe.mirai.internal.contact.FriendImpl -import net.mamoe.mirai.internal.contact.GroupImpl -import net.mamoe.mirai.internal.contact.NormalMemberImpl -import net.mamoe.mirai.internal.contact.StrangerImpl +import net.mamoe.mirai.internal.asQQAndroidBot +import net.mamoe.mirai.internal.contact.* import net.mamoe.mirai.internal.contact.info.FriendInfoImpl import net.mamoe.mirai.internal.contact.info.GroupInfoImpl import net.mamoe.mirai.internal.contact.info.MemberInfoImpl @@ -211,4 +209,15 @@ internal interface GroupExtensions { members.delegate.add(NormalMemberImpl(this.cast(), this.coroutineContext, info)) return this } + + fun Bot.addOtherClient( + appId: Int, + platform: Platform = Platform.IOS, + deviceName: String = "my device $appId", + deviceKind: String = "my device kind $appId" + ): OtherClient { + return bot.asQQAndroidBot().createOtherClient(OtherClientInfo(appId, platform, deviceName, deviceKind)).also { + this.otherClients.delegate.add(it) + } + } } \ No newline at end of file diff --git a/mirai-core/src/commonTest/kotlin/notice/processors/MessageSyncTest.kt b/mirai-core/src/commonTest/kotlin/notice/processors/MessageSyncTest.kt index c05d53ea25f..22ecf9f01e3 100644 --- a/mirai-core/src/commonTest/kotlin/notice/processors/MessageSyncTest.kt +++ b/mirai-core/src/commonTest/kotlin/notice/processors/MessageSyncTest.kt @@ -96,6 +96,7 @@ internal class MessageSyncTest : AbstractNoticeProcessorTest() { addMember(1230001, permission = MemberPermission.OWNER) addMember(1230002, permission = MemberPermission.MEMBER) } + addOtherClient(537067835) } runTest().toList().run { @@ -162,6 +163,7 @@ internal class MessageSyncTest : AbstractNoticeProcessorTest() { setBot(1230002).apply { addFriend(1230001) + addOtherClient(537067835) } runTest().toList().run {