modules/graphics/src/test/java/test/com/sun/javafx/util/WeakReferenceQueueTest.java

rev 9250 : 8134762: Refactor Javafx graphics module tests for clear separation of tests
Reviewed-by:

@@ -21,12 +21,14 @@
  * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
 
-package com.sun.javafx.util;
+package test.com.sun.javafx.util;
 
+import com.sun.javafx.util.WeakReferenceQueue;
+import com.sun.javafx.util.WeakReferenceQueueShim;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Iterator;

@@ -37,11 +39,11 @@
     @Test
     public void testAdd() {
         WeakReferenceQueue q = new WeakReferenceQueue();
         String s = new String("Wow!");
         q.add(s);
-        assertEquals(1, q.size);
+        assertEquals(1, WeakReferenceQueueShim.size(q));
     }
     
     @Test
     public void testRemove() {
         WeakReferenceQueue q = new WeakReferenceQueue();

@@ -50,14 +52,14 @@
         String b = new String("b");
         q.add(b);
         String c = new String("c");
         q.add(c);
         
-        assertEquals(3, q.size);
+        assertEquals(3, WeakReferenceQueueShim.size(q));
         q.remove(a);
         q.remove(c);
-        assertEquals(1, q.size);
+        assertEquals(1, WeakReferenceQueueShim.size(q));
     }
     
     @Test
     public void testCleanup() {
         WeakReferenceQueue q = new WeakReferenceQueue();

@@ -66,16 +68,16 @@
         String b = new String("b");
         q.add(b);
         String c = new String("c");
         q.add(c);
         
-        assertEquals(3, q.size);
+        assertEquals(3, WeakReferenceQueueShim.size(q));
         a = null;
         c = null;
         tryGCReallyHard();
         q.cleanup();
-        assertEquals(1, q.size);
+        assertEquals(1, WeakReferenceQueueShim.size(q));
     }
     
     @Test
     public void testIterator() {
         WeakReferenceQueue q = new WeakReferenceQueue();

@@ -123,17 +125,17 @@
         q.add(c);
         
         Iterator itr = q.iterator();
         itr.next(); // gives me "c"
         itr.remove();
-        assertEquals(2, q.size);
+        assertEquals(2, WeakReferenceQueueShim.size(q));
         itr.next(); // gives me "b"
         itr.remove();
-        assertEquals(1, q.size);
+        assertEquals(1, WeakReferenceQueueShim.size(q));
         itr.next(); // gives me "a"
         itr.remove();
-        assertEquals(0, q.size);
+        assertEquals(0, WeakReferenceQueueShim.size(q));
         
         q.add(a);
         q.add(b);
         q.add(c);
         itr = q.iterator();

@@ -154,11 +156,11 @@
         String b = new String("b");
         q.add(b);
         String c = new String("c");
         q.add(c);
         
-        assertEquals(3, q.size);
+        assertEquals(3, WeakReferenceQueueShim.size(q));
         a = null;
         c = null;
         tryGCReallyHard();
         q.cleanup();
 

@@ -175,11 +177,11 @@
         String b = new String("b");
         q.add(b);
         String c = new String("c");
         q.add(c);
 
-        assertEquals(3, q.size);
+        assertEquals(3, WeakReferenceQueueShim.size(q));
         a = null;
         c = null;
         tryGCReallyHard();
 
         Iterator itr = q.iterator();