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 { ArtifactSerializer.deserialize(JsonObject(), null, null) } assertFailsWith { ArtifactSerializer.deserialize(JsonArray(), null, null) } assertFailsWith { 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 { 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)