From 045b3e5d54c57e358042b4674b0ac0a493c9a8b0 Mon Sep 17 00:00:00 2001
From: LamGC <lam827@lamgc.net>
Date: Sun, 26 Jun 2022 02:32:53 +0800
Subject: [PATCH] =?UTF-8?q?test(config):=20=E7=BB=9F=E4=B8=80=20Test=20?=
 =?UTF-8?q?=E6=B3=A8=E8=A7=A3=E7=9A=84=E4=BD=BF=E7=94=A8,=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=B5=8B=E8=AF=95=E4=BB=A3=E7=A0=81=E7=9A=84=E9=A1=BA?=
 =?UTF-8?q?=E5=BA=8F.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Test 注解将统一使用 kotlin.test.Test, 这么做可以保持兼容性;
将 MavenRepositoryConfigSerializerTest.`json primitive deserialize test` 中的两段代码顺序调整一下, 以避免出现歧义.
---
 scalabot-meta/src/test/kotlin/ConfigsTest.kt  |  6 ++---
 .../kotlin/serializer/SerializersKtTest.kt    | 26 +++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/scalabot-meta/src/test/kotlin/ConfigsTest.kt b/scalabot-meta/src/test/kotlin/ConfigsTest.kt
index b3fb0a2..37a0244 100644
--- a/scalabot-meta/src/test/kotlin/ConfigsTest.kt
+++ b/scalabot-meta/src/test/kotlin/ConfigsTest.kt
@@ -17,7 +17,7 @@ import kotlin.test.*
 
 internal class BotAccountTest {
 
-    @org.junit.jupiter.api.Test
+    @Test
     fun `id getter`() {
         val accountId = abs(Random().nextInt()).toLong()
         Assertions.assertEquals(accountId, BotAccount("Test", "${accountId}:AAHErDroUTznQsOd_oZPJ6cQEj4Z5mGHO10", 0).id)
@@ -26,7 +26,7 @@ internal class BotAccountTest {
     private val gson = GsonBuilder()
         .create()
 
-    @org.junit.jupiter.api.Test
+    @Test
     fun deserializerTest() {
         val accountId = abs(Random().nextInt()).toLong()
         val creatorId = abs(Random().nextInt()).toLong()
@@ -46,7 +46,7 @@ internal class BotAccountTest {
         assertEquals("${accountId}:AAHErDroUTznQsOd_oZPJ6cQEj4Z5mGHO10", botAccount.token)
     }
 
-    @org.junit.jupiter.api.Test
+    @Test
     fun serializerTest() {
         val accountId = abs(Random().nextInt()).toLong()
         val creatorId = abs(Random().nextInt()).toLong()
diff --git a/scalabot-meta/src/test/kotlin/serializer/SerializersKtTest.kt b/scalabot-meta/src/test/kotlin/serializer/SerializersKtTest.kt
index 10defc4..6cefc4a 100644
--- a/scalabot-meta/src/test/kotlin/serializer/SerializersKtTest.kt
+++ b/scalabot-meta/src/test/kotlin/serializer/SerializersKtTest.kt
@@ -131,13 +131,6 @@ internal class MavenRepositoryConfigSerializerTest {
 
     @Test
     fun `json primitive deserialize test`() {
-        val expectRepoUrl = "https://repo.example.org/maven"
-        val config = MavenRepositoryConfigSerializer.deserialize(
-            JsonPrimitive(expectRepoUrl),
-            MavenRepositoryConfig::class.java,
-            TestJsonSerializationContext.default()
-        )
-
         assertThrows(JsonParseException::class.java) {
             MavenRepositoryConfigSerializer.deserialize(
                 JsonPrimitive("NOT A URL."),
@@ -146,6 +139,13 @@ internal class MavenRepositoryConfigSerializerTest {
             )
         }
 
+        val expectRepoUrl = "https://repo.example.org/maven"
+        val config = MavenRepositoryConfigSerializer.deserialize(
+            JsonPrimitive(expectRepoUrl),
+            MavenRepositoryConfig::class.java,
+            TestJsonSerializationContext.default()
+        )
+
         assertNull(config.id)
         assertEquals(URL(expectRepoUrl), config.url)
         assertNull(config.proxy, "Proxy 默认值不为 null.")
@@ -577,14 +577,14 @@ internal class ProxyConfigSerializerTest {
 
 internal class ArtifactSerializerTest {
 
-    @org.junit.jupiter.api.Test
+    @Test
     fun badJsonType() {
         assertFailsWith<JsonParseException> { ArtifactSerializer.deserialize(JsonObject(), null, null) }
         assertFailsWith<JsonParseException> { ArtifactSerializer.deserialize(JsonArray(), null, null) }
         assertFailsWith<JsonParseException> { ArtifactSerializer.deserialize(JsonPrimitive("A STRING"), null, null) }
     }
 
-    @org.junit.jupiter.api.Test
+    @Test
     fun `Basic format serialization`() {
         val gav = "org.example.software:test:1.0.0-SNAPSHOT"
         val expectArtifact = DefaultArtifact(gav)
@@ -592,7 +592,7 @@ internal class ArtifactSerializerTest {
         assertEquals(expectArtifact, actualArtifact)
     }
 
-    @org.junit.jupiter.api.Test
+    @Test
     fun `Full format serialization`() {
         val gav = "org.example.software:test:war:javadoc:1.0.0-SNAPSHOT"
         val expectArtifact = DefaultArtifact(gav)
@@ -600,14 +600,14 @@ internal class ArtifactSerializerTest {
         assertEquals(expectArtifact, actualArtifact)
     }
 
-    @org.junit.jupiter.api.Test
+    @Test
     fun `Bad format serialization`() {
         assertFailsWith<JsonParseException> {
             ArtifactSerializer.deserialize(JsonPrimitive("org.example~test"), null, null)
         }
     }
 
-    @org.junit.jupiter.api.Test
+    @Test
     fun `Other artifact implementation serialization`() {
         val gav = "org.example.software:test:war:javadoc:1.0.0-SNAPSHOT"
         val expectArtifact = DefaultArtifact(gav)
@@ -624,7 +624,7 @@ internal class ArtifactSerializerTest {
         assertEquals(expectArtifact.toString(), json.asString)
     }
 
-    @org.junit.jupiter.api.Test
+    @Test
     fun deserialize() {
         val gav = "org.example.software:test:war:javadoc:1.0.0-SNAPSHOT"
         val expectArtifact = DefaultArtifact(gav)