Add functional tests for select

Author: asm89

lib/Rx/Observable/EmptyObservable.php

@@ -2,6 +2,8 @@
 
 namespace Rx\Observable;
 
+use Rx\Disposable\EmptyDisposable;
+
 class EmptyObservable extends BaseObservable
 {
     protected function doStart($scheduler)
@@ -13,5 +15,8 @@ protected function doStart($scheduler)
                 $observer->onCompleted();
             }
         });
+
+        //todo: add "real" disposable
+        return new EmptyDisposable();
     }
 }

lib/Rx/Observable/ThrowObservable.php

@@ -3,6 +3,7 @@
 namespace Rx\Observable;
 
 use Exception;
+use Rx\Disposable\EmptyDisposable;
 
 class ThrowObservable extends BaseObservable
 {
@@ -24,5 +25,8 @@ protected function doStart($scheduler)
                 $observer->onError($exception);
             }
         });
+
+        // todo: real disposable
+        return new EmptyDisposable();
     }
 }

test/Rx/Functional/FunctionalTestCase.php

@@ -6,15 +6,11 @@
 use Rx\Scheduler\VirtualTimeScheduler;
 use Rx\TestCase;
 use Rx\Testing\HotObservable;
-use Rx\Testing\Recorded;
 use Rx\Testing\Subscription;
-use Rx\Notification\OnCompletedNotification;
-use Rx\Notification\OnErrorNotification;
-use Rx\Notification\OnNextNotification;
+use Rx\Testing\TestScheduler;
 
 abstract class FunctionalTestCase extends TestCase
 {
-
     public function assertMessages(array $expected, array $recorded)
     {
         if (count($expected) !== count($recorded)) {
@@ -50,16 +46,9 @@ public function assertSubscription(HotObservable $observable, Subscription $expe
 
         $this->assertTrue(true); // success
     }
-}
-
-function onError($dueTime, $error) {
-    return new Recorded($dueTime, new OnErrorNotification($error));
-}
 
-function onNext($dueTime, $value) {
-    return new Recorded($dueTime, new OnNextNotification($value));
-}
-
-function onCompleted($dueTime) {
-    return new Recorded($dueTime, new OnCompletedNotification());
+    protected function createTestScheduler()
+    {
+        return new TestScheduler();
+    }
 }

test/Rx/Functional/Operator/SelectTest.php

@@ -0,0 +1,93 @@
+<?php
+
+namespace Rx\Functional\Operator;
+
+use Exception;
+use Rx\Functional\FunctionalTestCase;
+use Rx\Testing\HotObservable;
+use Rx\Testing\TestScheduler;
+use Rx\Observable\ReturnObservable;
+use Rx\Observable\EmptyObservable;
+use Rx\Observable\ThrowObservable;
+
+class SelectTest extends FunctionalTestCase
+{
+    /**
+     * @test
+     */
+    public function exception_thrown_in_callable_is_not_catched()
+    {
+        $observable = new ReturnObservable(1);
+
+        $called = false;
+        $observable->select(function() { throw new Exception(); })
+            ->subscribeCallback(function() {}, function($ex) use (&$called) { $called = true; });
+
+        $this->assertTrue($called);
+    }
+
+    /**
+     * @test
+     */
+    public function select_calls_on_completed()
+    {
+        $observable = new EmptyObservable();
+
+        $called = false;
+        $observable->select('RxIdentity')
+            ->subscribeCallback(function() {}, function() {}, function() use (&$called) { $called = true; });
+
+        $this->assertTrue($called);
+    }
+
+    /**
+     * @test
+     */
+    public function select_calls_on_error()
+    {
+        $observable = new ThrowObservable(new Exception);
+
+        $called = false;
+        $observable->select('RxIdentity')
+            ->subscribeCallback(function() {}, function() use (&$called) { $called = true; });
+
+        $this->assertTrue($called);
+    }
+
+    /**
+     * @test
+     * @expectedException InvalidArgumentException
+     */
+    public function select_expects_a_callable()
+    {
+        $observable = new ReturnObservable(1);
+        $observable->select(42);
+    }
+
+    /**
+     * @test
+     */
+    public function select_calls_selector()
+    {
+        $scheduler = $this->createTestScheduler();
+        $xs        = new HotObservable($scheduler, array(
+            onNext(100,  2),
+            onNext(300, 21),
+            onNext(500, 42),
+            onNext(800, 84),
+            onCompleted(820),
+        ));
+
+        $results = $scheduler->startWithCreate(function() use ($xs) {
+            return $xs->select(function($elem) { return $elem * 2; });
+        });
+
+        $this->assertMessages(array(
+            onNext(300,  42),
+            onNext(500,  84),
+            onNext(800, 168),
+            onCompleted(820),
+        ), $results->getMessages());
+
+    }
+}

test/Rx/Functional/WhereOperatorTest.php renamed to test/Rx/Functional/Operator/WhereTest.php

@@ -1,15 +1,13 @@
 <?php
 
-namespace Rx\Functional;
+namespace Rx\Functional\Operator;
 
 use Exception;
-use Rx\TestCase;
+use Rx\Functional\FunctionalTestCase;
 use Rx\Testing\HotObservable;
-use Rx\Testing\Recorded;
-use Rx\Testing\Subscription;
 use Rx\Testing\TestScheduler;
 
-class WhereOperatorTest extends FunctionalTestCase
+class WhereTest extends FunctionalTestCase
 {
     /**
      * @test
@@ -83,9 +81,4 @@ protected function createHotObservableWithData($scheduler)
             onCompleted(820),
         ));
     }
-
-    protected function createTestScheduler()
-    {
-        return new TestScheduler();
-    }
 }

test/bootstrap.php

@@ -12,6 +12,8 @@
 if (file_exists($file = __DIR__.'/../vendor/autoload.php')) {
     $loader = require_once $file;
     $loader->add('Rx', __DIR__);
+    require_once __DIR__ . '/helper-functions.php';
 } else {
     throw new RuntimeException('Install dependencies to run test suite.');
 }
+

test/helper-functions.php

@@ -0,0 +1,22 @@
+<?php
+
+use Rx\Testing\Recorded;
+use Rx\Notification\OnCompletedNotification;
+use Rx\Notification\OnErrorNotification;
+use Rx\Notification\OnNextNotification;
+
+function onError($dueTime, $error) {
+    return new Recorded($dueTime, new OnErrorNotification($error));
+}
+
+function onNext($dueTime, $value) {
+    return new Recorded($dueTime, new OnNextNotification($value));
+}
+
+function onCompleted($dueTime) {
+    return new Recorded($dueTime, new OnCompletedNotification());
+}
+
+function RxIdentity($x) {
+    return $x;
+}