Merge pull request #847 from kazuki43zoo/add-test-for-cache

Add tests for injecting property value to cache object

Author: kazuki43zoo

src/test/java/org/apache/ibatis/submitted/cache/CacheTest.java

@@ -19,21 +19,29 @@
 import java.lang.reflect.Field;
 import java.sql.Connection;
 
+import org.apache.ibatis.annotations.CacheNamespace;
+import org.apache.ibatis.annotations.Property;
 import org.apache.ibatis.cache.Cache;
+import org.apache.ibatis.cache.CacheException;
 import org.apache.ibatis.io.Resources;
 import org.apache.ibatis.jdbc.ScriptRunner;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.apache.ibatis.session.SqlSessionFactoryBuilder;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 
 // issue #524
 public class CacheTest {
 
   private static SqlSessionFactory sqlSessionFactory;
 
+  @Rule
+  public ExpectedException expectedException = ExpectedException.none();
+
   @Before
   public void setUp() throws Exception {
     // create a SqlSessionFactory
@@ -309,8 +317,28 @@ public void shouldApplyCacheNamespaceRef() {
   public void shouldApplyCustomCacheProperties() {
     CustomCache customCache = unwrap(sqlSessionFactory.getConfiguration().getCache(CustomCacheMapper.class.getName()));
     Assert.assertEquals("bar", customCache.getStringValue());
-    Assert.assertEquals(99, customCache.getIntegerValue().intValue());
-    Assert.assertEquals(9999, customCache.getLongValue());
+    Assert.assertEquals(1, customCache.getIntegerValue().intValue());
+    Assert.assertEquals(2, customCache.getIntValue());
+    Assert.assertEquals(3, customCache.getLongWrapperValue().longValue());
+    Assert.assertEquals(4, customCache.getLongValue());
+    Assert.assertEquals(5, customCache.getShortWrapperValue().shortValue());
+    Assert.assertEquals(6, customCache.getShortValue());
+    Assert.assertEquals((float) 7.1, customCache.getFloatWrapperValue(), 0);
+    Assert.assertEquals((float)8.1, customCache.getFloatValue(), 0);
+    Assert.assertEquals(9.01, customCache.getDoubleWrapperValue(), 0);
+    Assert.assertEquals(10.01, customCache.getDoubleValue(), 0);
+    Assert.assertEquals((byte)11, customCache.getByteWrapperValue().byteValue());
+    Assert.assertEquals((byte)12, customCache.getByteValue());
+    Assert.assertEquals(true, customCache.getBooleanWrapperValue());
+    Assert.assertEquals(true, customCache.isBooleanValue());
+  }
+
+  @Test
+  public void shouldErrorUnsupportedProperties() {
+    expectedException.expect(CacheException.class);
+    expectedException.expectMessage("Unsupported property type for cache: 'date' of type class java.util.Date");
+
+    sqlSessionFactory.getConfiguration().addMapper(CustomCacheUnsupportedPropertyMapper.class);
   }
 
   private CustomCache unwrap(Cache cache){
@@ -330,4 +358,10 @@ private CustomCache unwrap(Cache cache){
     }
   }
 
+  @CacheNamespace(implementation = CustomCache.class, properties = {
+      @Property(name = "date", value = "2016/11/21")
+  })
+  private interface CustomCacheUnsupportedPropertyMapper {
+  }
+
 }

src/test/java/org/apache/ibatis/submitted/cache/CustomCache.java

@@ -17,11 +17,26 @@
 
 import org.apache.ibatis.cache.impl.PerpetualCache;
 
+import java.util.Date;
+
 public class CustomCache extends PerpetualCache {
 
   private String stringValue;
   private Integer integerValue;
+  private int intValue;
+  private Long longWrapperValue;
   private long longValue;
+  private Short shortWrapperValue;
+  private short shortValue;
+  private Float floatWrapperValue;
+  private float floatValue;
+  private Double doubleWrapperValue;
+  private double doubleValue;
+  private Byte byteWrapperValue;
+  private byte byteValue;
+  private Boolean booleanWrapperValue;
+  private boolean booleanValue;
+  private Date date;
 
   public CustomCache(String id) {
     super(id);
@@ -51,4 +66,108 @@ public void setLongValue(long longValue) {
     this.longValue = longValue;
   }
 
+  public int getIntValue() {
+    return intValue;
+  }
+
+  public void setIntValue(int intValue) {
+    this.intValue = intValue;
+  }
+
+  public Long getLongWrapperValue() {
+    return longWrapperValue;
+  }
+
+  public void setLongWrapperValue(Long longWrapperValue) {
+    this.longWrapperValue = longWrapperValue;
+  }
+
+  public Short getShortWrapperValue() {
+    return shortWrapperValue;
+  }
+
+  public void setShortWrapperValue(Short shortWrapperValue) {
+    this.shortWrapperValue = shortWrapperValue;
+  }
+
+  public short getShortValue() {
+    return shortValue;
+  }
+
+  public void setShortValue(short shortValue) {
+    this.shortValue = shortValue;
+  }
+
+  public Float getFloatWrapperValue() {
+    return floatWrapperValue;
+  }
+
+  public void setFloatWrapperValue(Float floatWrapperValue) {
+    this.floatWrapperValue = floatWrapperValue;
+  }
+
+  public float getFloatValue() {
+    return floatValue;
+  }
+
+  public void setFloatValue(float floatValue) {
+    this.floatValue = floatValue;
+  }
+
+  public Double getDoubleWrapperValue() {
+    return doubleWrapperValue;
+  }
+
+  public void setDoubleWrapperValue(Double doubleWrapperValue) {
+    this.doubleWrapperValue = doubleWrapperValue;
+  }
+
+  public double getDoubleValue() {
+    return doubleValue;
+  }
+
+  public void setDoubleValue(double doubleValue) {
+    this.doubleValue = doubleValue;
+  }
+
+  public Byte getByteWrapperValue() {
+    return byteWrapperValue;
+  }
+
+  public void setByteWrapperValue(Byte byteWrapperValue) {
+    this.byteWrapperValue = byteWrapperValue;
+  }
+
+  public byte getByteValue() {
+    return byteValue;
+  }
+
+  public void setByteValue(byte byteValue) {
+    this.byteValue = byteValue;
+  }
+
+  public Boolean getBooleanWrapperValue() {
+    return booleanWrapperValue;
+  }
+
+  public void setBooleanWrapperValue(Boolean booleanWrapperValue) {
+    this.booleanWrapperValue = booleanWrapperValue;
+  }
+
+  public boolean isBooleanValue() {
+    return booleanValue;
+  }
+
+  public void setBooleanValue(boolean booleanValue) {
+    this.booleanValue = booleanValue;
+  }
+
+  public Date getDate() {
+    return date;
+  }
+
+  public void setDate(Date date) {
+    this.date = date;
+  }
+
 }

src/test/java/org/apache/ibatis/submitted/cache/CustomCacheMapper.java

@@ -20,8 +20,20 @@
 
 @CacheNamespace(implementation = CustomCache.class, properties = {
     @Property(name = "stringValue", value = "bar"),
-    @Property(name = "integerValue", value = "99"),
-    @Property(name = "longValue", value = "9999")
+    @Property(name = "integerValue", value = "1"),
+    @Property(name = "intValue", value = "2"),
+    @Property(name = "longWrapperValue", value = "3"),
+    @Property(name = "longValue", value = "4"),
+    @Property(name = "shortWrapperValue", value = "5"),
+    @Property(name = "shortValue", value = "6"),
+    @Property(name = "floatWrapperValue", value = "7.1"),
+    @Property(name = "floatValue", value = "8.1"),
+    @Property(name = "doubleWrapperValue", value = "9.01"),
+    @Property(name = "doubleValue", value = "10.01"),
+    @Property(name = "byteWrapperValue", value = "11"),
+    @Property(name = "byteValue", value = "12"),
+    @Property(name = "booleanWrapperValue", value = "true"),
+    @Property(name = "booleanValue", value = "true")
 })
 public interface CustomCacheMapper {
 }