test(config): 统一 Test 注解的使用, 修改测试代码的顺序.

Test 注解将统一使用 kotlin.test.Test, 这么做可以保持兼容性;
将 MavenRepositoryConfigSerializerTest.`json primitive deserialize test` 中的两段代码顺序调整一下, 以避免出现歧义.
This commit is contained in:
LamGC 2022-06-26 02:32:53 +08:00
parent d6b25c4560
commit 045b3e5d54
Signed by: LamGC
GPG Key ID: 6C5AE2A913941E1D
2 changed files with 16 additions and 16 deletions

View File

@ -17,7 +17,7 @@ import kotlin.test.*
internal class BotAccountTest { internal class BotAccountTest {
@org.junit.jupiter.api.Test @Test
fun `id getter`() { fun `id getter`() {
val accountId = abs(Random().nextInt()).toLong() val accountId = abs(Random().nextInt()).toLong()
Assertions.assertEquals(accountId, BotAccount("Test", "${accountId}:AAHErDroUTznQsOd_oZPJ6cQEj4Z5mGHO10", 0).id) Assertions.assertEquals(accountId, BotAccount("Test", "${accountId}:AAHErDroUTznQsOd_oZPJ6cQEj4Z5mGHO10", 0).id)
@ -26,7 +26,7 @@ internal class BotAccountTest {
private val gson = GsonBuilder() private val gson = GsonBuilder()
.create() .create()
@org.junit.jupiter.api.Test @Test
fun deserializerTest() { fun deserializerTest() {
val accountId = abs(Random().nextInt()).toLong() val accountId = abs(Random().nextInt()).toLong()
val creatorId = abs(Random().nextInt()).toLong() val creatorId = abs(Random().nextInt()).toLong()
@ -46,7 +46,7 @@ internal class BotAccountTest {
assertEquals("${accountId}:AAHErDroUTznQsOd_oZPJ6cQEj4Z5mGHO10", botAccount.token) assertEquals("${accountId}:AAHErDroUTznQsOd_oZPJ6cQEj4Z5mGHO10", botAccount.token)
} }
@org.junit.jupiter.api.Test @Test
fun serializerTest() { fun serializerTest() {
val accountId = abs(Random().nextInt()).toLong() val accountId = abs(Random().nextInt()).toLong()
val creatorId = abs(Random().nextInt()).toLong() val creatorId = abs(Random().nextInt()).toLong()

View File

@ -131,13 +131,6 @@ internal class MavenRepositoryConfigSerializerTest {
@Test @Test
fun `json primitive deserialize 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) { assertThrows(JsonParseException::class.java) {
MavenRepositoryConfigSerializer.deserialize( MavenRepositoryConfigSerializer.deserialize(
JsonPrimitive("NOT A URL."), 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) assertNull(config.id)
assertEquals(URL(expectRepoUrl), config.url) assertEquals(URL(expectRepoUrl), config.url)
assertNull(config.proxy, "Proxy 默认值不为 null.") assertNull(config.proxy, "Proxy 默认值不为 null.")
@ -577,14 +577,14 @@ internal class ProxyConfigSerializerTest {
internal class ArtifactSerializerTest { internal class ArtifactSerializerTest {
@org.junit.jupiter.api.Test @Test
fun badJsonType() { fun badJsonType() {
assertFailsWith<JsonParseException> { ArtifactSerializer.deserialize(JsonObject(), null, null) } assertFailsWith<JsonParseException> { ArtifactSerializer.deserialize(JsonObject(), null, null) }
assertFailsWith<JsonParseException> { ArtifactSerializer.deserialize(JsonArray(), null, null) } assertFailsWith<JsonParseException> { ArtifactSerializer.deserialize(JsonArray(), null, null) }
assertFailsWith<JsonParseException> { ArtifactSerializer.deserialize(JsonPrimitive("A STRING"), null, null) } assertFailsWith<JsonParseException> { ArtifactSerializer.deserialize(JsonPrimitive("A STRING"), null, null) }
} }
@org.junit.jupiter.api.Test @Test
fun `Basic format serialization`() { fun `Basic format serialization`() {
val gav = "org.example.software:test:1.0.0-SNAPSHOT" val gav = "org.example.software:test:1.0.0-SNAPSHOT"
val expectArtifact = DefaultArtifact(gav) val expectArtifact = DefaultArtifact(gav)
@ -592,7 +592,7 @@ internal class ArtifactSerializerTest {
assertEquals(expectArtifact, actualArtifact) assertEquals(expectArtifact, actualArtifact)
} }
@org.junit.jupiter.api.Test @Test
fun `Full format serialization`() { fun `Full format serialization`() {
val gav = "org.example.software:test:war:javadoc:1.0.0-SNAPSHOT" val gav = "org.example.software:test:war:javadoc:1.0.0-SNAPSHOT"
val expectArtifact = DefaultArtifact(gav) val expectArtifact = DefaultArtifact(gav)
@ -600,14 +600,14 @@ internal class ArtifactSerializerTest {
assertEquals(expectArtifact, actualArtifact) assertEquals(expectArtifact, actualArtifact)
} }
@org.junit.jupiter.api.Test @Test
fun `Bad format serialization`() { fun `Bad format serialization`() {
assertFailsWith<JsonParseException> { assertFailsWith<JsonParseException> {
ArtifactSerializer.deserialize(JsonPrimitive("org.example~test"), null, null) ArtifactSerializer.deserialize(JsonPrimitive("org.example~test"), null, null)
} }
} }
@org.junit.jupiter.api.Test @Test
fun `Other artifact implementation serialization`() { fun `Other artifact implementation serialization`() {
val gav = "org.example.software:test:war:javadoc:1.0.0-SNAPSHOT" val gav = "org.example.software:test:war:javadoc:1.0.0-SNAPSHOT"
val expectArtifact = DefaultArtifact(gav) val expectArtifact = DefaultArtifact(gav)
@ -624,7 +624,7 @@ internal class ArtifactSerializerTest {
assertEquals(expectArtifact.toString(), json.asString) assertEquals(expectArtifact.toString(), json.asString)
} }
@org.junit.jupiter.api.Test @Test
fun deserialize() { fun deserialize() {
val gav = "org.example.software:test:war:javadoc:1.0.0-SNAPSHOT" val gav = "org.example.software:test:war:javadoc:1.0.0-SNAPSHOT"
val expectArtifact = DefaultArtifact(gav) val expectArtifact = DefaultArtifact(gav)