Improved test coverage

Author: tyler-sommer

phpunit.xml.dist

@@ -23,6 +23,7 @@
                 <file>./src/DependencyInjection/ExtendableInterface.php</file>
                 <file>./src/Router/DispatcherFactoryInterface.php</file>
                 <file>./src/Router/RouteCollectorInterface.php</file>
+                <file>./src/Router/RouteMapperInterface.php</file>
                 <file>./src/DependencyInjection/ContainerInitializerInterface.php</file>
                 <file>./src/Security/AuthenticatorInterface.php</file>
                 <file>./src/Router/NamedDataGeneratorInterface.php</file>

src/Router/UrlGenerator/SimpleUrlGenerator.php

@@ -70,7 +70,15 @@ public function generate($name, array $parameters = array(), $absolute = false)
             }
         }
 
-        return ($this->request ? (($absolute ? $this->request->getSchemeAndHttpHost() : '').$this->request->getBaseUrl()) : '').$path;
+        if ($this->request) {
+            $path = $this->request->getBaseUrl().$path;
+
+            if ($absolute) {
+                $path = $this->request->getSchemeAndHttpHost().$path;
+            }
+        }
+
+        return $path;
     }
 
     /**

tests/Router/RouterSubscriberTest.php

@@ -63,6 +63,22 @@ public function testMethodNotAllowed()
         $subscriber->onKernelRequest($event);
     }
 
+    /**
+     * Test a Request that already has a _controller
+     */
+    public function testRequestAlreadyResolved()
+    {
+        $subscriber = $this->getSubscriber();
+        $request = Request::create('/', 'POST');
+        $request->attributes->set('_controller', 'handler0');
+
+        $event = $this->getEvent($request);
+
+        $subscriber->onKernelRequest($event);
+
+        $this->assertEquals('handler0', $request->attributes->get('_controller'));
+    }
+
     /**
      * Test not found
      */

tests/Router/UrlGenerator/SimpleUrlGeneratorTest.php

@@ -0,0 +1,104 @@
+<?php
+
+/*
+ * Copyright (c) Tyler Sommer
+ *
+ * For the full copyright and license information, please view the LICENSE file
+ * that was distributed with this source code.
+ */
+
+namespace Nice\Tests\Router\UrlGenerator;
+
+use Nice\Router\UrlGenerator\SimpleUrlGenerator;
+use Symfony\Component\HttpFoundation\Request;
+
+class SimpleUrlGeneratorTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * Test basic functionality
+     */
+    public function testFunctionality()
+    {
+        $generator = $this->getGenerator();
+
+        $this->assertEquals('/', $generator->generate('home'));
+    }
+
+    /**
+     * Test base URL functionality
+     */
+    public function testBaseUrl()
+    {
+        $generator = $this->getGenerator();
+
+        $request = Request::create('https://www.example.com/subdirectory/somepage', 'GET', array(), array(), array(), array(
+            'SCRIPT_FILENAME' => 'index.php',
+            'PHP_SELF' => '/subdirectory/index.php'
+        ));
+        $generator->setRequest($request);
+
+        $this->assertEquals('/subdirectory/', $generator->generate('home'));
+    }
+
+    /**
+     * Test absolute URL functionality
+     */
+    public function testAbsoluteUrl()
+    {
+        $generator = $this->getGenerator();
+
+        $request = Request::create('https://www.example.com/subdirectory/somepage', 'GET', array(), array(), array(), array(
+            'SCRIPT_FILENAME' => 'index.php',
+            'PHP_SELF' => '/subdirectory/index.php'
+        ));
+        $generator->setRequest($request);
+
+        $this->assertEquals('https://www.example.com/subdirectory/', $generator->generate('home', array(), true));
+    }
+
+    /**
+     * Test a dynamic route
+     */
+    public function testDynamicRoute()
+    {
+        $generator = $this->getGenerator(array(
+            'user_edit' => array(
+                'params' => array(
+                    'id'
+                ),
+                'path' => '/user/{id}/edit'
+            )
+        ));
+
+        $this->assertEquals('/user/123/edit', $generator->generate('user_edit', array('id' => 123)));
+    }
+
+    /**
+     * Test a dynamic route with a missing parameter
+     */
+    public function testDynamicRouteWithMissingParameter()
+    {
+        $generator = $this->getGenerator(array(
+            'user_edit' => array(
+                'params' => array(
+                    'id'
+                ),
+                'path' => '/user/{id}/edit'
+            )
+        ));
+
+        $this->setExpectedException('RuntimeException', 'Missing required parameter');
+
+        $this->assertEquals('/user/123/edit', $generator->generate('user_edit'));
+    }
+
+    private function getGenerator(array $routes = array('home' => '/'))
+    {
+        $dataGenerator = $this->getMockForAbstractClass('Nice\Router\UrlGenerator\DataGeneratorInterface');
+        $dataGenerator->expects($this->once())
+            ->method('getData')
+            ->will($this->returnValue($routes));
+
+        return new SimpleUrlGenerator($dataGenerator);
+    }
+}