More unit tests for *By* routine.

Author: Augusto Pascutti

library/Respect/Rest/Routines/AbstractRoutine.php

@@ -20,4 +20,9 @@ public function __construct($callback)
         $this->callback = $callback;
     }
 
+    protected function getCallback()
+    {
+        return $this->callback;
+    }
+
 }

library/Respect/Rest/Routines/AbstractSyncedRoutine.php

@@ -21,10 +21,11 @@ public function getParameters()
     /** Returns a concrete ReflectionFunctionAbstract for this routine callback */
     protected function getReflection()
     {
-        if (is_array($this->callback))
-            return new ReflectionMethod($this->callback[0], $this->callback[1]);
+        $callback = $this->getCallback();
+        if (is_array($callback))
+            return new ReflectionMethod($callback[0], $callback[1]);
         else
-            return new ReflectionFunction($this->callback);
+            return new ReflectionFunction($callback);
     }
 
 }

tests/legacy/Respect/Rest/Routines/AbstractSyncedRoutineTest.php

@@ -5,8 +5,6 @@
  * @covers Respect\Rest\Routines\ParamSynced
  * @author Nick Lombard <github@jigsoft.co.za>
  */
-use \ReflectionParameterr;
-
 class AbstractSyncedRoutineTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -37,7 +35,7 @@ protected function tearDown()
     }
 
     /**
-     * @covers Respect\Rest\Routines\AbstractSyncedRoutine::getParameters
+     * @covers Respect\Rest\Routines\AbstractSyncedRoutine
      */
     public function testGetParameters()
     {
@@ -48,4 +46,56 @@ public function testGetParameters()
         $this->assertEquals('blogId', $parameters[1]->name);
         $this->assertInstanceOf('ReflectionParameter', $parameters[0]);
     }
+
+    /**
+     * @covers Respect\Rest\Routines\AbstractSyncedRoutine
+     * @covers Respect\Rest\Routines\AbstractRoutine
+     */
+    public function test_getParameters_with_an_array()
+    {
+        $class    = 'Respect\Rest\Routines\AbstractSyncedRoutine';
+        $callback = array('DateTime', 'createFromFormat');
+        $stub     = $this->getMockBuilder($class)
+                         ->setMethods(array('getCallback'))
+                         ->disableOriginalConstructor()
+                         ->getMock();
+        $stub->expects($this->once())
+             ->method('getCallback')
+             ->will($this->returnValue($callback));
+
+        $this->assertContainsOnlyInstancesOf(
+            $expected = 'ReflectionParameter',
+            $result   = $stub->getParameters()
+        );
+        $this->assertCount(
+            $expected = 3,
+            $result
+        );
+    }
+
+    /**
+     * @covers Respect\Rest\Routines\AbstractSyncedRoutine
+     * @covers Respect\Rest\Routines\AbstractRoutine
+     */
+    public function test_getParameters_with_function()
+    {
+        $class    = 'Respect\Rest\Routines\AbstractSyncedRoutine';
+        $callback = function($name) { return 'Hello '.$name; };
+        $stub     = $this->getMockBuilder($class)
+                         ->setMethods(array('getCallback'))
+                         ->disableOriginalConstructor()
+                         ->getMock();
+        $stub->expects($this->once())
+             ->method('getCallback')
+             ->will($this->returnValue($callback));
+
+        $this->assertContainsOnlyInstancesOf(
+            $expected = 'ReflectionParameter',
+            $result   = $stub->getParameters()
+        );
+        $this->assertCount(
+            $expected = 1,
+            $result
+        );
+    }
 }

tests/legacy/Respect/Rest/Routines/ByTest.php

@@ -1,19 +1,15 @@
 <?php
 namespace Respect\Rest\Routines;
 
-use Respect\Rest\Request;
+use Respect\Rest\Request,
+    Respect\Rest\Router;
 
 /**
  * @covers Respect\Rest\Routines\By
  * @author Nick Lombard <github@jigsoft.co.za>
  */
 class ByTest extends \PHPUnit_Framework_TestCase
 {
-    /**
-     * @var By
-     */
-    protected $object;
-
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
@@ -37,12 +33,26 @@ protected function tearDown()
     /**
      * @covers Respect\Rest\Routines\By::by
      */
-    public function testBy()
+    public function test_by_with_an_anonymous_function()
+    {
+        $request = new Request();
+        $params  = array();
+        $routine = new By(function() { return 'from by callback'; });
+        $this->assertEquals('from by callback', $routine->by($request, $params));
+    }
+
+    /**
+     * @covers Respect\Rest\Routines\By
+     */
+    public function test_by_on_a_route()
     {
-        $request = @new Request();
-        $params = array();
-        $alias = &$this->object;
-        $this->assertEquals('from by callback',
-                $alias->by($request, $params));
+        $router = new Router();
+        $router->get('/', function() { return 'route'; })
+               ->by(function() { return 'by'; });
+        // By does not affect the output of the route.
+        $this->assertEquals(
+            $expected = 'route',
+            (string) $router->dispatch('GET', '/')
+        );
     }
 }