変数類を整理

Author: k163377

src/test/java/com/mapk/krowmapper/ByStaticMethod.java

@@ -3,18 +3,18 @@
 import com.mapk.annotations.KColumnDeserializer;
 
 public class ByStaticMethod {
-    private final String bazString;
+    private final String quxString;
 
-    public ByStaticMethod(String bazString) {
-        this.bazString = bazString;
+    public ByStaticMethod(String quxString) {
+        this.quxString = quxString;
     }
 
-    public String getBazString() {
-        return bazString;
+    public String getQuxString() {
+        return quxString;
     }
 
     @KColumnDeserializer
-    public static ByStaticMethod factory(Integer bazArg) {
-        return new ByStaticMethod(bazArg.toString());
+    public static ByStaticMethod factory(Integer quxArg) {
+        return new ByStaticMethod(quxArg.toString());
     }
 }

src/test/kotlin/com/mapk/krowmapper/DeserializeByMethodTest.kt

@@ -10,22 +10,22 @@ import org.junit.jupiter.api.Test
 
 class DeserializeByMethodTest {
     data class ByConstructor @KColumnDeserializer constructor(val fooString: String)
-    data class ByCompanionObject(val barInt: Int) {
+    data class BySecondaryConstructor(val barShort: Short) {
+        @KColumnDeserializer
+        constructor(bar: String) : this(bar.toShort())
+    }
+    data class ByCompanionObject(val bazInt: Int) {
         companion object {
             @KColumnDeserializer
-            fun factory(bar: String) = ByCompanionObject(bar.toInt())
+            fun factory(baz: String) = ByCompanionObject(baz.toInt())
         }
     }
-    data class BySecondaryConstructor(val quxShort: Short) {
-        @KColumnDeserializer
-        constructor(qux: String) : this(qux.toShort())
-    }
 
     data class Dst(
         val foo: ByConstructor,
-        val bar: ByCompanionObject,
-        val baz: ByStaticMethod,
-        val qux: BySecondaryConstructor
+        val bar: BySecondaryConstructor,
+        val baz: ByCompanionObject,
+        val qux: ByStaticMethod
     )
 
     @Test
@@ -34,14 +34,14 @@ class DeserializeByMethodTest {
         val resultSet = mockk<ResultSet>()
         every { resultSet.getObject("foo", any<Class<*>>()) } returns "foo"
         every { resultSet.getObject("bar", any<Class<*>>()) } returns "123"
-        every { resultSet.getObject("baz", any<Class<*>>()) } returns 321
-        every { resultSet.getObject("qux", any<Class<*>>()) } returns "777"
+        every { resultSet.getObject("baz", any<Class<*>>()) } returns "321"
+        every { resultSet.getObject("qux", any<Class<*>>()) } returns 777
 
         val result = KRowMapper(::Dst).mapRow(resultSet, 0)
 
         Assertions.assertEquals("foo", result.foo.fooString)
-        Assertions.assertEquals(123, result.bar.barInt)
-        Assertions.assertEquals("321", result.baz.bazString)
-        Assertions.assertEquals(777, result.qux.quxShort)
+        Assertions.assertEquals(123, result.bar.barShort)
+        Assertions.assertEquals(321, result.baz.bazInt)
+        Assertions.assertEquals("777", result.qux.quxString)
     }
 }