* Modify unit test of caselib.

test/class/caselib.class.php

@@ -7,23 +7,6 @@ class caselibTest
          $this->objectModel = $tester->loadModel('caselib');
     }
 
-    /**
-     * Set lib menu test.
-     * 
-     * @param mixed $libraries 
-     * @param mixed $libID 
-     * @access public
-     * @return void
-     */
-    public function setLibMenuTest($libraries, $libID)
-    {
-        $objects = $this->objectModel->setLibMenu($libraries, $libID);
-
-        if(dao::isError()) return dao::getError();
-
-        return $objects;
-    }
-
     /**
      * Save lib state test.
      *
@@ -168,43 +151,6 @@ class caselibTest
         return $objects;
     }
 
-    /**
-     * Build searchform test.
-     * 
-     * @param mixed $libID 
-     * @param mixed $libraries 
-     * @param mixed $queryID 
-     * @param mixed $actionURL 
-     * @access public
-     * @return void
-     */
-    public function buildSearchFormTest($libID, $libraries, $queryID, $actionURL)
-    {
-        $objects = $this->objectModel->buildSearchForm($libID, $libraries, $queryID, $actionURL);
-
-        if(dao::isError()) return dao::getError();
-
-        return $objects;
-    }
-
-    /**
-     * Get liblink test.
-     * 
-     * @param mixed $module 
-     * @param mixed $method 
-     * @param mixed $extra 
-     * @access public
-     * @return void
-     */
-    public function getLibLinkTest($module, $method, $extra)
-    {
-        $objects = $this->objectModel->getLibLink($module, $method, $extra);
-
-        if(dao::isError()) return dao::getError();
-
-        return $objects;
-    }
-
     /**
      * Create from import test.
      *

test/model/caselib/batchcreatecase.php

@@ -34,7 +34,7 @@ $total = $tester->dao->select('count(*) total')->from(TABLE_CASE)->where( 'lib')
 $cases = $tester->dao->select('*')->from(TABLE_CASE)->where( 'lib')->eq(201)->fetchAll('id');
 
 r($total) && p()                 && e('12');                        // 添加两条数据之后查询数据条数是否正确
-r($cases) && p('411:title,type') && e('测试导入添加1,performance'); // 添加数据之后查询新加用例的名称,用例类型
+r($cases) && p('561:title,type') && e('测试导入添加1,performance'); // 添加数据之后查询新加用例的名称,用例类型
-r($cases) && p('412:title,type') && e('测试导入添加2,unit');        // 添加数据之后查询新加用例的名称,用例类型
+r($cases) && p('562:title,type') && e('测试导入添加2,unit');        // 添加数据之后查询新加用例的名称,用例类型
 
 $db->restoreDB();

test/model/caselib/buildsearchform.php

@@ -1,28 +0,0 @@
-#!/usr/bin/env php
-<?php
-include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
-include dirname(dirname(dirname(__FILE__))) . '/class/caselib.class.php';
-su('admin');
-
-/**
-
-title=测试 caselibModel->buildSearchForm();
-cid=1
-pid=1
-
-测试设置的url参数 >> model/caselib/buildsearchform.php?m=caselib&f=browse&t=&libID=201&browseType=bySearch&queryID=myQueryID
-测试设置的queryID值是否正确 >> 10
-
-*/
-
-$caselib   = new caselibTest();
-$libID     = 201;
-$queryID   = 10;
-$actionURL = helper::createLink('caselib', 'browse', "libID=$libID&browseType=bySearch&queryID=myQueryID");
-$libs      = $tester->loadModel('caselib')->getLibraries();
-
-$caselib->buildSearchFormTest($libID, $libs, $queryID, $actionURL);
-$search = $tester->config->testcase->search;
-
-r($search) && p('actionURL') && e('model/caselib/buildsearchform.php?m=caselib&f=browse&t=&libID=201&browseType=bySearch&queryID=myQueryID'); //测试设置的url参数
-r($search) && p('queryID')   && e('10'); //测试设置的queryID值是否正确

test/model/caselib/createfromimport.php

@@ -26,8 +26,10 @@ $_POST = array(
         'type'         => array(2 => 'performance',   3 => 'unit'),
         'stage'        => array(2 => array(),         3 => array()),
         'keywords'     => array(2 => 'keywords1',     3 => 'keywords2'),
+        'status'       => array(2 => '',              3 => ''),
+        'desc'         => array(2 => array(),         3 => array()),
         'precondition' => array(2 => '',              3 => ''),
-        'isEndPage'    => 1,
+        'isEndPage'    => 0,
         'pagerID'      => 1
 );
 
