modules/base/src/test/java/javafx/beans/property/ReadOnlyDoubleWrapperTest.java

rev 9213 : 8089557: bindBidirection works for ReadOnly*Wrapper incorrectly

*** 154,164 ****
          
          // set value once
          property.set(VALUE_1);
          assertEquals(VALUE_1, property.get(), EPSILON);
          property.check(1);
!         internalInvalidationListener.check(readOnlyProperty, 1);
          assertEquals(VALUE_1, readOnlyProperty.get(), EPSILON);
          publicInvalidationListener.check(readOnlyProperty, 1);
          
          // set same value again
          property.set(VALUE_1);
--- 154,164 ----
          
          // set value once
          property.set(VALUE_1);
          assertEquals(VALUE_1, property.get(), EPSILON);
          property.check(1);
!         internalInvalidationListener.check(property, 1);
          assertEquals(VALUE_1, readOnlyProperty.get(), EPSILON);
          publicInvalidationListener.check(readOnlyProperty, 1);
          
          // set same value again
          property.set(VALUE_1);
*** 171,181 ****
          // set value twice without reading
          property.set(VALUE_2);
          property.set(VALUE_1);
          assertEquals(VALUE_1, property.get(), EPSILON);
          property.check(1);
!         internalInvalidationListener.check(readOnlyProperty, 1);
          assertEquals(VALUE_1, readOnlyProperty.get(), EPSILON);
          publicInvalidationListener.check(readOnlyProperty, 1);
      }
      
      @Test
--- 171,181 ----
          // set value twice without reading
          property.set(VALUE_2);
          property.set(VALUE_1);
          assertEquals(VALUE_1, property.get(), EPSILON);
          property.check(1);
!         internalInvalidationListener.check(property, 1);
          assertEquals(VALUE_1, readOnlyProperty.get(), EPSILON);
          publicInvalidationListener.check(readOnlyProperty, 1);
      }
      
      @Test
*** 184,194 ****
          
          // set value once
          property.set(VALUE_1);
          assertEquals(VALUE_1, property.get(), EPSILON);
          property.check(1);
!         internalChangeListener.check(readOnlyProperty, DEFAULT, VALUE_1, 1);
          assertEquals(VALUE_1, readOnlyProperty.get(), EPSILON);
          
          // set same value again
          property.set(VALUE_1);
          assertEquals(VALUE_1, property.get(), EPSILON);
--- 184,194 ----
          
          // set value once
          property.set(VALUE_1);
          assertEquals(VALUE_1, property.get(), EPSILON);
          property.check(1);
!         internalChangeListener.check(property, DEFAULT, VALUE_1, 1);
          assertEquals(VALUE_1, readOnlyProperty.get(), EPSILON);
          
          // set same value again
          property.set(VALUE_1);
          assertEquals(VALUE_1, property.get(), EPSILON);
*** 199,209 ****
          // set value twice without reading
          property.set(VALUE_2);
          property.set(VALUE_1);
          assertEquals(VALUE_1, property.get(), EPSILON);
          property.check(2);
!         internalChangeListener.check(readOnlyProperty, VALUE_2, VALUE_1, 2);
          assertEquals(VALUE_1, readOnlyProperty.get(), EPSILON);
      }
      
      @Test
      public void testPublicEagerSet() {
--- 199,209 ----
          // set value twice without reading
          property.set(VALUE_2);
          property.set(VALUE_1);
          assertEquals(VALUE_1, property.get(), EPSILON);
          property.check(2);
!         internalChangeListener.check(property, VALUE_2, VALUE_1, 2);
          assertEquals(VALUE_1, readOnlyProperty.get(), EPSILON);
      }
      
      @Test
      public void testPublicEagerSet() {
*** 238,248 ****
          
          // set value once
          property.setValue(VALUE_1);
          assertEquals(VALUE_1, property.get(), EPSILON);
          property.check(1);
!         internalInvalidationListener.check(readOnlyProperty, 1);
          assertEquals(VALUE_1, readOnlyProperty.get(), EPSILON);
          publicInvalidationListener.check(readOnlyProperty, 1);
          
          // set same value again
          property.setValue(VALUE_1);
--- 238,248 ----
          
          // set value once
          property.setValue(VALUE_1);
          assertEquals(VALUE_1, property.get(), EPSILON);
          property.check(1);
!         internalInvalidationListener.check(property, 1);
          assertEquals(VALUE_1, readOnlyProperty.get(), EPSILON);
          publicInvalidationListener.check(readOnlyProperty, 1);
          
          // set same value again
          property.setValue(VALUE_1);
*** 255,265 ****
          // set value twice without reading
          property.setValue(VALUE_2);
          property.setValue(VALUE_1);
          assertEquals(VALUE_1, property.get(), EPSILON);
          property.check(1);
!         internalInvalidationListener.check(readOnlyProperty, 1);
          assertEquals(VALUE_1, readOnlyProperty.get(), EPSILON);
          publicInvalidationListener.check(readOnlyProperty, 1);
      }
      
      @Test
