svn commit: r431142 - in /ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap: MultiResultSetTest.java proc/DerbyProcs.java

[cbegin]

Author: cbegin
Date: Sat Aug 12 21:03:44 2006
New Revision: 431142

URL: http://svn.apache.org/viewvc?rev=431142&view=rev
Log:
Cosmetic test changes

Modified:
    
ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/MultiResultSetTest.java
    ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/proc/DerbyProcs.java

Modified: 
ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/MultiResultSetTest.java
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/MultiResultSetTest.java?rev=431142&r1=431141&r2=431142&view=diff
==============================================================================
--- 
ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/MultiResultSetTest.java 
(original)
+++ 
ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/MultiResultSetTest.java 
Sat Aug 12 21:03:44 2006
@@ -27,7 +27,7 @@
    * This test should return 2 lists of 2 accounts each
    * 
    */
-  public void test01() {
+  public void testShouldRetrieveTwoSetsOfTwoAccountsFromMultipleResultSets() {
     
     Map persons = new HashMap();
     persons.put("accountId1",new Integer(1));
@@ -38,8 +38,9 @@
     try {
       List results = 
           sqlMap.queryForList("getMultiListsRm", persons);
-      assertFalse(results.isEmpty());
-      // need assertion to check for list in list with 2 accounts each
+
+      assertEquals(2,results.size());
+
     } catch (Exception e) {
       fail(e.getMessage());
     }

Modified: 
ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/proc/DerbyProcs.java
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/proc/DerbyProcs.java?rev=431142&r1=431141&r2=431142&view=diff
==============================================================================
--- 
ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/proc/DerbyProcs.java 
(original)
+++ 
ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/proc/DerbyProcs.java 
Sat Aug 12 21:03:44 2006
@@ -7,30 +7,17 @@
 import java.sql.SQLException;
 
 public class DerbyProcs {
+  public static void selectRows(int p1, int p2, int p3, int p4, ResultSet[] 
rs1, ResultSet[] rs2) throws SQLException {
+    Connection conn = DriverManager.getConnection("jdbc:default:connection");
+    PreparedStatement ps1 = conn.prepareStatement("select * from account where 
acc_id in (?,?)");
+    ps1.setInt(1, p1);
+    ps1.setInt(2, p2);
+    rs1[0] = ps1.executeQuery();
+    PreparedStatement ps2 = conn.prepareStatement("select * from account where 
acc_id in (?,?)");
+    ps2.setInt(1, p3);
+    ps2.setInt(2, p4);
+    rs1[0] = ps2.executeQuery();
+    conn.close();
+  }
 
-    public static void selectRows(
-      int p1, int p2, 
-      int p3, int p4,
-      ResultSet[] rs1,
-      ResultSet[] rs2) 
-    throws SQLException {
-      
-      System.out.println("IN THE PROC " + p1 + " " + p2 + " " + p3 + " " + p4);
-      Connection conn = DriverManager.getConnection("jdbc:default:connection");
-      
-      PreparedStatement ps1 = conn.prepareStatement("select * from account 
where acc_id in (?,?)");
-      ps1.setInt(1, p1);
-      ps1.setInt(2, p2);
-      
-      rs1[0] = ps1.executeQuery();
-
-      PreparedStatement ps2 = conn.prepareStatement("select * from account 
where acc_id in (?,?)");
-      ps2.setInt(1, p3);
-      ps2.setInt(2, p4);
-      
-      rs1[0] = ps2.executeQuery();
-
-      conn.close();
-    }
-    
 }