modules/base/src/test/java/test/com/sun/javafx/event/CompositeEventHandlerTest.java
Print this page
rev 9235 : 8134760: Refactor Javafx base module tests for clear separation of tests
Reviewed-by:
@@ -21,12 +21,16 @@
* 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.event;
+package test.com.sun.javafx.event;
+import com.sun.javafx.event.CompositeEventHandler;
+import com.sun.javafx.event.CompositeEventHandlerShim;
+import test.com.sun.javafx.event.EventCountingHandler;
+import test.com.sun.javafx.event.EmptyEvent;
import javafx.event.Event;
import javafx.event.WeakEventHandler;
import javafx.event.WeakEventHandlerUtil;
import org.junit.Assert;
@@ -49,20 +53,20 @@
new WeakEventHandler<Event>(eventCountingHandler);
compositeEventHandler.addEventHandler(weakEventHandler);
Assert.assertTrue(
- compositeEventHandler.containsHandler(weakEventHandler));
+ CompositeEventHandlerShim.containsHandler(compositeEventHandler, weakEventHandler));
compositeEventHandler.dispatchCapturingEvent(new EmptyEvent());
Assert.assertEquals(0, eventCountingHandler.getEventCount());
compositeEventHandler.dispatchBubblingEvent(new EmptyEvent());
Assert.assertEquals(1, eventCountingHandler.getEventCount());
WeakEventHandlerUtil.clear(weakEventHandler);
Assert.assertFalse(
- compositeEventHandler.containsHandler(weakEventHandler));
+ CompositeEventHandlerShim.containsHandler(compositeEventHandler, weakEventHandler));
compositeEventHandler.dispatchCapturingEvent(new EmptyEvent());
Assert.assertEquals(1, eventCountingHandler.getEventCount());
compositeEventHandler.dispatchBubblingEvent(new EmptyEvent());
Assert.assertEquals(1, eventCountingHandler.getEventCount());
}
@@ -75,20 +79,20 @@
new WeakEventHandler<Event>(eventCountingFilter);
compositeEventHandler.addEventFilter(weakEventFilter);
Assert.assertTrue(
- compositeEventHandler.containsFilter(weakEventFilter));
+ CompositeEventHandlerShim.containsFilter(compositeEventHandler, weakEventFilter));
compositeEventHandler.dispatchCapturingEvent(new EmptyEvent());
Assert.assertEquals(1, eventCountingFilter.getEventCount());
compositeEventHandler.dispatchBubblingEvent(new EmptyEvent());
Assert.assertEquals(1, eventCountingFilter.getEventCount());
WeakEventHandlerUtil.clear(weakEventFilter);
Assert.assertFalse(
- compositeEventHandler.containsFilter(weakEventFilter));
+ CompositeEventHandlerShim.containsFilter(compositeEventHandler, weakEventFilter));
compositeEventHandler.dispatchCapturingEvent(new EmptyEvent());
Assert.assertEquals(1, eventCountingFilter.getEventCount());
compositeEventHandler.dispatchBubblingEvent(new EmptyEvent());
Assert.assertEquals(1, eventCountingFilter.getEventCount());
}