svn commit: r691993 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests: jdbcapi/DatabaseMetaDataTest.java lang/UpdatableResultSetTest.java

[ka...@apache.org]

Author: kahatlen
Date: Thu Sep  4 05:39:58 2008
New Revision: 691993

URL: http://svn.apache.org/viewvc?rev=691993&view=rev
Log:
DERBY-3850: Remove unneeded workarounds for DERBY-177 and DERBY-3693

Removed calls to DatabasePropertyTestSetup.setLockTimeout() from some
tests since the bug that caused the hang has been fixed.

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java?rev=691993&r1=691992&r2=691993&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java Thu Sep  4 05:39:58 2008
@@ -207,10 +207,7 @@
         // meta-data queries.
         suite.addTest(
             TestConfiguration.singleUseDatabaseDecorator(
-                // until DERBY-177 is fixed, set lock timeout to prevent the
-                // test from waiting one minute
-                DatabasePropertyTestSetup.setLockTimeouts(
-                    new DatabaseMetaDataTest("initialCompilationTest"), 2, 4)));
+                new DatabaseMetaDataTest("initialCompilationTest")));
 
         // Test for DERBY-3693 needs a fresh database to ensure that the size
         // of SYSTABLES is so small that creating a relatively small number of

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java?rev=691993&r1=691992&r2=691993&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java Thu Sep  4 05:39:58 2008
@@ -29,7 +29,6 @@
 
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
 import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
-import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
 import org.apache.derbyTesting.junit.JDBC;
 import org.apache.derbyTesting.junit.TestConfiguration;
 
@@ -292,13 +291,7 @@
         suite.addTest(TestConfiguration.clientServerDecorator(
                 new CleanDatabaseTestSetup(clientSuite)));
 
-        // DERBY-177: The internal transaction that tries to compile the
-        // trigger in testDeleteRowWithDeleteTrigger gets a lock timeout
-        // because the main transaction has an exclusive lock on the trigger
-        // statement. It does not fail, because the compilation is retried in
-        // the main transaction where it completes successfully. Reduce the
-        // lock timeout to make the test run faster until the bug is fixed.
-        return DatabasePropertyTestSetup.setLockTimeouts(suite, 2, 4);
+        return suite;
     }
     
     private static TestSuite baseSuite(String name) {