--- 255,265 ----
          // set value twice without reading
          property.setValue(VALUE_2);
          property.setValue(VALUE_1);
          assertEquals(VALUE_1, property.get(), EPSILON);
          property.check(1);
!         internalInvalidationListener.check(property, 1);
          assertEquals(VALUE_1, readOnlyProperty.get(), EPSILON);
          publicInvalidationListener.check(readOnlyProperty, 1);
      }
      
      @Test
*** 268,278 ****
          
          // set value once
          property.setValue(VALUE_1);
          assertEquals(VALUE_1, property.get(), EPSILON);
          property.check(1);
!         internalChangeListener.check(readOnlyProperty, DEFAULT, VALUE_1, 1);
          assertEquals(VALUE_1, readOnlyProperty.get(), EPSILON);
          
          // set same value again
          property.setValue(VALUE_1);
          assertEquals(VALUE_1, property.get(), EPSILON);
--- 268,278 ----
          
          // set value once
          property.setValue(VALUE_1);
          assertEquals(VALUE_1, property.get(), EPSILON);
          property.check(1);
!         internalChangeListener.check(property, DEFAULT, VALUE_1, 1);
          assertEquals(VALUE_1, readOnlyProperty.get(), EPSILON);
          
          // set same value again
          property.setValue(VALUE_1);
          assertEquals(VALUE_1, property.get(), EPSILON);
*** 283,293 ****
          // set value twice without reading
          property.setValue(VALUE_2);
          property.setValue(VALUE_1);
          assertEquals(VALUE_1, property.get(), EPSILON);
          property.check(2);
!         internalChangeListener.check(readOnlyProperty, VALUE_2, VALUE_1, 2);
          assertEquals(VALUE_1, readOnlyProperty.get(), EPSILON);
      }
      
      @Test
      public void testPublicEagerSetValue() {
--- 283,293 ----
          // set value twice without reading
          property.setValue(VALUE_2);
          property.setValue(VALUE_1);
          assertEquals(VALUE_1, property.get(), EPSILON);
          property.check(2);
!         internalChangeListener.check(property, VALUE_2, VALUE_1, 2);
          assertEquals(VALUE_1, readOnlyProperty.get(), EPSILON);
      }
      
      @Test
      public void testPublicEagerSetValue() {
*** 330,366 ****
  
          property.bind(v);
          assertEquals(VALUE_1, property.get(), EPSILON);
          assertTrue(property.isBound());
          property.check(1);
!         internalInvalidationListener.check(readOnlyProperty, 1);
          assertEquals(VALUE_1, readOnlyProperty.get(), EPSILON);
          publicInvalidationListener.check(readOnlyProperty, 1);
  
          // change binding once
          v.set(VALUE_2);
          assertEquals(VALUE_2, property.get(), EPSILON);
          property.check(1);
!         internalInvalidationListener.check(readOnlyProperty, 1);
          assertEquals(VALUE_2, readOnlyProperty.get(), EPSILON);
          publicInvalidationListener.check(readOnlyProperty, 1);
  
          // change binding twice without reading
          v.set(VALUE_1);
          v.set(VALUE_2);
          assertEquals(VALUE_2, property.get(), EPSILON);
          property.check(1);
!         internalInvalidationListener.check(readOnlyProperty, 1);
          assertEquals(VALUE_2, readOnlyProperty.get(), EPSILON);
          publicInvalidationListener.check(readOnlyProperty, 1);
  
          // change binding twice to same value
          v.set(VALUE_1);
          v.set(VALUE_1);
          assertEquals(VALUE_1, property.get(), EPSILON);
          property.check(1);
!         internalInvalidationListener.check(readOnlyProperty, 1);
          assertEquals(VALUE_1, readOnlyProperty.get(), EPSILON);
          publicInvalidationListener.check(readOnlyProperty, 1);
      }
  
      @Test
--- 330,366 ----
  
          property.bind(v);
          assertEquals(VALUE_1, property.get(), EPSILON);
          assertTrue(property.isBound());
          property.check(1);
!         internalInvalidationListener.check(property, 1);
          assertEquals(VALUE_1, readOnlyProperty.get(), EPSILON);
          publicInvalidationListener.check(readOnlyProperty, 1);
  
          // change binding once
          v.set(VALUE_2);
          assertEquals(VALUE_2, property.get(), EPSILON);
          property.check(1);
