--- old/modules/base/src/test/java/com/sun/javafx/event/CompositeEventHandlerTest.java 2015-08-31 10:23:01.397217767 -0400 +++ /dev/null 2015-08-30 16:31:40.093001923 -0400 @@ -1,95 +0,0 @@ -/* - * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * 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; - -import javafx.event.Event; -import javafx.event.WeakEventHandler; -import javafx.event.WeakEventHandlerUtil; -import org.junit.Assert; - -import org.junit.Before; -import org.junit.Test; - -public class CompositeEventHandlerTest { - private CompositeEventHandler compositeEventHandler; - - @Before - public void setUp() { - compositeEventHandler = new CompositeEventHandler(); - } - - @Test - public void weakEventHandlerTest() { - final EventCountingHandler eventCountingHandler = - new EventCountingHandler(); - final WeakEventHandler weakEventHandler = - new WeakEventHandler(eventCountingHandler); - - compositeEventHandler.addEventHandler(weakEventHandler); - - Assert.assertTrue( - compositeEventHandler.containsHandler(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)); - compositeEventHandler.dispatchCapturingEvent(new EmptyEvent()); - Assert.assertEquals(1, eventCountingHandler.getEventCount()); - compositeEventHandler.dispatchBubblingEvent(new EmptyEvent()); - Assert.assertEquals(1, eventCountingHandler.getEventCount()); - } - - @Test - public void weakEventFilterTest() { - final EventCountingHandler eventCountingFilter = - new EventCountingHandler(); - final WeakEventHandler weakEventFilter = - new WeakEventHandler(eventCountingFilter); - - compositeEventHandler.addEventFilter(weakEventFilter); - - Assert.assertTrue( - compositeEventHandler.containsFilter(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)); - compositeEventHandler.dispatchCapturingEvent(new EmptyEvent()); - Assert.assertEquals(1, eventCountingFilter.getEventCount()); - compositeEventHandler.dispatchBubblingEvent(new EmptyEvent()); - Assert.assertEquals(1, eventCountingFilter.getEventCount()); - } -} --- /dev/null 2015-08-30 16:31:40.093001923 -0400 +++ new/modules/base/src/test/java/test/com/sun/javafx/event/CompositeEventHandlerTest.java 2015-08-31 10:23:01.265217768 -0400 @@ -0,0 +1,99 @@ +/* + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * 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.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; + +import org.junit.Before; +import org.junit.Test; + +public class CompositeEventHandlerTest { + private CompositeEventHandler compositeEventHandler; + + @Before + public void setUp() { + compositeEventHandler = new CompositeEventHandler(); + } + + @Test + public void weakEventHandlerTest() { + final EventCountingHandler eventCountingHandler = + new EventCountingHandler(); + final WeakEventHandler weakEventHandler = + new WeakEventHandler(eventCountingHandler); + + compositeEventHandler.addEventHandler(weakEventHandler); + + Assert.assertTrue( + 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( + CompositeEventHandlerShim.containsHandler(compositeEventHandler, weakEventHandler)); + compositeEventHandler.dispatchCapturingEvent(new EmptyEvent()); + Assert.assertEquals(1, eventCountingHandler.getEventCount()); + compositeEventHandler.dispatchBubblingEvent(new EmptyEvent()); + Assert.assertEquals(1, eventCountingHandler.getEventCount()); + } + + @Test + public void weakEventFilterTest() { + final EventCountingHandler eventCountingFilter = + new EventCountingHandler(); + final WeakEventHandler weakEventFilter = + new WeakEventHandler(eventCountingFilter); + + compositeEventHandler.addEventFilter(weakEventFilter); + + Assert.assertTrue( + 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( + CompositeEventHandlerShim.containsFilter(compositeEventHandler, weakEventFilter)); + compositeEventHandler.dispatchCapturingEvent(new EmptyEvent()); + Assert.assertEquals(1, eventCountingFilter.getEventCount()); + compositeEventHandler.dispatchBubblingEvent(new EmptyEvent()); + Assert.assertEquals(1, eventCountingFilter.getEventCount()); + } +}