db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r1142539 - in /db/derby/code/branches/10.6: ./ java/testing/org/apache/derbyTesting/functionTests/suites/ java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ java/testing/org/apache/derbyTesting/functionTests/tests/memory/
Date Mon, 04 Jul 2011 04:31:35 GMT
Author: kmarsden
Date: Mon Jul  4 04:31:35 2011
New Revision: 1142539

URL: http://svn.apache.org/viewvc?rev=1142539&view=rev
Log:
DERBY-3337 convert jdbcapi/derbyStress.java to JUnit
DERBY-4200 client side OutOfMemoryError running derbnetclientmats:jdbcapi/derbyStress

Merged revision 1141924 from trunk. 

Convert test to JUnit and also run the finalizer periodically if freeMemory() falls below
500K.  The converted tests is no longer called derbyStress. It is now memory.MemoryLeakFixes
and runs with the junit-lowmem target or can be run directly with junit.textui.TestRunner
with -Xmx16M.  



Added:
    db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/tests/memory/MemoryLeakFixesTest.java
      - copied unchanged from r1141924, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memory/MemoryLeakFixesTest.java
Removed:
    db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/suites/jdbcapi.runall
    db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/derbyStress.java
    db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/derbyStress_app.properties
Modified:
    db/derby/code/branches/10.6/   (props changed)
    db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNet.exclude
    db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientUseprocess.exclude
    db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/suites/j9derbynetmats.properties
    db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/tests/memory/_Suite.java

Propchange: db/derby/code/branches/10.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul  4 04:31:35 2011
@@ -1,3 +1,3 @@
 /db/derby/code/branches/10.7:1140196
-/db/derby/code/trunk:938547,938796,938959,939231,940462,940469,941627,942031,942286,942476,942480,942587,944152,946794,948045,948069,951346,951366,952138,952237,952581,954344,954421,954544,954748,955001,955540,955634,956075,956234,956445,956569,956659,957260,957902,958163,958257,958264,958508,958522,958555,958618,958939,959550,961892,962716,963206,963705,964039,964115,964402,965647,966393,967201,967304,980089,980684,986689,986834,987539,989099,990292,997325,998170,999119,999479,999485,1002291,1002682,1002853,1021426,1024511,1024528,1025615,1025795,1028716,1030043,1033485,1033864,1035164,1038514,1040658,1053724,1055169,1062096,1063809,1065061,1067250,1069661,1071886,1078461,1081455,1097247,1103681,1103718
+/db/derby/code/trunk:938547,938796,938959,939231,940462,940469,941627,942031,942286,942476,942480,942587,944152,946794,948045,948069,951346,951366,952138,952237,952581,954344,954421,954544,954748,955001,955540,955634,956075,956234,956445,956569,956659,957260,957902,958163,958257,958264,958508,958522,958555,958618,958939,959550,961892,962716,963206,963705,964039,964115,964402,965647,966393,967201,967304,980089,980684,986689,986834,987539,989099,990292,997325,998170,999119,999479,999485,1002291,1002682,1002853,1021426,1024511,1024528,1025615,1025795,1028716,1030043,1033485,1033864,1035164,1038514,1040658,1053724,1055169,1062096,1063809,1065061,1067250,1069661,1071886,1078461,1081455,1097247,1103681,1103718,1141924
 /db/derby/docs/trunk:954344

Modified: db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNet.exclude
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNet.exclude?rev=1142539&r1=1142538&r2=1142539&view=diff
==============================================================================
--- db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNet.exclude
(original)
+++ db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNet.exclude
Mon Jul  4 04:31:35 2011
@@ -4,6 +4,4 @@
 # 			see DERBY-326 and DERBY-550 issues
 jdbcapi/rsgetXXXcolumnNames.java
 jdbcapi/SetQueryTimeoutTest.java
-# excluding jdbcapi/derbyStress.java - jcc runs out of memory with this test
-jdbcapi/derbyStress.java
 largedata/LobLimits.java

Modified: db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientUseprocess.exclude
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientUseprocess.exclude?rev=1142539&r1=1142538&r2=1142539&view=diff
==============================================================================
--- db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientUseprocess.exclude
(original)
+++ db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientUseprocess.exclude
Mon Jul  4 04:31:35 2011
@@ -9,7 +9,6 @@
 # stress/stress.multi - exits suite
 # following fail for various reasons, many related to not being able to connect:
 #  lang/wisconsin.java
-#  jdbcapi/derbyStress.java
 #  jdbcapi/maxfieldsize.java
 #
 jdbcapi/HoldabilityTest.junit
@@ -19,5 +18,4 @@ derbynet/dblook_test_net.java
 derbynet/dblook_test_net_territory.java
 stress/stress.multi
 lang/wisconsin.java
-jdbcapi/derbyStress.java
 jdbcapi/maxfieldsize.java

Modified: db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/suites/j9derbynetmats.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/suites/j9derbynetmats.properties?rev=1142539&r1=1142538&r2=1142539&view=diff
==============================================================================
--- db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/suites/j9derbynetmats.properties
(original)
+++ db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/suites/j9derbynetmats.properties
Mon Jul  4 04:31:35 2011
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 framework=DerbyNet
-suites=j9derbynetmats jdbcapi jdbc20
+suites=j9derbynetmats jdbc20
 jdk12test=true
 runwithj9=false
 runwithibm13=false

Modified: db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/tests/memory/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/tests/memory/_Suite.java?rev=1142539&r1=1142538&r2=1142539&view=diff
==============================================================================
--- db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/tests/memory/_Suite.java
(original)
+++ db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/tests/memory/_Suite.java
Mon Jul  4 04:31:35 2011
@@ -40,6 +40,7 @@ public class _Suite extends BaseJDBCTest
         suite.addTest(ClobMemTest.suite());
         suite.addTest(MultiByteClobTest.suite());
         suite.addTest(RolesDependencyTest.suite());
+        suite.addTest(MemoryLeakFixesTest.suite());
         return suite;
     }
 }



Mime
View raw message