db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r521854 [2/2] - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting: functionTests/master/ functionTests/master/DerbyNetClient/jdk14/ functionTests/suites/ functionTests/tests/jdbcapi/ functionTests/util/ junit/
Date Fri, 23 Mar 2007 18:38:29 GMT
Copied: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/XATestUtil.java (from
r520630, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/XATestUtil.java)
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/XATestUtil.java?view=diff&rev=521854&p1=db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/XATestUtil.java&r1=520630&p2=db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/XATestUtil.java&r2=521854
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/XATestUtil.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/XATestUtil.java Fri Mar
23 11:38:28 2007
@@ -19,7 +19,7 @@
 
  */
 
-package org.apache.derbyTesting.functionTests.util;
+package org.apache.derbyTesting.junit;
 
 import java.io.Serializable;
 import java.sql.Connection;
@@ -75,12 +75,15 @@
      * @param conn
      * @throws SQLException
      */
-    public static void showXATransactionView(Connection conn) throws SQLException
+    public static void checkXATransactionView(Connection conn,String[][] expectedRows) throws
SQLException
     {
         Statement s = conn.createStatement();
         ResultSet rs = s.executeQuery(
                 "select * from XATESTUTIL.global_xactTable where gxid is not null order by
gxid");
-        JDBCDisplayUtil.DisplayResults(System.out, rs, conn);
+        if (expectedRows == null)
+            JDBC.assertEmpty(rs);
+        else
+            JDBC.assertFullResultSet(rs, expectedRows);
         rs.close();
     }
     
@@ -178,4 +181,4 @@
     public byte[] getBranchQualifier() {
         return (branch_id);
     }
-}
\ No newline at end of file
+}



Mime
View raw message