mirrors
/
flight-core
mirror of https://github.com/flightphp/core
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changed PHPUnit references. Added new tests for router.

Browse Source
pull/25/head
Mike Cao 12 years ago
parent 61ce37ca64
commit ae32c228d1
11 changed files with 46 additions and 24 deletions
Show Stats Download Patch File Download Diff File

2
tests/AutoloadTest.php
Unescape View File

@ -6,7 +6,7 @@
* @license http://www.opensource.org/licenses/mit-license.php * @license http://www.opensource.org/licenses/mit-license.php
*/ */
require_once 'PHPUnit.php'; require_once 'PHPUnit/Autoload.php';
require_once __DIR__.'/../flight/Flight.php'; require_once __DIR__.'/../flight/Flight.php';
class AutoloadTest extends PHPUnit_Framework_TestCase class AutoloadTest extends PHPUnit_Framework_TestCase

2
tests/DispatcherTest.php
Unescape View File

@ -6,7 +6,7 @@
* @license http://www.opensource.org/licenses/mit-license.php * @license http://www.opensource.org/licenses/mit-license.php
*/ */
require_once 'PHPUnit.php'; require_once 'PHPUnit/Autoload.php';
require_once __DIR__.'/../flight/core/Dispatcher.php'; require_once __DIR__.'/../flight/core/Dispatcher.php';
require_once __DIR__.'/classes/Hello.php'; require_once __DIR__.'/classes/Hello.php';

2
tests/FilterTest.php
Unescape View File

@ -6,7 +6,7 @@
* @license http://www.opensource.org/licenses/mit-license.php * @license http://www.opensource.org/licenses/mit-license.php
*/ */
require_once 'PHPUnit.php'; require_once 'PHPUnit/Autoload.php';
require_once __DIR__.'/../flight/Flight.php'; require_once __DIR__.'/../flight/Flight.php';
class FilterTest extends PHPUnit_Framework_TestCase class FilterTest extends PHPUnit_Framework_TestCase

2
tests/LoaderTest.php
Unescape View File

@ -6,7 +6,7 @@
* @license http://www.opensource.org/licenses/mit-license.php * @license http://www.opensource.org/licenses/mit-license.php
*/ */
require_once 'PHPUnit.php'; require_once 'PHPUnit/Autoload.php';
require_once __DIR__.'/../flight/core/Loader.php'; require_once __DIR__.'/../flight/core/Loader.php';
class LoaderTest extends PHPUnit_Framework_TestCase class LoaderTest extends PHPUnit_Framework_TestCase

2
tests/MapTest.php
Unescape View File

@ -6,7 +6,7 @@
* @license http://www.opensource.org/licenses/mit-license.php * @license http://www.opensource.org/licenses/mit-license.php
*/ */
require_once 'PHPUnit.php'; require_once 'PHPUnit/Autoload.php';
require_once __DIR__.'/../flight/Flight.php'; require_once __DIR__.'/../flight/Flight.php';
require_once __DIR__.'/classes/Hello.php'; require_once __DIR__.'/classes/Hello.php';

2
tests/RegisterTest.php
Unescape View File

@ -6,7 +6,7 @@
* @license http://www.opensource.org/licenses/mit-license.php * @license http://www.opensource.org/licenses/mit-license.php
*/ */
require_once 'PHPUnit.php'; require_once 'PHPUnit/Autoload.php';
require_once __DIR__.'/../flight/Flight.php'; require_once __DIR__.'/../flight/Flight.php';
class RegisterTest extends PHPUnit_Framework_TestCase class RegisterTest extends PHPUnit_Framework_TestCase

4
tests/RenderTest.php
Unescape View File

@ -6,7 +6,7 @@
* @license http://www.opensource.org/licenses/mit-license.php * @license http://www.opensource.org/licenses/mit-license.php
*/ */
require_once 'PHPUnit.php'; require_once 'PHPUnit/Autoload.php';
require_once __DIR__.'/../flight/Flight.php'; require_once __DIR__.'/../flight/Flight.php';
class RenderTest extends PHPUnit_Framework_TestCase class RenderTest extends PHPUnit_Framework_TestCase
@ -26,7 +26,7 @@ class RenderTest extends PHPUnit_Framework_TestCase
// Renders a view into a layout // Renders a view into a layout
function testRenderLayout(){ function testRenderLayout(){
Flight::render('hello', array('name' => 'Bob'), 'content'); Flight::render('hello', array('name' => 'Bob'), 'content');
Flight::render('layout'); Flight::render('layouts/layout');
$this->expectOutputString('<html>Hello, Bob!</html>'); $this->expectOutputString('<html>Hello, Bob!</html>');
} }

46
tests/RouterTest.php
Unescape View File

