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

* [unittest] Fix story fetchprojectstories tao method test.

Browse Source
This commit is contained in:
wangyidong
2025-06-11 11:11:39 +08:00
parent 545d93dae7
commit fec756bf45
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/story/tao.php
+1 -1
View File
@@ -539,7 +539,7 @@ class storyTao extends storyModel
if(strpos($orderBy, 'version_') !== false) $orderBy = str_replace('version_', 't2.version_', $orderBy);
$unclosedStatus = $this->getUnclosedStatusKeys();
return $storyDAO->beginIF(!empty($productID) && (!$project->charter || ($project->charter && $project->hasProduct)))->andWhere('t1.product')->eq($productID)->fi()
return $storyDAO->beginIF(!empty($productID) && ($project && (!$project->charter || ($project->charter && $project->hasProduct))))->andWhere('t1.product')->eq($productID)->fi()
->beginIF($type == 'bybranch' and $branch !== '')->andWhere('t2.branch')->in("0,$branch")->fi()
->beginIF(strpos('draft|reviewing|changing|closed', $type) !== false)->andWhere('t2.status')->eq($type)->fi()
->beginIF($type == 'unclosed')->andWhere('t2.status')->in($unclosedStatus)->fi()
module/story/test/lib/story.unittest.class.php
+3 -2
View File
@@ -636,6 +636,7 @@ class storyTest
unset($unclosedStatus['closed']);
$storyIdList = array('1,2,3,4,5,6,7');
$project = $this->objectModel->dao->select("*")->from(TABLE_PROJECT)->where('id')->eq($projectID)->fetch();
$storyDAO = $this->objectModel->dao->select("DISTINCT t2.*")->from(TABLE_PROJECTSTORY)->alias('t1')
->leftJoin(TABLE_STORY)->alias('t2')->on('t1.story = t2.id')
->leftJoin(TABLE_PRODUCT)->alias('t3')->on('t2.product = t3.id')
@@ -644,7 +645,7 @@ class storyTest
->andWhere('t2.deleted')->eq(0)
->andWhere('t3.deleted')->eq(0);
return $this->objectModel->fetchProjectStories($storyDAO, $productID, $type, $branch, $storyIdList, 't2.id_desc', $pager);
return $this->objectModel->fetchProjectStories($storyDAO, $productID, $type, $branch, $storyIdList, 't2.id_desc', $pager, empty($project) ? null : $project);
}
/**
@@ -818,7 +819,7 @@ class storyTest
$this->objectModel->doCreateSpec($storyID, $story, $files);
if(dao::isError()) return dao::getError();
return $this->objectModel->dao->select('*')->from(TABLE_STORYSPEC)->fetchAll();
return $this->objectModel->dao->select('*')->from(TABLE_STORYSPEC)->fetchAll('', false);
}
/**
module/story/test/tao/fetchprojectstories.php
+2 -2
View File
@@ -59,7 +59,7 @@ r(count($storyTest->fetchProjectStoriesTest($productID[1], $projectID[1], 'linke
r(count($storyTest->fetchProjectStoriesTest($productID[1], $projectID[1], 'unlinkedexecution'))) && p() && e('24'); //传入项目，获取未关联执行的需求。
$storyTest->objectModel->app->loadClass('pager', $static = true);
$storyTest->objectModel->app->moduleName = 'product';
$storyTest->objectModel->app->methodName = 'track';
$storyTest->objectModel->app->rawModule = 'product';
$storyTest->objectModel->app->rawMethod = 'track';
$pager = new pager(0, 5, 1);
r(count($storyTest->fetchProjectStoriesTest($productID[1], $projectID[1], 'unclosed', '', $pager))) && p() && e('5'); //分页获取需求。