db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r1480959 - in /db/derby/code/branches/10.9: ./ java/testing/org/apache/derbyTesting/functionTests/tests/store/ClobReclamationTest.java
Date Fri, 10 May 2013 09:31:05 GMT
Author: kahatlen
Date: Fri May 10 09:31:05 2013
New Revision: 1480959

URL: http://svn.apache.org/r1480959
Log:
DERBY-6215: derby.log grows enormously during StressMultiTest

Merged revision 1480947 from trunk.

Modified:
    db/derby/code/branches/10.9/   (props changed)
    db/derby/code/branches/10.9/java/testing/org/apache/derbyTesting/functionTests/tests/store/ClobReclamationTest.java

Propchange: db/derby/code/branches/10.9/
------------------------------------------------------------------------------
  Merged /db/derby/code/trunk:r1480947

Modified: db/derby/code/branches/10.9/java/testing/org/apache/derbyTesting/functionTests/tests/store/ClobReclamationTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.9/java/testing/org/apache/derbyTesting/functionTests/tests/store/ClobReclamationTest.java?rev=1480959&r1=1480958&r2=1480959&view=diff
==============================================================================
--- db/derby/code/branches/10.9/java/testing/org/apache/derbyTesting/functionTests/tests/store/ClobReclamationTest.java
(original)
+++ db/derby/code/branches/10.9/java/testing/org/apache/derbyTesting/functionTests/tests/store/ClobReclamationTest.java
Fri May 10 09:31:05 2013
@@ -26,15 +26,13 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 
-import java.util.Properties;
-
 import junit.framework.Test;
 
+import org.apache.derby.iapi.services.sanity.SanityManager;
 import org.apache.derbyTesting.functionTests.util.Formatters;
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
 import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
 import org.apache.derbyTesting.junit.JDBC;
-import org.apache.derbyTesting.junit.SystemPropertyTestSetup;
 import org.apache.derbyTesting.junit.TestConfiguration;
 
 /**
@@ -281,17 +279,17 @@ public class ClobReclamationTest extends
     }
     
     public static Test suite() {
-
-        Properties sysProps = new Properties();
-        sysProps.put("derby.debug.true", "DaemonTrace");
         Test suite = TestConfiguration.embeddedSuite(ClobReclamationTest.class);
-        return new CleanDatabaseTestSetup(new SystemPropertyTestSetup(suite,
-                sysProps, true)) {
+        return new CleanDatabaseTestSetup(suite) {
             /**
              * Creates the table used in the test cases.
              * 
              */
             protected void decorateSQL(Statement s) throws SQLException {
+                if (SanityManager.DEBUG) {
+                    SanityManager.DEBUG_SET("DaemonTrace");
+                }
+
                 Connection conn = s.getConnection();
                 s
                         .executeUpdate("CREATE TABLE CLOBTAB (I INT  PRIMARY KEY NOT NULL,
c CLOB)");
@@ -307,6 +305,13 @@ public class ClobReclamationTest extends
                 s.executeUpdate("CREATE TABLE CLOBTAB3 (I INT, C CLOB)");               

             }
 
+            protected void tearDown() throws Exception {
+                if (SanityManager.DEBUG) {
+                    SanityManager.DEBUG_CLEAR("DaemonTrace");
+                }
+                super.tearDown();
+            }
+
         };
 
     }



Mime
View raw message