@ -6,7 +6,7 @@
* @license http://www.opensource.org/licenses/mit-license.php * @license http://www.opensource.org/licenses/mit-license.php
*/ */
require_once 'PHPUnit.php'; require_once 'PHPUnit/Autoload.php';
require_once __DIR__.'/../flight/net/Router.php'; require_once __DIR__.'/../flight/net/Router.php';
require_once __DIR__.'/../flight/net/Request.php'; require_once __DIR__.'/../flight/net/Request.php';
@ -23,11 +23,15 @@ class RouterTest extends PHPUnit_Framework_TestCase
private $request; private $request;
function setUp(){ function setUp(){
Flight::init();
$this->router = new \flight\net\Router(); $this->router = new \flight\net\Router();
$this->request = new \flight\net\Request(); $this->request = new \flight\net\Request();
} }
// Simple output
function ok(){
echo 'OK';
}
// Checks if a route was matched // Checks if a route was matched
function check($str = 'OK'){ function check($str = 'OK'){
$callback = $this->router->route($this->request); $callback = $this->router->route($this->request);
@ -42,7 +46,7 @@ class RouterTest extends PHPUnit_Framework_TestCase
// Default route // Default route
function testDefaultRoute(){ function testDefaultRoute(){
$this->router->map('/', 'ok'); $this->router->map('/', array($this, 'ok'));
$this->request->url = '/'; $this->request->url = '/';
$this->check(); $this->check();
@ -50,7 +54,7 @@ class RouterTest extends PHPUnit_Framework_TestCase
// Simple path // Simple path
function testPathRoute() { function testPathRoute() {
$this->router->map('/path', 'ok'); $this->router->map('/path', array($this, 'ok'));
$this->request->url = '/path'; $this->request->url = '/path';
$this->check(); $this->check();
@ -58,7 +62,7 @@ class RouterTest extends PHPUnit_Framework_TestCase
// POST route // POST route
function testPostRoute(){ function testPostRoute(){
$this->router->map('POST /', 'ok'); $this->router->map('POST /', array($this, 'ok'));
$this->request->url = '/'; $this->request->url = '/';
$this->request->method = 'POST'; $this->request->method = 'POST';
@ -67,7 +71,7 @@ class RouterTest extends PHPUnit_Framework_TestCase
// Either GET or POST route // Either GET or POST route
function testGetPostRoute(){ function testGetPostRoute(){
$this->router->map('GET|POST /', 'ok'); $this->router->map('GET|POST /', array($this, 'ok'));
$this->request->url = '/'; $this->request->url = '/';
$this->request->method = 'GET'; $this->request->method = 'GET';
@ -76,7 +80,7 @@ class RouterTest extends PHPUnit_Framework_TestCase
// Test regular expression matching // Test regular expression matching
function testRegEx(){ function testRegEx(){
$this->router->map('/num/[0-9]+', 'ok'); $this->router->map('/num/[0-9]+', array($this, 'ok'));
$this->request->url = '/num/1234'; $this->request->url = '/num/1234';
$this->check(); $this->check();
@ -114,15 +118,33 @@ class RouterTest extends PHPUnit_Framework_TestCase
$this->check('2000,,'); $this->check('2000,,');
} }
// Regex in optional parameters
function testRegexOptionalParameters(){
$this->router->map('/@controller/@method(/@id:[0-9]+)', function($controller, $method, $id){
echo "$controller,$method,$id";
});
$this->request->url = '/user/delete/123';
$this->check('user,delete,123');
}
// Regex in optional parameters
function testRegexEmptyOptionalParameters(){
$this->router->map('/@controller/@method(/@id:[0-9]+)', function($controller, $method, $id){
echo "$controller,$method,$id";
});
$this->request->url = '/user/delete/';
$this->check('user,delete,');
}
// Wildcard matching // Wildcard matching
function testWildcard(){ function testWildcard(){
$this->router->map('/account/*', 'ok'); $this->router->map('/account/*', array($this, 'ok'));
$this->request->url = '/account/123/abc/xyz'; $this->request->url = '/account/123/abc/xyz';
$this->check(); $this->check();
} }
} }
function ok(){
echo 'OK';
}

2
tests/VariableTest.php
Unescape View File

@ -6,7 +6,7 @@
* @license http://www.opensource.org/licenses/mit-license.php * @license http://www.opensource.org/licenses/mit-license.php
*/ */
require_once 'PHPUnit.php'; require_once 'PHPUnit/Autoload.php';
require_once __DIR__.'/../flight/Flight.php'; require_once __DIR__.'/../flight/Flight.php';
class VariableTest extends PHPUnit_Framework_TestCase class VariableTest extends PHPUnit_Framework_TestCase

6
tests/ViewTest.php
Unescape View File

@ -6,7 +6,7 @@
* @license http://www.opensource.org/licenses/mit-license.php * @license http://www.opensource.org/licenses/mit-license.php
*/ */
require_once 'PHPUnit.php'; require_once 'PHPUnit/Autoload.php';
require_once __DIR__.'/../flight/template/View.php'; require_once __DIR__.'/../flight/template/View.php';
class ViewTest extends PHPUnit_Framework_TestCase class ViewTest extends PHPUnit_Framework_TestCase
@ -30,9 +30,9 @@ class ViewTest extends PHPUnit_Framework_TestCase
$this->assertTrue($this->view->has('test')); $this->assertTrue($this->view->has('test'));
$this->assertTrue(!$this->view->has('unknown')); $this->assertTrue(!$this->view->has('unknown'));
$this->view->clear('tests'); $this->view->clear('test');
$this->assertEquals(null, $this->view->get('tess')); $this->assertEquals(null, $this->view->get('test'));
} }
// Check if template files exist // Check if template files exist

0
tests/views/layout.php → tests/views/layouts/layout.php
Unescape View File

Write Preview
Loading…
Cancel
Save