Merge pull request #833 from simple-robot/fix-Services-addProviderExceptJvm

Services.addProviderExceptJvm 的jvm判断条件与实际情况相反

Author: ForteScarlet

simbot-commons/simbot-common-core/src/commonMain/kotlin/love/forte/simbot/common/services/Services.kt

@@ -95,7 +95,7 @@ public inline fun <T : Any> Services.addProvider(
  * 只有在 **非Jvm** 平台上添加 [providerCreator]。
  */
 public inline fun <T : Any> Services.addProviderExceptJvm(type: KClass<T>, crossinline providerCreator: () -> T) {
-    addProvider(isJvm, type, providerCreator)
+    addProvider(!isJvm, type, providerCreator)
 }
 
 @PublishedApi

simbot-commons/simbot-common-core/src/commonTest/kotlin/love/forte/simbot/common/services/ServicesTests.kt

@@ -0,0 +1,54 @@
+/*
+ *     Copyright (c) 2024. ForteScarlet.
+ *
+ *     Project    https://github.com/simple-robot/simpler-robot
+ *     Email      [email protected]
+ *
+ *     This file is part of the Simple Robot Library (Alias: simple-robot, simbot, etc.).
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     Lesser GNU General Public License for more details.
+ *
+ *     You should have received a copy of the Lesser GNU General Public License
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+package love.forte.simbot.common.services
+
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+
+/**
+ *
+ * @author ForteScarlet
+ */
+class ServicesTests {
+
+    @Test
+    fun serviceJvmOnlyTest() {
+        Services.addProviderExceptJvm(TestProvider::class) {
+            TestProviderImpl()
+        }
+
+        val providers = Services.loadProviders<TestProvider>()
+
+        assertEquals(expectProviderNums, providers.toList().size)
+    }
+
+
+}
+
+internal expect val expectProviderNums: Int
+
+internal interface TestProvider
+
+internal class TestProviderImpl : TestProvider

simbot-commons/simbot-common-core/src/jsTest/kotlin/love/forte/simbot/common/services/ServicesTests.js.kt

@@ -0,0 +1,26 @@
+/*
+ *     Copyright (c) 2024. ForteScarlet.
+ *
+ *     Project    https://github.com/simple-robot/simpler-robot
+ *     Email      [email protected]
+ *
+ *     This file is part of the Simple Robot Library (Alias: simple-robot, simbot, etc.).
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     Lesser GNU General Public License for more details.
+ *
+ *     You should have received a copy of the Lesser GNU General Public License
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+package love.forte.simbot.common.services
+
+internal actual val expectProviderNums: Int = 1

simbot-commons/simbot-common-core/src/jvmTest/kotlin/love/forte/simbot/common/services/ServicesTests.jvm.kt

@@ -0,0 +1,26 @@
+/*
+ *     Copyright (c) 2024. ForteScarlet.
+ *
+ *     Project    https://github.com/simple-robot/simpler-robot
+ *     Email      [email protected]
+ *
+ *     This file is part of the Simple Robot Library (Alias: simple-robot, simbot, etc.).
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     Lesser GNU General Public License for more details.
+ *
+ *     You should have received a copy of the Lesser GNU General Public License
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+package love.forte.simbot.common.services
+
+internal actual val expectProviderNums: Int = 0

simbot-commons/simbot-common-core/src/nativeTest/kotlin/love/forte/simbot/common/services/ServicesTests.native.kt

@@ -0,0 +1,26 @@
+/*
+ *     Copyright (c) 2024. ForteScarlet.
+ *
+ *     Project    https://github.com/simple-robot/simpler-robot
+ *     Email      [email protected]
+ *
+ *     This file is part of the Simple Robot Library (Alias: simple-robot, simbot, etc.).
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     Lesser GNU General Public License for more details.
+ *
+ *     You should have received a copy of the Lesser GNU General Public License
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+package love.forte.simbot.common.services
+
+internal actual val expectProviderNums: Int = 1

simbot-commons/simbot-common-core/src/wasmJsTest/kotlin/love/forte/simbot/common/services/ServicesTests.wasmjs.kt

@@ -0,0 +1,26 @@
+/*
+ *     Copyright (c) 2024. ForteScarlet.
+ *
+ *     Project    https://github.com/simple-robot/simpler-robot
+ *     Email      [email protected]
+ *
+ *     This file is part of the Simple Robot Library (Alias: simple-robot, simbot, etc.).
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     Lesser GNU General Public License for more details.
+ *
+ *     You should have received a copy of the Lesser GNU General Public License
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+package love.forte.simbot.common.services
+
+internal actual val expectProviderNums: Int = 1