@@ -37,7 +39,7 @@ $total = $tester->dao->select('count(*) total')->from(TABLE_CASE)->where( 'lib')
 $cases = $tester->dao->select('*')->from(TABLE_CASE)->where( 'lib')->eq(201)->fetchAll('id');
 
 r($total) && p()                     && e('12');                      //添加两条数据之后查询数据条数是否正确
-r($cases) && p('411:title,keywords') && e('测试导入添加1,keywords1'); //添加数据之后查询新加用例的名称，关键字
+r($cases) && p('561:title,keywords') && e('测试导入添加1,keywords1'); //添加数据之后查询新加用例的名称，关键字
-r($cases) && p('412:title,keywords') && e('测试导入添加2,keywords2'); //添加数据之后查询新加用例的名称，关键字
+r($cases) && p('562:title,keywords') && e('测试导入添加2,keywords2'); //添加数据之后查询新加用例的名称，关键字
 
 $db->restoreDB();

test/model/caselib/getliblink.php

@@ -1,29 +0,0 @@
-#!/usr/bin/env php
-<?php
-include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
-include dirname(dirname(dirname(__FILE__))) . '/class/caselib.class.php';
-su('admin');
-
-/**
-
-title=测试 caselibModel->getLibLink();
-cid=1
-pid=1
-
-测试参数情况1返回值 >> model/caselib/getliblink.php?m=caselib&f=browse&t=&libID=%s
-测试参数情况2返回值 >> model/caselib/getliblink.php?m=caselib&f=test&t=&libID=%s
-测试参数情况3返回值 >> model/caselib/getliblink.php?m=tree&f=&t=&libID=%s&type=caselib&currentModuleID=0
-测试参数情况4返回值 >> model/caselib/getliblink.php?m=caselib&f=browse&t=&libID=%s
-
-*/
-
-$caselib = new caselibTest();
-$link1   = $caselib->getLibLinkTest('caselib', 'create', '');
-$link2   = $caselib->getLibLinkTest('caselib', 'test', '');
-$link3   = $caselib->getLibLinkTest('tree', '', '');
-$link4   = $caselib->getLibLinkTest('', '', '');
-
-r($link1) && p() && e('model/caselib/getliblink.php?m=caselib&f=browse&t=&libID=%s');                       // 测试参数情况1返回值
-r($link2) && p() && e('model/caselib/getliblink.php?m=caselib&f=test&t=&libID=%s');                         // 测试参数情况2返回值
-r($link3) && p() && e('model/caselib/getliblink.php?m=tree&f=&t=&libID=%s&type=caselib&currentModuleID=0'); // 测试参数情况3返回值
-r($link4) && p() && e('model/caselib/getliblink.php?m=caselib&f=browse&t=&libID=%s');                       // 测试参数情况4返回值

test/model/caselib/setlibmenu.php

@@ -1,25 +0,0 @@
-#!/usr/bin/env php
-<?php
-include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
-include dirname(dirname(dirname(__FILE__))) . '/class/caselib.class.php';
-su('admin');
-
-/**
-
-title=测试 caselibModel->setLibMenu();
-cid=1
-pid=1
-
-修改下拉菜单之后返回值 >> 1
-
-*/
-
-$caselib         = new caselibTest();
-$libs            = $tester->loadModel('caselib')->getLibraries();
-$config->webRoot = 'model/caselib/';//ztest运行时候获取的不一致
-$info            = $caselib->setLibMenuTest($libs, 201);
-
-$menuStr = <<<EOT
-<div class='btn-group header-btn' id='swapper'><button data-toggle='dropdown' type='button' class='btn' id='currentItem' title='这是测试套件名称201'><span class='text'>这是测试套件名称201</span> <span class='caret' style='margin-top: 3px'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='model/caselib/setlibmenu.php?m=caselib&f=ajaxGetDropMenu&t=&objectID=201&module=caselib&method=browse'><div class="input-control search-box has-icon-left has-icon-right search-example"><input type="search" class="form-control search-input" /><label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label><a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a></div></div></div>
-EOT;
-r($tester->lang->switcherMenu == trim($menuStr)) && p() && e('1'); //修改下拉菜单之后返回值