Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Refactor testcaseModel::forceNotReview, and modify its unit test.

Browse Source
This commit is contained in:
liumengyi
2023-09-13 08:59:29 +08:00
parent bff2b9ec76
commit ab8757fe03
3 changed files with 43 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testcase/model.php
+7 -3
View File
@@ -1617,19 +1617,23 @@ class testcaseModel extends model
}
/**
* 检查是否不需要评审。
* Check whether force not review.
*
* @access public
* @return bool
*/
public function forceNotReview()
public function forceNotReview(): bool
{
if(empty($this->config->testcase->needReview))
if(!$this->config->testcase->needReview)
{
if(!isset($this->config->testcase->forceReview)) return true;
if(strpos(",{$this->config->testcase->forceReview},", ",{$this->app->user->account},") === false) return true;
}
if($this->config->testcase->needReview && isset($this->config->testcase->forceNotReview) && strpos(",{$this->config->testcase->forceNotReview},", ",{$this->app->user->account},") !== false) return true;
elseif(isset($this->config->testcase->forceNotReview) && strpos(",{$this->config->testcase->forceNotReview},", ",{$this->app->user->account},") !== false)
{
return true;
}
return false;
}
module/testcase/test/model/forcenotreview.php
+26 -4
View File
@@ -2,7 +2,10 @@
<?php
include dirname(__FILE__, 5) . '/test/lib/init.php';
include dirname(__FILE__, 2) . '/testcase.class.php';
su('admin');
zdTable('user')->gen('10');
su('user1');
/**
@@ -10,10 +13,29 @@ title=测试 testcaseModel->forceNotReview();
cid=1
pid=1
测试检查是否强制审核 >> 1
*/
$testcase = new testcaseTest();
r($testcase->forceNotReviewTest()) && p() && e('1'); // 测试检查是否强制审核
$needReviewList = array(true, false);
$forceReviewList = array(false, 'user1,user2', '');
$forceNotReviewList = array(false, 'user1,user2', '');
r($testcase->forceNotReviewTest($needReviewList[0], $forceReviewList[0], $forceNotReviewList[0])) && p() && e('2'); // 测试检查needReview true forceReviewList false forceNotReviewList false 时是否强制审核
r($testcase->forceNotReviewTest($needReviewList[0], $forceReviewList[0], $forceNotReviewList[1])) && p() && e('1'); // 测试检查needReview true forceReviewList false forceNotReviewList user1,user2 时是否强制审核
r($testcase->forceNotReviewTest($needReviewList[0], $forceReviewList[0], $forceNotReviewList[2])) && p() && e('2'); // 测试检查needReview true forceReviewList false forceNotReviewList '' 时是否强制审核
r($testcase->forceNotReviewTest($needReviewList[0], $forceReviewList[1], $forceNotReviewList[0])) && p() && e('2'); // 测试检查needReview true forceReviewList user1,user2 forceNotReviewList false 时是否强制审核
r($testcase->forceNotReviewTest($needReviewList[0], $forceReviewList[1], $forceNotReviewList[1])) && p() && e('1'); // 测试检查needReview true forceReviewList user1,user2 forceNotReviewList user1,user2 时是否强制审核
r($testcase->forceNotReviewTest($needReviewList[0], $forceReviewList[1], $forceNotReviewList[2])) && p() && e('2'); // 测试检查needReview true forceReviewList user1,user2 forceNotReviewList '' 时是否强制审核
r($testcase->forceNotReviewTest($needReviewList[0], $forceReviewList[2], $forceNotReviewList[0])) && p() && e('2'); // 测试检查needReview true forceReviewList '' forceNotReviewList false 时是否强制审核
r($testcase->forceNotReviewTest($needReviewList[0], $forceReviewList[2], $forceNotReviewList[1])) && p() && e('1'); // 测试检查needReview true forceReviewList '' forceNotReviewList user1,user2 时是否强制审核
r($testcase->forceNotReviewTest($needReviewList[0], $forceReviewList[2], $forceNotReviewList[2])) && p() && e('2'); // 测试检查needReview true forceReviewList '' forceNotReviewList '' 时是否强制审核
r($testcase->forceNotReviewTest($needReviewList[0], $forceReviewList[0], $forceNotReviewList[0])) && p() && e('2'); // 测试检查needReview false forceReviewList false forceNotReviewList false 时是否强制审核
r($testcase->forceNotReviewTest($needReviewList[0], $forceReviewList[0], $forceNotReviewList[1])) && p() && e('1'); // 测试检查needReview false forceReviewList false forceNotReviewList user1,user2 时是否强制审核
r($testcase->forceNotReviewTest($needReviewList[0], $forceReviewList[0], $forceNotReviewList[2])) && p() && e('2'); // 测试检查needReview false forceReviewList false forceNotReviewList '' 时是否强制审核
r($testcase->forceNotReviewTest($needReviewList[0], $forceReviewList[1], $forceNotReviewList[0])) && p() && e('2'); // 测试检查needReview false forceReviewList user1,user2 forceNotReviewList false 时是否强制审核
r($testcase->forceNotReviewTest($needReviewList[0], $forceReviewList[1], $forceNotReviewList[1])) && p() && e('1'); // 测试检查needReview false forceReviewList user1,user2 forceNotReviewList user1,user2 时是否强制审核
r($testcase->forceNotReviewTest($needReviewList[0], $forceReviewList[1], $forceNotReviewList[2])) && p() && e('2'); // 测试检查needReview false forceReviewList user1,user2 forceNotReviewList '' 时是否强制审核
r($testcase->forceNotReviewTest($needReviewList[0], $forceReviewList[2], $forceNotReviewList[0])) && p() && e('2'); // 测试检查needReview false forceReviewList '' forceNotReviewList false 时是否强制审核
r($testcase->forceNotReviewTest($needReviewList[0], $forceReviewList[2], $forceNotReviewList[1])) && p() && e('1'); // 测试检查needReview false forceReviewList '' forceNotReviewList user1,user2 时是否强制审核
r($testcase->forceNotReviewTest($needReviewList[0], $forceReviewList[2], $forceNotReviewList[2])) && p() && e('2'); // 测试检查needReview false forceReviewList '' forceNotReviewList '' 时是否强制审核
module/testcase/test/testcase.class.php
+10 -1
View File
@@ -695,13 +695,22 @@ class testcaseTest
}
/**
* 测试检查是否不需要评审。
* Test check whether force not review.
*
* @param bool $needReview
* @param bool|string $forceReview
* @param bool|string $forceNotReview
* @access public
* @return int
*/
public function forceNotReviewTest()
public function forceNotReviewTest(bool $needReview, bool|string $forceReview, bool|string $forceNotReview): int
{
global $tester;
$tester->config->testcase->needReview = $needReview;
$tester->config->testcase->forceReview = $forceReview;
$tester->config->testcase->forceNotReview = $forceNotReview;
$object = $this->objectModel->forceNotReview();
if(dao::isError()) return dao::getError();