修正单元测试

This commit is contained in:
thinkphp
2016-05-11 12:55:56 +08:00
parent f83632cb7f
commit fce80eb623

View File

@@ -95,8 +95,8 @@ class routeTest extends \PHPUnit_Framework_TestCase
Route::get('hello/:name', 'index/hello');
Route::get('blog/:id', 'blog/read', [], ['id' => '\d+']);
$this->assertEquals(false, Route::check('test/thinkphp'));
$this->assertEquals(false, Route::check('blog/thinkphp'));
$this->assertEquals(false, Route::check(Request::instance(), 'test/thinkphp'));
$this->assertEquals(false, Route::check(Request::instance(), 'blog/thinkphp'));
$this->assertEquals(['type' => 'module', 'module' => [null, 'blog', 'read']], Route::check(Request::instance(), 'blog/5'));
$this->assertEquals(['type' => 'module', 'module' => [null, 'index', 'hello']], Route::check(Request::instance(), 'hello/thinkphp/abc/test'));
}
@@ -105,7 +105,7 @@ class routeTest extends \PHPUnit_Framework_TestCase
{
Route::pattern(['id' => '\d+', 'name' => '\w{6,25}']);
Route::group('group', [':id' => 'index/hello', ':name' => 'index/say']);
$this->assertEquals(false, Route::check('empty/think'));
$this->assertEquals(false, Route::check(Request::instance(), 'empty/think'));
$this->assertEquals(['type' => 'module', 'module' => [null, 'index', 'say']], Route::check(Request::instance(), 'group/think'));
$this->assertEquals(['type' => 'module', 'module' => [null, 'index', 'hello']], Route::check(Request::instance(), 'group/10'));
$this->assertEquals(['type' => 'module', 'module' => [null, 'index', 'say']], Route::check(Request::instance(), 'group/thinkphp'));
@@ -115,8 +115,8 @@ class routeTest extends \PHPUnit_Framework_TestCase
{
Route::get('hello/:name', 'index/hello');
Route::get('blog/:id', 'blog/read', [], ['id' => '\d+']);
$this->assertEquals(false, Route::check('test/thinkphp'));
$this->assertEquals(false, Route::check('blog/thinkphp'));
$this->assertEquals(false, Route::check(Request::instance(), 'test/thinkphp'));
$this->assertEquals(false, Route::check(Request::instance(), 'blog/thinkphp'));
$this->assertEquals(['type' => 'module', 'module' => [null, 'index', 'hello']], Route::check(Request::instance(), 'hello/thinkphp'));
$this->assertEquals(['type' => 'module', 'module' => [null, 'blog', 'read']], Route::check(Request::instance(), 'blog/5'));
}