db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From myrn...@apache.org
Subject svn commit: r1384397 - in /db/derby/code/branches/10.9: ./ java/testing/org/apache/derbyTesting/functionTests/master/ java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/
Date Thu, 13 Sep 2012 16:33:31 GMT
Author: myrnavl
Date: Thu Sep 13 16:33:30 2012
New Revision: 1384397

URL: http://svn.apache.org/viewvc?rev=1384397&view=rev
Log:
DERBY-5912; testIsValidImplemented fails for NetworkServer in some slow running machines/configurations
  This commits the following changes:
  partial backport of revision 1381731 from trunk:
  - changes the timeout in ConnectionMethodsTest from isValid(1) to isValid(200) and adds
a comment
  - updates the comment in ConnectionTest so it refers to ConnectionMethodsTest
DERBY-2855;  Convert jdbc4/TestConnectionMethods.java to JUnit
  backport of revision 1381429 from trunk: removing orphaned master file


Removed:
    db/derby/code/branches/10.9/java/testing/org/apache/derbyTesting/functionTests/master/TestConnectionMethods.out
Modified:
    db/derby/code/branches/10.9/   (props changed)
    db/derby/code/branches/10.9/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ConnectionMethodsTest.java
    db/derby/code/branches/10.9/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ConnectionTest.java

Propchange: db/derby/code/branches/10.9/
------------------------------------------------------------------------------
  Merged /db/derby/code/trunk:r1381429

Modified: db/derby/code/branches/10.9/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ConnectionMethodsTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.9/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ConnectionMethodsTest.java?rev=1384397&r1=1384396&r2=1384397&view=diff
==============================================================================
--- db/derby/code/branches/10.9/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ConnectionMethodsTest.java
(original)
+++ db/derby/code/branches/10.9/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ConnectionMethodsTest.java
Thu Sep 13 16:33:30 2012
@@ -322,10 +322,12 @@ public class ConnectionMethodsTest exten
         }
 
        /*
-        * Test with a valid timeout
+        * Test with a valid timeout.
+        * The value is set very large; we expect
+        * to complete and succeed much sooner. See DERBY-5912
         */
-        if (!conn.isValid(1)) {
-            fail("FAIL: isValid(1): returned false");
+        if (!conn.isValid(200)) {
+            fail("FAIL: isValid(200): returned false");
         }
 
        /*

Modified: db/derby/code/branches/10.9/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ConnectionTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.9/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ConnectionTest.java?rev=1384397&r1=1384396&r2=1384397&view=diff
==============================================================================
--- db/derby/code/branches/10.9/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ConnectionTest.java
(original)
+++ db/derby/code/branches/10.9/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ConnectionTest.java
Thu Sep 13 16:33:30 2012
@@ -157,7 +157,7 @@ public class ConnectionTest
      * Tests that <code>isValid</code> is implemented and returns true
      * for the connection. This test is very limited but is tested
      * for all connection types. A more complete test of isValid is
-     * found in the TestConnectionMethods.java test that is run for
+     * found in the ConnectionMethodsTest.java test that is run for
      * embedded and network client connections.
      */
     public void testIsValidImplemented() throws SQLException {



Mime
View raw message