svn commit: r1479577 - in /commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils: BeanificationTestCase.java locale/LocaleBeanificationTestCase.java

[se...@apache.org]

Author: sebb
Date: Mon May  6 14:13:07 2013
New Revision: 1479577

URL: http://svn.apache.org/r1479577
Log:
Never import .*

Modified:
    commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BeanificationTestCase.java
    commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanificationTestCase.java

Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BeanificationTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BeanificationTestCase.java?rev=1479577&r1=1479576&r2=1479577&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BeanificationTestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BeanificationTestCase.java Mon May  6 14:13:07 2013
@@ -17,10 +17,10 @@
 
 package org.apache.commons.beanutils;
 
-import java.util.*;
-
 import java.lang.ref.WeakReference;
 import java.lang.ref.ReferenceQueue;
+import java.util.Map;
+import java.util.WeakHashMap;
 
 import junit.framework.TestCase;
 import junit.framework.Test;

Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanificationTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanificationTestCase.java?rev=1479577&r1=1479576&r2=1479577&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanificationTestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanificationTestCase.java Mon May  6 14:13:07 2013
@@ -17,10 +17,11 @@
 
 package org.apache.commons.beanutils.locale;
 
-import java.util.*;
-
 import java.lang.ref.WeakReference;
 import java.lang.ref.ReferenceQueue;
+import java.util.Locale;
+import java.util.Map;
+import java.util.WeakHashMap;
 
 import junit.framework.TestCase;
 import junit.framework.Test;
@@ -35,8 +36,6 @@ import org.apache.commons.beanutils.Conv
 import org.apache.commons.beanutils.ConversionException;
 import org.apache.commons.beanutils.locale.converters.LongLocaleConverter;
 
-import java.util.Locale;
-
 /**
  * <p>
  * Test Case for changes made during LocaleBeanutils Beanification.
@@ -107,8 +106,8 @@ public class LocaleBeanificationTestCase
         // test methodology
         // many thanks to Juozas Baliuka for suggesting this method
         ClassLoader loader = new ClassLoader(this.getClass().getClassLoader()) {};
-        WeakReference reference = new  WeakReference(loader);
-        Class myClass = loader.loadClass("org.apache.commons.beanutils.BetaBean");
+        WeakReference<ClassLoader> reference = new  WeakReference<ClassLoader>(loader);
+        Class<?> myClass = loader.loadClass("org.apache.commons.beanutils.BetaBean");
 
         assertNotNull("Weak reference released early", reference.get());
 
@@ -145,13 +144,13 @@ public class LocaleBeanificationTestCase
 
         // many thanks to Juozas Baliuka for suggesting this methodology
         TestClassLoader loader = new TestClassLoader();
-        ReferenceQueue queue = new ReferenceQueue();
+        ReferenceQueue<?> queue = new ReferenceQueue<Object>();
         WeakReference loaderReference = new WeakReference(loader, queue);
         Integer test = new Integer(1);
 
         WeakReference testReference = new WeakReference(test, queue);
         //Map map = new ReferenceMap(ReferenceMap.WEAK, ReferenceMap.HARD, true);
-        Map map = new WeakHashMap();
+        Map<TestClassLoader, Integer> map = new WeakHashMap<TestClassLoader, Integer>();
         map.put(loader, test);
 
         assertEquals("In map", test, map.get(loader));
@@ -193,7 +192,7 @@ public class LocaleBeanificationTestCase
 
         // many thanks to Juozas Baliuka for suggesting this methodology
         TestClassLoader loader = new TestClassLoader();
-        WeakReference loaderReference = new  WeakReference(loader);
+        WeakReference<TestClassLoader> loaderReference = new  WeakReference<TestClassLoader>(loader);
         LocaleBeanUtilsBean.getLocaleBeanUtilsInstance();
 
         class GetBeanUtilsBeanThread extends Thread {
@@ -219,7 +218,7 @@ public class LocaleBeanificationTestCase
 
 
         GetBeanUtilsBeanThread thread = new GetBeanUtilsBeanThread();
-        WeakReference threadWeakReference = new WeakReference(thread);
+        WeakReference<GetBeanUtilsBeanThread> threadWeakReference = new WeakReference<GetBeanUtilsBeanThread>(thread);
         thread.setContextClassLoader(loader);
 
         thread.start();