From 7d76daa8a6a105353169f12add3be4b37469249e Mon Sep 17 00:00:00 2001 From: Haotong Lin Date: Fri, 4 Mar 2016 12:01:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84view=E5=8D=95=E5=85=83?= =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/thinkphp/library/think/viewTest.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/thinkphp/library/think/viewTest.php b/tests/thinkphp/library/think/viewTest.php index 9ebcd906..efb377f3 100644 --- a/tests/thinkphp/library/think/viewTest.php +++ b/tests/thinkphp/library/think/viewTest.php @@ -124,7 +124,12 @@ class viewTest extends \PHPUnit_Framework_TestCase $view_instance = \think\View::instance(); $method = new \ReflectionMethod('\think\View', 'ParseTemplate'); $method->setAccessible(true); - $this->assertEquals(DS . 'theme_name' . DS . 'template_name.html', $method->invoke($view_instance, 'template_name')); + if (defined('CONTROLLER_NAME')) { + $expect_data = DS . 'theme_name' . DS . CONTROLLER_NAME . DS . 'template_name.html'; + } else { + $expect_data = DS . 'theme_name' . DS . 'template_name.html'; + } + $this->assertEquals($expect_data, $method->invoke($view_instance, 'template_name')); } /**