2 files changed, 97 insertions, 0 deletions

diff --git a/tests/units/RouterTest.php b/tests/units/RouterTest.php
new file mode 100644
index 00000000..e4582121
--- /dev/null
+++ b/tests/units/RouterTest.php
@@ -0,0 +1,79 @@
+<?php
+
+require_once __DIR__.'/Base.php';
+
+use Core\Router;
+
+class RouterTest extends Base
+{
+    public function testSanitize()
+    {
+        $r = new Router($this->container);
+
+        $this->assertEquals('plop', $r->sanitize('PloP', 'default'));
+        $this->assertEquals('default', $r->sanitize('', 'default'));
+        $this->assertEquals('default', $r->sanitize('123-AB', 'default'));
+        $this->assertEquals('default', $r->sanitize('R&D', 'default'));
+        $this->assertEquals('default', $r->sanitize('Test123', 'default'));
+    }
+
+    public function testPath()
+    {
+        $r = new Router($this->container);
+
+        $this->assertEquals('a/b/c', $r->getPath('/a/b/c'));
+        $this->assertEquals('a/b/something', $r->getPath('/a/b/something?test=a', 'test=a'));
+
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+        $_SERVER['PHP_SELF'] = '/a/index.php';
+
+        $this->assertEquals('b/c', $r->getPath('/a/b/c'));
+        $this->assertEquals('b/c', $r->getPath('/a/b/c?e=f', 'e=f'));
+    }
+
+    public function testFindRouteWithEmptyTable()
+    {
+        $r = new Router($this->container);
+        $this->assertEquals(array('app', 'index'), $r->findRoute(''));
+        $this->assertEquals(array('app', 'index'), $r->findRoute('/'));
+    }
+
+    public function testFindRouteWithoutPlaceholders()
+    {
+        $r = new Router($this->container);
+        $r->addRoute('a/b', 'controller', 'action');
+        $this->assertEquals(array('app', 'index'), $r->findRoute('a/b/c'));
+        $this->assertEquals(array('controller', 'action'), $r->findRoute('a/b'));
+    }
+
+    public function testFindRouteWithPlaceholders()
+    {
+        $r = new Router($this->container);
+        $r->addRoute('a/:myvar1/b/:myvar2', 'controller', 'action');
+        $this->assertEquals(array('app', 'index'), $r->findRoute('a/123/b'));
+        $this->assertEquals(array('controller', 'action'), $r->findRoute('a/456/b/789'));
+        $this->assertEquals(array('myvar1' => 456, 'myvar2' => 789), $_GET);
+    }
+
+    public function testFindMultipleRoutes()
+    {
+        $r = new Router($this->container);
+        $r->addRoute('a/b', 'controller1', 'action1');
+        $r->addRoute('a/b', 'duplicate', 'duplicate');
+        $r->addRoute('a', 'controller2', 'action2');
+        $this->assertEquals(array('controller1', 'action1'), $r->findRoute('a/b'));
+        $this->assertEquals(array('controller2', 'action2'), $r->findRoute('a'));
+    }
+
+    public function testFindUrl()
+    {
+        $r = new Router($this->container);
+        $r->addRoute('a/b', 'controller1', 'action1');
+        $r->addRoute('a/:myvar1/b/:myvar2', 'controller2', 'action2', array('myvar1', 'myvar2'));
+
+        $this->assertEquals('a/1/b/2', $r->findUrl('controller2', 'action2', array('myvar1' => 1, 'myvar2' => 2)));
+        $this->assertEquals('', $r->findUrl('controller2', 'action2', array('myvar1' => 1)));
+        $this->assertEquals('a/b', $r->findUrl('controller1', 'action1'));
+        $this->assertEquals('', $r->findUrl('controller1', 'action2'));
+    }
+}
diff --git a/tests/units/UrlHelperTest.php b/tests/units/UrlHelperTest.php
index 3ef3402a..ebfe9c99 100644
--- a/tests/units/UrlHelperTest.php
+++ b/tests/units/UrlHelperTest.php
@@ -34,6 +34,22 @@ class UrlHelperTest extends Base
         );
     }
 
+    public function testDir()
+    {
+        $h = new Url($this->container);
+        $this->assertEquals('', $h->dir());
+
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+        $_SERVER['PHP_SELF'] = '/plop/index.php';
+        $h = new Url($this->container);
+        $this->assertEquals('/plop/', $h->dir());
+
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+        $_SERVER['PHP_SELF'] = '';
+        $h = new Url($this->container);
+        $this->assertEquals('/', $h->dir());
+    }
+
     public function testServer()
     {
         $h = new Url($this->container);
@@ -57,11 +73,13 @@ class UrlHelperTest extends Base
         $_SERVER['SERVER_NAME'] = 'kb';
         $_SERVER['SERVER_PORT'] = 1234;
 
+        $h = new Url($this->container);
         $this->assertEquals('http://kb:1234/', $h->base());
 
         $c = new Config($this->container);
         $c->save(array('application_url' => 'https://mykanboard/'));
 
+        $h = new Url($this->container);
         $this->assertEquals('https://mykanboard/', $c->get('application_url'));
         $this->assertEquals('https://mykanboard/', $h->base());
     }