单元测试调整

This commit is contained in:
thinkphp
2016-09-09 18:32:00 +08:00
parent f52a7bf978
commit f8dfd9278b

View File

@@ -227,7 +227,7 @@ class routeTest extends \PHPUnit_Framework_TestCase
{ {
$request = Request::instance(); $request = Request::instance();
Route::get('say/:name', '@app\index\controller\index\hello'); Route::get('say/:name', '@app\index\controller\index\hello');
$this->assertEquals(['type' => 'controller', 'controller' => 'app\index\controller\index\hello', 'params' => ['name' => 'thinkphp']], Route::check($request, 'say/thinkphp')); $this->assertEquals(['type' => 'controller', 'controller' => 'app\index\controller\index\hello'], Route::check($request, 'say/thinkphp'));
} }
public function testRouteToMethod() public function testRouteToMethod()
@@ -235,8 +235,8 @@ class routeTest extends \PHPUnit_Framework_TestCase
$request = Request::instance(); $request = Request::instance();
Route::get('user/:name', '\app\index\service\User::get', [], ['name' => '\w+']); Route::get('user/:name', '\app\index\service\User::get', [], ['name' => '\w+']);
Route::get('info/:name', '\app\index\model\Info@getInfo', [], ['name' => '\w+']); Route::get('info/:name', '\app\index\model\Info@getInfo', [], ['name' => '\w+']);
$this->assertEquals(['type' => 'method', 'method' => '\app\index\service\User::get', 'params' => ['name' => 'thinkphp']], Route::check($request, 'user/thinkphp')); $this->assertEquals(['type' => 'method', 'method' => '\app\index\service\User::get'], Route::check($request, 'user/thinkphp'));
$this->assertEquals(['type' => 'method', 'method' => ['\app\index\model\Info', 'getInfo'], 'params' => ['name' => 'thinkphp']], Route::check($request, 'info/thinkphp')); $this->assertEquals(['type' => 'method', 'method' => ['\app\index\model\Info', 'getInfo']], Route::check($request, 'info/thinkphp'));
} }
public function testRouteToRedirect() public function testRouteToRedirect()
@@ -255,10 +255,10 @@ class routeTest extends \PHPUnit_Framework_TestCase
$this->assertEquals(['index', 'blog', 'read'], $result['module']); $this->assertEquals(['index', 'blog', 'read'], $result['module']);
Route::bind('\app\index\controller', 'namespace'); Route::bind('\app\index\controller', 'namespace');
$this->assertEquals(['type' => 'method', 'method' => ['\app\index\controller\blog', 'read'], 'params' => []], Route::check($request, 'blog/read')); $this->assertEquals(['type' => 'method', 'method' => ['\app\index\controller\blog', 'read']], Route::check($request, 'blog/read'));
Route::bind('\app\index\controller\blog', 'class'); Route::bind('\app\index\controller\blog', 'class');
$this->assertEquals(['type' => 'method', 'method' => ['\app\index\controller\blog', 'read'], 'params' => []], Route::check($request, 'read')); $this->assertEquals(['type' => 'method', 'method' => ['\app\index\controller\blog', 'read']], Route::check($request, 'read'));
} }
public function testDomain() public function testDomain()