db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r1160095 [1/3] - in /db/derby/code/branches/10.8: ./ java/testing/org/apache/derbyTesting/functionTests/suites/ java/testing/org/apache/derbyTesting/functionTests/tests/largedata/ java/testing/org/apache/derbyTesting/functionTests/util/
Date Mon, 22 Aug 2011 03:09:30 GMT
Author: kmarsden
Date: Mon Aug 22 03:09:29 2011
New Revision: 1160095

URL: http://svn.apache.org/viewvc?rev=1160095&view=rev
Log:
DERBY-1903 Convert largedata/LobLimits.java to junit

backport to 10.8. Leaving old test in the branch for comparison.


Added:
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/LobLimitsClientTest.java
      - copied unchanged from r1148429, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/LobLimitsClientTest.java
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/LobLimitsLiteTest.java
      - copied, changed from r1147219, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/LobLimitsLiteTest.java
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/LobLimitsTest.java
      - copied, changed from r1147219, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/LobLimitsTest.java
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/_Suite.java
      - copied, changed from r1148429, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/_Suite.java
Modified:
    db/derby/code/branches/10.8/   (props changed)
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/AllPackages.java
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/build.xml
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/util/PrivilegedFileOpsForTests.java

Propchange: db/derby/code/branches/10.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 22 03:09:29 2011
@@ -1,2 +1,2 @@
 /db/derby/code/branches/10.7:1061570,1061578,1082235
-/db/derby/code/trunk:1063809,1088633,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1095247,1096741,1096890,1097247,1097249,1097460,1097469,1097471,1098033,1101059,1101839,1102620,1102826,1103681,1103718,1103742,1125305,1126358,1126468,1127825,1127883,1128243,1128942,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132860,1132928,1133304,1133317,1133741,1133752,1134139,1136363,1136371,1136397,1136844,1138201,1138341,1138444,1138787,1138795,1139449,1139451,1141924,1142583,1142635,1146644,1146915,1146962,1148344,1148354,1148658,1151101,1151612
+/db/derby/code/trunk:1063809,1088633,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1095247,1096741,1096890,1097247,1097249,1097460,1097469,1097471,1098033,1101059,1101839,1102620,1102826,1103681,1103718,1103742,1125305,1126358,1126468,1127825,1127883,1128243,1128942,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132860,1132928,1133304,1133317,1133741,1133752,1134139,1136363,1136371,1136397,1136844,1138201,1138341,1138444,1138787,1138795,1139449,1139451,1141924,1142583,1142635,1146644,1146915,1146962,1147219,1147242,1147335,1148344,1148354,1148429,1148658,1149054,1149090,1149270,1149482,1149662,1151101,1151612

Modified: db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/AllPackages.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/AllPackages.java?rev=1160095&r1=1160094&r2=1160095&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/AllPackages.java
(original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/AllPackages.java
Mon Aug 22 03:09:29 2011
@@ -88,7 +88,12 @@ public class AllPackages extends BaseTes
         ArrayList classes = new ArrayList();
 
         classes.add(org.apache.derbyTesting.functionTests.tests.derbynet._Suite.class);
-        classes.add(org.apache.derbyTesting.functionTests.tests.lang._Suite.class);
+        classes.add(org.apache.derbyTesting.functionTests.tests.lang._Suite.class); 
+        // DERBY-1903
+        // For the largedata test, just run the lite version of the test as
+        // the full test is too big.
+        classes.add(
+             org.apache.derbyTesting.functionTests.tests.largedata.LobLimitsLiteTest.class);
         classes.add(org.apache.derbyTesting.functionTests.tests.jdbcapi._Suite.class);
         classes.add(org.apache.derbyTesting.functionTests.tests.store._Suite.class);
         classes.add(org.apache.derbyTesting.functionTests.tests.tools._Suite.class);

Copied: db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/LobLimitsLiteTest.java
(from r1147219, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/LobLimitsLiteTest.java)
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/LobLimitsLiteTest.java?p2=db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/LobLimitsLiteTest.java&p1=db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/LobLimitsLiteTest.java&r1=1147219&r2=1160095&rev=1160095&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/LobLimitsLiteTest.java
(original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/LobLimitsLiteTest.java
Mon Aug 22 03:09:29 2011
@@ -21,14 +21,10 @@ limitations under the License.
 
 package org.apache.derbyTesting.functionTests.tests.largedata;
 
-import java.sql.SQLException;
-import java.sql.Statement;
-
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
-import org.apache.derbyTesting.junit.SupportFilesSetup;
+import org.apache.derbyTesting.junit.TestConfiguration;
 
 
 
@@ -51,16 +47,12 @@ public class LobLimitsLiteTest extends L
     static final int _100K = 1024 *100;
     
     public static Test suite() {
-        // Right now run just with embeddded.
-        Test suite = new CleanDatabaseTestSetup(
-                new TestSuite(LobLimitsTest.class)) {
-                    protected void decorateSQL(Statement s)
-                            throws SQLException {
-                        setupTables(s,_1MB, _100K);
-                    }
-                };
-                
-        return new SupportFilesSetup(suite);
+        Test test = LobLimitsTest.baseSuite(_1MB, _100K);
+        TestSuite suite = new TestSuite("LobLimitsLiteTest");
+        suite.addTest(test);
+        suite.addTest(TestConfiguration.clientServerDecorator(test));
+        return suite;
+        
     }
 
 }



Mime
View raw message