From 60c7f2e1ed79ac5a8f5684ad534fbf0574bf400e Mon Sep 17 00:00:00 2001 From: tianshujie Date: Mon, 25 Dec 2023 08:49:01 +0800 Subject: [PATCH] * Change the result of product unit test. --- module/product/test/model/checkaccess.php | 16 +++++++------- .../test/model/getprojectlistbyproduct.php | 21 +++++++++---------- module/product/test/model/getstats4kanban.php | 2 +- .../test/tao/fetchallproductprojects.php | 6 +++--- .../test/tao/fetchinvolvedproductprojects.php | 6 +++--- 5 files changed, 25 insertions(+), 26 deletions(-) diff --git a/module/product/test/model/checkaccess.php b/module/product/test/model/checkaccess.php index acf97c3b4a..440e54bb27 100755 --- a/module/product/test/model/checkaccess.php +++ b/module/product/test/model/checkaccess.php @@ -1,17 +1,17 @@ #!/usr/bin/env php gen(10); su('admin'); -/** - -title=测试 productModel::checkAccess; -timeout=0 -cid=1 - -*/ global $tester; $tester->loadModel('product'); @@ -20,5 +20,5 @@ $products = array(1 => 1, 2 => 2, 6 => 6); $idList = array(0, 6, 10); r($tester->product->checkAccess($idList[0], $products)) && p() && e('1'); //不传入ID r($tester->product->checkAccess($idList[1], $products)) && p() && e('6'); //传入存在ID的值 -r($tester->product->checkAccess($idList[0], $products)) && p() && e('1'); //不传入ID，读取session信息 +r($tester->product->checkAccess($idList[0], $products)) && p() && e('6'); //不传入ID，读取session信息 r($tester->product->checkAccess($idList[2], $products)) && p() && e('10'); //传入正确的ID diff --git a/module/product/test/model/getprojectlistbyproduct.php b/module/product/test/model/getprojectlistbyproduct.php index 253768864c..ec4a10e0ce 100755 --- a/module/product/test/model/getprojectlistbyproduct.php +++ b/module/product/test/model/getprojectlistbyproduct.php @@ -1,5 +1,12 @@ #!/usr/bin/env php getProjectListByProduct(); +cid=1 + +*/ + include dirname(__FILE__, 5) . '/test/lib/init.php'; include dirname(__FILE__, 2) . '/product.class.php'; @@ -31,14 +38,6 @@ $projectproduct->product->range('1-2'); $projectproduct->project->range('1-50'); $projectproduct->gen(50); -/** - -title=productModel->getProjectListByProduct(); -cid=1 -pid=1 - -*/ - global $tester; $product = $tester->loadModel('product'); su('admin'); @@ -47,14 +46,14 @@ $product->app->moduleName = 'product'; $product->app->methodName = 'project'; r(count($product->getProjectListByProduct($productID = 0, 'all', '', false, 'order_desc'))) && p() && e('0'); -r(count($product->getProjectListByProduct($productID = 1, 'all', '', false, 'order_desc'))) && p() && e('20'); +r(count($product->getProjectListByProduct($productID = 1, 'all', '', false, 'order_desc'))) && p() && e('17'); r(count($product->getProjectListByProduct($productID = 1, 'all', '0', false, 'order_desc'))) && p() && e('17'); -r(count($product->getProjectListByProduct($productID = 1, 'undone', '', false, 'order_desc'))) && p() && e('15'); +r(count($product->getProjectListByProduct($productID = 1, 'undone', '', false, 'order_desc'))) && p() && e('12'); r(count($product->getProjectListByProduct($productID = 1, 'wait', 'all', false, 'order_desc'))) && p() && e('5'); $product->app->loadClass('pager', $static = true); $pager = new pager(0, 50, 1); -r(count($product->getProjectListByProduct($productID = 1, 'all', '', false, 'order_desc', $pager))) && p() && e('20'); +r(count($product->getProjectListByProduct($productID = 1, 'all', '', false, 'order_desc', $pager))) && p() && e('17'); $pager = new pager(0, 5, 1); r(count($product->getProjectListByProduct($productID = 1, 'all', '', false, 'order_desc', $pager))) && p() && e('5'); diff --git a/module/product/test/model/getstats4kanban.php b/module/product/test/model/getstats4kanban.php index babd8de4b9..3d39d16ca6 100755 --- a/module/product/test/model/getstats4kanban.php +++ b/module/product/test/model/getstats4kanban.php @@ -29,4 +29,4 @@ r($product->getStats4KanbanTest(2)) && p('13:name;14:name') && e('项 r($product->getStats4KanbanTest(5)) && p('11:name;19:name') && e('项目21,项目29'); r($product->getStats4KanbanTest(1, true)) && p() && e('1'); r($product->getStats4KanbanTest(3, true)) && p() && e('4'); -r($product->getStats4KanbanTest(4, true)) && p() && e('3'); +r($product->getStats4KanbanTest(4, true)) && p() && e('6'); diff --git a/module/product/test/tao/fetchallproductprojects.php b/module/product/test/tao/fetchallproductprojects.php index ebb261cbce..9628fce0d7 100755 --- a/module/product/test/tao/fetchallproductprojects.php +++ b/module/product/test/tao/fetchallproductprojects.php @@ -26,14 +26,14 @@ $product->app->moduleName = 'product'; $product->app->methodName = 'project'; r(count($product->fetchAllProductProjects($productID = 0, 'all', '', 'order_desc'))) && p() && e('0'); -r(count($product->fetchAllProductProjects($productID = 1, 'all', '', 'order_desc'))) && p() && e('20'); +r(count($product->fetchAllProductProjects($productID = 1, 'all', '', 'order_desc'))) && p() && e('17'); r(count($product->fetchAllProductProjects($productID = 1, 'all', '0', 'order_desc'))) && p() && e('17'); -r(count($product->fetchAllProductProjects($productID = 1, 'undone', '', 'order_desc'))) && p() && e('15'); +r(count($product->fetchAllProductProjects($productID = 1, 'undone', '', 'order_desc'))) && p() && e('12'); r(count($product->fetchAllProductProjects($productID = 1, 'wait', 'all', 'order_desc'))) && p() && e('5'); $product->app->loadClass('pager', $static = true); $pager = new pager(0, 50, 1); -r(count($product->fetchAllProductProjects($productID = 1, 'all', '', 'order_desc', $pager))) && p() && e('20'); +r(count($product->fetchAllProductProjects($productID = 1, 'all', '', 'order_desc', $pager))) && p() && e('17'); $pager = new pager(0, 5, 1); r(count($product->fetchAllProductProjects($productID = 1, 'all', '', 'order_desc', $pager))) && p() && e('5'); diff --git a/module/product/test/tao/fetchinvolvedproductprojects.php b/module/product/test/tao/fetchinvolvedproductprojects.php index ae83f0d739..736e194732 100755 --- a/module/product/test/tao/fetchinvolvedproductprojects.php +++ b/module/product/test/tao/fetchinvolvedproductprojects.php @@ -47,14 +47,14 @@ $product->app->moduleName = 'product'; $product->app->methodName = 'project'; r(count($product->fetchInvolvedProductProjects($productID = 0, 'all', '', 'order_desc'))) && p() && e('0'); -r(count($product->fetchInvolvedProductProjects($productID = 1, 'all', '', 'order_desc'))) && p() && e('10'); +r(count($product->fetchInvolvedProductProjects($productID = 1, 'all', '', 'order_desc'))) && p() && e('8'); r(count($product->fetchInvolvedProductProjects($productID = 1, 'all', '0', 'order_desc'))) && p() && e('8'); -r(count($product->fetchInvolvedProductProjects($productID = 1, 'undone', '', 'order_desc'))) && p() && e('10'); +r(count($product->fetchInvolvedProductProjects($productID = 1, 'undone', '', 'order_desc'))) && p() && e('8'); r(count($product->fetchInvolvedProductProjects($productID = 1, 'wait', 'all', 'order_desc'))) && p() && e('5'); $product->app->loadClass('pager', $static = true); $pager = new pager(0, 50, 1); -r(count($product->fetchInvolvedProductProjects($productID = 1, 'all', '', 'order_desc', $pager))) && p() && e('10'); +r(count($product->fetchInvolvedProductProjects($productID = 1, 'all', '', 'order_desc', $pager))) && p() && e('8'); $pager = new pager(0, 5, 1); r(count($product->fetchInvolvedProductProjects($productID = 1, 'all', '', 'order_desc', $pager))) && p() && e('5');