(try to) fix unit tests

[php-libraries/Router.git] / tests / src / PHPRouterTest / RouterTest.php

diff --git a/tests/src/PHPRouterTest/RouterTest.php b/tests/src/PHPRouterTest/RouterTest.php
index 7263ff3..1852d6c 100644 (file)
--- a/tests/src/PHPRouterTest/RouterTest.php
+++ b/tests/src/PHPRouterTest/RouterTest.php
@@ -34,13 +34,15 @@ class RouterTest extends PHPUnit_Framework_TestCase
      */
     public function testMatch($router, $path, $expected)
     {
-        self::assertEquals($expected, (bool)$router->match($path));
+        $result = $router->match($path);
+
+        $this->assertEquals($expected, $result);
     }
 
     public function testMatchWrongMethod()
     {
         $router = $this->getRouter();
-        self::assertFalse($router->match('/users', 'POST'));
+        $this->assertFalse($router->match('/users', 'POST'));
     }
 
     public function testBasePathConfigIsSettedProperly()
@@ -48,14 +50,14 @@ class RouterTest extends PHPUnit_Framework_TestCase
         $router = new Router(new RouteCollection);
         $router->setBasePath('/webroot/');
 
-        self::assertAttributeEquals('/webroot', 'basePath', $router);
+        $this->assertAttributeEquals('/webroot', 'basePath', $router);
     }
 
     public function testMatchRouterUsingBasePath()
     {
         $collection = new RouteCollection();
         $collection->attach(new Route('/users/', array(
-            '_controller' => 'PHPRouter\Test\SomeController::usersCreate',
+            '_controller' => '\PHPRouter\Test\Fixtures\SomeController::usersCreate',
             'methods' => 'GET'
         )));
 
@@ -64,7 +66,7 @@ class RouterTest extends PHPUnit_Framework_TestCase
 
         foreach ($this->serverProvider() as $server) {
             $_SERVER = $server;
-            self::assertTrue((bool)$router->matchCurrentRequest());
+            $this->assertTrue((bool)$router->matchCurrentRequest());
         }
     }
 
@@ -90,7 +92,7 @@ class RouterTest extends PHPUnit_Framework_TestCase
         $route = new Route(
             '/page/:page_id',
             array(
-                '_controller' => 'PHPRouter\Test\SomeController::page',
+                '_controller' => '\PHPRouter\Test\Fixtures\SomeController::page',
                 'methods' => 'GET'
             )
         );
@@ -98,7 +100,7 @@ class RouterTest extends PHPUnit_Framework_TestCase
         $collection->attachRoute($route);
 
         $router = new Router($collection);
-        self::assertEquals(
+        $this->assertEquals(
             array(array('page_id' => 'MySuperPage')),
             $router->match('/page/MySuperPage')->getParameters()
         );
@@ -110,7 +112,7 @@ class RouterTest extends PHPUnit_Framework_TestCase
         $route = new Route(
             '/js/:filename.js',
             array(
-                '_controller' => 'PHPRouter\Test\SomeController::dynamicFilterUrlMatch',
+                '_controller' => '\PHPRouter\Test\Fixtures\SomeController::dynamicFilterUrlMatch',
                 'methods' => 'GET',
             )
         );
@@ -118,17 +120,17 @@ class RouterTest extends PHPUnit_Framework_TestCase
         $collection->attachRoute($route);
 
         $router = new Router($collection);
-        self::assertEquals(
+        $this->assertEquals(
             array(array('filename' => 'someJsFile')),
             $router->match('/js/someJsFile.js')->getParameters()
         );
 
-        self::assertEquals(
+        $this->assertEquals(
             array(array('filename' => 'someJsFile.min')),
             $router->match('/js/someJsFile.min.js')->getParameters()
         );
 
-        self::assertEquals(
+        $this->assertEquals(
             array(array('filename' => 'someJsFile.min.js')),
             $router->match('/js/someJsFile.min.js.js')->getParameters()
         );
@@ -138,14 +140,14 @@ class RouterTest extends PHPUnit_Framework_TestCase
     {
         $config = Config::loadFromFile(__DIR__ . '/../../Fixtures/router.yaml');
         $router = Router::parseConfig($config);
-        self::assertAttributeEquals($config['base_path'], 'basePath', $router);
+        $this->assertAttributeEquals($config['base_path'], 'basePath', $router);
     }
 
     public function testGenerate()
     {
         $router = $this->getRouter();
-        self::assertSame('/users/', $router->generate('users'));
-        self::assertSame('/user/123', $router->generate('user', array('id' => 123)));
+        $this->assertSame('/users/', $router->generate('users'));
+        $this->assertSame('/user/123', $router->generate('user', array('id' => 123)));
     }
 
     /**
@@ -154,7 +156,7 @@ class RouterTest extends PHPUnit_Framework_TestCase
     public function testGenerateNotExistent()
     {
         $router = $this->getRouter();
-        self::assertSame('/notExists/', $router->generate('notThisRoute'));
+        $this->assertSame('/notExists/', $router->generate('notThisRoute'));
     }
 
     /**
@@ -164,17 +166,17 @@ class RouterTest extends PHPUnit_Framework_TestCase
     {
         $collection = new RouteCollection();
         $collection->attachRoute(new Route('/users/', array(
-            '_controller' => 'PHPRouter\Test\SomeController::usersCreate',
+            '_controller' => '\PHPRouter\Test\Fixtures\SomeController::usersCreate',
             'methods' => 'GET',
             'name' => 'users'
         )));
         $collection->attachRoute(new Route('/user/:id', array(
-            '_controller' => 'PHPRouter\Test\SomeController::user',
+            '_controller' => '\PHPRouter\Test\Fixtures\SomeController::user',
             'methods' => 'GET',
             'name' => 'user'
         )));
         $collection->attachRoute(new Route('/', array(
-            '_controller' => 'PHPRouter\Test\SomeController::indexAction',
+            '_controller' => '\PHPRouter\Test\Fixtures\SomeController::indexAction',
             'methods' => 'GET',
             'name' => 'index'
         )));
@@ -194,6 +196,7 @@ class RouterTest extends PHPUnit_Framework_TestCase
             array($router, '/', true),
             array($router, '/aaa', false),
             array($router, '/users', true),
+            array($router, '/usersssss', false),
             array($router, '/user/1', true),
             array($router, '/user/%E3%81%82', true),
         );
@@ -217,6 +220,7 @@ class RouterTest extends PHPUnit_Framework_TestCase
             array($router, '/api', true),
             array($router, '/api/aaa', false),
             array($router, '/api/users', true),
+            array($router, '/api/userssss', false),
             array($router, '/api/user/1', true),
             array($router, '/api/user/%E3%81%82', true),
         );