From d0c2304e1abce82f2e9c6408749a607cf0e02260 Mon Sep 17 00:00:00 2001 From: Him188 Date: Sun, 26 Dec 2021 19:01:46 +0000 Subject: [PATCH] Rename test package `framework` to `testFramework` --- mirai-console/backend/mirai-console/test/command/TestCommand.kt | 2 +- .../mirai-console/test/data/JavaPluginDescriptionTests.kt | 2 +- .../backend/mirai-console/test/data/PluginMovingTests.kt | 2 +- .../test/{framework => testFramework}/AbstractConsoleTest.kt | 2 +- .../test/{framework => testFramework}/test/FrameworkTest.kt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename mirai-console/backend/mirai-console/test/{framework => testFramework}/AbstractConsoleTest.kt (97%) rename mirai-console/backend/mirai-console/test/{framework => testFramework}/test/FrameworkTest.kt (92%) diff --git a/mirai-console/backend/mirai-console/test/command/TestCommand.kt b/mirai-console/backend/mirai-console/test/command/TestCommand.kt index f4324960f..9a13ddb41 100644 --- a/mirai-console/backend/mirai-console/test/command/TestCommand.kt +++ b/mirai-console/backend/mirai-console/test/command/TestCommand.kt @@ -22,7 +22,7 @@ import net.mamoe.mirai.console.command.CommandManager.INSTANCE.unregisterCommand import net.mamoe.mirai.console.command.descriptor.CommandValueArgumentParser import net.mamoe.mirai.console.command.descriptor.ExperimentalCommandDescriptors import net.mamoe.mirai.console.command.descriptor.buildCommandArgumentContext -import net.mamoe.mirai.console.framework.AbstractConsoleTest +import net.mamoe.mirai.console.testFramework.AbstractConsoleTest import net.mamoe.mirai.console.internal.command.CommandManagerImpl import net.mamoe.mirai.console.internal.command.flattenCommandComponents import net.mamoe.mirai.message.data.* diff --git a/mirai-console/backend/mirai-console/test/data/JavaPluginDescriptionTests.kt b/mirai-console/backend/mirai-console/test/data/JavaPluginDescriptionTests.kt index 79b623d0b..c8e8f3372 100644 --- a/mirai-console/backend/mirai-console/test/data/JavaPluginDescriptionTests.kt +++ b/mirai-console/backend/mirai-console/test/data/JavaPluginDescriptionTests.kt @@ -8,7 +8,7 @@ */ package net.mamoe.mirai.console.data -import net.mamoe.mirai.console.framework.AbstractConsoleTest +import net.mamoe.mirai.console.testFramework.AbstractConsoleTest @Suppress("unused") class JavaPluginDescriptionTests : AbstractConsoleTest() { diff --git a/mirai-console/backend/mirai-console/test/data/PluginMovingTests.kt b/mirai-console/backend/mirai-console/test/data/PluginMovingTests.kt index 0c9c8e4d6..4ae8f8c35 100644 --- a/mirai-console/backend/mirai-console/test/data/PluginMovingTests.kt +++ b/mirai-console/backend/mirai-console/test/data/PluginMovingTests.kt @@ -10,7 +10,7 @@ package net.mamoe.mirai.console.data import net.mamoe.mirai.console.MiraiConsole -import net.mamoe.mirai.console.framework.AbstractConsoleTest +import net.mamoe.mirai.console.testFramework.AbstractConsoleTest import net.mamoe.mirai.console.internal.data.mkdir import net.mamoe.mirai.console.plugin.PluginManager import net.mamoe.mirai.console.plugin.PluginManager.INSTANCE.load diff --git a/mirai-console/backend/mirai-console/test/framework/AbstractConsoleTest.kt b/mirai-console/backend/mirai-console/test/testFramework/AbstractConsoleTest.kt similarity index 97% rename from mirai-console/backend/mirai-console/test/framework/AbstractConsoleTest.kt rename to mirai-console/backend/mirai-console/test/testFramework/AbstractConsoleTest.kt index 4f20e5bcb..dc35932ca 100644 --- a/mirai-console/backend/mirai-console/test/framework/AbstractConsoleTest.kt +++ b/mirai-console/backend/mirai-console/test/testFramework/AbstractConsoleTest.kt @@ -7,7 +7,7 @@ * https://github.com/mamoe/mirai/blob/dev/LICENSE */ -package net.mamoe.mirai.console.framework +package net.mamoe.mirai.console.testFramework import kotlinx.coroutines.CancellationException import kotlinx.coroutines.cancelAndJoin diff --git a/mirai-console/backend/mirai-console/test/framework/test/FrameworkTest.kt b/mirai-console/backend/mirai-console/test/testFramework/test/FrameworkTest.kt similarity index 92% rename from mirai-console/backend/mirai-console/test/framework/test/FrameworkTest.kt rename to mirai-console/backend/mirai-console/test/testFramework/test/FrameworkTest.kt index 8839c4833..f81d22e8c 100644 --- a/mirai-console/backend/mirai-console/test/framework/test/FrameworkTest.kt +++ b/mirai-console/backend/mirai-console/test/testFramework/test/FrameworkTest.kt @@ -9,7 +9,7 @@ package net.mamoe.mirai.console.framework.test -import net.mamoe.mirai.console.framework.AbstractConsoleTest +import net.mamoe.mirai.console.testFramework.AbstractConsoleTest import net.mamoe.mirai.console.plugin.PluginManager import org.junit.jupiter.api.Test import kotlin.test.assertEquals