Merge branch '2.11.x' of https://github.com/ReactiveX/RxJavaFX into 2.11.x

Author: Thomas Nield

build.gradle

@@ -70,7 +70,6 @@ task sourcesJar(type: Jar, dependsOn: classes) {
     classifier = "sources"
     from sourceSets.main.allSource
 }
-
 artifacts {
     archives jar
 }

buildViaTravis.sh

@@ -9,12 +9,9 @@ export GRADLE_OPTS=-Xmx1024m
 if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
   echo -e "Build Pull Request #$TRAVIS_PULL_REQUEST => Branch [$TRAVIS_BRANCH]"
   ./gradlew -PreleaseMode=pr build
-elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" == "" ]; then
-  echo -e 'Build Branch with Snapshot => Branch ['$TRAVIS_BRANCH']'
-  ./gradlew -PreleaseMode=branch -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" build --stacktrace
 elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" != "" ]; then
   echo -e 'Build Branch for Release => Branch ['$TRAVIS_BRANCH']  Tag ['$TRAVIS_TAG']'
   ./gradlew -PreleaseMode=full -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" build --stacktrace
 else
   echo -e 'WARN: Should not be here => Branch ['$TRAVIS_BRANCH']  Tag ['$TRAVIS_TAG']  Pull Request ['$TRAVIS_PULL_REQUEST']'
-fi
+fi

gradle/buildViaTravis.sh

@@ -4,9 +4,6 @@
 if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
   echo -e "Build Pull Request #$TRAVIS_PULL_REQUEST => Branch [$TRAVIS_BRANCH]"
   ./gradlew -Prelease.useLastTag=true build
-elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" == "" ]; then
-  echo -e 'Build Branch with Snapshot => Branch ['$TRAVIS_BRANCH']'
-  ./gradlew -Prelease.travisci=true -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" build snapshot --stacktrace
 elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" != "" ]; then
   echo -e 'Build Branch for Release => Branch ['$TRAVIS_BRANCH']  Tag ['$TRAVIS_TAG']'
   ./gradlew -Prelease.travisci=true -Prelease.useLastTag=true -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" final --stacktrace

src/main/java/io/reactivex/rxjavafx/sources/Change.java

@@ -15,6 +15,8 @@
  */
 package io.reactivex.rxjavafx.sources;
 
+import java.util.Objects;
+
 public final class Change<T> {
     private final T oldVal;
     private final T newVal;
@@ -29,4 +31,26 @@ public T getOldVal() {
     public T getNewVal() {
         return newVal;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Change<?> change = (Change<?>) o;
+        return Objects.equals(oldVal, change.oldVal) &&
+                Objects.equals(newVal, change.newVal);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(oldVal, newVal);
+    }
+
+    @Override
+    public String toString() {
+        return "Change{" +
+                "oldVal=" + oldVal +
+                ", newVal=" + newVal +
+                '}';
+    }
 }

src/main/java/io/reactivex/rxjavafx/sources/ObservableValueSource.java

@@ -26,14 +26,14 @@
 
 public class ObservableValueSource {
 
+
     public static <T> Observable<T> fromObservableValue(final ObservableValue<T> fxObservable) {
         return Observable.create((ObservableEmitter<T> emitter) -> {
             if (fxObservable.getValue() != null)
                 emitter.onNext(fxObservable.getValue());
 
             final ChangeListener<T> listener = (observableValue, prev, current) -> {
-                if (current != null)
-                    emitter.onNext(current);
+                emitter.onNext(current);
             };
 
             fxObservable.addListener(listener);
@@ -80,8 +80,7 @@ public static <T> Observable<Optional<T>> fromNullableObservableValue(final Obse
     public static <T> Observable<Change<T>> fromObservableValueChanges(final ObservableValue<T> fxObservable) {
         return Observable.create((ObservableEmitter<Change<T>> emitter) -> {
             final ChangeListener<T> listener = (observableValue, prev, current) -> {
-                if (current != null)
-                    emitter.onNext(new Change<>(prev,current));
+                emitter.onNext(new Change<>(prev,current));
             };
 
             fxObservable.addListener(listener);

src/test/java/io/reactivex/rxjavafx/sources/JavaFxObservableTest.java

@@ -25,6 +25,7 @@
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.util.Duration;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 import java.util.Arrays;
@@ -35,6 +36,11 @@
 
 public final class JavaFxObservableTest {
 
+    @BeforeClass
+    public static void initJFX() {
+        javafx.application.Platform.startup(() ->{});
+    }
+
     @Test
     public void testIntervalSource() {
 
@@ -87,6 +93,27 @@ public void testListPropertyEmitOnChanged() {
 
         testObserver.assertValueCount(3);
     }
+    @Test
+    public void testRxObservableChanges() {
+        Property<String> sourceProperty = new SimpleStringProperty();
+        Observable<Change<String>> emissions = JavaFxObservable.changesOf(sourceProperty).take(4);
+
+        TestObserver<Change<String>> testObserver = new TestObserver<>();
+
+        emissions.subscribe(testObserver);
+
+        sourceProperty.setValue("Alpha");
+        sourceProperty.setValue("Beta");
+        sourceProperty.setValue(null);
+        sourceProperty.setValue("Gamma");
+
+        testObserver.assertValues(
+                        new Change<>(null, "Alpha"),
+                        new Change<>("Alpha", "Beta"),
+                        new Change<>("Beta", null),
+                        new Change<>(null, "Gamma")
+        );
+    }
 
     @Test
     public void testRxObservableListAdds() {
@@ -101,7 +128,7 @@ public void testRxObservableListAdds() {
                 .take(3)
                 .toList()
                 .toObservable()
-                .subscribe(l -> assertTrue(l.containsAll(Arrays.asList("Alpha","Beta","Gamma"))),Throwable::printStackTrace,gate::countDown);
+                .subscribe(l -> assertTrue(l.equals(Arrays.asList("Alpha", "Beta", "Gamma"))), Throwable::printStackTrace, gate::countDown);;
 
         Platform.runLater(() -> {
             sourceList.add("Alpha");