use single instance of TestScheduler in all Notification objects

Author: martinsik

src/Notification/OnNextObservableNotification.php

@@ -3,6 +3,8 @@
 namespace Rx\Notification;
 
 use Rx\Observable;
+use Rx\Testing\ColdObservable;
+use Rx\Testing\HotObservable;
 use Rx\Testing\MockHigherOrderObserver;
 use Rx\Testing\TestScheduler;
 
@@ -11,18 +13,12 @@ class OnNextObservableNotification extends OnNextNotification
     /** @var MockHigherOrderObserver */
     private $observer;
 
-    public function __construct(Observable $value, TestScheduler $scheduler = null)
+    public function __construct(Observable $value, TestScheduler $scheduler)
     {
         parent::__construct($value);
-        if (!$scheduler) {
-            $scheduler = new TestScheduler();
-        }
 
         $this->observer = new MockHigherOrderObserver($scheduler, $scheduler->getClock());
-
         $value->subscribe($this->observer);
-
-        $scheduler->start();
     }
 
     public function equals($other): bool

test/Rx/Functional/FunctionalTestCase.php

@@ -19,11 +19,19 @@ abstract class FunctionalTestCase extends TestCase
     /** @var  TestScheduler */
     protected $scheduler;
 
+    /** @var  TestScheduler */
+    static protected $globalScheduler;
+
     const TIME_FACTOR = 10;
 
     public function setup()
     {
         $this->scheduler = $this->createTestScheduler();
+        self::$globalScheduler = $this->scheduler;
+    }
+
+    static function getScheduler() {
+        return self::$globalScheduler;
     }
 
     /**
@@ -32,6 +40,8 @@ public function setup()
      */
     public function assertMessages(array $expected, array $recorded)
     {
+        $this->scheduler->start();
+
         if (count($expected) !== count($recorded)) {
             $this->fail(sprintf('Expected message count %d does not match actual count %d.', count($expected), count($recorded)));
         }
@@ -51,6 +61,8 @@ public function assertMessages(array $expected, array $recorded)
      */
     public function assertMessagesNotEqual(array $expected, array $recorded)
     {
+        $this->scheduler->start();
+
         if (count($expected) !== count($recorded)) {
             $this->assertTrue(true);
             return;
@@ -68,6 +80,8 @@ public function assertMessagesNotEqual(array $expected, array $recorded)
 
     public function assertSubscription(HotObservable $observable, Subscription $expected)
     {
+        $this->scheduler->start();
+
         $subscriptionCount = count($observable->getSubscriptions());
 
         if ($subscriptionCount === 0) {
@@ -89,6 +103,8 @@ public function assertSubscription(HotObservable $observable, Subscription $expe
 
     public function assertSubscriptions(array $expected, array $recorded)
     {
+        $this->scheduler->start();
+
         if (count($expected) !== count($recorded)) {
             $this->fail(sprintf('Expected subscription count %d does not match actual count %d.', count($expected), count($recorded)));
         }

test/Rx/Testing/RecordedTest.php

@@ -46,8 +46,30 @@ public function compare_cold_observables()
             onCompleted(300),
         ]));
 
-        $this->assertTrue($records1->equals($records2));
         $this->assertMessages([$records1], [$records2]);
+        $this->assertTrue($records1->equals($records2));
+    }
+
+    /**
+     * @test
+     */
+    public function compare_cold_observables_not_equal()
+    {
+        $records1 = onNext(100, $this->createColdObservable([
+            onNext(150, 1),
+            onNext(200, 42), // this is wrong
+            onNext(250, 3),
+            onCompleted(300),
+        ]));
+        $records2 = onNext(100, $this->createColdObservable([
+            onNext(150, 1),
+            onNext(200, 2),
+            onNext(250, 3),
+            onCompleted(300),
+        ]));
+
+        $this->assertMessagesNotEqual([$records1], [$records2]);
+        $this->assertFalse($records1->equals($records2));
     }
 
     /**
@@ -73,8 +95,8 @@ public function automatic_mock_observer_doesnt_create_loggable_subscription()
             onCompleted(300),
         ]));
 
-        $this->assertTrue($records->equals($expected));
         $this->assertMessages([$records], [$expected]);
+        $this->assertTrue($records->equals($expected));
 
         $this->assertSubscriptions([], $inner->getSubscriptions());
     }
@@ -84,7 +106,7 @@ public function automatic_mock_observer_doesnt_create_loggable_subscription()
      */
     public function compare_with_range_cold_observable()
     {
-        $records1 = onNext(100, Observable::range(1, 3));
+        $records1 = onNext(100, Observable::range(1, 3, $this->scheduler));
         $records2 = onNext(100, $this->createColdObservable([
             onNext(1, 1),
             onNext(2, 2),
@@ -105,7 +127,7 @@ public function compare_with_delayed_range_cold_observable()
             onNext(100, 2),
             onNext(150, 3),
             onCompleted(200)
-        ])->delay(100));
+        ])->delay(100, $this->scheduler));
 
         $records2 = onNext(100, $this->createColdObservable([
             onNext(150, 1),
@@ -131,6 +153,8 @@ public function observables_at_different_time_with_same_records_arent_equal()
             onNext(100, 2),
         ]));
 
+        $this->scheduler->start();
+
         $this->assertFalse($records1->equals($records2));
         $this->assertEquals('[OnNext(1)@50, OnNext(2)@100]@50', $records1->__toString());
     }
