diff --git a/module/bug/test/bug.class.php b/module/bug/test/bug.class.php index 3070d495bc..3680e0a290 100644 --- a/module/bug/test/bug.class.php +++ b/module/bug/test/bug.class.php @@ -2171,39 +2171,4 @@ class bugTest return 'no error'; } } - - /** - * 测试批量编辑 bug 后的其他处理。 - * Test processing after batch edit of bug. - * - * @param object $bug - * @access public - * @return string - */ - public function afterBatchEditTest(object $bug): string - { - $_SERVER['HTTP_HOST'] = ''; - - global $tester; - - $tester->config->global->scoreStatus = true; - - $oldScore = $tester->dao->select('score')->from(TABLE_USER)->where('account')->eq('admin')->fetch('score'); - $oldBug = $tester->dao->findByID($bug->id)->from(TABLE_BUG)->fetch(); - - $this->objectModel->afterBatchEdit($bug, $oldBug); - - if(dao::isError()) - { - return dao::getError(); - } - else - { - $score = $tester->dao->select('score')->from(TABLE_USER)->where('account')->eq('admin')->fetch('score'); - $action = $tester->dao->select('*')->from(TABLE_ACTION)->orderBy('id_desc')->limit(1)->fetch(); - - $scoreDifference = $score - $oldScore; - return "scoreDifference:{$scoreDifference};lastAction:{$action->objectType}-{$action->action}-{$action->objectID}"; - } - } } diff --git a/module/bug/test/model/afterbatchedit.php b/module/bug/test/model/afterbatchedit.php deleted file mode 100755 index c134de5a06..0000000000 --- a/module/bug/test/model/afterbatchedit.php +++ /dev/null @@ -1,60 +0,0 @@ -#!/usr/bin/env php -config('bug_afterbatchedit')->gen(10); -zdTable('user')->gen(2); -zdTable('action')->gen(1); -zdTable('score')->gen(1); - -su('admin'); - -/** - -title=bugModel->afterBatchEdit(); -cid=1 -pid=1 - -*/ - -$normal = new stdclass(); -$normal->id = 1; -$normal->severity = 1; -$normal->title = '修改后的名称1'; - -$resolved1 = new stdclass(); -$resolved1->id = 2; -$resolved1->severity = 1; -$resolved1->title = '修改后的名称2'; -$resolved1->status = 'resolved'; -$resolved1->resolvedBy = 'admin'; - -$resolved3 = new stdclass(); -$resolved3->id = 3; -$resolved3->severity = 3; -$resolved3->title = '修改后的名称3'; -$resolved3->status = 'resolved'; -$resolved3->resolvedBy = 'admin'; - -$hasResolved1 = new stdclass(); -$hasResolved1->id = 4; -$hasResolved1->severity = 1; -$hasResolved1->title = '修改后的名称4'; -$hasResolved1->status = 'resolved'; -$hasResolved1->resolvedBy = 'admin'; - -$hasResolved3 = new stdclass(); -$hasResolved3->id = 5; -$hasResolved3->severity = 3; -$hasResolved3->title = '修改后的名称5'; -$hasResolved3->status = 'resolved'; -$hasResolved3->resolvedBy = 'admin'; - -$bug = new bugTest(); - -r($bug->afterBatchEditTest($normal)) && p() && e('scoreDifference:0;lastAction:bug-edited-1'); // 测试 普通的 bug 批量更新后的操作 -r($bug->afterBatchEditTest($resolved1)) && p() && e('scoreDifference:4;lastAction:bug-edited-2'); // 测试 编辑时解决的优先级1 bug 批量更新后的操作 -r($bug->afterBatchEditTest($resolved3)) && p() && e('scoreDifference:2;lastAction:bug-edited-3'); // 测试 编辑时解决的优先级3 bug 批量更新后的操作 -r($bug->afterBatchEditTest($hasResolved1)) && p() && e('scoreDifference:0;lastAction:bug-edited-4'); // 测试 之前就解决的优先级1 bug 批量更新后的操作 -r($bug->afterBatchEditTest($hasResolved3)) && p() && e('scoreDifference:0;lastAction:bug-edited-5'); // 测试 之前就解决的优先级3 bug 批量更新后的操作 diff --git a/module/bug/test/model/yaml/afterbatchedit/bug_afterbatchedit.yaml b/module/bug/test/model/yaml/afterbatchedit/bug_afterbatchedit.yaml deleted file mode 100644 index 21d3ecb163..0000000000 --- a/module/bug/test/model/yaml/afterbatchedit/bug_afterbatchedit.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -title: zt_bug -author: Mengyi Liu -version: "1.0" -fields: -- field: assignedTo - range: user1 -- field: status - range: active{3},resolved{2} -... -