From e1c4ff9cbd854f6ed54b59a982add8070ac75449 Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Fri, 22 Nov 2019 19:10:10 +0800
Subject: [PATCH] Small improvements

---
 .../MiraiHttpApplication.kt                       |  2 --
 mirai-core/build.gradle.kts                       | 13 ++++++++++++-
 .../network/protocol/tim/packet/PacketFactory.kt  |  3 ++-
 .../io/{TypeConvertion.kt => TypeConversion.kt}   |  1 -
 .../TypeConversionTest.kt                         | 10 ++++++++++
 mirai-debug/src/main/kotlin/test/ProtoTest.kt     | 15 ---------------
 6 files changed, 24 insertions(+), 20 deletions(-)
 rename mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/io/{TypeConvertion.kt => TypeConversion.kt} (99%)
 create mode 100644 mirai-core/src/commonTest/kotlin/net.mamoe.mirai.utils.io/TypeConversionTest.kt

diff --git a/mirai-api-http/src/main/kotlin/net.mamoe.mirai.api.http/MiraiHttpApplication.kt b/mirai-api-http/src/main/kotlin/net.mamoe.mirai.api.http/MiraiHttpApplication.kt
index 068148174..7876df4f5 100644
--- a/mirai-api-http/src/main/kotlin/net.mamoe.mirai.api.http/MiraiHttpApplication.kt
+++ b/mirai-api-http/src/main/kotlin/net.mamoe.mirai.api.http/MiraiHttpApplication.kt
@@ -75,8 +75,6 @@ private fun Route.mirai(path: String, body: PipelineInterceptor<Unit, Applicatio
     }
 }
 
-
-@Suppress("NOTHING_TO_INLINE")
 suspend inline fun ApplicationCall.ok() = this.respond(HttpStatusCode.OK, "OK")
 
 /**
diff --git a/mirai-core/build.gradle.kts b/mirai-core/build.gradle.kts
index 7be0ce2ac..4e9d8740a 100644
--- a/mirai-core/build.gradle.kts
+++ b/mirai-core/build.gradle.kts
@@ -121,12 +121,23 @@ kotlin {
         }
     }
 
+    sourceSets["commonTest"].apply {
+        dependencies {
+            kotlin("kotlin-test-annotations-common")
+            kotlin("kotlin-test-common")
+        }
+        kotlin.setSrcDirs(listOf("src/$name/kotlin"))
+    }
+
     sourceSets["jvmTest"].apply {
         dependencies {
+            kotlin("kotlin-test", kotlinVersion)
+            kotlin("kotlin-test-annotations-common", kotlinVersion)
+            kotlin("kotlin-test-junit5", kotlinVersion)
+            implementation("org.junit.jupiter:junit-jupiter-api:5.5.2")
         }
         kotlin.outputDir = file("build/classes/kotlin/jvm/test")
         kotlin.setSrcDirs(listOf("src/$name/kotlin"))
-
     }
 
     sourceSets.all {
diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/PacketFactory.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/PacketFactory.kt
index 42d4b6e21..8e62b671f 100644
--- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/PacketFactory.kt
+++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/PacketFactory.kt
@@ -11,7 +11,6 @@ import kotlinx.serialization.DeserializationStrategy
 import kotlinx.serialization.protobuf.ProtoBuf
 import net.mamoe.mirai.network.BotNetworkHandler
 import net.mamoe.mirai.utils.io.ByteArrayPool
-import net.mamoe.mirai.utils.io.debugPrint
 import net.mamoe.mirai.utils.io.read
 import net.mamoe.mirai.utils.io.toUHexString
 import net.mamoe.mirai.utils.readProtoMap
@@ -35,6 +34,8 @@ abstract class PacketFactory<out TPacket : Packet, TDecrypter : Decrypter>(val d
         get() = (this::class.annotations.firstOrNull { it is AnnotatedId } as? AnnotatedId)
             ?: error("Annotation AnnotatedId not found for class ${this::class.simpleName}")
 
+
+    // TODO: 2019/11/22 修改为参数
     /**
      * 包 ID.
      */
diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/io/TypeConvertion.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/io/TypeConversion.kt
similarity index 99%
rename from mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/io/TypeConvertion.kt
rename to mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/io/TypeConversion.kt
index d8b64841a..43d5bf5c1 100644
--- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/io/TypeConvertion.kt
+++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/io/TypeConversion.kt
@@ -8,7 +8,6 @@ import kotlinx.io.pool.ObjectPool
 import kotlin.random.Random
 import kotlin.random.nextInt
 
-
 /*
  * 类型转换 Utils.
  * 这些函数为内部函数, 可能会改变
diff --git a/mirai-core/src/commonTest/kotlin/net.mamoe.mirai.utils.io/TypeConversionTest.kt b/mirai-core/src/commonTest/kotlin/net.mamoe.mirai.utils.io/TypeConversionTest.kt
new file mode 100644
index 000000000..c42e4d85b
--- /dev/null
+++ b/mirai-core/src/commonTest/kotlin/net.mamoe.mirai.utils.io/TypeConversionTest.kt
@@ -0,0 +1,10 @@
+package net.mamoe.mirai.utils.io
+
+
+class TypeConversionTest {
+
+    //@Test
+    fun testConversions() {
+
+    }
+}
\ No newline at end of file
diff --git a/mirai-debug/src/main/kotlin/test/ProtoTest.kt b/mirai-debug/src/main/kotlin/test/ProtoTest.kt
index e61b9b0da..158599af1 100644
--- a/mirai-debug/src/main/kotlin/test/ProtoTest.kt
+++ b/mirai-debug/src/main/kotlin/test/ProtoTest.kt
@@ -70,21 +70,6 @@ suspend fun deserializeTest() {
            
            """.trimIndent().replace("\n", " ").replace("[", "").replace("]", "")
             .hexToBytes()
-
-    /*
-    00 00 00 07 00 00 00 52 08 01 12 03 98 01 02
-    10 02
-    22 [4E] 08 A0 89 F7 B6 03 10 A2 FF 8C F0 03 18 BB 92 94 BF 08 22 10 64 CF BB 65 00 13 8D B5 58 E2 45 1E EA 65 88 E1 28 04 30 02 38 20 40 FF 01 48 00 50 01 5A 05 32 36 39 33 33 60 00 68 00 70 00 78 00 80 01 97 04 88 01 ED 03 90 01 04 A0 01 01
-     */
-
-    /*
-    for (i in 0..bytes.size) {
-        try {
-            println(bytes.copyOfRange(i, bytes.size).read { readProtoMap() })
-        } catch (e: Exception) {
-
-        }
-    }*/
     println(bytes.read { readProtoMap() })
 }