svn commit: r1564635 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LockTableVtiTest.java

[my...@apache.org]

Author: myrnavl
Date: Wed Feb  5 04:59:06 2014
New Revision: 1564635

URL: http://svn.apache.org/r1564635
Log:
DERBY-5630; intermittent test failure in store/lockTableVTI.sql
   fixing up javadoc, some comments, adjusting some exception class thrown

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LockTableVtiTest.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LockTableVtiTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LockTableVtiTest.java?rev=1564635&r1=1564634&r2=1564635&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LockTableVtiTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LockTableVtiTest.java Wed Feb  5 04:59:06 2014
@@ -44,7 +44,7 @@ import org.apache.derbyTesting.junit.JDB
 import org.apache.derbyTesting.junit.TestConfiguration;
 
 /**
- * Tests the LOCK TABLE in various modes.
+ * Tests the printing of the WAIT state in the LOCK TABLE.
  */
 public class LockTableVtiTest extends BaseJDBCTestCase {
 
@@ -59,7 +59,7 @@ public class LockTableVtiTest extends Ba
 
     /**
      * Construct top level suite in this JUnit test
-     * The suite is wrapped in a DatabasePropertyTestSetup set
+     * The suite is wrapped in a DatabasePropertyTestSetup to set
      * the lock wait timeout.
      *
      * @return A suite containing embedded fixtures
@@ -133,9 +133,9 @@ public class LockTableVtiTest extends Ba
      * Tests to make sure that WAIT state is displayed in lock
      * table output
      * 
-     * @exception SQLException
+     * @exception Exception
      */
-    public void testDisplayWaitState() throws Throwable {
+    public void testDisplayWaitState() throws Exception {
         Statement s = createStatement();
         setAutoCommit(false);
         // setting to -1 (wait for ever) to improve timing control
@@ -208,11 +208,11 @@ public class LockTableVtiTest extends Ba
     }
     
     /**
-     * Get the number of locks in the lock table
-     * @return number of locks
+     * See if there is a 'WAIT' lock
+     * @return true if there was a WAIT lock, false if not
      * @throws SQLException
      */
-    private boolean getWaitState() throws Exception {
+    private boolean getWaitState() throws SQLException {
         Statement s = createStatement();
         ResultSet rs = s.executeQuery(
                 "SELECT state from syscs_diag.lock_table " +