db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From o..@apache.org
Subject svn commit: r789601 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: suites/All.java suites/AllPackages.java tests/replicationTests/ReplicationRun_Local_StateTest_part1_1.java
Date Tue, 30 Jun 2009 07:48:38 GMT
Author: ole
Date: Tue Jun 30 07:48:38 2009
New Revision: 789601

URL: http://svn.apache.org/viewvc?rev=789601&view=rev
Log:
DERBY-4277: Replacing simple connect() with waitForConnect().

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/All.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/AllPackages.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part1_1.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/All.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/All.java?rev=789601&r1=789600&r2=789601&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/All.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/All.java
Tue Jun 30 07:48:38 2009
@@ -49,6 +49,7 @@
         suite.addTest(AllPackages.suite());
         
         // Encrypted tests
+        // J2ME (JSR169) does not support encryption.
         suite.addTest(EncryptionSuite.suite());
         
         // Replication tests. Implementation require DataSource. 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/AllPackages.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/AllPackages.java?rev=789601&r1=789600&r2=789601&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/AllPackages.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/AllPackages.java
Tue Jun 30 07:48:38 2009
@@ -56,7 +56,7 @@
         suite.addTest(org.apache.derbyTesting.functionTests.tests.lang._Suite.suite());
         suite.addTest(org.apache.derbyTesting.functionTests.tests.jdbcapi._Suite.suite());
         suite.addTest(org.apache.derbyTesting.functionTests.tests.store._Suite.suite());
-	 suite.addTest(org.apache.derbyTesting.functionTests.tests.tools._Suite.suite());
+        suite.addTest(org.apache.derbyTesting.functionTests.tests.tools._Suite.suite());
         suite.addTest(org.apache.derbyTesting.functionTests.tests.engine._Suite.suite());
         suite.addTest(org.apache.derbyTesting.functionTests.tests.demo._Suite.suite());
         suite.addTest(org.apache.derbyTesting.functionTests.tests.memory._Suite.suite());

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part1_1.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part1_1.java?rev=789601&r1=789600&r2=789601&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part1_1.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part1_1.java
Tue Jun 30 07:48:38 2009
@@ -20,13 +20,9 @@
  */
 package org.apache.derbyTesting.functionTests.tests.replicationTests;
 
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.apache.derbyTesting.junit.SecurityManagerSetup;
-import org.apache.derbyTesting.junit.BaseJDBCTestCase;
 
 
 /**
@@ -200,18 +196,8 @@
         util.DEBUG("4. testPostStartedMasterAndSlave_StopSlave: " +
                    connectionURL);
 
-        try {
-            DriverManager.getConnection(connectionURL).close();
-            util.DEBUG("4. Connected as expected: " + connectionURL);
-
-        } catch (SQLException se) {
-            int ec = se.getErrorCode();
-            String ss = se.getSQLState();
-            String msg = ec + " " + ss + " " + se.getMessage();
-            util.DEBUG("4. Unexpectedly failed to connect: " +
-                       connectionURL +  " " + msg);
-            assertTrue("Unexpectedly failed to connect: " +
-                       connectionURL +  " " + msg, false);
-        }
+        waitForConnect(100L, 10, 
+                slaveDatabasePath + FS + slaveDbSubPath + FS + replicatedDb, 
+                slaveServerHost, slaveServerPort);
     }
 }



Mime
View raw message