modules/base/src/test/java/test/com/sun/javafx/collections/SetListenerHelperTest.java

rev 9235 : 8134760: Refactor Javafx base module tests for clear separation of tests
Reviewed-by:

@@ -21,19 +21,19 @@
  * 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.collections;
+package test.com.sun.javafx.collections;
 
 import com.sun.javafx.binding.SetExpressionHelper;
+import com.sun.javafx.collections.SetListenerHelper;
 import javafx.beans.InvalidationListener;
-import javafx.beans.InvalidationListenerMock;
+import test.javafx.beans.InvalidationListenerMock;
 import javafx.beans.Observable;
 import javafx.collections.FXCollections;
-import javafx.collections.ListChangeListener;
-import javafx.collections.MockSetObserver;
+import test.javafx.collections.MockSetObserver;
 import javafx.collections.ObservableSet;
 import javafx.collections.SetChangeListener;
 import org.junit.Before;
 import org.junit.Test;
 

@@ -619,41 +619,41 @@
 
 
     @Test
     public void testExceptionNotPropagatedFromSingleInvalidation() {
         helper = SetListenerHelper.addListener(helper,(Observable o) -> {throw new RuntimeException();});
-        helper.fireValueChangedEvent(change);
+        SetListenerHelper.fireValueChangedEvent(helper,change);
     }
 
     @Test
     public void testExceptionNotPropagatedFromMultipleInvalidation() {
         BitSet called = new BitSet();
 
         helper = SetListenerHelper.addListener(helper, (Observable o) -> {called.set(0); throw new RuntimeException();});
         helper = SetListenerHelper.addListener(helper, (Observable o) -> {called.set(1); throw new RuntimeException();});
 
-        helper.fireValueChangedEvent(change);
+        SetListenerHelper.fireValueChangedEvent(helper,change);
 
         assertTrue(called.get(0));
         assertTrue(called.get(1));
     }
 
     @Test
     public void testExceptionNotPropagatedFromSingleChange() {
         helper = SetListenerHelper.addListener(helper, (SetChangeListener.Change<? extends Object> c) -> {
             throw new RuntimeException();
         });
-        helper.fireValueChangedEvent(change);
+        SetListenerHelper.fireValueChangedEvent(helper,change);
     }
 
     @Test
     public void testExceptionNotPropagatedFromMultipleChange() {
         BitSet called = new BitSet();
 
         helper = SetListenerHelper.addListener(helper, (SetChangeListener.Change<? extends Object> c) -> {called.set(0); throw new RuntimeException();});
         helper = SetListenerHelper.addListener(helper, (SetChangeListener.Change<? extends Object> c) -> {called.set(1); throw new RuntimeException();});
-        helper.fireValueChangedEvent(change);
+        SetListenerHelper.fireValueChangedEvent(helper,change);
 
         assertTrue(called.get(0));
         assertTrue(called.get(1));
     }
 

@@ -663,11 +663,11 @@
 
         helper = SetListenerHelper.addListener(helper, (SetChangeListener.Change<? extends Object> c) -> {called.set(0); throw new RuntimeException();});
         helper = SetListenerHelper.addListener(helper, (SetChangeListener.Change<? extends Object> c) -> {called.set(1); throw new RuntimeException();});
         helper = SetListenerHelper.addListener(helper, (Observable o) -> {called.set(2); throw new RuntimeException();});
         helper = SetListenerHelper.addListener(helper, (Observable o) -> {called.set(3); throw new RuntimeException();});
-        helper.fireValueChangedEvent(change);
+        SetListenerHelper.fireValueChangedEvent(helper,change);
 
         assertTrue(called.get(0));
         assertTrue(called.get(1));
         assertTrue(called.get(2));
         assertTrue(called.get(3));

@@ -679,11 +679,11 @@
         AtomicBoolean called = new AtomicBoolean(false);
 
         Thread.currentThread().setUncaughtExceptionHandler((t, e) -> called.set(true));
 
         helper = SetListenerHelper.addListener(helper,(Observable o) -> {throw new RuntimeException();});
-        helper.fireValueChangedEvent(change);
+        SetListenerHelper.fireValueChangedEvent(helper,change);
 
         assertTrue(called.get());
     }
 
 

@@ -693,22 +693,22 @@
 
         Thread.currentThread().setUncaughtExceptionHandler((t, e) -> called.incrementAndGet());
 
         helper = SetListenerHelper.addListener(helper, (Observable o) -> {throw new RuntimeException();});
         helper = SetListenerHelper.addListener(helper, (Observable o) -> {throw new RuntimeException();});
-        helper.fireValueChangedEvent(change);
+        SetListenerHelper.fireValueChangedEvent(helper,change);
 
         assertEquals(2, called.get());
     }
 
     @Test
     public void testExceptionHandledByThreadUncaughtHandlerInSingleChange() {
         AtomicBoolean called = new AtomicBoolean(false);
 
         Thread.currentThread().setUncaughtExceptionHandler((t, e) -> called.set(true));
         helper = SetListenerHelper.addListener(helper, (SetChangeListener.Change<? extends Object> c) -> {throw new RuntimeException();});
-        helper.fireValueChangedEvent(change);
+        SetListenerHelper.fireValueChangedEvent(helper,change);
 
         assertTrue(called.get());
     }
 
     @Test

@@ -717,11 +717,11 @@
 
         Thread.currentThread().setUncaughtExceptionHandler((t, e) -> called.incrementAndGet());
 
         helper = SetListenerHelper.addListener(helper, (SetChangeListener.Change<? extends Object> c) -> {throw new RuntimeException();});
         helper = SetListenerHelper.addListener(helper, (SetChangeListener.Change<? extends Object> c) -> {throw new RuntimeException();});
-        helper.fireValueChangedEvent(change);
+        SetListenerHelper.fireValueChangedEvent(helper,change);
 
         assertEquals(2, called.get());
     }
 
     @Test

@@ -732,11 +732,11 @@
 
         helper = SetListenerHelper.addListener(helper, (SetChangeListener.Change<? extends Object> c) -> { throw new RuntimeException();});
         helper = SetListenerHelper.addListener(helper, (SetChangeListener.Change<? extends Object> c) -> { throw new RuntimeException();});
         helper = SetListenerHelper.addListener(helper, (Observable o) -> { throw new RuntimeException();});
         helper = SetListenerHelper.addListener(helper, (Observable o) -> {throw new RuntimeException();});
-        helper.fireValueChangedEvent(change);
+        SetListenerHelper.fireValueChangedEvent(helper,change);
 
         assertEquals(4, called.get());
     }
 
 }