svn commit: r1540324 - in /commons/proper/beanutils/trunk: pom.xml src/test/java/org/apache/commons/beanutils/memoryleaktests/MemoryLeakTestCase.java

[oh...@apache.org]

Author: oheger
Date: Sat Nov  9 15:08:46 2013
New Revision: 1540324

URL: http://svn.apache.org/r1540324
Log:
Re-enabled long-running test case.

This test case had been disabled while generics were added.

Modified:
    commons/proper/beanutils/trunk/pom.xml
    commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/memoryleaktests/MemoryLeakTestCase.java

Modified: commons/proper/beanutils/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/pom.xml?rev=1540324&r1=1540323&r2=1540324&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/pom.xml (original)
+++ commons/proper/beanutils/trunk/pom.xml Sat Nov  9 15:08:46 2013
@@ -308,8 +308,6 @@
                   -  so we will just exclude it until someone comes up with a solution.
                 -->
                 <exclude>**/*MemoryTestCase.java</exclude>
-                <!-- Temporarily disabled long-running test case -->
-                <exclude>**/MemoryLeakTestCase.java</exclude>
               </excludes>
 
               <!-- Configure Logging -->

Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/memoryleaktests/MemoryLeakTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/memoryleaktests/MemoryLeakTestCase.java?rev=1540324&r1=1540323&r2=1540324&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/memoryleaktests/MemoryLeakTestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/memoryleaktests/MemoryLeakTestCase.java Sat Nov  9 15:08:46 2013
@@ -421,7 +421,7 @@ public class MemoryLeakTestCase extends 
         // if you comment the following two lines, the testcase will work, and the ClassLoader will be released.
         // That proves that nothing is wrong with the test, and LocaleConvertUtilsBean is holding a reference
         LocaleConvertUtils.register(new IntegerLocaleConverter(Locale.US, false), beanClass, Locale.US);
-        assertEquals(new Integer(12345), LocaleConvertUtils.convert(bean.toString(), beanClass, Locale.US, "#,###"));
+        assertEquals(new Integer(12345), LocaleConvertUtils.convert(bean.toString(), Integer.class, Locale.US, "#,###"));
 
         // this should make the reference go away.
         loader    = null;