Merge pull request #18 from k163377/refactor_tests

Refactor tests.

Author: k163377

src/test/kotlin/com/mapk/kmapper/ConverterKMapperTest.kt

@@ -6,6 +6,7 @@ import com.mapk.annotations.KConverter
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.DisplayName
+import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
 
 private data class ConstructorConverterDst(val argument: ConstructorConverter)
@@ -26,30 +27,34 @@ private data class StaticMethodConverterDst(val argument: StaticMethodConverter)
 
 @DisplayName("コンバータ有りでのマッピングテスト")
 class ConverterKMapperTest {
-    @Test
-    @DisplayName("コンストラクターでのコンバートテスト")
-    fun constructorConverterTest() {
-        val mapper = KMapper(ConstructorConverterDst::class)
-        val result = mapper.map(mapOf("argument" to 1))
-
-        assertEquals(ConstructorConverter(1), result.argument)
-    }
+    @Nested
+    @DisplayName("KMapper")
+    inner class KMapperTest {
+        @Test
+        @DisplayName("コンストラクターでのコンバートテスト")
+        fun constructorConverterTest() {
+            val mapper = KMapper(ConstructorConverterDst::class)
+            val result = mapper.map(mapOf("argument" to 1))
+
+            assertEquals(ConstructorConverter(1), result.argument)
+        }
 
-    @Test
-    @DisplayName("コンパニオンオブジェクトに定義したコンバータでのコンバートテスト")
-    fun companionConverterTest() {
-        val mapper = KMapper(CompanionConverterDst::class)
-        val result = mapper.map(mapOf("argument" to "arg"))
+        @Test
+        @DisplayName("コンパニオンオブジェクトに定義したコンバータでのコンバートテスト")
+        fun companionConverterTest() {
+            val mapper = KMapper(CompanionConverterDst::class)
+            val result = mapper.map(mapOf("argument" to "arg"))
 
-        assertEquals("arg", result.argument.arg)
-    }
+            assertEquals("arg", result.argument.arg)
+        }
 
-    @Test
-    @DisplayName("スタティックメソッドに定義したコンバータでのコンバートテスト")
-    fun staticMethodConverterTest() {
-        val mapper = KMapper(StaticMethodConverterDst::class)
-        val result = mapper.map(mapOf("argument" to "1,2,3"))
+        @Test
+        @DisplayName("スタティックメソッドに定義したコンバータでのコンバートテスト")
+        fun staticMethodConverterTest() {
+            val mapper = KMapper(StaticMethodConverterDst::class)
+            val result = mapper.map(mapOf("argument" to "1,2,3"))
 
-        assertTrue(intArrayOf(1, 2, 3) contentEquals result.argument.arg)
+            assertTrue(intArrayOf(1, 2, 3) contentEquals result.argument.arg)
+        }
     }
 }

src/test/kotlin/com/mapk/kmapper/DefaultArgumentTest.kt

@@ -3,18 +3,23 @@ package com.mapk.kmapper
 import com.mapk.annotations.KUseDefaultArgument
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.DisplayName
+import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
 
 @DisplayName("デフォルト引数を指定するテスト")
 class DefaultArgumentTest {
     data class Dst(val fooArgument: Int, @param:KUseDefaultArgument val barArgument: String = "default")
     data class Src(val fooArgument: Int, val barArgument: String)
 
-    @Test
-    fun test() {
-        val src = Src(1, "src")
+    @Nested
+    @DisplayName("KMapper")
+    inner class KMapperTest {
+        @Test
+        fun test() {
+            val src = Src(1, "src")
 
-        val result = KMapper(::Dst).map(src)
-        assertEquals(Dst(1, "default"), result)
+            val result = KMapper(::Dst).map(src)
+            assertEquals(Dst(1, "default"), result)
+        }
     }
 }

src/test/kotlin/com/mapk/kmapper/EnumMappingTest.kt

@@ -4,6 +4,7 @@ package com.mapk.kmapper
 
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.DisplayName
+import org.junit.jupiter.api.Nested
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.EnumSource
 
@@ -15,13 +16,17 @@ private class EnumMappingDst(val language: JvmLanguage?)
 
 @DisplayName("文字列 -> Enumのマッピングテスト")
 class EnumMappingTest {
-    private val mapper = KMapper(EnumMappingDst::class)
+    @Nested
+    @DisplayName("KMapper")
+    inner class KMapperTest {
+        private val mapper = KMapper(EnumMappingDst::class)
 
-    @ParameterizedTest(name = "Non-Null要求")
-    @EnumSource(value = JvmLanguage::class)
-    fun test(language: JvmLanguage) {
-        val result = mapper.map("language" to language.name)
+        @ParameterizedTest(name = "Non-Null要求")
+        @EnumSource(value = JvmLanguage::class)
+        fun test(language: JvmLanguage) {
+            val result = mapper.map("language" to language.name)
 
-        assertEquals(language, result.language)
+            assertEquals(language, result.language)
+        }
     }
 }

src/test/kotlin/com/mapk/kmapper/KGetterIgnoreTest.kt

@@ -4,6 +4,7 @@ import com.mapk.annotations.KGetterIgnore
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.DisplayName
+import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
 
 class KGetterIgnoreTest {
@@ -12,18 +13,22 @@ class KGetterIgnoreTest {
 
     data class Dst(val arg1: Int, val arg2: String, val arg3: Int, val arg4: String)
 
-    @Test
-    @DisplayName("フィールドを無視するテスト")
-    fun test() {
-        val src1 = Src1(1, "2-1", 31)
-        val src2 = Src2("2-2", 32, "4")
+    @Nested
+    @DisplayName("KMapper")
+    inner class KMapperTest {
+        @Test
+        @DisplayName("フィールドを無視するテスト")
+        fun test() {
+            val src1 = Src1(1, "2-1", 31)
+            val src2 = Src2("2-2", 32, "4")
 
-        val mapper = KMapper(::Dst)
+            val mapper = KMapper(::Dst)
 
-        val dst1 = mapper.map(src1, src2)
-        val dst2 = mapper.map(src2, src1)
+            val dst1 = mapper.map(src1, src2)
+            val dst2 = mapper.map(src2, src1)
 
-        assertTrue(dst1 == dst2)
-        assertEquals(Dst(1, "2-1", 32, "4"), dst1)
+            assertTrue(dst1 == dst2)
+            assertEquals(Dst(1, "2-1", 32, "4"), dst1)
+        }
     }
 }

src/test/kotlin/com/mapk/kmapper/ParameterNameConverterTest.kt

@@ -3,26 +3,31 @@ package com.mapk.kmapper
 import com.google.common.base.CaseFormat
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.DisplayName
+import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
 
 private class CamelCaseDst(val camelCase: String)
 
 @DisplayName("パラメータ名変換のテスト")
 class ParameterNameConverterTest {
-    @Test
-    @DisplayName("スネークケースsrc -> キャメルケースdst")
-    fun test() {
-        val expected = "snakeCase"
-        val src = mapOf("camel_case" to expected)
+    @Nested
+    @DisplayName("KMapper")
+    inner class KMapperTest {
+        @Test
+        @DisplayName("スネークケースsrc -> キャメルケースdst")
+        fun test() {
+            val expected = "snakeCase"
+            val src = mapOf("camel_case" to expected)
 
-        val mapper = KMapper(CamelCaseDst::class) {
-            CaseFormat.LOWER_CAMEL.to(
-                CaseFormat.LOWER_UNDERSCORE,
-                it
-            )
-        }
-        val result = mapper.map(src)
+            val mapper = KMapper(CamelCaseDst::class) {
+                CaseFormat.LOWER_CAMEL.to(
+                    CaseFormat.LOWER_UNDERSCORE,
+                    it
+                )
+            }
+            val result = mapper.map(src)
 
-        assertEquals(expected, result.camelCase)
+            assertEquals(expected, result.camelCase)
+        }
     }
 }

src/test/kotlin/com/mapk/kmapper/PropertyAliasTest.kt

@@ -4,6 +4,7 @@ import com.mapk.annotations.KGetterAlias
 import com.mapk.annotations.KParameterAlias
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.DisplayName
+import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
 
 private data class AliasedDst(
@@ -19,28 +20,32 @@ private data class AliasedSrc(
 
 @DisplayName("エイリアスを貼った場合のテスト")
 class PropertyAliasTest {
-    @Test
-    @DisplayName("パラメータにエイリアスを貼った場合")
-    fun paramAliasTest() {
-        val src = mapOf(
-            "arg1" to 1.0,
-            "arg2" to "2",
-            "arg3" to 3
-        )
-
-        val result = KMapper(::AliasedDst).map(src)
-
-        assertEquals(1.0, result.arg1)
-        assertEquals(3, result.arg2)
-    }
-
-    @Test
-    @DisplayName("ゲッターにエイリアスを貼った場合")
-    fun getAliasTest() {
-        val src = AliasedSrc(1.0, 2)
-        val result = KMapper(::AliasedDst).map(src)
-
-        assertEquals(1.0, result.arg1)
-        assertEquals(2, result.arg2)
+    @Nested
+    @DisplayName("KMapper")
+    inner class KMapperTest {
+        @Test
+        @DisplayName("パラメータにエイリアスを貼った場合")
+        fun paramAliasTest() {
+            val src = mapOf(
+                "arg1" to 1.0,
+                "arg2" to "2",
+                "arg3" to 3
+            )
+
+            val result = KMapper(::AliasedDst).map(src)
+
+            assertEquals(1.0, result.arg1)
+            assertEquals(3, result.arg2)
+        }
+
+        @Test
+        @DisplayName("ゲッターにエイリアスを貼った場合")
+        fun getAliasTest() {
+            val src = AliasedSrc(1.0, 2)
+            val result = KMapper(::AliasedDst).map(src)
+
+            assertEquals(1.0, result.arg1)
+            assertEquals(2, result.arg2)
+        }
     }
 }