mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-07 23:22:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

修正单元测试错误

Browse Source
This commit is contained in:
thinkphp
2016-02-02 15:29:03 +08:00
parent 8ec6835dca
commit 27cc3d524a
4 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
library/think/template/taglib/Cx.php
View File

@@ -76,11 +76,11 @@ class Cx extends Taglib
*/ */
public function _volist($tag, $content) public function _volist($tag, $content)
{ {
$name = $tag['name']; $name = $tag['name'];
$id = $tag['id']; $id = $tag['id'];
$empty = isset($tag['empty']) ? $tag['empty'] : ''; $empty = isset($tag['empty']) ? $tag['empty'] : '';
$key = !empty($tag['key']) ? $tag['key'] : 'i'; $key = !empty($tag['key']) ? $tag['key'] : 'i';
$mod = isset($tag['mod']) ? $tag['mod'] : '2'; $mod = isset($tag['mod']) ? $tag['mod'] : '2';
$offset = !empty($tag['offset']) && is_numeric($tag['offset']) ? intval($tag['offset']) : 0; $offset = !empty($tag['offset']) && is_numeric($tag['offset']) ? intval($tag['offset']) : 0;
$length = !empty($tag['length']) && is_numeric($tag['length']) ? intval($tag['length']) : 'null'; $length = !empty($tag['length']) && is_numeric($tag['length']) ? intval($tag['length']) : 'null';
// 允许使用函数设定数据集 <volist name=":fun('arg')" id="vo">{$vo.name}</volist> // 允许使用函数设定数据集 <volist name=":fun('arg')" id="vo">{$vo.name}</volist>
@@ -96,7 +96,7 @@ class Cx extends Taglib
$parseStr .= 'if(is_array(' . $name . ')): $' . $key . ' = 0;'; $parseStr .= 'if(is_array(' . $name . ')): $' . $key . ' = 0;';
// 设置了输出数组长度 // 设置了输出数组长度
if (0 != $offset || 'null' != $length) { if (0 != $offset || 'null' != $length) {
$parseStr .= '$__LIST__ = array_slice(' . $name . ',' . $offset . ',' . $length . ', true); '; $parseStr .= '$__LIST__ = array_slice(' . $name . ',' . $offset . ',' . $length . ', true); ';
} else { } else {
$parseStr .= ' $__LIST__ = ' . $name . ';'; $parseStr .= ' $__LIST__ = ' . $name . ';';
} }
@@ -566,7 +566,7 @@ class Cx extends Taglib
} else { } else {
// 命名空间导入模式 默认是js // 命名空间导入模式 默认是js
$type = $type ? $type : (!empty($tag['type']) ? strtolower($tag['type']) : 'js'); $type = $type ? $type : (!empty($tag['type']) ? strtolower($tag['type']) : 'js');
$basepath = !empty($tag['basepath']) ? $tag['basepath'] : __ROOT__ . '/Public'; $basepath = !empty($tag['basepath']) ? $tag['basepath'] : '/Public';
// 命名空间方式导入外部文件 // 命名空间方式导入外部文件
$array = explode(',', $file); $array = explode(',', $file);
foreach ($array as $val) { foreach ($array as $val) {

8
tests/thinkphp/library/think/debugTest.php
View File

@@ -49,7 +49,7 @@ class debugTest extends \PHPUnit_Framework_TestCase
*/ */
public function testRemark() public function testRemark()
{ {
$name = "testremarkkey"; $name = "testremarkkey";
\think\Debug::remark($name); \think\Debug::remark($name);
} }
@@ -166,11 +166,11 @@ class debugTest extends \PHPUnit_Framework_TestCase
$var = array(); $var = array();
$var["key"] = "val"; $var["key"] = "val";
$output = \think\Debug::dump($var, false, $label = "label"); $output = \think\Debug::dump($var, false, $label = "label");
$array = explode("array", json_encode($output));
if (IS_WIN) { if (IS_WIN) {
$this->assertEquals("(1) {\\n 'key' =>\\n string(3) \\\"val\\\"\\n}\\n\\r\\n\"", end(explode("array", json_encode($output)))); $this->assertEquals("(1) {\\n 'key' =>\\n string(3) \\\"val\\\"\\n}\\n\\r\\n\"", end($array));
} else { } else {
$this->assertEquals("(1) {\\n 'key' =>\\n string(3) \\\"val\\\"\\n}\\n\\n\"", end(explode("array", json_encode($output)))); $this->assertEquals("(1) {\\n 'key' =>\\n string(3) \\\"val\\\"\\n}\\n\\n\"", end($array));
} }
} }
} }

2
tests/thinkphp/library/think/inputTest.php
View File

