Polishing tests for compatibility with mockito 3.3.x

kazuki43zoo · kazuki43zoo · commit bf5598dcd468 · 2020-03-14T19:22:08.000+09:00
diff --git a/src/test/java/org/apache/ibatis/type/BooleanTypeHandlerTest.java b/src/test/java/org/apache/ibatis/type/BooleanTypeHandlerTest.java
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2019 the original author or authors.
+ *    Copyright 2009-2020 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -36,10 +36,8 @@ public void shouldSetParameter() throws Exception {
   @Override
   @Test
   public void shouldGetResultFromResultSetByName() throws Exception {
-    when(rs.getBoolean("column")).thenReturn(true);
+    when(rs.getBoolean("column")).thenReturn(true, false);
     assertEquals(true, TYPE_HANDLER.getResult(rs, "column"));
-
-    when(rs.getBoolean("column")).thenReturn(false);
     assertEquals(false, TYPE_HANDLER.getResult(rs, "column"));
   }
 
@@ -54,10 +52,8 @@ public void shouldGetResultNullFromResultSetByName() throws Exception {
   @Override
   @Test
   public void shouldGetResultFromResultSetByPosition() throws Exception {
-    when(rs.getBoolean(1)).thenReturn(true);
+    when(rs.getBoolean(1)).thenReturn(true, false);
     assertEquals(true, TYPE_HANDLER.getResult(rs, 1));
-
-    when(rs.getBoolean(1)).thenReturn(false);
     assertEquals(false, TYPE_HANDLER.getResult(rs, 1));
   }
 
@@ -72,10 +68,8 @@ public void shouldGetResultNullFromResultSetByPosition() throws Exception {
   @Override
   @Test
   public void shouldGetResultFromCallableStatement() throws Exception {
-    when(cs.getBoolean(1)).thenReturn(true);
+    when(cs.getBoolean(1)).thenReturn(true, false);
     assertEquals(true, TYPE_HANDLER.getResult(cs, 1));
-
-    when(cs.getBoolean(1)).thenReturn(false);
     assertEquals(false, TYPE_HANDLER.getResult(cs, 1));
   }
 
@@ -86,4 +80,4 @@ public void shouldGetResultNullFromCallableStatement() throws Exception {
     assertNull(TYPE_HANDLER.getResult(cs, 1));
   }
 
-}
+}
diff --git a/src/test/java/org/apache/ibatis/type/ByteTypeHandlerTest.java b/src/test/java/org/apache/ibatis/type/ByteTypeHandlerTest.java
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2019 the original author or authors.
+ *    Copyright 2009-2020 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -36,10 +36,8 @@ public void shouldSetParameter() throws Exception {
   @Override
   @Test
   public void shouldGetResultFromResultSetByName() throws Exception {
-    when(rs.getByte("column")).thenReturn((byte) 100);
+    when(rs.getByte("column")).thenReturn((byte) 100, (byte) 0);
     assertEquals(Byte.valueOf((byte) 100), TYPE_HANDLER.getResult(rs, "column"));
-
-    when(rs.getByte("column")).thenReturn((byte) 0);
     assertEquals(Byte.valueOf((byte) 0), TYPE_HANDLER.getResult(rs, "column"));
   }
 
@@ -54,10 +52,8 @@ public void shouldGetResultNullFromResultSetByName() throws Exception {
   @Override
   @Test
   public void shouldGetResultFromResultSetByPosition() throws Exception {
-    when(rs.getByte(1)).thenReturn((byte) 100);
+    when(rs.getByte(1)).thenReturn((byte) 100, (byte) 0);
     assertEquals(Byte.valueOf((byte) 100), TYPE_HANDLER.getResult(rs, 1));
-
-    when(rs.getByte(1)).thenReturn((byte) 0);
     assertEquals(Byte.valueOf((byte) 0), TYPE_HANDLER.getResult(rs, 1));
   }
 
@@ -72,10 +68,8 @@ public void shouldGetResultNullFromResultSetByPosition() throws Exception {
   @Override
   @Test
   public void shouldGetResultFromCallableStatement() throws Exception {
-    when(cs.getByte(1)).thenReturn((byte) 100);
+    when(cs.getByte(1)).thenReturn((byte) 100, (byte) 0);
     assertEquals(Byte.valueOf((byte) 100), TYPE_HANDLER.getResult(cs, 1));
-
-    when(cs.getByte(1)).thenReturn((byte) 0);
     assertEquals(Byte.valueOf((byte) 0), TYPE_HANDLER.getResult(cs, 1));
   }
 
@@ -87,4 +81,4 @@ public void shouldGetResultNullFromCallableStatement() throws Exception {
     assertNull(TYPE_HANDLER.getResult(cs, 1));
   }
 
-}
+}
diff --git a/src/test/java/org/apache/ibatis/type/DoubleTypeHandlerTest.java b/src/test/java/org/apache/ibatis/type/DoubleTypeHandlerTest.java
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2019 the original author or authors.
+ *    Copyright 2009-2020 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -36,10 +36,8 @@ public void shouldSetParameter() throws Exception {
   @Override
   @Test
   public void shouldGetResultFromResultSetByName() throws Exception {
-    when(rs.getDouble("column")).thenReturn(100d);
+    when(rs.getDouble("column")).thenReturn(100d, 0d);
     assertEquals(Double.valueOf(100d), TYPE_HANDLER.getResult(rs, "column"));
-
-    when(rs.getDouble("column")).thenReturn(0d);
     assertEquals(Double.valueOf(0d), TYPE_HANDLER.getResult(rs, "column"));
   }
 
@@ -54,10 +52,8 @@ public void shouldGetResultNullFromResultSetByName() throws Exception {
   @Override
   @Test
   public void shouldGetResultFromResultSetByPosition() throws Exception {
-    when(rs.getDouble(1)).thenReturn(100d);
+    when(rs.getDouble(1)).thenReturn(100d, 0d);
     assertEquals(Double.valueOf(100d), TYPE_HANDLER.getResult(rs, 1));
-
-    when(rs.getDouble(1)).thenReturn(0d);
     assertEquals(Double.valueOf(0d), TYPE_HANDLER.getResult(rs, 1));
   }
 
@@ -72,10 +68,8 @@ public void shouldGetResultNullFromResultSetByPosition() throws Exception {
   @Override
   @Test
   public void shouldGetResultFromCallableStatement() throws Exception {
-    when(cs.getDouble(1)).thenReturn(100d);
+    when(cs.getDouble(1)).thenReturn(100d, 0d);
     assertEquals(Double.valueOf(100d), TYPE_HANDLER.getResult(cs, 1));
-
-    when(cs.getDouble(1)).thenReturn(0d);
     assertEquals(Double.valueOf(0d), TYPE_HANDLER.getResult(cs, 1));
   }
 
@@ -87,4 +81,4 @@ public void shouldGetResultNullFromCallableStatement() throws Exception {
     assertNull(TYPE_HANDLER.getResult(cs, 1));
   }
 
-}
+}
diff --git a/src/test/java/org/apache/ibatis/type/FloatTypeHandlerTest.java b/src/test/java/org/apache/ibatis/type/FloatTypeHandlerTest.java
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2019 the original author or authors.
+ *    Copyright 2009-2020 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -36,10 +36,8 @@ public void shouldSetParameter() throws Exception {
   @Override
   @Test
   public void shouldGetResultFromResultSetByName() throws Exception {
-    when(rs.getFloat("column")).thenReturn(100f);
+    when(rs.getFloat("column")).thenReturn(100f, 0f);
     assertEquals(Float.valueOf(100f), TYPE_HANDLER.getResult(rs, "column"));
-
-    when(rs.getFloat("column")).thenReturn(0f);
     assertEquals(Float.valueOf(0f), TYPE_HANDLER.getResult(rs, "column"));
   }
 
@@ -54,10 +52,8 @@ public void shouldGetResultNullFromResultSetByName() throws Exception {
   @Override
   @Test
   public void shouldGetResultFromResultSetByPosition() throws Exception {
-    when(rs.getFloat(1)).thenReturn(100f);
+    when(rs.getFloat(1)).thenReturn(100f, 0f);
     assertEquals(Float.valueOf(100f), TYPE_HANDLER.getResult(rs, 1));
-
-    when(rs.getFloat(1)).thenReturn(0f);
     assertEquals(Float.valueOf(0f), TYPE_HANDLER.getResult(rs, 1));
   }
 
@@ -72,10 +68,8 @@ public void shouldGetResultNullFromResultSetByPosition() throws Exception {
   @Override
   @Test
   public void shouldGetResultFromCallableStatement() throws Exception {
-    when(cs.getFloat(1)).thenReturn(100f);
+    when(cs.getFloat(1)).thenReturn(100f, 0f);
     assertEquals(Float.valueOf(100f), TYPE_HANDLER.getResult(cs, 1));
-
-    when(cs.getFloat(1)).thenReturn(0f);
     assertEquals(Float.valueOf(0f), TYPE_HANDLER.getResult(cs, 1));
   }
 
@@ -87,4 +81,4 @@ public void shouldGetResultNullFromCallableStatement() throws Exception {
     assertNull(TYPE_HANDLER.getResult(cs, 1));
   }
 
-}
+}
diff --git a/src/test/java/org/apache/ibatis/type/IntegerTypeHandlerTest.java b/src/test/java/org/apache/ibatis/type/IntegerTypeHandlerTest.java
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2019 the original author or authors.
+ *    Copyright 2009-2020 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -36,10 +36,8 @@ public void shouldSetParameter() throws Exception {
   @Override
   @Test
   public void shouldGetResultFromResultSetByName() throws Exception {
-    when(rs.getInt("column")).thenReturn(100);
+    when(rs.getInt("column")).thenReturn(100, 0);
     assertEquals(Integer.valueOf(100), TYPE_HANDLER.getResult(rs, "column"));
-
-    when(rs.getInt("column")).thenReturn(0);
     assertEquals(Integer.valueOf(0), TYPE_HANDLER.getResult(rs, "column"));
   }
 
@@ -54,10 +52,8 @@ public void shouldGetResultNullFromResultSetByName() throws Exception {
   @Override
   @Test
   public void shouldGetResultFromResultSetByPosition() throws Exception {
-    when(rs.getInt(1)).thenReturn(100);
+    when(rs.getInt(1)).thenReturn(100, 0);
     assertEquals(Integer.valueOf(100), TYPE_HANDLER.getResult(rs, 1));
-
-    when(rs.getInt(1)).thenReturn(0);
     assertEquals(Integer.valueOf(0), TYPE_HANDLER.getResult(rs, 1));
   }
 
@@ -72,10 +68,8 @@ public void shouldGetResultNullFromResultSetByPosition() throws Exception {
   @Override
   @Test
   public void shouldGetResultFromCallableStatement() throws Exception {
-    when(cs.getInt(1)).thenReturn(100);
+    when(cs.getInt(1)).thenReturn(100, 0);
     assertEquals(Integer.valueOf(100), TYPE_HANDLER.getResult(cs, 1));
-
-    when(cs.getInt(1)).thenReturn(0);
     assertEquals(Integer.valueOf(0), TYPE_HANDLER.getResult(cs, 1));
   }
 
@@ -87,4 +81,4 @@ public void shouldGetResultNullFromCallableStatement() throws Exception {
     assertNull(TYPE_HANDLER.getResult(cs, 1));
   }
 
-}
+}
diff --git a/src/test/java/org/apache/ibatis/type/LongTypeHandlerTest.java b/src/test/java/org/apache/ibatis/type/LongTypeHandlerTest.java
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2019 the original author or authors.
+ *    Copyright 2009-2020 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -36,10 +36,8 @@ public void shouldSetParameter() throws Exception {
   @Override
   @Test
   public void shouldGetResultFromResultSetByName() throws Exception {
-    when(rs.getLong("column")).thenReturn(100L);
+    when(rs.getLong("column")).thenReturn(100L, 0L);
     assertEquals(Long.valueOf(100L), TYPE_HANDLER.getResult(rs, "column"));
-
-    when(rs.getLong("column")).thenReturn(0L);
     assertEquals(Long.valueOf(0L), TYPE_HANDLER.getResult(rs, "column"));
   }
 
@@ -54,10 +52,8 @@ public void shouldGetResultNullFromResultSetByName() throws Exception {
   @Override
   @Test
   public void shouldGetResultFromResultSetByPosition() throws Exception {
-    when(rs.getLong(1)).thenReturn(100L);
+    when(rs.getLong(1)).thenReturn(100L, 0L);
     assertEquals(Long.valueOf(100L), TYPE_HANDLER.getResult(rs, 1));
-
-    when(rs.getLong(1)).thenReturn(0L);
     assertEquals(Long.valueOf(0L), TYPE_HANDLER.getResult(rs, 1));
   }
 
@@ -72,10 +68,8 @@ public void shouldGetResultNullFromResultSetByPosition() throws Exception {
   @Override
   @Test
   public void shouldGetResultFromCallableStatement() throws Exception {
-    when(cs.getLong(1)).thenReturn(100L);
+    when(cs.getLong(1)).thenReturn(100L, 0L);
     assertEquals(Long.valueOf(100L), TYPE_HANDLER.getResult(cs, 1));
-
-    when(cs.getLong(1)).thenReturn(0L);
     assertEquals(Long.valueOf(0L), TYPE_HANDLER.getResult(cs, 1));
   }
 
@@ -87,4 +81,4 @@ public void shouldGetResultNullFromCallableStatement() throws Exception {
     assertNull(TYPE_HANDLER.getResult(cs, 1));
   }
 
-}
+}
diff --git a/src/test/java/org/apache/ibatis/type/MonthTypeHandlerTest.java b/src/test/java/org/apache/ibatis/type/MonthTypeHandlerTest.java
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2019 the original author or authors.
+ *    Copyright 2009-2020 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -42,10 +42,8 @@ public void shouldSetParameter() throws Exception {
   @Override
   @Test
   public void shouldGetResultFromResultSetByName() throws Exception {
-    when(rs.getInt("column")).thenReturn(INSTANT.getValue());
+    when(rs.getInt("column")).thenReturn(INSTANT.getValue(), 0);
     assertEquals(INSTANT, TYPE_HANDLER.getResult(rs, "column"));
-
-    when(rs.getInt("column")).thenReturn(0);
     try {
       TYPE_HANDLER.getResult(rs, "column");
       fail();
@@ -65,10 +63,8 @@ public void shouldGetResultNullFromResultSetByName() throws Exception {
   @Override
   @Test
   public void shouldGetResultFromResultSetByPosition() throws Exception {
-    when(rs.getInt(1)).thenReturn(INSTANT.getValue());
+    when(rs.getInt(1)).thenReturn(INSTANT.getValue(), 0);
     assertEquals(INSTANT, TYPE_HANDLER.getResult(rs, 1));
-
-    when(rs.getInt(1)).thenReturn(0);
     try {
       TYPE_HANDLER.getResult(rs, 1);
       fail();
@@ -88,10 +84,8 @@ public void shouldGetResultNullFromResultSetByPosition() throws Exception {
   @Override
   @Test
   public void shouldGetResultFromCallableStatement() throws Exception {
-    when(cs.getInt(1)).thenReturn(INSTANT.getValue());
+    when(cs.getInt(1)).thenReturn(INSTANT.getValue(), 0);
     assertEquals(INSTANT, TYPE_HANDLER.getResult(cs, 1));
-
-    when(cs.getInt(1)).thenReturn(0);
     try {
       TYPE_HANDLER.getResult(cs, 1);
       fail();
diff --git a/src/test/java/org/apache/ibatis/type/ShortTypeHandlerTest.java b/src/test/java/org/apache/ibatis/type/ShortTypeHandlerTest.java
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2019 the original author or authors.
+ *    Copyright 2009-2020 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -36,10 +36,8 @@ public void shouldSetParameter() throws Exception {
   @Override
   @Test
   public void shouldGetResultFromResultSetByName() throws Exception {
-    when(rs.getShort("column")).thenReturn((short) 100);
+    when(rs.getShort("column")).thenReturn((short) 100, (short) 0);
     assertEquals(Short.valueOf((short) 100), TYPE_HANDLER.getResult(rs, "column"));
-
-    when(rs.getShort("column")).thenReturn((short) 0);
     assertEquals(Short.valueOf((short) 0), TYPE_HANDLER.getResult(rs, "column"));
   }
 
@@ -54,10 +52,8 @@ public void shouldGetResultNullFromResultSetByName() throws Exception {
   @Override
   @Test
   public void shouldGetResultFromResultSetByPosition() throws Exception {
-    when(rs.getShort(1)).thenReturn((short) 100);
+    when(rs.getShort(1)).thenReturn((short) 100, (short) 0);
     assertEquals(Short.valueOf((short) 100), TYPE_HANDLER.getResult(rs, 1));
-
-    when(rs.getShort(1)).thenReturn((short) 0);
     assertEquals(Short.valueOf((short) 0), TYPE_HANDLER.getResult(rs, 1));
   }
 
@@ -72,10 +68,8 @@ public void shouldGetResultNullFromResultSetByPosition() throws Exception {
   @Override
   @Test
   public void shouldGetResultFromCallableStatement() throws Exception {
-    when(cs.getShort(1)).thenReturn((short) 100);
+    when(cs.getShort(1)).thenReturn((short) 100, (short) 0);
     assertEquals(Short.valueOf((short) 100), TYPE_HANDLER.getResult(cs, 1));
-
-    when(cs.getShort(1)).thenReturn((short) 0);
     assertEquals(Short.valueOf((short) 0), TYPE_HANDLER.getResult(cs, 1));
   }
 
@@ -87,4 +81,4 @@ public void shouldGetResultNullFromCallableStatement() throws Exception {
     assertNull(TYPE_HANDLER.getResult(cs, 1));
   }
 
-}
+}
diff --git a/src/test/java/org/apache/ibatis/type/YearTypeHandlerTest.java b/src/test/java/org/apache/ibatis/type/YearTypeHandlerTest.java
