diff --git a/module/testcase/model.php b/module/testcase/model.php index feb653490e..11351ba3f1 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -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; } diff --git a/module/testcase/test/model/forcenotreview.php b/module/testcase/test/model/forcenotreview.php index 175e868762..ec01cef688 100755 --- a/module/testcase/test/model/forcenotreview.php +++ b/module/testcase/test/model/forcenotreview.php @@ -2,7 +2,10 @@ 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'); // 测试检查是否强制审核 \ No newline at end of file +$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 '' 时是否强制审核 diff --git a/module/testcase/test/testcase.class.php b/module/testcase/test/testcase.class.php index 656206c0da..1859a72411 100644 --- a/module/testcase/test/testcase.class.php +++ b/module/testcase/test/testcase.class.php @@ -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();