db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r601309 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/OLAPTest.java
Date Wed, 05 Dec 2007 12:12:09 GMT
Author: kahatlen
Date: Wed Dec  5 04:12:06 2007
New Revision: 601309

URL: http://svn.apache.org/viewvc?rev=601309&view=rev
Log:
DERBY-2998: Use utility methods for statement creation in OLAPTest,
and don't lower lock timeouts.

Patch contributed by Thomas Nielsen.

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

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/OLAPTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/OLAPTest.java?rev=601309&r1=601308&r2=601309&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/OLAPTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/OLAPTest.java
Wed Dec  5 04:12:06 2007
@@ -21,7 +21,6 @@
 
 package org.apache.derbyTesting.functionTests.tests.lang;
 
-import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
@@ -29,7 +28,6 @@
 import junit.framework.Test;
 
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
-import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
 import org.apache.derbyTesting.junit.JDBC;
 import org.apache.derbyTesting.junit.TestConfiguration;
 
@@ -52,8 +50,7 @@
 	public void testBasicOperations() 
 		throws SQLException 
 	{   
-		Connection conn = getConnection();
-		Statement s = conn.createStatement();
+		Statement s = createStatement();
 
 		s.executeUpdate("create table t1 (a int, b int)");
 		s.executeUpdate("create table t2 (x int)");
@@ -114,10 +111,11 @@
 		s.executeUpdate("drop table t1");        
 		s.executeUpdate("drop table t2");
 		s.executeUpdate("drop table t3");
+
+		s.close();
 	}
 
 	public static Test suite() {
-		Test suite = TestConfiguration.defaultSuite(OLAPTest.class);
-		return DatabasePropertyTestSetup.setLockTimeouts(suite,3,3);
+		return TestConfiguration.defaultSuite(OLAPTest.class);
 	}
 }



Mime
View raw message