switch tests from deprecated API

Author: thomasnield

src/test/java/rx/javafx/sources/JavaFxObservableTest.java

@@ -61,7 +61,7 @@ public void testRxObservableListAdds() {
         new JFXPanel();
 
         ObservableList<String> sourceList = FXCollections.observableArrayList();
-        Observable<String> emissions = JavaFxObservable.fromObservableListAdds(sourceList);
+        Observable<String> emissions = JavaFxObservable.additionsOf(sourceList);
 
         CountDownLatch gate = new CountDownLatch(1);
 
@@ -91,7 +91,7 @@ public void testRxObservableListRemoves() {
         new JFXPanel();
 
         ObservableList<String> sourceList = FXCollections.observableArrayList();
-        Observable<String> emissions = JavaFxObservable.fromObservableListRemovals(sourceList);
+        Observable<String> emissions = JavaFxObservable.removalsOf(sourceList);
 
         CountDownLatch gate = new CountDownLatch(1);
 
@@ -121,7 +121,7 @@ public void testRxObservableListChanges() {
         new JFXPanel();
 
         ObservableList<String> sourceList = FXCollections.observableArrayList();
-        Observable<ListChange<String>> emissions = JavaFxObservable.fromObservableListChanges(sourceList);
+        Observable<ListChange<String>> emissions = JavaFxObservable.changesOf(sourceList);
 
         CountDownLatch gate = new CountDownLatch(1);
 
@@ -165,7 +165,7 @@ public void testRxObservableListDistinctChangeMappings() {
         new JFXPanel();
 
         ObservableList<String> sourceList = FXCollections.observableArrayList();
-        Observable<ListChange<Integer>> emissions = JavaFxObservable.fromObservableListDistinctMappings(sourceList, String::length);
+        Observable<ListChange<Integer>> emissions = JavaFxObservable.distinctMappingsOf(sourceList, String::length);
 
         CountDownLatch gate = new CountDownLatch(1);
 
@@ -211,7 +211,7 @@ public void testRxObservableListDistinctChanges() {
         new JFXPanel();
 
         ObservableList<String> sourceList = FXCollections.observableArrayList();
-        Observable<ListChange<String>> emissions = JavaFxObservable.fromObservableListDistinctChanges(sourceList);
+        Observable<ListChange<String>> emissions = JavaFxObservable.distinctChangesOf(sourceList);
 
         CountDownLatch gate = new CountDownLatch(1);
 

src/test/java/rx/schedulers/JavaFxSchedulerTest.java

@@ -48,11 +48,8 @@ public final class JavaFxSchedulerTest {
     public ExpectedException exception = ExpectedException.none();
 
     private static void waitForEmptyEventQueue() throws Exception {
-        FXUtilities.runAndWait(new Runnable() {
-            @Override
-            public void run() {
-                // nothing to do, we're just waiting here for the event queue to be emptied
-            }
+        FXUtilities.runAndWait(() -> {
+            // nothing to do, we're just waiting here for the event queue to be emptied
         });
     }
 
@@ -77,15 +74,12 @@ public void testPeriodicScheduling() throws Exception {
         final CountDownLatch latch = new CountDownLatch(4);
 
         final Action0 innerAction = mock(Action0.class);
-        final Action0 action = new Action0() {
-            @Override
-            public void call() {
-                try {
-                    innerAction.call();
-                    assertTrue(Platform.isFxApplicationThread());
-                } finally {
-                    latch.countDown();
-                }
+        final Action0 action = () -> {
+            try {
+                innerAction.call();
+                assertTrue(Platform.isFxApplicationThread());
+            } finally {
+                latch.countDown();
             }
         };
 
@@ -114,31 +108,22 @@ public void testNestedActions() throws Exception {
         final Action0 thirdStepStart = mock(Action0.class);
         final Action0 thirdStepEnd = mock(Action0.class);
 
-        final Action0 firstAction = new Action0() {
-            @Override
-            public void call() {
-                assertTrue(Platform.isFxApplicationThread());
-                firstStepStart.call();
-                firstStepEnd.call();
-            }
+        final Action0 firstAction = () -> {
+            assertTrue(Platform.isFxApplicationThread());
+            firstStepStart.call();
+            firstStepEnd.call();
         };
-        final Action0 secondAction = new Action0() {
-            @Override
-            public void call() {
-                assertTrue(Platform.isFxApplicationThread());
-                secondStepStart.call();
-                inner.schedule(firstAction);
-                secondStepEnd.call();
-            }
+        final Action0 secondAction = () -> {
+            assertTrue(Platform.isFxApplicationThread());
+            secondStepStart.call();
+            inner.schedule(firstAction);
+            secondStepEnd.call();
         };
-        final Action0 thirdAction = new Action0() {
-            @Override
-            public void call() {
-                assertTrue(Platform.isFxApplicationThread());
-                thirdStepStart.call();
-                inner.schedule(secondAction);
-                thirdStepEnd.call();
-            }
+        final Action0 thirdAction = () -> {
+            assertTrue(Platform.isFxApplicationThread());
+            thirdStepStart.call();
+            inner.schedule(secondAction);
+            thirdStepEnd.call();
         };
 
         InOrder inOrder = inOrder(firstStepStart, firstStepEnd, secondStepStart, secondStepEnd, thirdStepStart, thirdStepEnd);
@@ -190,21 +175,17 @@ public static void runAndWait( final Runnable run) throws InterruptedException,
                 final ThrowableWrapper throwableWrapper = new ThrowableWrapper();
                 lock.lock();
                 try {
-                    Platform.runLater(new Runnable() {
-
-                        @Override
-                        public void run() {
-                            lock.lock();
+                    Platform.runLater(() -> {
+                        lock.lock();
+                        try {
+                            run.run();
+                        } catch (Throwable e) {
+                            throwableWrapper.t = e;
+                        } finally {
                             try {
-                                run.run();
-                            } catch (Throwable e) {
-                                throwableWrapper.t = e;
+                                condition.signal();
                             } finally {
-                                try {
-                                    condition.signal();
-                                } finally {
-                                    lock.unlock();
-                                }
+                                lock.unlock();
                             }
                         }
                     });