@@ -149,6 +173,8 @@ public function observables_with_inner_records_at_different_time_arent_equal()
             onNext(100, 2),
         ]));
 
+        $this->scheduler->start();
+
         $this->assertFalse($records1->equals($records2));
         $this->assertEquals('[OnNext(1)@50, OnNext(2)@150]@100', $records1->__toString());
     }
@@ -168,7 +194,7 @@ public function observables_with_more_nested_inner_observables()
                     onNext(10, 5),
                     onNext(20, 6),
                 ])),
-            ])->delay(100)),
+            ])->delay(100, $this->scheduler)),
         ]));
         $records2 = onNext(100, $this->createColdObservable([
             onNext(50, 1),
@@ -183,8 +209,8 @@ public function observables_with_more_nested_inner_observables()
             ])),
         ]));
 
-        $this->assertTrue($records1->equals($records2));
         $this->assertMessages([$records1], [$records2]);
+        $this->assertTrue($records1->equals($records2));
     }
 
     /**
@@ -202,7 +228,7 @@ public function observables_with_difference_in_nested_inner_observables()
                     onNext(10, 5),
                     onNext(20, 6),
                 ])),
-            ])->delay(100)),
+            ])->delay(100, $this->scheduler)),
         ]));
         $records2 = onNext(100, $this->createColdObservable([
             onNext(50, 1),
@@ -217,6 +243,7 @@ public function observables_with_difference_in_nested_inner_observables()
             ])),
         ]));
 
+        $this->scheduler->start();
         $this->assertFalse($records1->equals($records2));
     }
 

test/helper-functions.php

@@ -5,6 +5,7 @@
 use Rx\Observable;
 use Rx\Testing\Recorded;
 use Rx\Testing\Subscription;
+use Rx\Functional\FunctionalTestCase;
 use Rx\Notification\OnCompletedNotification;
 use Rx\Notification\OnErrorNotification;
 use Rx\Notification\OnNextNotification;
@@ -19,7 +20,7 @@ function onNext(int $dueTime, $value, callable $comparer = null)
 {
     if ($value instanceof Observable) {
         try {
-            $notification = new OnNextObservableNotification($value);
+            $notification = new OnNextObservableNotification($value, FunctionalTestCase::getScheduler());
         } catch (Throwable $e) {
             $notification = new OnErrorNotification($e);
         }