Updated tests that are related to #591

Author: harawata

src/test/java/org/apache/ibatis/submitted/typehandler/Mapper.java

@@ -15,6 +15,8 @@
  */
 package org.apache.ibatis.submitted.typehandler;
 
+import java.util.Map;
+
 import org.apache.ibatis.annotations.Arg;
 import org.apache.ibatis.annotations.ConstructorArgs;
 import org.apache.ibatis.annotations.Insert;
@@ -58,4 +60,7 @@ public interface Mapper {
 
   @Select("select id from product where name = #{value}")
   ProductId getProductIdByName(String name);
+
+  @Select("select id, name, released_on from product where id = #{id}")
+  Map<String, Object> getProductAsMap(Integer id);
 }

src/test/java/org/apache/ibatis/submitted/typehandler/TypeHandlerTest.java

@@ -19,9 +19,10 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.io.Reader;
+import java.time.LocalDate;
+import java.util.Map;
 
 import org.apache.ibatis.BaseDataTest;
-import org.apache.ibatis.builder.BuilderException;
 import org.apache.ibatis.io.Resources;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
@@ -30,9 +31,8 @@
 import org.apache.ibatis.submitted.typehandler.Product.ProductId;
 import org.apache.ibatis.submitted.typehandler.Product.ProductIdTypeHandler;
 import org.apache.ibatis.type.JdbcType;
-import org.junit.jupiter.api.Assertions;
+import org.apache.ibatis.type.LocalDateTypeHandler;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 class TypeHandlerTest {
@@ -135,29 +135,49 @@ void shouldPickSameTypeHandlerMappedToDifferentJdbcTypes() {
     }
   }
 
-  @Disabled("This does not fail anymore because jdbcType resolution is performed at exection time using metadata")
   @Test
   void shouldFailIfMultipleHandlerMappedToAType() {
     sqlSessionFactory.getConfiguration().getTypeHandlerRegistry().register(ProductId.class, JdbcType.BIGINT,
         ConstantProductIdTypeHandler.class);
-    // multiple type handlers are mapped to ProductId and
-    // none of them are mapped to null jdbcType.
-    Assertions.assertThrows(BuilderException.class, this::addMapper);
+    // Two type handlers are mapped to ProductId.
+    // One for JdbcType=BIGINT and the other for JdbcType=INTEGER
+    // The runtime JdbcType is INTEGER, so the second one should be used.
+    addMapper();
+    try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
+      Mapper mapper = sqlSession.getMapper(Mapper.class);
+      Product product = mapper.getProductByNameXml("iPad");
+      assertEquals(Integer.valueOf(2), product.getId().getValue());
+    }
   }
 
-  @Disabled("This is no longer the expected behavior. "
-      + "As there is a type handler registered for ProductId:INTEGER combination, it will be used.")
   @Test
-  void shouldPickHandlerForNull() {
+  void shouldHandlerBePickedBasedOnRuntimeJdbcType() {
     sqlSessionFactory.getConfiguration().getTypeHandlerRegistry().register(ProductId.class, null,
         ConstantProductIdTypeHandler.class);
-    // multiple type handlers are mapped to ProductId and
-    // one of them are mapped to null jdbcType.
+    // Two type handlers are mapped to ProductId.
+    // One for JdbcType=NULL and the other for JdbcType=INTEGER
+    // The runtime JdbcType is INTEGER, so the second one should be used.
     addMapper();
     try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
       Mapper mapper = sqlSession.getMapper(Mapper.class);
       Product product = mapper.getProductByNameXml("iPad");
-      assertEquals(Integer.valueOf(999), product.getId().getValue());
+      assertEquals(Integer.valueOf(2), product.getId().getValue());
     }
   }
+
+  @Test
+  void shouldHandlerBePickedBasedOnRuntimeJdbcType_Map() {
+    // gh-591
+    // If a handler is registered against Object and JdbcType,
+    // it will be used when result type is Map
+    sqlSessionFactory.getConfiguration().getTypeHandlerRegistry().register(Object.class, JdbcType.DATE,
+        LocalDateTypeHandler.class);
+    addMapper();
+    try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
+      Mapper mapper = sqlSession.getMapper(Mapper.class);
+      Map<String, Object> map = mapper.getProductAsMap(1);
+      assertEquals(LocalDate.of(2001, 11, 10), map.get("RELEASED_ON"));
+    }
+  }
+
 }

src/test/resources/org/apache/ibatis/submitted/typehandler/CreateDB.sql

@@ -26,11 +26,12 @@ create table users (
 
 create table product (
   id int identity,
-  name varchar(20)
+  name varchar(20),
+  released_on date
 );
 
 insert into users (id, name, city, state) values(1, '   User1', '  Carmel  ', '  IN ');
 
-insert into product (id, name) values
-(1, 'iPod'),
-(2, 'iPad');
+insert into product (id, name, released_on) values
+(1, 'iPod', '2001-11-10'),
+(2, 'iPad', '2010-04-03');