User: rt Date: 06/02/06 08:53:03 Modified: /dba/dbaccess/qa/complex/dbaccess/ RowSet.java
Log: INTEGRATION: CWS dba202f (1.5.2); FILE MERGED 2006/01/30 09:28:03 oj 1.5.2.1: #i61052# fix for updates, deletes and moves File Changes: Directory: /dba/dbaccess/qa/complex/dbaccess/ ============================================= File [changed]: RowSet.java Url: http://dba.openoffice.org/source/browse/dba/dbaccess/qa/complex/dbaccess/RowSet.java?r1=1.5&r2=1.6 Delta lines: +6 -6 ------------------- --- RowSet.java 25 Jan 2006 15:08:42 -0000 1.5 +++ RowSet.java 6 Feb 2006 16:53:01 -0000 1.6 @@ -90,7 +90,10 @@ { int pos = m_resultSet.getRow(); int val = m_row.getInt(1); +// log.println("Clone Move(" + m_id +") before i: " + (i+1) + " Pos: " + pos + " Val: " + val); testPosition( m_resultSet, m_row, i + 1, "clone move(" + m_id +")" ); +// val = m_row.getInt(1); +// log.println("Clone Move(" + m_id +") after i: " + (i+1) + " Pos: " + pos + " Val: " + val); int pos2 = m_resultSet.getRow(); assure("ResultSetMovementStress wrong position: " + i + " Pos1: " + pos + " Pos2: " + pos2,pos == pos2); } @@ -100,7 +103,6 @@ } } } - // -------------------------------------------------------------------------------------------------------- public String[] getTestMethodNames() { return new String[] @@ -235,7 +237,7 @@ int val = m_row.getInt(1); int pos = m_resultSet.getRow(); assure( location + ": value/position do not match: " + pos + " (pos) != " + val + " (val)", val == pos ); - assure( location + ": value/position are not as expected: " + pos + " (pos) != " + expectedValue + " (expected)", val == expectedValue ); + assure( location + ": value/position are not as expected: " + val + " (val) != " + expectedValue + " (expected)", val == expectedValue ); } // -------------------------------------------------------------------------------------------------------- @@ -410,7 +412,6 @@ moves[RowSetEventListener.ROW_COUNT] = true; moves[RowSetEventListener.APPROVE_ROW_CHANGE] = true; moves[RowSetEventListener.ROW_CHANGED] = true; - testCursorMove(upd,cupd.getMethod("insertRow",(Class[])null),pRow,moves,null); moves[RowSetEventListener.IS_NEW] = false; @@ -554,7 +555,6 @@ int positionAfter = m_resultSet.getRow(); int rowCountAfter = currentRowCount(); - assure( "position changed during |deleteRow| (it should not)", positionAfter == positionBefore ); assure( "row count changed with a |deleteRow| (it should not)", rowCountBefore == rowCountAfter ); assure( "RowSet does not report the current row as deleted after |deleteRow|", m_resultSet.rowDeleted() ); @@ -758,7 +758,7 @@ int rowValue1 = m_row.getInt(1); int rowPos = m_resultSet.getRow(); int rowValue2 = m_row.getInt(1); - assure( "repeated query for the same column value delivers different values (" + rowValue1 + " and " + rowValue2 + ")", + assure( "repeated query for the same column value delivers different values (" + rowValue1 + " and " + rowValue2 + ") on row: " + rowPos, rowValue1 == rowValue2 ); testPosition( clone, cloneRow, 1, "mixed clone/rowset move: clone check" ); @@ -774,6 +774,6 @@ m_resultSetUpdate.moveToCurrentRow(); testPosition( clone, cloneRow, 1, "mixed clone/rowset move/insertion: clone check" ); - testPosition( m_resultSet, m_row, 1, "mixed clone/rowset move/insertion: rowset check" ); + testPosition( m_resultSet, m_row, 100, "mixed clone/rowset move/insertion: rowset check" ); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
