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 ka...@apache.org on 2013/06/25 15:02:11 UTC
svn commit: r1496455 - in /db/derby/code/branches/10.10: ./
java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/LoginTimeoutTest.java
Author: kahatlen
Date: Tue Jun 25 13:02:10 2013
New Revision: 1496455
URL: http://svn.apache.org/r1496455
Log:
DERBY-6272: LoginTimeoutTest fails if server is missing
Merged revision 1496406 from trunk.
Modified:
db/derby/code/branches/10.10/ (props changed)
db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/LoginTimeoutTest.java
Propchange: db/derby/code/branches/10.10/
------------------------------------------------------------------------------
Merged /db/derby/code/trunk:r1496406
Modified: db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/LoginTimeoutTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/LoginTimeoutTest.java?rev=1496455&r1=1496454&r2=1496455&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/LoginTimeoutTest.java (original)
+++ db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/LoginTimeoutTest.java Tue Jun 25 13:02:10 2013
@@ -38,7 +38,7 @@ import org.apache.derby.authentication.U
import org.apache.derbyTesting.junit.BaseTestCase;
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
-import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
+import org.apache.derbyTesting.junit.Derby;
import org.apache.derbyTesting.junit.SystemPropertyTestSetup;
import org.apache.derbyTesting.junit.J2EEDataSource;
import org.apache.derbyTesting.junit.JDBCClient;
@@ -219,12 +219,18 @@ public class LoginTimeoutTest extends Ba
embedded = TestConfiguration.singleUseDatabaseDecorator( embedded );
embedded = new SystemPropertyTestSetup( embedded, systemProperties() );
suite.addTest( embedded );
-
- Test clientServer = new TestSuite( LoginTimeoutTest.class, "client/server LoginTimeoutTest" );
- clientServer = TestConfiguration.singleUseDatabaseDecorator( clientServer );
- clientServer = new JDBCClientSetup( clientServer, JDBCClient.DERBYNETCLIENT );
- clientServer = new NetworkServerTestSetup( clientServer, systemPropertiesArray(), new String[]{}, true );
- suite.addTest( clientServer );
+
+ if (Derby.hasServer() && Derby.hasClient()) {
+ Test clientServer = new TestSuite(
+ LoginTimeoutTest.class, "client/server LoginTimeoutTest");
+ clientServer =
+ TestConfiguration.singleUseDatabaseDecorator(clientServer);
+ clientServer = new JDBCClientSetup(
+ clientServer, JDBCClient.DERBYNETCLIENT);
+ clientServer = new NetworkServerTestSetup(clientServer,
+ systemPropertiesArray(), new String[]{}, true);
+ suite.addTest(clientServer);
+ }
return suite;
}