!         internalInvalidationListener.check(property, 1);
          assertEquals(VALUE_2, readOnlyProperty.get(), EPSILON);
          publicInvalidationListener.check(readOnlyProperty, 1);
  
          // change binding twice without reading
          v.set(VALUE_1);
          v.set(VALUE_2);
          assertEquals(VALUE_2, property.get(), EPSILON);
          property.check(1);
!         internalInvalidationListener.check(property, 1);
          assertEquals(VALUE_2, readOnlyProperty.get(), EPSILON);
          publicInvalidationListener.check(readOnlyProperty, 1);
  
          // change binding twice to same value
          v.set(VALUE_1);
          v.set(VALUE_1);
          assertEquals(VALUE_1, property.get(), EPSILON);
          property.check(1);
!         internalInvalidationListener.check(property, 1);
          assertEquals(VALUE_1, readOnlyProperty.get(), EPSILON);
          publicInvalidationListener.check(readOnlyProperty, 1);
      }
  
      @Test
*** 370,403 ****
  
          property.bind(v);
          assertEquals(VALUE_1, property.get(), EPSILON);
          assertTrue(property.isBound());
          property.check(1);
!         internalChangeListener.check(readOnlyProperty, DEFAULT, VALUE_1, 1);
          assertEquals(VALUE_1, readOnlyProperty.get(), EPSILON);
  
          // change binding once
          v.set(VALUE_2);
          assertEquals(VALUE_2, property.get(), EPSILON);
          property.check(1);
!         internalChangeListener.check(readOnlyProperty, VALUE_1, VALUE_2, 1);
          assertEquals(VALUE_2, readOnlyProperty.get(), EPSILON);
  
          // change binding twice without reading
          v.set(VALUE_1);
          v.set(VALUE_2);
          assertEquals(VALUE_2, property.get(), EPSILON);
          property.check(2);
!         internalChangeListener.check(readOnlyProperty, VALUE_1, VALUE_2, 2);
          assertEquals(VALUE_2, readOnlyProperty.get(), EPSILON);
  
          // change binding twice to same value
          v.set(VALUE_1);
          v.set(VALUE_1);
          assertEquals(VALUE_1, property.get(), EPSILON);
          property.check(2);
!         internalChangeListener.check(readOnlyProperty, VALUE_2, VALUE_1, 1);
          assertEquals(VALUE_1, readOnlyProperty.get(), EPSILON);
      }
      
      @Test
      public void testPublicEagerBind_primitive() {
--- 370,403 ----
  
          property.bind(v);
          assertEquals(VALUE_1, property.get(), EPSILON);
          assertTrue(property.isBound());
          property.check(1);
!         internalChangeListener.check(property, DEFAULT, VALUE_1, 1);
          assertEquals(VALUE_1, readOnlyProperty.get(), EPSILON);
  
          // change binding once
          v.set(VALUE_2);
          assertEquals(VALUE_2, property.get(), EPSILON);
          property.check(1);
!         internalChangeListener.check(property, VALUE_1, VALUE_2, 1);
          assertEquals(VALUE_2, readOnlyProperty.get(), EPSILON);
  
          // change binding twice without reading
          v.set(VALUE_1);
          v.set(VALUE_2);
          assertEquals(VALUE_2, property.get(), EPSILON);
          property.check(2);
!         internalChangeListener.check(property, VALUE_1, VALUE_2, 2);
          assertEquals(VALUE_2, readOnlyProperty.get(), EPSILON);
  
          // change binding twice to same value
          v.set(VALUE_1);
          v.set(VALUE_1);
          assertEquals(VALUE_1, property.get(), EPSILON);
          property.check(2);
!         internalChangeListener.check(property, VALUE_2, VALUE_1, 1);
          assertEquals(VALUE_1, readOnlyProperty.get(), EPSILON);
      }
      
      @Test
      public void testPublicEagerBind_primitive() {
*** 442,478 ****
  
          property.bind(v);
          assertEquals(VALUE_1, property.get(), EPSILON);
          assertTrue(property.isBound());
          property.check(1);
!         internalInvalidationListener.check(readOnlyProperty, 1);
          assertEquals(VALUE_1, readOnlyProperty.get(), EPSILON);
          publicInvalidationListener.check(readOnlyProperty, 1);
  
          // change binding once
          v.set(VALUE_2);
          assertEquals(VALUE_2, property.get(), EPSILON);
          property.check(1);
!         internalInvalidationListener.check(readOnlyProperty, 1);
          assertEquals(VALUE_2, readOnlyProperty.get(), EPSILON);
          publicInvalidationListener.check(readOnlyProperty, 1);
  
          // change binding twice without reading
          v.set(VALUE_1);
          v.set(VALUE_2);
          assertEquals(VALUE_2, property.get(), EPSILON);
          property.check(1);
!         internalInvalidationListener.check(readOnlyProperty, 1);
          assertEquals(VALUE_2, readOnlyProperty.get(), EPSILON);
          publicInvalidationListener.check(readOnlyProperty, 1);
  
          // change binding twice to same value
          v.set(VALUE_1);
          v.set(VALUE_1);
          assertEquals(VALUE_1, property.get(), EPSILON);
          property.check(1);
!         internalInvalidationListener.check(readOnlyProperty, 1);
          assertEquals(VALUE_1, readOnlyProperty.get(), EPSILON);
          publicInvalidationListener.check(readOnlyProperty, 1);
      }
  
      @Test
