* Merge master.

test/model/dev/getlinkparams.php

@@ -0,0 +1,27 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/dev.class.php';
+
+/**
+
+title=测试 devModel::getLinkParams();
+cid=1
+pid=1
+
+获取空数据         >> 0
+获取字符串类型信息 >> index
+获取数组类型信息   >> my
+
+*/
+
+global $tester;
+$tester->loadModel('dev');
+$links = array(
+    'empty'  => '',
+    'string' => '仪表盘|index|',
+    'array'  => array('link' => '地盘|my|index|')
+);
+r($tester->dev->getLinkParams($links['empty']))  && p()    && e('0');      //获取空数据
+r($tester->dev->getLinkParams($links['string'])) && p('1') && e('index'); //获取字符串类型信息
+r($tester->dev->getLinkParams($links['array']))  && p('1') && e('my');    //获取数组类型信息

test/model/dev/getmenuobject.php

@@ -0,0 +1,18 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/dev.class.php';
+
+/**
+
+title=测试 devModel::getMenuObject();
+cid=1
+pid=1
+
+获取菜单对象 >> my
+
+*/
+
+global $tester;
+$tester->loadModel('dev');
+r($tester->dev->getMenuObject('标题', 'my', 'index'))  && p('module') && e('my'); //获取菜单对象

test/model/dev/gettree.php

@@ -0,0 +1,29 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/dev.class.php';
+
+su('admin');
+
+/**
+
+title=测试 devModel::getTree();
+cid=1
+pid=1
+
+测试传入空值的情况 >> 0
+测试传入错误类型的情况 >> 0
+测试获取type=module模块树，并检查高亮情况 >> my,1
+测试获取type=table模块树，并检查高亮情况 >> my,1
+
+*/
+
+global $tester;
+$tester->loadModel('dev');
+
+$activeList = array('', 'index', 'zt_todo');
+$typeList   = array('', 'tree', 'module', 'table');
+r($tester->dev->getTree($activeList[0], $typeList[0])) && p() && e('0');                  // 测试传入空值的情况
+r($tester->dev->getTree($activeList[0], $typeList[1])) && p() && e('0');                  // 测试传入错误类型的情况
+r($tester->dev->getTree($activeList[1], $typeList[2])) && p('0:key,active') && e('my,1'); // 测试获取type=module模块树，并检查高亮情况
+r($tester->dev->getTree($activeList[2], $typeList[3])) && p('0:key,active') && e('my,1'); // 测试获取type=table模块树，并检查高亮情况

test/model/dev/sortmenus.php

@@ -13,14 +13,14 @@ cid=1
 pid=1
 
 检查传入空值时的情况 >> 0
-检查传入地盘导航顺序 >> index,calendar,work,audit,project,execution,contribute,dynamic,score,contacts,
+检查传入产品导航顺序 >> dashboard,story,plan,project,release,roadmap,track,doc,dynamic,settings,
 
 */
 
 global $tester;
 $menuList[0] = array();
-$menuList[1] = $tester->lang->my->menu;
+$menuList[1] = $tester->lang->product->menu;
 
 $devTester = new devTest();
 r($devTester->sortMenusTest($menuList[0])) && p() && e('0');                                                                              // 检查传入空值时的情况
-r($devTester->sortMenusTest($menuList[1])) && p() && e('index,calendar,work,audit,project,execution,contribute,dynamic,score,contacts,'); // 检查传入地盘导航顺序
+r($devTester->sortMenusTest($menuList[1])) && p() && e('dashboard,story,plan,project,release,roadmap,track,doc,dynamic,settings,'); // 检查传入产品导航顺序