db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r1142002 - in /db/derby/code/branches/10.8: ./ java/testing/org/apache/derbyTesting/functionTests/suites/ java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ java/testing/org/apache/derbyTesting/functionTests/tests/memory/
Date Fri, 01 Jul 2011 17:36:31 GMT
Author: kmarsden
Date: Fri Jul  1 17:36:30 2011
New Revision: 1142002

URL: http://svn.apache.org/viewvc?rev=1142002&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.8/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.8/java/testing/org/apache/derbyTesting/functionTests/suites/jdbcapi.runall
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/derbyStress.java
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/derbyStress_app.properties
Modified:
    db/derby/code/branches/10.8/   (props changed)
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNet.exclude
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientUseprocess.exclude
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/derbyall.properties
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetclientmats.properties
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/j9derbynetmats.properties
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/memory/_Suite.java

Propchange: db/derby/code/branches/10.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul  1 17:36:30 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,1096741,1096890,1097247,1097249,1097460,1097469,1097471,1101059,1101839,1102620,1102826,1103681,1103718,1103742,1125305,1126358,1126468,1127825,1127883,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132860,1132928,1133304,1133317,1133741,1133752,1136371,1136397,1136844,1138201,1138444,1138787,1138795,1139449,1139451
+/db/derby/code/trunk:1063809,1088633,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1096741,1096890,1097247,1097249,1097460,1097469,1097471,1101059,1101839,1102620,1102826,1103681,1103718,1103742,1125305,1126358,1126468,1127825,1127883,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132860,1132928,1133304,1133317,1133741,1133752,1136371,1136397,1136844,1138201,1138444,1138787,1138795,1139449,1139451,1141924

Modified: db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNet.exclude
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNet.exclude?rev=1142002&r1=1142001&r2=1142002&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNet.exclude
(original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNet.exclude
Fri Jul  1 17:36:30 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.8/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientUseprocess.exclude
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientUseprocess.exclude?rev=1142002&r1=1142001&r2=1142002&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientUseprocess.exclude
(original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientUseprocess.exclude
Fri Jul  1 17:36:30 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.8/java/testing/org/apache/derbyTesting/functionTests/suites/derbyall.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/derbyall.properties?rev=1142002&r1=1142001&r2=1142002&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/derbyall.properties
(original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/derbyall.properties
Fri Jul  1 17:36:30 2011
@@ -13,6 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-suites=derbylang storeall xa derbytools jdbc20 jdbcapi derbynetclientmats encryptionAll simpledemo
unit i18nTest
+suites=derbylang storeall xa derbytools jdbc20 derbynetclientmats encryptionAll simpledemo
unit i18nTest
 derby.debug.true=enableBtreeConsistencyCheck
 derby.stream.error.logSeverityLevel=0

Modified: db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetclientmats.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetclientmats.properties?rev=1142002&r1=1142001&r2=1142002&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetclientmats.properties
(original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetclientmats.properties
Fri Jul  1 17:36:30 2011
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 framework=DerbyNetClient
-suites= encodingTests derbynetclientmats jdbcapi jdbc20
+suites= encodingTests derbynetclientmats jdbc20
 jdk12test=true
 runwithj9=false
 #Exclude for J2ME/Foundation - Network Server not supported

Modified: db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/j9derbynetmats.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/j9derbynetmats.properties?rev=1142002&r1=1142001&r2=1142002&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/j9derbynetmats.properties
(original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/j9derbynetmats.properties
Fri Jul  1 17:36:30 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.8/java/testing/org/apache/derbyTesting/functionTests/tests/memory/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/memory/_Suite.java?rev=1142002&r1=1142001&r2=1142002&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/memory/_Suite.java
(original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/memory/_Suite.java
Fri Jul  1 17:36:30 2011
@@ -41,6 +41,7 @@ public class _Suite extends BaseJDBCTest
         suite.addTest(MultiByteClobTest.suite());
         suite.addTest(RolesDependencyTest.suite());
         suite.addTest(Derby3009Test.suite());
+        suite.addTest(MemoryLeakFixesTest.suite());
         return suite;
     }
 }



Mime
View raw message