--- 442,478 ----
  
          property.bind(v);
          assertEquals(VALUE_1, property.get(), EPSILON);
          assertTrue(property.isBound());
          property.check(1);
!         internalInvalidationListener.check(property, 1);
          assertEquals(VALUE_1, readOnlyProperty.get(), EPSILON);
          publicInvalidationListener.check(readOnlyProperty, 1);
  
          // change binding once
          v.set(VALUE_2);
          assertEquals(VALUE_2, property.get(), EPSILON);
          property.check(1);
!         internalInvalidationListener.check(property, 1);
          assertEquals(VALUE_2, readOnlyProperty.get(), EPSILON);
          publicInvalidationListener.check(readOnlyProperty, 1);
  
          // change binding twice without reading
          v.set(VALUE_1);
          v.set(VALUE_2);
          assertEquals(VALUE_2, property.get(), EPSILON);
          property.check(1);
!         internalInvalidationListener.check(property, 1);
          assertEquals(VALUE_2, readOnlyProperty.get(), EPSILON);
          publicInvalidationListener.check(readOnlyProperty, 1);
  
          // change binding twice to same value
          v.set(VALUE_1);
          v.set(VALUE_1);
          assertEquals(VALUE_1, property.get(), EPSILON);
          property.check(1);
!         internalInvalidationListener.check(property, 1);
          assertEquals(VALUE_1, readOnlyProperty.get(), EPSILON);
          publicInvalidationListener.check(readOnlyProperty, 1);
      }
  
      @Test
*** 482,515 ****
  
          property.bind(v);
          assertEquals(VALUE_1, property.get(), EPSILON);
          assertTrue(property.isBound());
          property.check(1);
!         internalChangeListener.check(readOnlyProperty, DEFAULT, VALUE_1, 1);
          assertEquals(VALUE_1, readOnlyProperty.get(), EPSILON);
  
          // change binding once
          v.set(VALUE_2);
          assertEquals(VALUE_2, property.get(), EPSILON);
          property.check(1);
!         internalChangeListener.check(readOnlyProperty, VALUE_1, VALUE_2, 1);
          assertEquals(VALUE_2, readOnlyProperty.get(), EPSILON);
  
          // change binding twice without reading
          v.set(VALUE_1);
          v.set(VALUE_2);
          assertEquals(VALUE_2, property.get(), EPSILON);
          property.check(2);
!         internalChangeListener.check(readOnlyProperty, VALUE_1, VALUE_2, 2);
          assertEquals(VALUE_2, readOnlyProperty.get(), EPSILON);
  
          // change binding twice to same value
          v.set(VALUE_1);
          v.set(VALUE_1);
          assertEquals(VALUE_1, property.get(), EPSILON);
          property.check(2);
