You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by my...@apache.org on 2014/02/25 18:54:24 UTC
svn commit: r1571771 - in /db/derby/code/branches/10.10: ./
java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SetQueryTimeoutTest.java
Author: myrnavl
Date: Tue Feb 25 17:54:24 2014
New Revision: 1571771
URL: http://svn.apache.org/r1571771
Log:
DERBY-6280; test failure in SetQueryTimeoutTest ComparisonFailure: Output at line 16 expected:<Test[ing that PreparedStatement remembers timeout.]> but was:<Test[ SetQueryTimeoutTest FAILED]>
merge of revisions 1571764 and 1571769 from trunk
Modified:
db/derby/code/branches/10.10/ (props changed)
db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SetQueryTimeoutTest.java
Propchange: db/derby/code/branches/10.10/
------------------------------------------------------------------------------
Merged /db/derby/code/trunk:r1571764,1571769
Modified: db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SetQueryTimeoutTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SetQueryTimeoutTest.java?rev=1571771&r1=1571770&r2=1571771&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SetQueryTimeoutTest.java (original)
+++ db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SetQueryTimeoutTest.java Tue Feb 25 17:54:24 2014
@@ -684,8 +684,8 @@ public class SetQueryTimeoutTest
long runTime=0;
for (int i = 0; i < 3; i++) {
try {
- ResultSet rs = stmt.executeQuery(getFetchQuery("t"));
long startTime = System.currentTimeMillis();
+ ResultSet rs = stmt.executeQuery(getFetchQuery("t"));
while (rs.next());
long endTime = System.currentTimeMillis();
runTime = endTime - startTime;
@@ -712,8 +712,8 @@ public class SetQueryTimeoutTest
for (int i = 0; i < 3; i++) {
long runTime=0;
try {
- ResultSet rs = ps.executeQuery();
long startTime = System.currentTimeMillis();
+ ResultSet rs = ps.executeQuery();
while (rs.next());
long endTime = System.currentTimeMillis();
runTime = endTime - startTime;