AI 144830: Bringing luni down to 15 broken tests. Not perfect,

[android-x86/dalvik.git] / libcore / luni / src / test / java / tests / api / java / util / HashSetTest.java

diff --git a/libcore/luni/src/test/java/tests/api/java/util/HashSetTest.java b/libcore/luni/src/test/java/tests/api/java/util/HashSetTest.java
index 7eda101..1017111 100644 (file)
--- a/libcore/luni/src/test/java/tests/api/java/util/HashSetTest.java
+++ b/libcore/luni/src/test/java/tests/api/java/util/HashSetTest.java
@@ -40,13 +40,8 @@ public class HashSetTest extends junit.framework.TestCase {
 
     HashSet hs;
 
-    static Object[] objArray;
-    {
-        objArray = new Object[1000];
-        for (int i = 0; i < objArray.length; i++)
-            objArray[i] = new Integer(i);
-    }
-
+    Object[] objArray;
+    
     /**
      * @tests java.util.HashSet#HashSet()
      */
@@ -315,9 +310,16 @@ public class HashSetTest extends junit.framework.TestCase {
      * is called before a test is executed.
      */
     protected void setUp() {
+        objArray = new Object[1000];
+        for (int i = 0; i < objArray.length; i++) {
+            objArray[i] = new Integer(i);
+        }
+
         hs = new HashSet();
-        for (int i = 0; i < objArray.length; i++)
+        for (int i = 0; i < objArray.length; i++) {
             hs.add(objArray[i]);
+        }
+        
         hs.add(null);
     }
 
@@ -326,6 +328,8 @@ public class HashSetTest extends junit.framework.TestCase {
      * method is called after a test is executed.
      */
     protected void tearDown() {
+        hs = null;
+        objArray = null;
     }
     
     private static final SerializationTest.SerializableAssert comparator = new