modules/base/src/test/java/javafx/binding/BindingsMapTest.java

Print this page
rev 8094 : RT-27128

*** 35,45 **** import javafx.collections.ObservableMap; import com.sun.javafx.binding.ErrorLoggingUtiltity; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; - import org.junit.Ignore; import org.junit.Test; import static org.junit.Assert.*; public class BindingsMapTest { --- 35,44 ----
*** 256,271 **** @Test(expected = NullPointerException.class) public void testValueAt_Variable_Null_2() { Bindings.valueAt(property, (ObservableValue<String>)null); } - @Ignore("RT-27128") @Test public void testBooleanValueAt_Constant() { - synchronized (log) { - log.reset(); - final boolean defaultData = false; final boolean localData1 = false; final boolean localData2 = true; final MapProperty<String, Boolean> localProperty = new SimpleMapProperty<String, Boolean>(); final ObservableMap<String, Boolean> localMap1 = FXCollections.observableHashMap(); --- 255,266 ----
*** 278,342 **** final BooleanBinding binding2 = Bindings.booleanValueAt(localProperty, key3); DependencyUtils.checkDependencies(binding0.getDependencies(), localProperty); DependencyUtils.checkDependencies(binding1.getDependencies(), localProperty); DependencyUtils.checkDependencies(binding2.getDependencies(), localProperty); assertEquals(defaultData, binding0.get()); ! log.check(0, "INFO", 1, "NullPointerException"); assertEquals(defaultData, binding1.get()); ! log.check(0, "INFO", 1, "NullPointerException"); assertEquals(defaultData, binding2.get()); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.set(localMap1); assertEquals(localData1, binding0.get()); assertEquals(localData2, binding1.get()); assertEquals(defaultData, binding2.get()); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.remove(key2); assertEquals(localData1, binding0.get()); assertEquals(defaultData, binding1.get()); ! log.check(0, "INFO", 1, "NullPointerException"); assertEquals(defaultData, binding2.get()); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.set(localMap2); assertEquals(defaultData, binding0.get()); ! log.check(0, "INFO", 1, "NullPointerException"); assertEquals(defaultData, binding1.get()); ! log.check(0, "INFO", 1, "NullPointerException"); assertEquals(defaultData, binding2.get()); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.put(key1, localData2); localProperty.put(key2, localData2); assertEquals(localData2, binding0.get()); assertEquals(localData2, binding1.get()); assertEquals(defaultData, binding2.get()); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.set(null); assertEquals(defaultData, binding0.get()); ! log.check(0, "INFO", 1, "NullPointerException"); assertEquals(defaultData, binding1.get()); ! log.check(0, "INFO", 1, "NullPointerException"); assertEquals(defaultData, binding2.get()); ! log.check(0, "INFO", 1, "NullPointerException"); ! } } @Test(expected = NullPointerException.class) public void testBooleanValueAt_Constant_Null() { Bindings.booleanValueAt(null, key1); } - @Ignore("RT-27128") @Test public void testBooleanValueAt_Variable() { - synchronized (log) { - log.reset(); - final boolean defaultData = false; final boolean localData1 = false; final boolean localData2 = true; final MapProperty<String, Boolean> localProperty = new SimpleMapProperty<String, Boolean>(); final ObservableMap<String, Boolean> localMap1 = FXCollections.observableHashMap(); --- 273,332 ---- final BooleanBinding binding2 = Bindings.booleanValueAt(localProperty, key3); DependencyUtils.checkDependencies(binding0.getDependencies(), localProperty); DependencyUtils.checkDependencies(binding1.getDependencies(), localProperty); DependencyUtils.checkDependencies(binding2.getDependencies(), localProperty); assertEquals(defaultData, binding0.get()); ! log.checkFine(NullPointerException.class); assertEquals(defaultData, binding1.get()); ! log.checkFine(NullPointerException.class); assertEquals(defaultData, binding2.get()); ! log.checkFine(NullPointerException.class); localProperty.set(localMap1); assertEquals(localData1, binding0.get()); assertEquals(localData2, binding1.get()); assertEquals(defaultData, binding2.get()); ! log.checkFine(NullPointerException.class); localProperty.remove(key2); assertEquals(localData1, binding0.get()); assertEquals(defaultData, binding1.get()); ! log.checkFine(NullPointerException.class); assertEquals(defaultData, binding2.get()); ! log.checkFine(NullPointerException.class); localProperty.set(localMap2); assertEquals(defaultData, binding0.get()); ! log.checkFine(NullPointerException.class); assertEquals(defaultData, binding1.get()); ! log.checkFine(NullPointerException.class); assertEquals(defaultData, binding2.get()); ! log.checkFine(NullPointerException.class); localProperty.put(key1, localData2); localProperty.put(key2, localData2); assertEquals(localData2, binding0.get()); assertEquals(localData2, binding1.get()); assertEquals(defaultData, binding2.get()); ! log.checkFine(NullPointerException.class); localProperty.set(null); assertEquals(defaultData, binding0.get()); ! log.checkFine(NullPointerException.class); assertEquals(defaultData, binding1.get()); ! log.checkFine(NullPointerException.class); assertEquals(defaultData, binding2.get()); ! log.checkFine(NullPointerException.class); } @Test(expected = NullPointerException.class) public void testBooleanValueAt_Constant_Null() { Bindings.booleanValueAt(null, key1); } @Test public void testBooleanValueAt_Variable() { final boolean defaultData = false; final boolean localData1 = false; final boolean localData2 = true; final MapProperty<String, Boolean> localProperty = new SimpleMapProperty<String, Boolean>(); final ObservableMap<String, Boolean> localMap1 = FXCollections.observableHashMap();
*** 347,412 **** final BooleanBinding binding = Bindings.booleanValueAt(localProperty, index); DependencyUtils.checkDependencies(binding.getDependencies(), localProperty, index); index.set(null); assertEquals(defaultData, binding.get()); ! log.check(0, "INFO", 1, "NullPointerException"); index.set(key1); assertEquals(defaultData, binding.get()); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.set(localMap1); index.set(null); assertEquals(defaultData, binding.get()); ! log.check(0, "INFO", 1, "NullPointerException"); index.set(key1); assertEquals(localData1, binding.get()); index.set(key2); assertEquals(localData2, binding.get()); index.set(key3); assertEquals(defaultData, binding.get()); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.remove(key2); index.set(null); assertEquals(defaultData, binding.get()); ! log.check(0, "INFO", 1, "NullPointerException"); index.set(key1); assertEquals(localData1, binding.get()); index.set(key2); assertEquals(defaultData, binding.get()); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.set(localMap2); index.set(null); assertEquals(defaultData, binding.get()); ! log.check(0, "INFO", 1, "NullPointerException"); index.set(key1); assertEquals(defaultData, binding.get()); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.put(key1, localData2); localProperty.put(key2, localData2); index.set(null); assertEquals(defaultData, binding.get()); ! log.check(0, "INFO", 1, "NullPointerException"); index.set(key1); assertEquals(localData2, binding.get()); index.set(key2); assertEquals(localData2, binding.get()); index.set(key3); assertEquals(defaultData, binding.get()); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.set(null); index.set(null); assertEquals(defaultData, binding.get()); ! log.check(0, "INFO", 1, "NullPointerException"); index.set(key1); assertEquals(defaultData, binding.get()); ! log.check(0, "INFO", 1, "NullPointerException"); ! } } @Test(expected = NullPointerException.class) public void testBooleanValueAt_Variable_Null() { Bindings.booleanValueAt((ObservableMap<String, Boolean>)null, index); --- 337,401 ---- final BooleanBinding binding = Bindings.booleanValueAt(localProperty, index); DependencyUtils.checkDependencies(binding.getDependencies(), localProperty, index); index.set(null); assertEquals(defaultData, binding.get()); ! log.checkFine(NullPointerException.class); index.set(key1); assertEquals(defaultData, binding.get()); ! log.checkFine(NullPointerException.class); localProperty.set(localMap1); index.set(null); assertEquals(defaultData, binding.get()); ! log.checkFine(NullPointerException.class); index.set(key1); assertEquals(localData1, binding.get()); index.set(key2); assertEquals(localData2, binding.get()); index.set(key3); assertEquals(defaultData, binding.get()); ! log.checkFine(NullPointerException.class); localProperty.remove(key2); index.set(null); assertEquals(defaultData, binding.get()); ! log.checkFine(NullPointerException.class); index.set(key1); assertEquals(localData1, binding.get()); index.set(key2); assertEquals(defaultData, binding.get()); ! log.checkFine(NullPointerException.class); localProperty.set(localMap2); index.set(null); assertEquals(defaultData, binding.get()); ! log.checkFine(NullPointerException.class); index.set(key1); assertEquals(defaultData, binding.get()); ! log.checkFine(NullPointerException.class); localProperty.put(key1, localData2); localProperty.put(key2, localData2); index.set(null); assertEquals(defaultData, binding.get()); ! log.checkFine(NullPointerException.class); index.set(key1); assertEquals(localData2, binding.get()); index.set(key2); assertEquals(localData2, binding.get()); index.set(key3); assertEquals(defaultData, binding.get()); ! log.checkFine(NullPointerException.class); localProperty.set(null); index.set(null); assertEquals(defaultData, binding.get()); ! log.checkFine(NullPointerException.class); index.set(key1); assertEquals(defaultData, binding.get()); ! log.checkFine(NullPointerException.class); } @Test(expected = NullPointerException.class) public void testBooleanValueAt_Variable_Null() { Bindings.booleanValueAt((ObservableMap<String, Boolean>)null, index);
*** 416,431 **** public void testBooleanValueAt_Variable_Null_2() { final MapProperty<String, Boolean> localProperty = new SimpleMapProperty<String, Boolean>(); Bindings.booleanValueAt(localProperty, (ObservableValue<String>)null); } - @Ignore("RT-27128") @Test public void testDoubleValueAt_Constant() { - synchronized (log) { - log.reset(); - final double defaultData = 0.0; final double localData1 = Math.PI; final double localData2 = -Math.E; final MapProperty<String, Double> localProperty = new SimpleMapProperty<String, Double>(); final ObservableMap<String, Double> localMap1 = FXCollections.observableHashMap(); --- 405,416 ----
*** 438,502 **** final DoubleBinding binding2 = Bindings.doubleValueAt(localProperty, key3); DependencyUtils.checkDependencies(binding0.getDependencies(), localProperty); DependencyUtils.checkDependencies(binding1.getDependencies(), localProperty); DependencyUtils.checkDependencies(binding2.getDependencies(), localProperty); assertEquals(defaultData, binding0.get(), EPSILON_DOUBLE); ! log.check(0, "INFO", 1, "NullPointerException"); assertEquals(defaultData, binding1.get(), EPSILON_DOUBLE); ! log.check(0, "INFO", 1, "NullPointerException"); assertEquals(defaultData, binding2.get(), EPSILON_DOUBLE); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.set(localMap1); assertEquals(localData1, binding0.get(), EPSILON_DOUBLE); assertEquals(localData2, binding1.get(), EPSILON_DOUBLE); assertEquals(defaultData, binding2.get(), EPSILON_DOUBLE); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.remove(key2); assertEquals(localData1, binding0.get(), EPSILON_DOUBLE); assertEquals(defaultData, binding1.get(), EPSILON_DOUBLE); ! log.check(0, "INFO", 1, "NullPointerException"); assertEquals(defaultData, binding2.get(), EPSILON_DOUBLE); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.set(localMap2); assertEquals(defaultData, binding0.get(), EPSILON_DOUBLE); ! log.check(0, "INFO", 1, "NullPointerException"); assertEquals(defaultData, binding1.get(), EPSILON_DOUBLE); ! log.check(0, "INFO", 1, "NullPointerException"); assertEquals(defaultData, binding2.get(), EPSILON_DOUBLE); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.put(key1, localData2); localProperty.put(key2, localData2); assertEquals(localData2, binding0.get(), EPSILON_DOUBLE); assertEquals(localData2, binding1.get(), EPSILON_DOUBLE); assertEquals(defaultData, binding2.get(), EPSILON_DOUBLE); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.set(null); assertEquals(defaultData, binding0.get(), EPSILON_DOUBLE); ! log.check(0, "INFO", 1, "NullPointerException"); assertEquals(defaultData, binding1.get(), EPSILON_DOUBLE); ! log.check(0, "INFO", 1, "NullPointerException"); assertEquals(defaultData, binding2.get(), EPSILON_DOUBLE); ! log.check(0, "INFO", 1, "NullPointerException"); ! } } @Test(expected = NullPointerException.class) public void testDoubleValueAt_Constant_Null() { Bindings.doubleValueAt(null, key1); } - @Ignore("RT-27128") @Test public void testDoubleValueAt_Variable() { - synchronized (log) { - log.reset(); - final double defaultData = 0.0; final double localData1 = -Math.PI; final double localData2 = Math.E; final MapProperty<String, Double> localProperty = new SimpleMapProperty<String, Double>(); final ObservableMap<String, Double> localMap1 = FXCollections.observableHashMap(); --- 423,482 ---- final DoubleBinding binding2 = Bindings.doubleValueAt(localProperty, key3); DependencyUtils.checkDependencies(binding0.getDependencies(), localProperty); DependencyUtils.checkDependencies(binding1.getDependencies(), localProperty); DependencyUtils.checkDependencies(binding2.getDependencies(), localProperty); assertEquals(defaultData, binding0.get(), EPSILON_DOUBLE); ! log.checkFine(NullPointerException.class); assertEquals(defaultData, binding1.get(), EPSILON_DOUBLE); ! log.checkFine(NullPointerException.class); assertEquals(defaultData, binding2.get(), EPSILON_DOUBLE); ! log.checkFine(NullPointerException.class); localProperty.set(localMap1); assertEquals(localData1, binding0.get(), EPSILON_DOUBLE); assertEquals(localData2, binding1.get(), EPSILON_DOUBLE); assertEquals(defaultData, binding2.get(), EPSILON_DOUBLE); ! log.checkFine(NullPointerException.class); localProperty.remove(key2); assertEquals(localData1, binding0.get(), EPSILON_DOUBLE); assertEquals(defaultData, binding1.get(), EPSILON_DOUBLE); ! log.checkFine(NullPointerException.class); assertEquals(defaultData, binding2.get(), EPSILON_DOUBLE); ! log.checkFine(NullPointerException.class); localProperty.set(localMap2); assertEquals(defaultData, binding0.get(), EPSILON_DOUBLE); ! log.checkFine(NullPointerException.class); assertEquals(defaultData, binding1.get(), EPSILON_DOUBLE); ! log.checkFine(NullPointerException.class); assertEquals(defaultData, binding2.get(), EPSILON_DOUBLE); ! log.checkFine(NullPointerException.class); localProperty.put(key1, localData2); localProperty.put(key2, localData2); assertEquals(localData2, binding0.get(), EPSILON_DOUBLE); assertEquals(localData2, binding1.get(), EPSILON_DOUBLE); assertEquals(defaultData, binding2.get(), EPSILON_DOUBLE); ! log.checkFine(NullPointerException.class); localProperty.set(null); assertEquals(defaultData, binding0.get(), EPSILON_DOUBLE); ! log.checkFine(NullPointerException.class); assertEquals(defaultData, binding1.get(), EPSILON_DOUBLE); ! log.checkFine(NullPointerException.class); assertEquals(defaultData, binding2.get(), EPSILON_DOUBLE); ! log.checkFine(NullPointerException.class); } @Test(expected = NullPointerException.class) public void testDoubleValueAt_Constant_Null() { Bindings.doubleValueAt(null, key1); } @Test public void testDoubleValueAt_Variable() { final double defaultData = 0.0; final double localData1 = -Math.PI; final double localData2 = Math.E; final MapProperty<String, Double> localProperty = new SimpleMapProperty<String, Double>(); final ObservableMap<String, Double> localMap1 = FXCollections.observableHashMap();
*** 507,572 **** final DoubleBinding binding = Bindings.doubleValueAt(localProperty, index); DependencyUtils.checkDependencies(binding.getDependencies(), localProperty, index); index.set(null); assertEquals(defaultData, binding.get(), EPSILON_DOUBLE); ! log.check(0, "INFO", 1, "NullPointerException"); index.set(key1); assertEquals(defaultData, binding.get(), EPSILON_DOUBLE); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.set(localMap1); index.set(null); assertEquals(defaultData, binding.get(), EPSILON_DOUBLE); ! log.check(0, "INFO", 1, "NullPointerException"); index.set(key1); assertEquals(localData1, binding.get(), EPSILON_DOUBLE); index.set(key2); assertEquals(localData2, binding.get(), EPSILON_DOUBLE); index.set(key3); assertEquals(defaultData, binding.get(), EPSILON_DOUBLE); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.remove(key2); index.set(null); assertEquals(defaultData, binding.get(), EPSILON_DOUBLE); ! log.check(0, "INFO", 1, "NullPointerException"); index.set(key1); assertEquals(localData1, binding.get(), EPSILON_DOUBLE); index.set(key2); assertEquals(defaultData, binding.get(), EPSILON_DOUBLE); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.set(localMap2); index.set(null); assertEquals(defaultData, binding.get(), EPSILON_DOUBLE); ! log.check(0, "INFO", 1, "NullPointerException"); index.set(key1); assertEquals(defaultData, binding.get(), EPSILON_DOUBLE); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.put(key1, localData2); localProperty.put(key2, localData2); index.set(null); assertEquals(defaultData, binding.get(), EPSILON_DOUBLE); ! log.check(0, "INFO", 1, "NullPointerException"); index.set(key1); assertEquals(localData2, binding.get(), EPSILON_DOUBLE); index.set(key2); assertEquals(localData2, binding.get(), EPSILON_DOUBLE); index.set(key3); assertEquals(defaultData, binding.get(), EPSILON_DOUBLE); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.set(null); index.set(null); assertEquals(defaultData, binding.get(), EPSILON_DOUBLE); ! log.check(0, "INFO", 1, "NullPointerException"); index.set(key1); assertEquals(defaultData, binding.get(), EPSILON_DOUBLE); ! log.check(0, "INFO", 1, "NullPointerException"); ! } } @Test(expected = NullPointerException.class) public void testDoubleValueAt_Variable_Null_1() { Bindings.doubleValueAt((ObservableMap<String, Double>)null, index); --- 487,551 ---- final DoubleBinding binding = Bindings.doubleValueAt(localProperty, index); DependencyUtils.checkDependencies(binding.getDependencies(), localProperty, index); index.set(null); assertEquals(defaultData, binding.get(), EPSILON_DOUBLE); ! log.checkFine(NullPointerException.class); index.set(key1); assertEquals(defaultData, binding.get(), EPSILON_DOUBLE); ! log.checkFine(NullPointerException.class); localProperty.set(localMap1); index.set(null); assertEquals(defaultData, binding.get(), EPSILON_DOUBLE); ! log.checkFine(NullPointerException.class); index.set(key1); assertEquals(localData1, binding.get(), EPSILON_DOUBLE); index.set(key2); assertEquals(localData2, binding.get(), EPSILON_DOUBLE); index.set(key3); assertEquals(defaultData, binding.get(), EPSILON_DOUBLE); ! log.checkFine(NullPointerException.class); localProperty.remove(key2); index.set(null); assertEquals(defaultData, binding.get(), EPSILON_DOUBLE); ! log.checkFine(NullPointerException.class); index.set(key1); assertEquals(localData1, binding.get(), EPSILON_DOUBLE); index.set(key2); assertEquals(defaultData, binding.get(), EPSILON_DOUBLE); ! log.checkFine(NullPointerException.class); localProperty.set(localMap2); index.set(null); assertEquals(defaultData, binding.get(), EPSILON_DOUBLE); ! log.checkFine(NullPointerException.class); index.set(key1); assertEquals(defaultData, binding.get(), EPSILON_DOUBLE); ! log.checkFine(NullPointerException.class); localProperty.put(key1, localData2); localProperty.put(key2, localData2); index.set(null); assertEquals(defaultData, binding.get(), EPSILON_DOUBLE); ! log.checkFine(NullPointerException.class); index.set(key1); assertEquals(localData2, binding.get(), EPSILON_DOUBLE); index.set(key2); assertEquals(localData2, binding.get(), EPSILON_DOUBLE); index.set(key3); assertEquals(defaultData, binding.get(), EPSILON_DOUBLE); ! log.checkFine(NullPointerException.class); localProperty.set(null); index.set(null); assertEquals(defaultData, binding.get(), EPSILON_DOUBLE); ! log.checkFine(NullPointerException.class); index.set(key1); assertEquals(defaultData, binding.get(), EPSILON_DOUBLE); ! log.checkFine(NullPointerException.class); } @Test(expected = NullPointerException.class) public void testDoubleValueAt_Variable_Null_1() { Bindings.doubleValueAt((ObservableMap<String, Double>)null, index);
*** 576,591 **** public void testDoubleValueAt_Variable_Null_2() { final MapProperty<String, Double> localProperty = new SimpleMapProperty<String, Double>(); Bindings.doubleValueAt(localProperty, (ObservableValue<String>)null); } - @Ignore("RT-27128") @Test public void testFloatValueAt_Constant() { - synchronized (log) { - log.reset(); - final float defaultData = 0.0f; final float localData1 = (float)Math.PI; final float localData2 = (float)-Math.E; final MapProperty<String, Float> localProperty = new SimpleMapProperty<String, Float>(); final ObservableMap<String, Float> localMap1 = FXCollections.observableHashMap(); --- 555,566 ----
*** 598,662 **** final FloatBinding binding2 = Bindings.floatValueAt(localProperty, key3); DependencyUtils.checkDependencies(binding0.getDependencies(), localProperty); DependencyUtils.checkDependencies(binding1.getDependencies(), localProperty); DependencyUtils.checkDependencies(binding2.getDependencies(), localProperty); assertEquals(defaultData, binding0.get(), EPSILON_FLOAT); ! log.check(0, "INFO", 1, "NullPointerException"); assertEquals(defaultData, binding1.get(), EPSILON_FLOAT); ! log.check(0, "INFO", 1, "NullPointerException"); assertEquals(defaultData, binding2.get(), EPSILON_FLOAT); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.set(localMap1); assertEquals(localData1, binding0.get(), EPSILON_FLOAT); assertEquals(localData2, binding1.get(), EPSILON_FLOAT); assertEquals(defaultData, binding2.get(), EPSILON_FLOAT); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.remove(key2); assertEquals(localData1, binding0.get(), EPSILON_FLOAT); assertEquals(defaultData, binding1.get(), EPSILON_FLOAT); ! log.check(0, "INFO", 1, "NullPointerException"); assertEquals(defaultData, binding2.get(), EPSILON_FLOAT); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.set(localMap2); assertEquals(defaultData, binding0.get(), EPSILON_FLOAT); ! log.check(0, "INFO", 1, "NullPointerException"); assertEquals(defaultData, binding1.get(), EPSILON_FLOAT); ! log.check(0, "INFO", 1, "NullPointerException"); assertEquals(defaultData, binding2.get(), EPSILON_FLOAT); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.put(key1, localData2); localProperty.put(key2, localData2); assertEquals(localData2, binding0.get(), EPSILON_FLOAT); assertEquals(localData2, binding1.get(), EPSILON_FLOAT); assertEquals(defaultData, binding2.get(), EPSILON_FLOAT); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.set(null); assertEquals(defaultData, binding0.get(), EPSILON_FLOAT); ! log.check(0, "INFO", 1, "NullPointerException"); assertEquals(defaultData, binding1.get(), EPSILON_FLOAT); ! log.check(0, "INFO", 1, "NullPointerException"); assertEquals(defaultData, binding2.get(), EPSILON_FLOAT); ! log.check(0, "INFO", 1, "NullPointerException"); ! } } @Test(expected = NullPointerException.class) public void testFloatValueAt_Constant_Null() { Bindings.floatValueAt(null, key1); } - @Ignore("RT-27128") @Test public void testFloatValueAt_Variable() { - synchronized (log) { - log.reset(); - final float defaultData = 0.0f; final float localData1 = (float)-Math.PI; final float localData2 = (float)Math.E; final MapProperty<String, Float> localProperty = new SimpleMapProperty<String, Float>(); final ObservableMap<String, Float> localMap1 = FXCollections.observableHashMap(); --- 573,632 ---- final FloatBinding binding2 = Bindings.floatValueAt(localProperty, key3); DependencyUtils.checkDependencies(binding0.getDependencies(), localProperty); DependencyUtils.checkDependencies(binding1.getDependencies(), localProperty); DependencyUtils.checkDependencies(binding2.getDependencies(), localProperty); assertEquals(defaultData, binding0.get(), EPSILON_FLOAT); ! log.checkFine(NullPointerException.class); assertEquals(defaultData, binding1.get(), EPSILON_FLOAT); ! log.checkFine(NullPointerException.class); assertEquals(defaultData, binding2.get(), EPSILON_FLOAT); ! log.checkFine(NullPointerException.class); localProperty.set(localMap1); assertEquals(localData1, binding0.get(), EPSILON_FLOAT); assertEquals(localData2, binding1.get(), EPSILON_FLOAT); assertEquals(defaultData, binding2.get(), EPSILON_FLOAT); ! log.checkFine(NullPointerException.class); localProperty.remove(key2); assertEquals(localData1, binding0.get(), EPSILON_FLOAT); assertEquals(defaultData, binding1.get(), EPSILON_FLOAT); ! log.checkFine(NullPointerException.class); assertEquals(defaultData, binding2.get(), EPSILON_FLOAT); ! log.checkFine(NullPointerException.class); localProperty.set(localMap2); assertEquals(defaultData, binding0.get(), EPSILON_FLOAT); ! log.checkFine(NullPointerException.class); assertEquals(defaultData, binding1.get(), EPSILON_FLOAT); ! log.checkFine(NullPointerException.class); assertEquals(defaultData, binding2.get(), EPSILON_FLOAT); ! log.checkFine(NullPointerException.class); localProperty.put(key1, localData2); localProperty.put(key2, localData2); assertEquals(localData2, binding0.get(), EPSILON_FLOAT); assertEquals(localData2, binding1.get(), EPSILON_FLOAT); assertEquals(defaultData, binding2.get(), EPSILON_FLOAT); ! log.checkFine(NullPointerException.class); localProperty.set(null); assertEquals(defaultData, binding0.get(), EPSILON_FLOAT); ! log.checkFine(NullPointerException.class); assertEquals(defaultData, binding1.get(), EPSILON_FLOAT); ! log.checkFine(NullPointerException.class); assertEquals(defaultData, binding2.get(), EPSILON_FLOAT); ! log.checkFine(NullPointerException.class); } @Test(expected = NullPointerException.class) public void testFloatValueAt_Constant_Null() { Bindings.floatValueAt(null, key1); } @Test public void testFloatValueAt_Variable() { final float defaultData = 0.0f; final float localData1 = (float)-Math.PI; final float localData2 = (float)Math.E; final MapProperty<String, Float> localProperty = new SimpleMapProperty<String, Float>(); final ObservableMap<String, Float> localMap1 = FXCollections.observableHashMap();
*** 667,732 **** final FloatBinding binding = Bindings.floatValueAt(localProperty, index); DependencyUtils.checkDependencies(binding.getDependencies(), localProperty, index); index.set(null); assertEquals(defaultData, binding.get(), EPSILON_FLOAT); ! log.check(0, "INFO", 1, "NullPointerException"); index.set(key1); assertEquals(defaultData, binding.get(), EPSILON_FLOAT); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.set(localMap1); index.set(null); assertEquals(defaultData, binding.get(), EPSILON_FLOAT); ! log.check(0, "INFO", 1, "NullPointerException"); index.set(key1); assertEquals(localData1, binding.get(), EPSILON_FLOAT); index.set(key2); assertEquals(localData2, binding.get(), EPSILON_FLOAT); index.set(key3); assertEquals(defaultData, binding.get(), EPSILON_FLOAT); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.remove(key2); index.set(null); assertEquals(defaultData, binding.get(), EPSILON_FLOAT); ! log.check(0, "INFO", 1, "NullPointerException"); index.set(key1); assertEquals(localData1, binding.get(), EPSILON_FLOAT); index.set(key2); assertEquals(defaultData, binding.get(), EPSILON_FLOAT); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.set(localMap2); index.set(null); assertEquals(defaultData, binding.get(), EPSILON_FLOAT); ! log.check(0, "INFO", 1, "NullPointerException"); index.set(key1); assertEquals(defaultData, binding.get(), EPSILON_FLOAT); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.put(key1, localData2); localProperty.put(key2, localData2); index.set(null); assertEquals(defaultData, binding.get(), EPSILON_FLOAT); ! log.check(0, "INFO", 1, "NullPointerException"); index.set(key1); assertEquals(localData2, binding.get(), EPSILON_FLOAT); index.set(key2); assertEquals(localData2, binding.get(), EPSILON_FLOAT); index.set(key3); assertEquals(defaultData, binding.get(), EPSILON_FLOAT); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.set(null); index.set(null); assertEquals(defaultData, binding.get(), EPSILON_FLOAT); ! log.check(0, "INFO", 1, "NullPointerException"); index.set(key1); assertEquals(defaultData, binding.get(), EPSILON_FLOAT); ! log.check(0, "INFO", 1, "NullPointerException"); ! } } @Test(expected = NullPointerException.class) public void testFloatValueAt_Variable_Null_1() { Bindings.floatValueAt((ObservableMap<String, Float>)null, index); --- 637,701 ---- final FloatBinding binding = Bindings.floatValueAt(localProperty, index); DependencyUtils.checkDependencies(binding.getDependencies(), localProperty, index); index.set(null); assertEquals(defaultData, binding.get(), EPSILON_FLOAT); ! log.checkFine(NullPointerException.class); index.set(key1); assertEquals(defaultData, binding.get(), EPSILON_FLOAT); ! log.checkFine(NullPointerException.class); localProperty.set(localMap1); index.set(null); assertEquals(defaultData, binding.get(), EPSILON_FLOAT); ! log.checkFine(NullPointerException.class); index.set(key1); assertEquals(localData1, binding.get(), EPSILON_FLOAT); index.set(key2); assertEquals(localData2, binding.get(), EPSILON_FLOAT); index.set(key3); assertEquals(defaultData, binding.get(), EPSILON_FLOAT); ! log.checkFine(NullPointerException.class); localProperty.remove(key2); index.set(null); assertEquals(defaultData, binding.get(), EPSILON_FLOAT); ! log.checkFine(NullPointerException.class); index.set(key1); assertEquals(localData1, binding.get(), EPSILON_FLOAT); index.set(key2); assertEquals(defaultData, binding.get(), EPSILON_FLOAT); ! log.checkFine(NullPointerException.class); localProperty.set(localMap2); index.set(null); assertEquals(defaultData, binding.get(), EPSILON_FLOAT); ! log.checkFine(NullPointerException.class); index.set(key1); assertEquals(defaultData, binding.get(), EPSILON_FLOAT); ! log.checkFine(NullPointerException.class); localProperty.put(key1, localData2); localProperty.put(key2, localData2); index.set(null); assertEquals(defaultData, binding.get(), EPSILON_FLOAT); ! log.checkFine(NullPointerException.class); index.set(key1); assertEquals(localData2, binding.get(), EPSILON_FLOAT); index.set(key2); assertEquals(localData2, binding.get(), EPSILON_FLOAT); index.set(key3); assertEquals(defaultData, binding.get(), EPSILON_FLOAT); ! log.checkFine(NullPointerException.class); localProperty.set(null); index.set(null); assertEquals(defaultData, binding.get(), EPSILON_FLOAT); ! log.checkFine(NullPointerException.class); index.set(key1); assertEquals(defaultData, binding.get(), EPSILON_FLOAT); ! log.checkFine(NullPointerException.class); } @Test(expected = NullPointerException.class) public void testFloatValueAt_Variable_Null_1() { Bindings.floatValueAt((ObservableMap<String, Float>)null, index);
*** 736,751 **** public void testFloatValueAt_Variable_Null_2() { final MapProperty<String, Float> localProperty = new SimpleMapProperty<String, Float>(); Bindings.floatValueAt(localProperty, (ObservableValue<String>)null); } - @Ignore("RT-27128") @Test public void testIntegerValueAt_Constant() { - synchronized (log) { - log.reset(); - final int defaultData = 0; final int localData1 = 42; final int localData2 = -7; final MapProperty<String, Integer> localProperty = new SimpleMapProperty<String, Integer>(); final ObservableMap<String, Integer> localMap1 = FXCollections.observableHashMap(); --- 705,716 ----
*** 758,822 **** final IntegerBinding binding2 = Bindings.integerValueAt(localProperty, key3); DependencyUtils.checkDependencies(binding0.getDependencies(), localProperty); DependencyUtils.checkDependencies(binding1.getDependencies(), localProperty); DependencyUtils.checkDependencies(binding2.getDependencies(), localProperty); assertEquals(defaultData, binding0.get()); ! log.check(0, "INFO", 1, "NullPointerException"); assertEquals(defaultData, binding1.get()); ! log.check(0, "INFO", 1, "NullPointerException"); assertEquals(defaultData, binding2.get()); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.set(localMap1); assertEquals(localData1, binding0.get()); assertEquals(localData2, binding1.get()); assertEquals(defaultData, binding2.get()); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.remove(key2); assertEquals(localData1, binding0.get()); assertEquals(defaultData, binding1.get()); ! log.check(0, "INFO", 1, "NullPointerException"); assertEquals(defaultData, binding2.get()); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.set(localMap2); assertEquals(defaultData, binding0.get()); ! log.check(0, "INFO", 1, "NullPointerException"); assertEquals(defaultData, binding1.get()); ! log.check(0, "INFO", 1, "NullPointerException"); assertEquals(defaultData, binding2.get()); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.put(key1, localData2); localProperty.put(key2, localData2); assertEquals(localData2, binding0.get()); assertEquals(localData2, binding1.get()); assertEquals(defaultData, binding2.get()); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.set(null); assertEquals(defaultData, binding0.get()); ! log.check(0, "INFO", 1, "NullPointerException"); assertEquals(defaultData, binding1.get()); ! log.check(0, "INFO", 1, "NullPointerException"); assertEquals(defaultData, binding2.get()); ! log.check(0, "INFO", 1, "NullPointerException"); ! } } @Test(expected = NullPointerException.class) public void testIntegerValueAt_Constant_Null() { Bindings.integerValueAt(null, key1); } - @Ignore("RT-27128") @Test public void testIntegerValueAt_Variable() { - synchronized (log) { - log.reset(); - final int defaultData = 0; final int localData1 = 42; final int localData2 = -7; final MapProperty<String, Integer> localProperty = new SimpleMapProperty<String, Integer>(); final ObservableMap<String, Integer> localMap1 = FXCollections.observableHashMap(); --- 723,782 ---- final IntegerBinding binding2 = Bindings.integerValueAt(localProperty, key3); DependencyUtils.checkDependencies(binding0.getDependencies(), localProperty); DependencyUtils.checkDependencies(binding1.getDependencies(), localProperty); DependencyUtils.checkDependencies(binding2.getDependencies(), localProperty); assertEquals(defaultData, binding0.get()); ! log.checkFine(NullPointerException.class); assertEquals(defaultData, binding1.get()); ! log.checkFine(NullPointerException.class); assertEquals(defaultData, binding2.get()); ! log.checkFine(NullPointerException.class); localProperty.set(localMap1); assertEquals(localData1, binding0.get()); assertEquals(localData2, binding1.get()); assertEquals(defaultData, binding2.get()); ! log.checkFine(NullPointerException.class); localProperty.remove(key2); assertEquals(localData1, binding0.get()); assertEquals(defaultData, binding1.get()); ! log.checkFine(NullPointerException.class); assertEquals(defaultData, binding2.get()); ! log.checkFine(NullPointerException.class); localProperty.set(localMap2); assertEquals(defaultData, binding0.get()); ! log.checkFine(NullPointerException.class); assertEquals(defaultData, binding1.get()); ! log.checkFine(NullPointerException.class); assertEquals(defaultData, binding2.get()); ! log.checkFine(NullPointerException.class); localProperty.put(key1, localData2); localProperty.put(key2, localData2); assertEquals(localData2, binding0.get()); assertEquals(localData2, binding1.get()); assertEquals(defaultData, binding2.get()); ! log.checkFine(NullPointerException.class); localProperty.set(null); assertEquals(defaultData, binding0.get()); ! log.checkFine(NullPointerException.class); assertEquals(defaultData, binding1.get()); ! log.checkFine(NullPointerException.class); assertEquals(defaultData, binding2.get()); ! log.checkFine(NullPointerException.class); } @Test(expected = NullPointerException.class) public void testIntegerValueAt_Constant_Null() { Bindings.integerValueAt(null, key1); } @Test public void testIntegerValueAt_Variable() { final int defaultData = 0; final int localData1 = 42; final int localData2 = -7; final MapProperty<String, Integer> localProperty = new SimpleMapProperty<String, Integer>(); final ObservableMap<String, Integer> localMap1 = FXCollections.observableHashMap();
*** 827,892 **** final IntegerBinding binding = Bindings.integerValueAt(localProperty, index); DependencyUtils.checkDependencies(binding.getDependencies(), localProperty, index); index.set(null); assertEquals(defaultData, binding.get()); ! log.check(0, "INFO", 1, "NullPointerException"); index.set(key1); assertEquals(defaultData, binding.get()); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.set(localMap1); index.set(null); assertEquals(defaultData, binding.get()); ! log.check(0, "INFO", 1, "NullPointerException"); index.set(key1); assertEquals(localData1, binding.get()); index.set(key2); assertEquals(localData2, binding.get()); index.set(key3); assertEquals(defaultData, binding.get()); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.remove(key2); index.set(null); assertEquals(defaultData, binding.get()); ! log.check(0, "INFO", 1, "NullPointerException"); index.set(key1); assertEquals(localData1, binding.get()); index.set(key2); assertEquals(defaultData, binding.get()); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.set(localMap2); index.set(null); assertEquals(defaultData, binding.get()); ! log.check(0, "INFO", 1, "NullPointerException"); index.set(key1); assertEquals(defaultData, binding.get()); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.put(key1, localData2); localProperty.put(key2, localData2); index.set(null); assertEquals(defaultData, binding.get()); ! log.check(0, "INFO", 1, "NullPointerException"); index.set(key1); assertEquals(localData2, binding.get()); index.set(key2); assertEquals(localData2, binding.get()); index.set(key3); assertEquals(defaultData, binding.get()); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.set(null); index.set(null); assertEquals(defaultData, binding.get()); ! log.check(0, "INFO", 1, "NullPointerException"); index.set(key1); assertEquals(defaultData, binding.get()); ! log.check(0, "INFO", 1, "NullPointerException"); ! } } @Test(expected = NullPointerException.class) public void testIntegerValueAt_Variable_Null_1() { Bindings.integerValueAt((ObservableMap<String, Integer>)null, index); --- 787,851 ---- final IntegerBinding binding = Bindings.integerValueAt(localProperty, index); DependencyUtils.checkDependencies(binding.getDependencies(), localProperty, index); index.set(null); assertEquals(defaultData, binding.get()); ! log.checkFine(NullPointerException.class); index.set(key1); assertEquals(defaultData, binding.get()); ! log.checkFine(NullPointerException.class); localProperty.set(localMap1); index.set(null); assertEquals(defaultData, binding.get()); ! log.checkFine(NullPointerException.class); index.set(key1); assertEquals(localData1, binding.get()); index.set(key2); assertEquals(localData2, binding.get()); index.set(key3); assertEquals(defaultData, binding.get()); ! log.checkFine(NullPointerException.class); localProperty.remove(key2); index.set(null); assertEquals(defaultData, binding.get()); ! log.checkFine(NullPointerException.class); index.set(key1); assertEquals(localData1, binding.get()); index.set(key2); assertEquals(defaultData, binding.get()); ! log.checkFine(NullPointerException.class); localProperty.set(localMap2); index.set(null); assertEquals(defaultData, binding.get()); ! log.checkFine(NullPointerException.class); index.set(key1); assertEquals(defaultData, binding.get()); ! log.checkFine(NullPointerException.class); localProperty.put(key1, localData2); localProperty.put(key2, localData2); index.set(null); assertEquals(defaultData, binding.get()); ! log.checkFine(NullPointerException.class); index.set(key1); assertEquals(localData2, binding.get()); index.set(key2); assertEquals(localData2, binding.get()); index.set(key3); assertEquals(defaultData, binding.get()); ! log.checkFine(NullPointerException.class); localProperty.set(null); index.set(null); assertEquals(defaultData, binding.get()); ! log.checkFine(NullPointerException.class); index.set(key1); assertEquals(defaultData, binding.get()); ! log.checkFine(NullPointerException.class); } @Test(expected = NullPointerException.class) public void testIntegerValueAt_Variable_Null_1() { Bindings.integerValueAt((ObservableMap<String, Integer>)null, index);
*** 896,911 **** public void testIntegerValueAt_Variable_Null_2() { final MapProperty<String, Integer> localProperty = new SimpleMapProperty<String, Integer>(); Bindings.integerValueAt(localProperty, (ObservableValue<String>)null); } - @Ignore("RT-27128") @Test public void testLongValueAt_Constant() { - synchronized (log) { - log.reset(); - final long defaultData = 0L; final long localData1 = 1234567890987654321L; final long localData2 = -987654321987654321L; final MapProperty<String, Long> localProperty = new SimpleMapProperty<String, Long>(); final ObservableMap<String, Long> localMap1 = FXCollections.observableHashMap(); --- 855,866 ----
*** 918,982 **** final LongBinding binding2 = Bindings.longValueAt(localProperty, key3); DependencyUtils.checkDependencies(binding0.getDependencies(), localProperty); DependencyUtils.checkDependencies(binding1.getDependencies(), localProperty); DependencyUtils.checkDependencies(binding2.getDependencies(), localProperty); assertEquals(defaultData, binding0.get()); ! log.check(0, "INFO", 1, "NullPointerException"); assertEquals(defaultData, binding1.get()); ! log.check(0, "INFO", 1, "NullPointerException"); assertEquals(defaultData, binding2.get()); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.set(localMap1); assertEquals(localData1, binding0.get()); assertEquals(localData2, binding1.get()); assertEquals(defaultData, binding2.get()); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.remove(key2); assertEquals(localData1, binding0.get()); assertEquals(defaultData, binding1.get()); ! log.check(0, "INFO", 1, "NullPointerException"); assertEquals(defaultData, binding2.get()); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.set(localMap2); assertEquals(defaultData, binding0.get()); ! log.check(0, "INFO", 1, "NullPointerException"); assertEquals(defaultData, binding1.get()); ! log.check(0, "INFO", 1, "NullPointerException"); assertEquals(defaultData, binding2.get()); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.put(key1, localData2); localProperty.put(key2, localData2); assertEquals(localData2, binding0.get()); assertEquals(localData2, binding1.get()); assertEquals(defaultData, binding2.get()); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.set(null); assertEquals(defaultData, binding0.get()); ! log.check(0, "INFO", 1, "NullPointerException"); assertEquals(defaultData, binding1.get()); ! log.check(0, "INFO", 1, "NullPointerException"); assertEquals(defaultData, binding2.get()); ! log.check(0, "INFO", 1, "NullPointerException"); ! } } @Test(expected = NullPointerException.class) public void testLongValueAt_Constant_Null() { Bindings.longValueAt(null, key1); } - @Ignore("RT-27128") @Test public void testLongValueAt_Variable() { - synchronized (log) { - log.reset(); - final long defaultData = 0; final long localData1 = 98765432123456789L; final long localData2 = -1234567890123456789L; final MapProperty<String, Long> localProperty = new SimpleMapProperty<String, Long>(); final ObservableMap<String, Long> localMap1 = FXCollections.observableHashMap(); --- 873,932 ---- final LongBinding binding2 = Bindings.longValueAt(localProperty, key3); DependencyUtils.checkDependencies(binding0.getDependencies(), localProperty); DependencyUtils.checkDependencies(binding1.getDependencies(), localProperty); DependencyUtils.checkDependencies(binding2.getDependencies(), localProperty); assertEquals(defaultData, binding0.get()); ! log.checkFine(NullPointerException.class); assertEquals(defaultData, binding1.get()); ! log.checkFine(NullPointerException.class); assertEquals(defaultData, binding2.get()); ! log.checkFine(NullPointerException.class); localProperty.set(localMap1); assertEquals(localData1, binding0.get()); assertEquals(localData2, binding1.get()); assertEquals(defaultData, binding2.get()); ! log.checkFine(NullPointerException.class); localProperty.remove(key2); assertEquals(localData1, binding0.get()); assertEquals(defaultData, binding1.get()); ! log.checkFine(NullPointerException.class); assertEquals(defaultData, binding2.get()); ! log.checkFine(NullPointerException.class); localProperty.set(localMap2); assertEquals(defaultData, binding0.get()); ! log.checkFine(NullPointerException.class); assertEquals(defaultData, binding1.get()); ! log.checkFine(NullPointerException.class); assertEquals(defaultData, binding2.get()); ! log.checkFine(NullPointerException.class); localProperty.put(key1, localData2); localProperty.put(key2, localData2); assertEquals(localData2, binding0.get()); assertEquals(localData2, binding1.get()); assertEquals(defaultData, binding2.get()); ! log.checkFine(NullPointerException.class); localProperty.set(null); assertEquals(defaultData, binding0.get()); ! log.checkFine(NullPointerException.class); assertEquals(defaultData, binding1.get()); ! log.checkFine(NullPointerException.class); assertEquals(defaultData, binding2.get()); ! log.checkFine(NullPointerException.class); } @Test(expected = NullPointerException.class) public void testLongValueAt_Constant_Null() { Bindings.longValueAt(null, key1); } @Test public void testLongValueAt_Variable() { final long defaultData = 0; final long localData1 = 98765432123456789L; final long localData2 = -1234567890123456789L; final MapProperty<String, Long> localProperty = new SimpleMapProperty<String, Long>(); final ObservableMap<String, Long> localMap1 = FXCollections.observableHashMap();
*** 987,1052 **** final LongBinding binding = Bindings.longValueAt(localProperty, index); DependencyUtils.checkDependencies(binding.getDependencies(), localProperty, index); index.set(null); assertEquals(defaultData, binding.get()); ! log.check(0, "INFO", 1, "NullPointerException"); index.set(key1); assertEquals(defaultData, binding.get()); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.set(localMap1); index.set(null); assertEquals(defaultData, binding.get()); ! log.check(0, "INFO", 1, "NullPointerException"); index.set(key1); assertEquals(localData1, binding.get()); index.set(key2); assertEquals(localData2, binding.get()); index.set(key3); assertEquals(defaultData, binding.get()); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.remove(key2); index.set(null); assertEquals(defaultData, binding.get()); ! log.check(0, "INFO", 1, "NullPointerException"); index.set(key1); assertEquals(localData1, binding.get()); index.set(key2); assertEquals(defaultData, binding.get()); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.set(localMap2); index.set(null); assertEquals(defaultData, binding.get()); ! log.check(0, "INFO", 1, "NullPointerException"); index.set(key1); assertEquals(defaultData, binding.get()); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.put(key1, localData2); localProperty.put(key2, localData2); index.set(null); assertEquals(defaultData, binding.get()); ! log.check(0, "INFO", 1, "NullPointerException"); index.set(key1); assertEquals(localData2, binding.get()); index.set(key2); assertEquals(localData2, binding.get()); index.set(key3); assertEquals(defaultData, binding.get()); ! log.check(0, "INFO", 1, "NullPointerException"); localProperty.set(null); index.set(null); assertEquals(defaultData, binding.get()); ! log.check(0, "INFO", 1, "NullPointerException"); index.set(key1); assertEquals(defaultData, binding.get()); ! log.check(0, "INFO", 1, "NullPointerException"); ! } } @Test(expected = NullPointerException.class) public void testLongValueAt_Variable_Null() { Bindings.longValueAt((ObservableMap<String, Long>)null, index); --- 937,1001 ---- final LongBinding binding = Bindings.longValueAt(localProperty, index); DependencyUtils.checkDependencies(binding.getDependencies(), localProperty, index); index.set(null); assertEquals(defaultData, binding.get()); ! log.checkFine(NullPointerException.class); index.set(key1); assertEquals(defaultData, binding.get()); ! log.checkFine(NullPointerException.class); localProperty.set(localMap1); index.set(null); assertEquals(defaultData, binding.get()); ! log.checkFine(NullPointerException.class); index.set(key1); assertEquals(localData1, binding.get()); index.set(key2); assertEquals(localData2, binding.get()); index.set(key3); assertEquals(defaultData, binding.get()); ! log.checkFine(NullPointerException.class); localProperty.remove(key2); index.set(null); assertEquals(defaultData, binding.get()); ! log.checkFine(NullPointerException.class); index.set(key1); assertEquals(localData1, binding.get()); index.set(key2); assertEquals(defaultData, binding.get()); ! log.checkFine(NullPointerException.class); localProperty.set(localMap2); index.set(null); assertEquals(defaultData, binding.get()); ! log.checkFine(NullPointerException.class); index.set(key1); assertEquals(defaultData, binding.get()); ! log.checkFine(NullPointerException.class); localProperty.put(key1, localData2); localProperty.put(key2, localData2); index.set(null); assertEquals(defaultData, binding.get()); ! log.checkFine(NullPointerException.class); index.set(key1); assertEquals(localData2, binding.get()); index.set(key2); assertEquals(localData2, binding.get()); index.set(key3); assertEquals(defaultData, binding.get()); ! log.checkFine(NullPointerException.class); localProperty.set(null); index.set(null); assertEquals(defaultData, binding.get()); ! log.checkFine(NullPointerException.class); index.set(key1); assertEquals(defaultData, binding.get()); ! log.checkFine(NullPointerException.class); } @Test(expected = NullPointerException.class) public void testLongValueAt_Variable_Null() { Bindings.longValueAt((ObservableMap<String, Long>)null, index);