modules/base/src/test/java/test/com/sun/javafx/binding/ExpressionHelperTest.java

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

*** 21,41 **** * 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.binding; import javafx.beans.InvalidationListener; ! import javafx.beans.InvalidationListenerMock; import javafx.beans.Observable; ! import javafx.beans.WeakInvalidationListenerMock; import javafx.beans.value.ChangeListener; ! import javafx.beans.value.ChangeListenerMock; import javafx.beans.value.ObservableValue; import javafx.beans.value.ObservableValueStub; ! import javafx.beans.value.WeakChangeListenerMock; import org.junit.Before; import org.junit.Test; import java.util.BitSet; import java.util.concurrent.atomic.AtomicBoolean; --- 21,43 ---- * 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.binding; + import com.sun.javafx.binding.ExpressionHelper; + import com.sun.javafx.binding.ExpressionHelperShim; import javafx.beans.InvalidationListener; ! import test.javafx.beans.InvalidationListenerMock; import javafx.beans.Observable; ! import test.javafx.beans.WeakInvalidationListenerMock; import javafx.beans.value.ChangeListener; ! import test.javafx.beans.value.ChangeListenerMock; import javafx.beans.value.ObservableValue; import javafx.beans.value.ObservableValueStub; ! import test.javafx.beans.value.WeakChangeListenerMock; import org.junit.Before; import org.junit.Test; import java.util.BitSet; import java.util.concurrent.atomic.AtomicBoolean;
*** 518,558 **** @Test public void testExceptionNotPropagatedFromSingleInvalidation() { helper = ExpressionHelper.addListener(helper, observable,(o) -> {throw new RuntimeException();}); observable.set(null); ! helper.fireValueChangedEvent(); } @Test public void testExceptionNotPropagatedFromMultipleInvalidation() { BitSet called = new BitSet(); helper = ExpressionHelper.addListener(helper, observable, (o) -> {called.set(0); throw new RuntimeException();}); helper = ExpressionHelper.addListener(helper, observable, (o) -> {called.set(1); throw new RuntimeException();}); observable.set(null); ! helper.fireValueChangedEvent(); assertTrue(called.get(0)); assertTrue(called.get(1)); } @Test public void testExceptionNotPropagatedFromSingleChange() { helper = ExpressionHelper.addListener(helper, observable, (value, o1, o2) -> {throw new RuntimeException();}); observable.set(null); ! helper.fireValueChangedEvent(); } @Test public void testExceptionNotPropagatedFromMultipleChange() { BitSet called = new BitSet(); helper = ExpressionHelper.addListener(helper, observable, (value, o1, o2) -> {called.set(0); throw new RuntimeException();}); helper = ExpressionHelper.addListener(helper, observable, (value, o1, o2) -> {called.set(1); throw new RuntimeException();}); observable.set(null); ! helper.fireValueChangedEvent(); assertTrue(called.get(0)); assertTrue(called.get(1)); } --- 520,560 ---- @Test public void testExceptionNotPropagatedFromSingleInvalidation() { helper = ExpressionHelper.addListener(helper, observable,(o) -> {throw new RuntimeException();}); observable.set(null); ! ExpressionHelperShim.fireValueChangedEvent(helper); } @Test public void testExceptionNotPropagatedFromMultipleInvalidation() { BitSet called = new BitSet(); helper = ExpressionHelper.addListener(helper, observable, (o) -> {called.set(0); throw new RuntimeException();}); helper = ExpressionHelper.addListener(helper, observable, (o) -> {called.set(1); throw new RuntimeException();}); observable.set(null); ! ExpressionHelperShim.fireValueChangedEvent(helper); assertTrue(called.get(0)); assertTrue(called.get(1)); } @Test public void testExceptionNotPropagatedFromSingleChange() { helper = ExpressionHelper.addListener(helper, observable, (value, o1, o2) -> {throw new RuntimeException();}); observable.set(null); ! ExpressionHelperShim.fireValueChangedEvent(helper); } @Test public void testExceptionNotPropagatedFromMultipleChange() { BitSet called = new BitSet(); helper = ExpressionHelper.addListener(helper, observable, (value, o1, o2) -> {called.set(0); throw new RuntimeException();}); helper = ExpressionHelper.addListener(helper, observable, (value, o1, o2) -> {called.set(1); throw new RuntimeException();}); observable.set(null); ! ExpressionHelperShim.fireValueChangedEvent(helper); assertTrue(called.get(0)); assertTrue(called.get(1)); }
*** 563,573 **** helper = ExpressionHelper.addListener(helper, observable, (value, o1, o2) -> {called.set(0); throw new RuntimeException();}); helper = ExpressionHelper.addListener(helper, observable, (value, o1, o2) -> {called.set(1); throw new RuntimeException();}); helper = ExpressionHelper.addListener(helper, observable, (o) -> {called.set(2); throw new RuntimeException();}); helper = ExpressionHelper.addListener(helper, observable, (o) -> {called.set(3); throw new RuntimeException();}); observable.set(null); ! helper.fireValueChangedEvent(); assertTrue(called.get(0)); assertTrue(called.get(1)); assertTrue(called.get(2)); assertTrue(called.get(3)); --- 565,575 ---- helper = ExpressionHelper.addListener(helper, observable, (value, o1, o2) -> {called.set(0); throw new RuntimeException();}); helper = ExpressionHelper.addListener(helper, observable, (value, o1, o2) -> {called.set(1); throw new RuntimeException();}); helper = ExpressionHelper.addListener(helper, observable, (o) -> {called.set(2); throw new RuntimeException();}); helper = ExpressionHelper.addListener(helper, observable, (o) -> {called.set(3); throw new RuntimeException();}); observable.set(null); ! ExpressionHelperShim.fireValueChangedEvent(helper); assertTrue(called.get(0)); assertTrue(called.get(1)); assertTrue(called.get(2)); assertTrue(called.get(3));
*** 579,589 **** Thread.currentThread().setUncaughtExceptionHandler((t, e) -> called.set(true)); helper = ExpressionHelper.addListener(helper, observable,(o) -> {throw new RuntimeException();}); observable.set(null); ! helper.fireValueChangedEvent(); assertTrue(called.get()); } --- 581,591 ---- Thread.currentThread().setUncaughtExceptionHandler((t, e) -> called.set(true)); helper = ExpressionHelper.addListener(helper, observable,(o) -> {throw new RuntimeException();}); observable.set(null); ! ExpressionHelperShim.fireValueChangedEvent(helper); assertTrue(called.get()); }
*** 594,604 **** Thread.currentThread().setUncaughtExceptionHandler((t, e) -> called.incrementAndGet()); helper = ExpressionHelper.addListener(helper, observable, (o) -> {throw new RuntimeException();}); helper = ExpressionHelper.addListener(helper, observable, (o) -> {throw new RuntimeException();}); observable.set(null); ! helper.fireValueChangedEvent(); assertEquals(2, called.get()); } @Test --- 596,606 ---- Thread.currentThread().setUncaughtExceptionHandler((t, e) -> called.incrementAndGet()); helper = ExpressionHelper.addListener(helper, observable, (o) -> {throw new RuntimeException();}); helper = ExpressionHelper.addListener(helper, observable, (o) -> {throw new RuntimeException();}); observable.set(null); ! ExpressionHelperShim.fireValueChangedEvent(helper); assertEquals(2, called.get()); } @Test
*** 606,616 **** AtomicBoolean called = new AtomicBoolean(false); Thread.currentThread().setUncaughtExceptionHandler((t, e) -> called.set(true)); helper = ExpressionHelper.addListener(helper, observable, (value, o1, o2) -> {throw new RuntimeException();}); observable.set(null); ! helper.fireValueChangedEvent(); assertTrue(called.get()); } @Test --- 608,618 ---- AtomicBoolean called = new AtomicBoolean(false); Thread.currentThread().setUncaughtExceptionHandler((t, e) -> called.set(true)); helper = ExpressionHelper.addListener(helper, observable, (value, o1, o2) -> {throw new RuntimeException();}); observable.set(null); ! ExpressionHelperShim.fireValueChangedEvent(helper); assertTrue(called.get()); } @Test
*** 620,630 **** Thread.currentThread().setUncaughtExceptionHandler((t, e) -> called.incrementAndGet()); helper = ExpressionHelper.addListener(helper, observable, (value, o1, o2) -> {throw new RuntimeException();}); helper = ExpressionHelper.addListener(helper, observable, (value, o1, o2) -> {throw new RuntimeException();}); observable.set(null); ! helper.fireValueChangedEvent(); assertEquals(2, called.get()); } @Test --- 622,632 ---- Thread.currentThread().setUncaughtExceptionHandler((t, e) -> called.incrementAndGet()); helper = ExpressionHelper.addListener(helper, observable, (value, o1, o2) -> {throw new RuntimeException();}); helper = ExpressionHelper.addListener(helper, observable, (value, o1, o2) -> {throw new RuntimeException();}); observable.set(null); ! ExpressionHelperShim.fireValueChangedEvent(helper); assertEquals(2, called.get()); } @Test
*** 636,646 **** helper = ExpressionHelper.addListener(helper, observable, (value, o1, o2) -> { throw new RuntimeException();}); helper = ExpressionHelper.addListener(helper, observable, (value, o1, o2) -> { throw new RuntimeException();}); helper = ExpressionHelper.addListener(helper, observable, (o) -> { throw new RuntimeException();}); helper = ExpressionHelper.addListener(helper, observable, (o) -> {throw new RuntimeException();}); observable.set(null); ! helper.fireValueChangedEvent(); assertEquals(4, called.get()); } } --- 638,648 ---- helper = ExpressionHelper.addListener(helper, observable, (value, o1, o2) -> { throw new RuntimeException();}); helper = ExpressionHelper.addListener(helper, observable, (value, o1, o2) -> { throw new RuntimeException();}); helper = ExpressionHelper.addListener(helper, observable, (o) -> { throw new RuntimeException();}); helper = ExpressionHelper.addListener(helper, observable, (o) -> {throw new RuntimeException();}); observable.set(null); ! ExpressionHelperShim.fireValueChangedEvent(helper); assertEquals(4, called.get()); } }