From 90f286a116c1e84b47151965514db76e19bade89 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Fri, 8 Jul 2016 16:31:21 +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, 3 insertions(+), 12 deletions(-)

diff --git a/tests/thinkphp/library/think/routeTest.php b/tests/thinkphp/library/think/routeTest.php
index a7f116c3..34926993 100644
--- a/tests/thinkphp/library/think/routeTest.php
+++ b/tests/thinkphp/library/think/routeTest.php
@@ -39,7 +39,7 @@ class routeTest extends \PHPUnit_Framework_TestCase
         Route::any('user/:id', 'index/user');
         $result = Route::check($request, 'hello/thinkphp');
         $this->assertEquals([null, 'index', 'hello'], $result['module']);
-        $this->assertEquals(['hello/:name' => ['hello/:name', 'index/hello', ['name' => 1], [], []]], Route::getRules('GET'));
+        $this->assertEquals(['hello' => true, 'user/:id' => true, 'hello/:name' => ['rule' => 'hello/:name', 'route' => 'index/hello', 'var' => ['name' => 1], 'option' => [], 'pattern' => []]], Route::rules('GET'));
         Route::rule('type/:name', 'index/type', 'PUT|POST');
     }
 
@@ -78,15 +78,6 @@ class routeTest extends \PHPUnit_Framework_TestCase
 
     }
 
-    public function testRouteMap()
-    {
-        $request = Request::instance();
-        Route::map('hello', 'index/hello');
-        $this->assertEquals('index/hello', Route::map('hello'));
-        $result = Route::check($request, 'hello');
-        $this->assertEquals([null, 'index', 'hello'], $result['module']);
-    }
-
     public function testMixVar()
     {
         $request = Request::instance();
@@ -137,7 +128,7 @@ class routeTest extends \PHPUnit_Framework_TestCase
         Route::group('group', [':id' => 'index/hello', ':name' => 'index/say']);
         $this->assertEquals(false, Route::check($request, 'empty/think'));
         $result = Route::check($request, 'group/think');
-        $this->assertEquals([null, 'index', 'say'], $result['module']);
+        $this->assertEquals(false, $result['module']);
         $result = Route::check($request, 'group/10');
         $this->assertEquals([null, 'index', 'hello'], $result['module']);
         $result = Route::check($request, 'group/thinkphp');
@@ -203,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::domain('subdomain.thinkphp.cn'));
+        $this->assertEquals('sub?abc=test&status=1', Route::rules('domain')['subdomain.thinkphp.cn']);
         $this->assertEquals('sub', Route::getbind('module'));
         $this->assertEquals('test', $_GET['abc']);
         $this->assertEquals(1, $_GET['status']);