From 46865721b0d99bc55c6abbe916d2af82d48e143c Mon Sep 17 00:00:00 2001 From: Him188 Date: Thu, 18 Nov 2021 02:58:42 +0000 Subject: [PATCH] Use new Duration methods --- .../src/commonMain/kotlin/utils/BotConfiguration.kt | 12 ++++++++---- .../handler/KeepAliveNetworkHandlerSelectorTest.kt | 6 +++--- .../kotlin/network/impl/netty/NettyUtilsTest.kt | 8 ++++---- mirai-core/src/commonTest/kotlin/test/utils.kt | 3 ++- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/mirai-core-api/src/commonMain/kotlin/utils/BotConfiguration.kt b/mirai-core-api/src/commonMain/kotlin/utils/BotConfiguration.kt index 7a8562d9d..a39d39dee 100644 --- a/mirai-core-api/src/commonMain/kotlin/utils/BotConfiguration.kt +++ b/mirai-core-api/src/commonMain/kotlin/utils/BotConfiguration.kt @@ -27,6 +27,7 @@ import kotlin.coroutines.CoroutineContext import kotlin.coroutines.EmptyCoroutineContext import kotlin.coroutines.coroutineContext import kotlin.time.Duration +import kotlin.time.Duration.Companion.milliseconds import kotlin.time.ExperimentalTime /** @@ -69,7 +70,10 @@ public open class BotConfiguration { // open for Java ignoreUnknownKeys = true prettyPrint = true } - }.getOrElse { Json {} } + }.getOrElse { + @Suppress("JSON_FORMAT_REDUNDANT_DEFAULT") // compatible for older versions + Json {} + } /////////////////////////////////////////////////////////////////////////// // Coroutines @@ -253,14 +257,14 @@ public open class BotConfiguration { // open for Java /** * iPad - 来自MiraiGo - * + * * @since 2.8 */ IPAD, /** * MacOS - 来自MiraiGo - * + * * @since 2.8 */ MACOS, @@ -503,7 +507,7 @@ public open class BotConfiguration { // open for Java */ @ExperimentalTime public inline var saveInterval: Duration - @JvmSynthetic inline get() = Duration.milliseconds(saveIntervalMillis) + @JvmSynthetic inline get() = saveIntervalMillis.milliseconds @JvmSynthetic inline set(v) { saveIntervalMillis = v.inWholeMilliseconds } diff --git a/mirai-core/src/commonTest/kotlin/network/handler/KeepAliveNetworkHandlerSelectorTest.kt b/mirai-core/src/commonTest/kotlin/network/handler/KeepAliveNetworkHandlerSelectorTest.kt index 47e82fbab..61d0462c8 100644 --- a/mirai-core/src/commonTest/kotlin/network/handler/KeepAliveNetworkHandlerSelectorTest.kt +++ b/mirai-core/src/commonTest/kotlin/network/handler/KeepAliveNetworkHandlerSelectorTest.kt @@ -19,7 +19,7 @@ import net.mamoe.mirai.utils.MiraiLogger import net.mamoe.mirai.utils.TestOnly import java.util.concurrent.atomic.AtomicInteger import kotlin.test.* -import kotlin.time.Duration +import kotlin.time.Duration.Companion.seconds internal val selectorLogger = MiraiLogger.Factory.create(TestSelector::class, "selector") @@ -52,7 +52,7 @@ internal class KeepAliveNetworkHandlerSelectorTest : AbstractMockNetworkHandlerT setState(State.OK) } } - runBlockingUnit(timeout = Duration.seconds(1)) { selector.awaitResumeInstance() } + runBlockingUnit(timeout = 1.seconds) { selector.awaitResumeInstance() } assertNotNull(selector.getCurrentInstanceOrNull()) } @@ -75,7 +75,7 @@ internal class KeepAliveNetworkHandlerSelectorTest : AbstractMockNetworkHandlerT selector.setCurrent(handler) assertSame(handler, selector.getCurrentInstanceOrNull()) handler.setState(State.CLOSED) - runBlockingUnit(timeout = Duration.seconds(3)) { selector.awaitResumeInstance() } + runBlockingUnit(timeout = 3.seconds) { selector.awaitResumeInstance() } assertEquals(1, selector.createInstanceCount.get()) } diff --git a/mirai-core/src/commonTest/kotlin/network/impl/netty/NettyUtilsTest.kt b/mirai-core/src/commonTest/kotlin/network/impl/netty/NettyUtilsTest.kt index d19785900..3c9183603 100644 --- a/mirai-core/src/commonTest/kotlin/network/impl/netty/NettyUtilsTest.kt +++ b/mirai-core/src/commonTest/kotlin/network/impl/netty/NettyUtilsTest.kt @@ -19,7 +19,7 @@ import org.junit.jupiter.api.AfterAll import org.junit.jupiter.api.Test import kotlin.test.assertFailsWith import kotlin.test.assertTrue -import kotlin.time.Duration +import kotlin.time.Duration.Companion.seconds /** * @see awaitKt @@ -36,7 +36,7 @@ internal class NettyUtilsTest : AbstractTest() { } @Test - fun canAwait() = runBlockingUnit(timeout = Duration.seconds(5)) { + fun canAwait() = runBlockingUnit(timeout = 5.seconds) { val future = DefaultChannelPromise(channel) launch(start = CoroutineStart.UNDISPATCHED) { future.awaitKt() } launch { @@ -45,7 +45,7 @@ internal class NettyUtilsTest : AbstractTest() { } @Test - fun returnsImmediatelyIfCompleted() = runBlockingUnit(timeout = Duration.seconds(5)) { + fun returnsImmediatelyIfCompleted() = runBlockingUnit(timeout = 5.seconds) { val future = DefaultChannelPromise(channel) future.setSuccess() future.awaitKt() @@ -55,7 +55,7 @@ internal class NettyUtilsTest : AbstractTest() { fun testAwait() { class MyError : AssertionError("My") // coroutine debugger will modify the exception if inside coroutine - runBlockingUnit(timeout = Duration.seconds(5)) { + runBlockingUnit(timeout = 5.seconds) { val future = DefaultChannelPromise(channel) launch(start = CoroutineStart.UNDISPATCHED) { assertFailsWith { diff --git a/mirai-core/src/commonTest/kotlin/test/utils.kt b/mirai-core/src/commonTest/kotlin/test/utils.kt index bbfc604eb..1e9f3b662 100644 --- a/mirai-core/src/commonTest/kotlin/test/utils.kt +++ b/mirai-core/src/commonTest/kotlin/test/utils.kt @@ -16,13 +16,14 @@ import kotlinx.coroutines.withTimeout import kotlin.coroutines.CoroutineContext import kotlin.coroutines.EmptyCoroutineContext import kotlin.time.Duration +import kotlin.time.Duration.Companion.seconds fun runBlockingUnit( context: CoroutineContext = EmptyCoroutineContext, block: suspend CoroutineScope.() -> Unit ) { return runBlocking(context) { - withTimeout(Duration.seconds(60)) { // always checks for infinite runs. + withTimeout(60.seconds) { // always checks for infinite runs. block() } }