@@ -157,7 +157,7 @@ class inputTest extends \PHPUnit_Framework_TestCase
//session_start(); //session_start();
$_SESSION['test'] = 'session value '; $_SESSION['test'] = 'session value ';
$this->assertEquals('session value', Input::session('test')); $this->assertEquals('session value', Input::session('test'));
session_destroy(); //session_destroy();
$_COOKIE['cookie'] = 'cookie value '; $_COOKIE['cookie'] = 'cookie value ';
$this->assertEquals('cookie value', Input::cookie('cookie')); $this->assertEquals('cookie value', Input::cookie('cookie'));

74
tests/thinkphp/library/think/template/taglib/cxTest.php
View File

@@ -29,7 +29,7 @@ class templateTest extends \PHPUnit_Framework_TestCase
$content = <<<EOF $content = <<<EOF
{php}echo \$a;{/php} {php}echo \$a;{/php}
EOF; EOF;
$data = <<<EOF $data = <<<EOF
<?php echo \$a; ?> <?php echo \$a; ?>
EOF; EOF;
$cx->parseTag($content); $cx->parseTag($content);
@@ -46,7 +46,7 @@ EOF;
{/volist} {/volist}
EOF; EOF;
$data = <<<EOF $data = <<<EOF
<?php if(is_array(\$list)): \$key = 0; \$__LIST__ = \$list;if( count(\$__LIST__)==0 ) : echo "" ;else: foreach(\$__LIST__ as \$key=>\$vo): \$mod = (\$key % 2 );++\$key;?> <?php if(is_array(\$list)): \$key = 0; \$__LIST__ = \$list;if( count(\$__LIST__)==0 ) : echo "" ;else: foreach(\$__LIST__ as \$key=>\$vo): \$mod = (\$key % 2 );++\$key;?>
<?php endforeach; endif; else: echo "" ;endif; ?> <?php endforeach; endif; else: echo "" ;endif; ?>
@@ -60,7 +60,7 @@ EOF;
{/volist} {/volist}
EOF; EOF;
$template->fetch($content, ['list' => [1,2,3,4,5]]); $template->fetch($content, ['list' => [1, 2, 3, 4, 5]]);
$this->expectOutputString('234'); $this->expectOutputString('234');
} }
@@ -74,7 +74,7 @@ EOF;
{/foreach} {/foreach}
EOF; EOF;
$data = <<<EOF $data = <<<EOF
<?php foreach(\$list as \$key=>\$val): ?> <?php foreach(\$list as \$key=>\$val): ?>
<?php endforeach; ?> <?php endforeach; ?>
@@ -87,7 +87,7 @@ EOF;
{/foreach} {/foreach}
EOF; EOF;
$data = <<<EOF $data = <<<EOF
<?php if(is_array(\$list)): foreach(\$list as \$key=>\$val): ?> <?php if(is_array(\$list)): foreach(\$list as \$key=>\$val): ?>
<?php endforeach; endif; ?><?php if(empty(\$list)): echo '"empty'; endif; ?> <?php endforeach; endif; ?><?php if(empty(\$list)): echo '"empty'; endif; ?>
@@ -118,7 +118,7 @@ two
default default
{/if} {/if}
EOF; EOF;
$data = <<<EOF $data = <<<EOF
<?php if(\$var['a']==\$var['b']): ?> <?php if(\$var['a']==\$var['b']): ?>
one one
<?php elseif(!empty(\$var['a'])): ?> <?php elseif(!empty(\$var['a'])): ?>
@@ -151,7 +151,7 @@ d
default default
{/switch} {/switch}
EOF; EOF;
$data = <<<EOF $data = <<<EOF
<?php switch(\$var): ?> <?php switch(\$var): ?>
<?php case \$a: ?> <?php case \$a: ?>
a a
@@ -180,7 +180,7 @@ EOF;
default default
{/eq} {/eq}
EOF; EOF;
$data = <<<EOF $data = <<<EOF
<?php if(\$var['a'] == \$var['b']): ?> <?php if(\$var['a'] == \$var['b']): ?>
default default
<?php endif; ?> <?php endif; ?>
@@ -193,7 +193,7 @@ EOF;
default default
{/equal} {/equal}
EOF; EOF;
$data = <<<EOF $data = <<<EOF
<?php if(\$var['a'] == '0'): ?> <?php if(\$var['a'] == '0'): ?>
default default
<?php endif; ?> <?php endif; ?>
@@ -206,7 +206,7 @@ EOF;
default default
{/neq} {/neq}
EOF; EOF;
$data = <<<EOF $data = <<<EOF
<?php if(\$var['a'] != '0'): ?> <?php if(\$var['a'] != '0'): ?>
default default
<?php endif; ?> <?php endif; ?>
@@ -219,7 +219,7 @@ EOF;
default default
{/notequal} {/notequal}
EOF; EOF;
$data = <<<EOF $data = <<<EOF
<?php if(\$var['a'] != '0'): ?> <?php if(\$var['a'] != '0'): ?>
default default
<?php endif; ?> <?php endif; ?>
@@ -232,7 +232,7 @@ EOF;
default default
{/gt} {/gt}
EOF; EOF;
$data = <<<EOF $data = <<<EOF
<?php if(\$var['a'] > '0'): ?> <?php if(\$var['a'] > '0'): ?>
default default
<?php endif; ?> <?php endif; ?>
@@ -245,7 +245,7 @@ EOF;
default default
{/egt} {/egt}
EOF; EOF;
$data = <<<EOF $data = <<<EOF
<?php if(\$var['a'] >= '0'): ?> <?php if(\$var['a'] >= '0'): ?>
default default
<?php endif; ?> <?php endif; ?>
@@ -258,7 +258,7 @@ EOF;
default default
{/lt} {/lt}
EOF; EOF;
$data = <<<EOF $data = <<<EOF
<?php if(\$var['a'] < '0'): ?> <?php if(\$var['a'] < '0'): ?>
default default
<?php endif; ?> <?php endif; ?>
@@ -271,7 +271,7 @@ EOF;
default default
{/elt} {/elt}
EOF; EOF;
$data = <<<EOF $data = <<<EOF
<?php if(\$var['a'] <= '0'): ?> <?php if(\$var['a'] <= '0'): ?>
default default
<?php endif; ?> <?php endif; ?>
@@ -284,7 +284,7 @@ EOF;
default default
{/heq} {/heq}
EOF; EOF;
$data = <<<EOF $data = <<<EOF
<?php if(\$var['a'] === '0'): ?> <?php if(\$var['a'] === '0'): ?>
default default
<?php endif; ?> <?php endif; ?>
@@ -297,7 +297,7 @@ EOF;
default default
{/nheq} {/nheq}
EOF; EOF;
$data = <<<EOF $data = <<<EOF
<?php if(\$var['a'] !== '0'): ?> <?php if(\$var['a'] !== '0'): ?>
default default
<?php endif; ?> <?php endif; ?>
@@ -317,7 +317,7 @@ EOF;
default default
{/in} {/in}
EOF; EOF;
$data = <<<EOF $data = <<<EOF
<?php if(in_array((\$var), is_array(\$value)?\$value:explode(',',\$value))): ?> <?php if(in_array((\$var), is_array(\$value)?\$value:explode(',',\$value))): ?>
default default
<?php endif; ?> <?php endif; ?>
@@ -330,7 +330,7 @@ EOF;
default default
{/notin} {/notin}
EOF; EOF;
$data = <<<EOF $data = <<<EOF
<?php if(!in_array((\$var), explode(',',"1,2,3"))): ?> <?php if(!in_array((\$var), explode(',',"1,2,3"))): ?>
default default
<?php endif; ?> <?php endif; ?>
@@ -356,7 +356,7 @@ EOF;
default default
{/present} {/present}
EOF; EOF;
$data = <<<EOF $data = <<<EOF
<?php if(isset(\$var)): ?> <?php if(isset(\$var)): ?>
default default
<?php endif; ?> <?php endif; ?>
@@ -369,7 +369,7 @@ EOF;
default default
{/notpresent} {/notpresent}
EOF; EOF;
$data = <<<EOF $data = <<<EOF
<?php if(!isset(\$var)): ?> <?php if(!isset(\$var)): ?>
default default
<?php endif; ?> <?php endif; ?>
@@ -388,7 +388,7 @@ EOF;
default default
{/empty} {/empty}
EOF; EOF;
$data = <<<EOF $data = <<<EOF
<?php if(empty(\$var)): ?> <?php if(empty(\$var)): ?>
default default
<?php endif; ?> <?php endif; ?>
@@ -401,7 +401,7 @@ EOF;
default default
{/notempty} {/notempty}
EOF; EOF;
$data = <<<EOF $data = <<<EOF
<?php if(!empty(\$var)): ?> <?php if(!empty(\$var)): ?>
default default
<?php endif; ?> <?php endif; ?>
@@ -420,7 +420,7 @@ EOF;
default default
{/defined} {/defined}
EOF; EOF;
$data = <<<EOF $data = <<<EOF
<?php if(defined("URL")): ?> <?php if(defined("URL")): ?>
default default
<?php endif; ?> <?php endif; ?>
@@ -433,7 +433,7 @@ EOF;
default default
{/notdefined} {/notdefined}
EOF; EOF;
$data = <<<EOF $data = <<<EOF
<?php if(!defined("URL")): ?> <?php if(!defined("URL")): ?>
default default
<?php endif; ?> <?php endif; ?>
@@ -450,8 +450,8 @@ EOF;
$content = <<<EOF $content = <<<EOF
{import file="base?ver=1.0" value="\$name.a" /} {import file="base?ver=1.0" value="\$name.a" /}
EOF; EOF;
$data = <<<EOF $data = <<<EOF
<?php if(isset(\$name['a'])): ?><script type="text/javascript" src="__ROOT__/Public/base.js?ver=1.0"></script><?php endif; ?> <?php if(isset(\$name['a'])): ?><script type="text/javascript" src="/Public/base.js?ver=1.0"></script><?php endif; ?>
EOF; EOF;
$cx->parseTag($content); $cx->parseTag($content);
$this->assertEquals($content, $data); $this->assertEquals($content, $data);
@@ -459,8 +459,8 @@ EOF;
$content = <<<EOF $content = <<<EOF
{import file="base" type="css" /} {import file="base" type="css" /}
EOF; EOF;
$data = <<<EOF $data = <<<EOF
<link rel="stylesheet" type="text/css" href="__ROOT__/Public/base.css" /> <link rel="stylesheet" type="text/css" href="/Public/base.css" />
EOF; EOF;
$cx->parseTag($content); $cx->parseTag($content);
$this->assertEquals($content, $data); $this->assertEquals($content, $data);
@@ -468,7 +468,7 @@ EOF;
$content = <<<EOF $content = <<<EOF
{import file="base,common" type="php" /} {import file="base,common" type="php" /}
EOF; EOF;
$data = <<<EOF $data = <<<EOF
<?php import("base"); ?><?php import("common"); ?> <?php import("base"); ?><?php import("common"); ?>
EOF; EOF;
$cx->parseTag($content); $cx->parseTag($content);
@@ -477,7 +477,7 @@ EOF;
$content = <<<EOF $content = <<<EOF
{load file="base.php" value="\$name.a" /} {load file="base.php" value="\$name.a" /}
EOF; EOF;
$data = <<<EOF $data = <<<EOF
<?php if(isset(\$name['a'])): ?><?php require_cache("base.php"); ?><?php endif; ?> <?php if(isset(\$name['a'])): ?><?php require_cache("base.php"); ?><?php endif; ?>
EOF; EOF;
$cx->parseTag($content); $cx->parseTag($content);
@@ -486,7 +486,7 @@ EOF;
$content = <<<EOF $content = <<<EOF
{js file="base.js" /} {js file="base.js" /}
EOF; EOF;
$data = <<<EOF $data = <<<EOF
<script type="text/javascript" src="base.js"></script> <script type="text/javascript" src="base.js"></script>
EOF; EOF;
$cx->parseTag($content); $cx->parseTag($content);
@@ -495,7 +495,7 @@ EOF;
$content = <<<EOF $content = <<<EOF
{css file="base.css" /} {css file="base.css" /}
EOF; EOF;
$data = <<<EOF $data = <<<EOF
<link rel="stylesheet" type="text/css" href="base.css" /> <link rel="stylesheet" type="text/css" href="base.css" />
EOF; EOF;
$cx->parseTag($content); $cx->parseTag($content);
@@ -510,7 +510,7 @@ EOF;
$content = <<<EOF $content = <<<EOF
{assign name="total" value="0" /} {assign name="total" value="0" /}
EOF; EOF;
$data = <<<EOF $data = <<<EOF
<?php \$total = '0'; ?> <?php \$total = '0'; ?>
EOF; EOF;
$cx->parseTag($content); $cx->parseTag($content);
@@ -519,7 +519,7 @@ EOF;
$content = <<<EOF $content = <<<EOF
{assign name="total" value=":count(\$list)" /} {assign name="total" value=":count(\$list)" /}
EOF; EOF;
$data = <<<EOF $data = <<<EOF
<?php \$total = count(\$list); ?> <?php \$total = count(\$list); ?>
EOF; EOF;
$cx->parseTag($content); $cx->parseTag($content);
@@ -534,7 +534,7 @@ EOF;
$content = <<<EOF $content = <<<EOF
{define name="INFO_NAME" value="test" /} {define name="INFO_NAME" value="test" /}
EOF; EOF;
$data = <<<EOF $data = <<<EOF
<?php define('INFO_NAME', 'test'); ?> <?php define('INFO_NAME', 'test'); ?>
EOF; EOF;
$cx->parseTag($content); $cx->parseTag($content);
@@ -543,7 +543,7 @@ EOF;
$content = <<<EOF $content = <<<EOF
{define name="INFO_NAME" value="\$name" /} {define name="INFO_NAME" value="\$name" /}
EOF; EOF;
$data = <<<EOF $data = <<<EOF
<?php define('INFO_NAME', \$name); ?> <?php define('INFO_NAME', \$name); ?>
EOF; EOF;
$cx->parseTag($content); $cx->parseTag($content);