Add tests for RowBounds on MapperMethod

Author: kazuki43zoo

src/test/java/org/apache/ibatis/binding/BindingTest.java

@@ -26,6 +26,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -36,6 +37,7 @@
 import net.sf.cglib.proxy.Factory;
 
 import org.apache.ibatis.BaseDataTest;
+import org.apache.ibatis.cursor.Cursor;
 import org.apache.ibatis.domain.blog.Author;
 import org.apache.ibatis.domain.blog.Blog;
 import org.apache.ibatis.domain.blog.DraftPost;
@@ -734,5 +736,55 @@ public void shouldGetBlogsWithAuthorsAndPostsEagerly() {
       session.close();
     }
   }
-  
+
+  @Test
+  public void executeWithResultHandlerAndRowBounds() {
+    SqlSession session = sqlSessionFactory.openSession();
+    try {
+      BoundBlogMapper mapper = session.getMapper(BoundBlogMapper.class);
+      final DefaultResultHandler handler = new DefaultResultHandler();
+      mapper.collectRangeBlogs(handler, new RowBounds(1, 1));
+
+      assertEquals(1, handler.getResultList().size());
+      Blog blog = (Blog) handler.getResultList().get(0);
+      assertEquals(2, blog.getId());
+
+    } finally {
+      session.close();
+    }
+  }
+
+  @Test
+  public void executeWithMapKeyAndRowBounds() {
+    SqlSession session = sqlSessionFactory.openSession();
+    try {
+      BoundBlogMapper mapper = session.getMapper(BoundBlogMapper.class);
+      Map<Integer, Blog> blogs = mapper.selectRangeBlogsAsMapById(new RowBounds(1, 1));
+
+      assertEquals(1, blogs.size());
+      Blog blog = blogs.get(2);
+      assertEquals(2, blog.getId());
+
+    } finally {
+      session.close();
+    }
+  }
+
+  @Test
+  public void executeWithCursorAndRowBounds() {
+    SqlSession session = sqlSessionFactory.openSession();
+    try {
+      BoundBlogMapper mapper = session.getMapper(BoundBlogMapper.class);
+      Cursor<Blog> blogs = mapper.openRangeBlogs(new RowBounds(1, 1));
+
+      Iterator<Blog> blogIterator = blogs.iterator();
+      Blog blog = blogIterator.next();
+      assertEquals(2, blog.getId());
+      assertFalse(blogIterator.hasNext());
+
+    } finally {
+      session.close();
+    }
+  }
+
 }

src/test/java/org/apache/ibatis/binding/BoundBlogMapper.java

@@ -16,11 +16,13 @@
 package org.apache.ibatis.binding;
 
 import org.apache.ibatis.annotations.*;
+import org.apache.ibatis.cursor.Cursor;
 import org.apache.ibatis.domain.blog.Author;
 import org.apache.ibatis.domain.blog.Blog;
 import org.apache.ibatis.domain.blog.DraftPost;
 import org.apache.ibatis.domain.blog.Post;
 import org.apache.ibatis.mapping.FetchType;
+import org.apache.ibatis.session.ResultHandler;
 import org.apache.ibatis.session.RowBounds;
 
 import java.util.List;
@@ -43,6 +45,10 @@ public interface BoundBlogMapper {
   @MapKey("id")
   Map<Integer,Blog> selectBlogsAsMapById();
 
+  @Select({ "SELECT * FROM blog ORDER BY id"})
+  @MapKey("id")
+  Map<Integer,Blog> selectRangeBlogsAsMapById(RowBounds rowBounds);
+
   //======================================================
 
   @Select({
@@ -51,6 +57,22 @@ public interface BoundBlogMapper {
   })
   List<Blog> selectBlogs();
 
+  @Select({
+          "SELECT *",
+          "FROM blog",
+          "ORDER BY id"
+  })
+  @ResultType(Blog.class)
+  void collectRangeBlogs(ResultHandler<Object> blog, RowBounds rowBounds);
+
+
+  @Select({
+          "SELECT *",
+          "FROM blog",
+          "ORDER BY id"
+  })
+  Cursor<Blog> openRangeBlogs(RowBounds rowBounds);
+
   //======================================================
 
   List<Blog> selectBlogsFromXML();