From a7d71bead96c6735c0127645a1b8ca1cd69e8269 Mon Sep 17 00:00:00 2001 From: thinkphp Date: Sat, 30 Jul 2016 22:33:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=8D=95=E5=85=83=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/thinkphp/library/think/routeTest.php | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/tests/thinkphp/library/think/routeTest.php b/tests/thinkphp/library/think/routeTest.php index 41e9e9c4..00de439c 100644 --- a/tests/thinkphp/library/think/routeTest.php +++ b/tests/thinkphp/library/think/routeTest.php @@ -194,7 +194,7 @@ class routeTest extends \PHPUnit_Framework_TestCase $request = Request::create('http://subdomain.thinkphp.cn'); Route::domain('subdomain.thinkphp.cn', 'sub?abc=test&status=1'); Route::checkDomain($request); - $this->assertEquals('sub?abc=test&status=1', Route::rules('domain')['subdomain.thinkphp.cn'][0][0]); + $this->assertEquals('sub?abc=test&status=1', Route::rules('domain')['subdomain.thinkphp.cn'][0]); $this->assertEquals('sub', Route::getbind('module')); $this->assertEquals('test', $_GET['abc']); $this->assertEquals(1, $_GET['status']); @@ -203,14 +203,13 @@ class routeTest extends \PHPUnit_Framework_TestCase Route::checkDomain($request); $this->assertEquals('sub2', Route::getbind('module')); - /* - Route::domain('subdomain.thinkphp.cn', '\app\index\controller'); - Route::checkDomain($request); - $this->assertEquals('\app\index\controller', Route::getbind('namespace')); + Route::domain('subdomain.thinkphp.cn', '\app\index\controller'); + Route::checkDomain($request); + $this->assertEquals('\app\index\controller', Route::getbind('namespace')); - Route::domain('subdomain.thinkphp.cn', '@\app\index\controller\blog'); - Route::checkDomain($request); - $this->assertEquals('\app\index\controller\blog', Route::getbind('class'));*/ + Route::domain('subdomain.thinkphp.cn', '@\app\index\controller\blog'); + Route::checkDomain($request); + $this->assertEquals('\app\index\controller\blog', Route::getbind('class')); } }