!         internalChangeListener.check(readOnlyProperty, VALUE_2, VALUE_1, 1);
          assertEquals(VALUE_1, readOnlyProperty.get(), EPSILON);
      }
  
      @Test
      public void testPublicEagerBind_generic() {
--- 482,515 ----
  
          property.bind(v);
          assertEquals(VALUE_1, property.get(), EPSILON);
          assertTrue(property.isBound());
          property.check(1);
!         internalChangeListener.check(property, DEFAULT, VALUE_1, 1);
          assertEquals(VALUE_1, readOnlyProperty.get(), EPSILON);
  
          // change binding once
          v.set(VALUE_2);
          assertEquals(VALUE_2, property.get(), EPSILON);
          property.check(1);
!         internalChangeListener.check(property, VALUE_1, VALUE_2, 1);
          assertEquals(VALUE_2, readOnlyProperty.get(), EPSILON);
  
          // change binding twice without reading
          v.set(VALUE_1);
          v.set(VALUE_2);
          assertEquals(VALUE_2, property.get(), EPSILON);
          property.check(2);
!         internalChangeListener.check(property, VALUE_1, VALUE_2, 2);
          assertEquals(VALUE_2, readOnlyProperty.get(), EPSILON);
  
          // change binding twice to same value
          v.set(VALUE_1);
          v.set(VALUE_1);
          assertEquals(VALUE_1, property.get(), EPSILON);
          property.check(2);
!         internalChangeListener.check(property, VALUE_2, VALUE_1, 1);
          assertEquals(VALUE_1, readOnlyProperty.get(), EPSILON);
      }
  
      @Test
      public void testPublicEagerBind_generic() {
*** 567,585 ****
          // rebind causes invalidation event
          property.bind(v2);
          assertEquals(VALUE_2, property.get(), EPSILON);
          assertTrue(property.isBound());
          property.check(1);
!         internalInvalidationListener.check(readOnlyProperty, 1);
          assertEquals(VALUE_2, readOnlyProperty.get(), EPSILON);
          publicInvalidationListener.check(readOnlyProperty, 1);
          
          // change new binding
          v2.set(VALUE_1);
          assertEquals(VALUE_1, property.get(), EPSILON);
          property.check(1);
!         internalInvalidationListener.check(readOnlyProperty, 1);
          assertEquals(VALUE_1, readOnlyProperty.get(), EPSILON);
          publicInvalidationListener.check(readOnlyProperty, 1);
          
          // change old binding
          v1.set(VALUE_2);
--- 567,585 ----
          // rebind causes invalidation event
          property.bind(v2);
          assertEquals(VALUE_2, property.get(), EPSILON);
          assertTrue(property.isBound());
          property.check(1);
!         internalInvalidationListener.check(property, 1);
          assertEquals(VALUE_2, readOnlyProperty.get(), EPSILON);
          publicInvalidationListener.check(readOnlyProperty, 1);
          
          // change new binding
          v2.set(VALUE_1);
          assertEquals(VALUE_1, property.get(), EPSILON);
          property.check(1);
!         internalInvalidationListener.check(property, 1);
          assertEquals(VALUE_1, readOnlyProperty.get(), EPSILON);
          publicInvalidationListener.check(readOnlyProperty, 1);
          
          // change old binding
          v1.set(VALUE_2);
*** 622,632 ****
          
          // set value
          property.set(VALUE_2);
          assertEquals(VALUE_2, property.get(), EPSILON);
          property.check(1);
!         internalInvalidationListener.check(readOnlyProperty, 1);
          assertEquals(VALUE_2, readOnlyProperty.get(), EPSILON);
          publicInvalidationListener.check(readOnlyProperty, 1);
      }
      
      @Test
--- 622,632 ----
          
          // set value
          property.set(VALUE_2);
          assertEquals(VALUE_2, property.get(), EPSILON);
          property.check(1);
!         internalInvalidationListener.check(property, 1);
          assertEquals(VALUE_2, readOnlyProperty.get(), EPSILON);
          publicInvalidationListener.check(readOnlyProperty, 1);
      }
      
      @Test
*** 640,650 ****
          // setting the property,checking internal
          property.set(VALUE_1);
          property.addListener(internalListener2);
          internalListener2.reset();
          property.set(VALUE_2);
!         internalListener2.check(readOnlyProperty, 1);
          
          // setting the property, checking public
          property.set(VALUE_1);
          readOnlyProperty.addListener(publicListener2);
          publicListener2.reset();
--- 640,650 ----
          // setting the property,checking internal
          property.set(VALUE_1);
          property.addListener(internalListener2);
          internalListener2.reset();
          property.set(VALUE_2);
!         internalListener2.check(property, 1);
          
          // setting the property, checking public
          property.set(VALUE_1);
          readOnlyProperty.addListener(publicListener2);
          publicListener2.reset();
*** 656,666 ****
          v.set(VALUE_2);
          property.addListener(internalListener3);
          v.get();
          internalListener3.reset();
          v.set(VALUE_1);
!         internalListener3.check(readOnlyProperty, 1);
          
          // binding the property, checking public
          property.bind(v);
          v.set(VALUE_2);
          readOnlyProperty.addListener(publicListener3);
--- 656,666 ----
          v.set(VALUE_2);
          property.addListener(internalListener3);
          v.get();
          internalListener3.reset();
          v.set(VALUE_1);
!         internalListener3.check(property, 1);
          
          // binding the property, checking public
          property.bind(v);
          v.set(VALUE_2);
          readOnlyProperty.addListener(publicListener3);