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,32 ****
   * 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;
  
  import static org.junit.Assert.assertEquals;
  import static org.junit.Assert.assertFalse;
  import static org.junit.Assert.assertTrue;
  
  import java.util.Iterator;
--- 21,34 ----
   * 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 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,47 ****
      @Test
      public void testAdd() {
          WeakReferenceQueue q = new WeakReferenceQueue();
          String s = new String("Wow!");
          q.add(s);
!         assertEquals(1, q.size);
      }
      
      @Test
      public void testRemove() {
          WeakReferenceQueue q = new WeakReferenceQueue();
--- 39,49 ----
      @Test
      public void testAdd() {
          WeakReferenceQueue q = new WeakReferenceQueue();
          String s = new String("Wow!");
          q.add(s);
!         assertEquals(1, WeakReferenceQueueShim.size(q));
      }
      
      @Test
      public void testRemove() {
          WeakReferenceQueue q = new WeakReferenceQueue();
*** 50,63 ****
          String b = new String("b");
          q.add(b);
          String c = new String("c");
          q.add(c);
          
!         assertEquals(3, q.size);
          q.remove(a);
          q.remove(c);
!         assertEquals(1, q.size);
      }
      
      @Test
      public void testCleanup() {
          WeakReferenceQueue q = new WeakReferenceQueue();
--- 52,65 ----
          String b = new String("b");
          q.add(b);
          String c = new String("c");
          q.add(c);
          
!         assertEquals(3, WeakReferenceQueueShim.size(q));
          q.remove(a);
          q.remove(c);
!         assertEquals(1, WeakReferenceQueueShim.size(q));
      }
      
      @Test
      public void testCleanup() {
          WeakReferenceQueue q = new WeakReferenceQueue();
*** 66,81 ****
          String b = new String("b");
          q.add(b);
          String c = new String("c");
          q.add(c);
          
!         assertEquals(3, q.size);
          a = null;
          c = null;
          tryGCReallyHard();
          q.cleanup();
!         assertEquals(1, q.size);
      }
      
      @Test
      public void testIterator() {
          WeakReferenceQueue q = new WeakReferenceQueue();
--- 68,83 ----
          String b = new String("b");
          q.add(b);
          String c = new String("c");
          q.add(c);
          
!         assertEquals(3, WeakReferenceQueueShim.size(q));
          a = null;
          c = null;
          tryGCReallyHard();
          q.cleanup();
!         assertEquals(1, WeakReferenceQueueShim.size(q));
      }
      
      @Test
      public void testIterator() {
          WeakReferenceQueue q = new WeakReferenceQueue();
*** 123,139 ****
          q.add(c);
          
          Iterator itr = q.iterator();
          itr.next(); // gives me "c"
          itr.remove();
!         assertEquals(2, q.size);
          itr.next(); // gives me "b"
          itr.remove();
!         assertEquals(1, q.size);
          itr.next(); // gives me "a"
          itr.remove();
!         assertEquals(0, q.size);
          
          q.add(a);
          q.add(b);
          q.add(c);
          itr = q.iterator();
--- 125,141 ----
          q.add(c);
          
          Iterator itr = q.iterator();
          itr.next(); // gives me "c"
          itr.remove();
!         assertEquals(2, WeakReferenceQueueShim.size(q));
          itr.next(); // gives me "b"
          itr.remove();
!         assertEquals(1, WeakReferenceQueueShim.size(q));
          itr.next(); // gives me "a"
          itr.remove();
!         assertEquals(0, WeakReferenceQueueShim.size(q));
          
          q.add(a);
          q.add(b);
          q.add(c);
          itr = q.iterator();
*** 154,164 ****
          String b = new String("b");
          q.add(b);
          String c = new String("c");
          q.add(c);
          
!         assertEquals(3, q.size);
          a = null;
          c = null;
          tryGCReallyHard();
          q.cleanup();
  
--- 156,166 ----
          String b = new String("b");
          q.add(b);
          String c = new String("c");
          q.add(c);
          
!         assertEquals(3, WeakReferenceQueueShim.size(q));
          a = null;
          c = null;
          tryGCReallyHard();
          q.cleanup();
  
*** 175,185 ****
          String b = new String("b");
          q.add(b);
          String c = new String("c");
          q.add(c);
  
!         assertEquals(3, q.size);
          a = null;
          c = null;
          tryGCReallyHard();
  
          Iterator itr = q.iterator();
--- 177,187 ----
          String b = new String("b");
          q.add(b);
          String c = new String("c");
          q.add(c);
  
!         assertEquals(3, WeakReferenceQueueShim.size(q));
          a = null;
          c = null;
          tryGCReallyHard();
  
          Iterator itr = q.iterator();