Add assertions for MultipleResultTest

Author: kazuki43zoo

src/test/java/org/apache/ibatis/submitted/usesjava8/multiple_resultsets/Mapper.java

@@ -19,8 +19,8 @@
 
 public interface Mapper {
 
-  List<?> getUsersAndGroups();
+  List<List<?>> getUsersAndGroups();
 
-  List<?> multiResultsWithUpdate();
+  List<List<?>> multiResultsWithUpdate();
 
 }

src/test/java/org/apache/ibatis/submitted/usesjava8/multiple_resultsets/Mapper.xml

@@ -23,14 +23,14 @@
 <mapper namespace="org.apache.ibatis.submitted.usesjava8.multiple_resultsets.Mapper">
 
 	<select id="getUsersAndGroups" resultMap="usersResult,groupsResult">
-		select * from mbtest.order_detail ; select * from mbtest.order_header
+		select * from mbtest.order_detail order by order_id, line_number ; select * from mbtest.order_header order by order_id
 	</select>
 
   <select id="multiResultsWithUpdate" resultMap="usersResult,groupsResult">
-    select * from mbtest.order_detail ;
+    select * from mbtest.order_detail order by order_id, line_number ;
     insert into mbtest.order_detail
       (order_id, line_number, quantity, item_description) values (2, 4, 5, 'Eraser') ;
-    select * from mbtest.order_header
+    select * from mbtest.order_header order by order_id
   </select>
 
 	<resultMap type="org.apache.ibatis.submitted.usesjava8.multiple_resultsets.OrderDetail" id="usersResult" />

src/test/java/org/apache/ibatis/submitted/usesjava8/multiple_resultsets/MultipleResultTest.java

@@ -83,17 +83,53 @@ public static void tearDown() {
   public void shouldGetMultipleResultSetsWithOneStatement() throws IOException {
     try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
       Mapper mapper = sqlSession.getMapper(Mapper.class);
-      List<?> usersAndGroups = mapper.getUsersAndGroups();
-      Assert.assertEquals(2, usersAndGroups.size());
+      List<List<?>> results = mapper.getUsersAndGroups();
+      Assert.assertEquals(2, results.size());
+
+      Assert.assertEquals(6, results.get(0).size());
+      OrderDetail detail = (OrderDetail)results.get(0).get(0);
+      Assert.assertEquals(1, detail.getOrderId());
+      Assert.assertEquals(1, detail.getLineNumber());
+      Assert.assertEquals(1, detail.getQuantity());
+      Assert.assertEquals("Pen", detail.getItemDescription());
+
+      Assert.assertEquals(2, results.get(1).size());
+      OrderHeader header = (OrderHeader)results.get(1).get(0);
+      Assert.assertEquals(1, header.getOrderId());
+      Assert.assertEquals("Fred", header.getCustName());
     }
   }
 
   @Test
   public void shouldSkipNullResultSet() {
     try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
-      Mapper mapper = sqlSession.getMapper(Mapper.class);
-      List<?> results = mapper.multiResultsWithUpdate();
-      Assert.assertEquals(2, results.size());
+      try {
+        Mapper mapper = sqlSession.getMapper(Mapper.class);
+        List<List<?>> results = mapper.multiResultsWithUpdate();
+        Assert.assertEquals(2, results.size());
+
+        Assert.assertEquals(6, results.get(0).size());
+        OrderDetail detail = (OrderDetail) results.get(0).get(0);
+        Assert.assertEquals(1, detail.getOrderId());
+        Assert.assertEquals(1, detail.getLineNumber());
+        Assert.assertEquals(1, detail.getQuantity());
+        Assert.assertEquals("Pen", detail.getItemDescription());
+
+        Assert.assertEquals(2, results.get(1).size());
+        OrderHeader header = (OrderHeader) results.get(1).get(0);
+        Assert.assertEquals(1, header.getOrderId());
+        Assert.assertEquals("Fred", header.getCustName());
+
+        results = mapper.getUsersAndGroups();
+        Assert.assertEquals(7, results.get(0).size());
+        detail = (OrderDetail) results.get(0).get(6);
+        Assert.assertEquals(2, detail.getOrderId());
+        Assert.assertEquals(4, detail.getLineNumber());
+        Assert.assertEquals(5, detail.getQuantity());
+        Assert.assertEquals("Eraser", detail.getItemDescription());
+      } finally {
+        sqlSession.rollback(true);
+      }
     }
   }
 }