From 84f9b06602bc0d1904b130fba9ffb387f1fa6b5f Mon Sep 17 00:00:00 2001 From: zhouxudong Date: Sat, 7 May 2022 02:31:57 +0000 Subject: [PATCH 1/3] * Add tutorial auto test. --- test/class/tutorial.class.php | 172 ++++++++++++++++++ test/model/tutorial/checknovice.php | 20 ++ test/model/tutorial/getexecution.php | 19 ++ test/model/tutorial/getexecutionpairs.php | 17 ++ test/model/tutorial/getexecutionproducts.php | 19 ++ test/model/tutorial/getexecutionstories.php | 17 ++ .../model/tutorial/getexecutionstorypairs.php | 17 ++ test/model/tutorial/getmodulepairs.php | 17 ++ test/model/tutorial/getproduct.php | 18 ++ test/model/tutorial/getproductpairs.php | 17 ++ test/model/tutorial/getproductstats.php | 17 ++ test/model/tutorial/getproject.php | 17 ++ test/model/tutorial/getprojectpairs.php | 17 ++ test/model/tutorial/getprojectstats.php | 19 ++ test/model/tutorial/getstories.php | 18 ++ test/model/tutorial/getteammembers.php | 17 ++ test/model/tutorial/getteammemberspairs.php | 17 ++ test/model/tutorial/gettutorialed.php | 17 ++ test/model/tutorial/getuserpairs.php | 17 ++ test/ztest | 7 +- 20 files changed, 494 insertions(+), 2 deletions(-) create mode 100644 test/class/tutorial.class.php create mode 100644 test/model/tutorial/checknovice.php create mode 100644 test/model/tutorial/getexecution.php create mode 100644 test/model/tutorial/getexecutionpairs.php create mode 100644 test/model/tutorial/getexecutionproducts.php create mode 100644 test/model/tutorial/getexecutionstories.php create mode 100644 test/model/tutorial/getexecutionstorypairs.php create mode 100644 test/model/tutorial/getmodulepairs.php create mode 100644 test/model/tutorial/getproduct.php create mode 100644 test/model/tutorial/getproductpairs.php create mode 100644 test/model/tutorial/getproductstats.php create mode 100644 test/model/tutorial/getproject.php create mode 100644 test/model/tutorial/getprojectpairs.php create mode 100644 test/model/tutorial/getprojectstats.php create mode 100644 test/model/tutorial/getstories.php create mode 100644 test/model/tutorial/getteammembers.php create mode 100644 test/model/tutorial/getteammemberspairs.php create mode 100644 test/model/tutorial/gettutorialed.php create mode 100644 test/model/tutorial/getuserpairs.php diff --git a/test/class/tutorial.class.php b/test/class/tutorial.class.php new file mode 100644 index 0000000000..b3f26312a0 --- /dev/null +++ b/test/class/tutorial.class.php @@ -0,0 +1,172 @@ +objectModel = $tester->loadModel('tutorial'); + } + + public function checkNoviceTest() + { + $this->app->user->modifyPassword = 1; + $objects = $this->objectModel->checkNovice(); + + if(dao::isError()) return dao::getError(); + + return $objects; + } + + public function getProductPairsTest() + { + $objects = $this->objectModel->getProductPairs(); + + if(dao::isError()) return dao::getError(); + + return $objects; + } + + public function getModulePairsTest() + { + $objects = $this->objectModel->getModulePairs(); + + if(dao::isError()) return dao::getError(); + + return $objects; + } + + public function getProductTest() + { + $objects = $this->objectModel->getProduct(); + + if(dao::isError()) return dao::getError(); + + return $objects; + } + + public function getProductStatsTest() + { + $objects = $this->objectModel->getProductStats(); + + if(dao::isError()) return dao::getError(); + + return $objects; + } + + public function getProjectTest() + { + $objects = $this->objectModel->getProject(); + + if(dao::isError()) return dao::getError(); + + return $objects; + } + + public function getProjectPairsTest() + { + $objects = $this->objectModel->getProjectPairs(); + + if(dao::isError()) return dao::getError(); + + return $objects; + } + + public function getProjectStatsTest($browseType = '') + { + $objects = $this->objectModel->getProjectStats($browseType = ''); + + if(dao::isError()) return dao::getError(); + + return $objects; + } + + public function getStoriesTest() + { + $objects = $this->objectModel->getStories(); + + if(dao::isError()) return dao::getError(); + + return $objects; + } + + public function getExecutionPairsTest() + { + $objects = $this->objectModel->getExecutionPairs(); + + if(dao::isError()) return dao::getError(); + + return $objects; + } + + public function getExecutionTest() + { + $objects = $this->objectModel->getExecution(); + + if(dao::isError()) return dao::getError(); + + return $objects; + } + + public function getExecutionProductsTest() + { + $objects = $this->objectModel->getExecutionProducts(); + + if(dao::isError()) return dao::getError(); + + return $objects; + } + + public function getExecutionStoriesTest() + { + $objects = $this->objectModel->getExecutionStories(); + + if(dao::isError()) return dao::getError(); + + return $objects; + } + + public function getExecutionStoryPairsTest() + { + $objects = $this->objectModel->getExecutionStoryPairs(); + + if(dao::isError()) return dao::getError(); + + return $objects; + } + + public function getTeamMembersTest() + { + $objects = $this->objectModel->getTeamMembers(); + + if(dao::isError()) return dao::getError(); + + return $objects; + } + + public function getTeamMembersPairsTest() + { + $objects = $this->objectModel->getTeamMembersPairs(); + + if(dao::isError()) return dao::getError(); + + return $objects; + } + + public function getUserPairsTest() + { + $objects = $this->objectModel->getUserPairs(); + + if(dao::isError()) return dao::getError(); + + return $objects; + } + + public function getTutorialedTest() + { + $objects = $this->objectModel->getTutorialed(); + + if(dao::isError()) return dao::getError(); + + return $objects; + } +} diff --git a/test/model/tutorial/checknovice.php b/test/model/tutorial/checknovice.php new file mode 100644 index 0000000000..c88b9f36ee --- /dev/null +++ b/test/model/tutorial/checknovice.php @@ -0,0 +1,20 @@ +#!/usr/bin/env php +checkNovice(); +cid=1 +pid=1 + +*/ + +$tutorial = new tutorialTest(); + +r($tutorial->checkNoviceTest()) && p() && e('0'); //检查当account是admin的时候的返回值。 +r($tutorial->checkNoviceTest()) && p() && e('0'); //检查当$this->app->user->modifyPassword是不为空的时候的返回值。 +su('guest'); +r($tutorial->checkNoviceTest()) && p() && e('0'); //检查当account是guest的时候的返回值。 diff --git a/test/model/tutorial/getexecution.php b/test/model/tutorial/getexecution.php new file mode 100644 index 0000000000..862226215c --- /dev/null +++ b/test/model/tutorial/getexecution.php @@ -0,0 +1,19 @@ +#!/usr/bin/env php +getExecution(); +cid=1 +pid=1 + +*/ + +$tutorial = new tutorialTest(); + +r($tutorial->getExecutionTest()) && p('id') && e('3'); //检查获取数据的id +r($tutorial->getExecutionTest()) && p('PM') && e('admin'); //检查获取数据的PM +r($tutorial->getExecutionTest()) && p('burns:0') && e('35'); //检查获取数据的burns diff --git a/test/model/tutorial/getexecutionpairs.php b/test/model/tutorial/getexecutionpairs.php new file mode 100644 index 0000000000..3e058f1586 --- /dev/null +++ b/test/model/tutorial/getexecutionpairs.php @@ -0,0 +1,17 @@ +#!/usr/bin/env php +getExecutionPairs(); +cid=1 +pid=1 + +*/ + +$tutorial = new tutorialTest(); + +r($tutorial->getExecutionPairsTest()) && p('3') && e('Test execution'); //检查获取的数据信息 diff --git a/test/model/tutorial/getexecutionproducts.php b/test/model/tutorial/getexecutionproducts.php new file mode 100644 index 0000000000..a55baa9884 --- /dev/null +++ b/test/model/tutorial/getexecutionproducts.php @@ -0,0 +1,19 @@ +#!/usr/bin/env php +getExecutionProducts(); +cid=1 +pid=1 + +*/ + +$tutorial = new tutorialTest(); + +r($tutorial->getExecutionProductsTest()) && p('1:type') && e('normal'); //测试拿到的数据是否正确 +r($tutorial->getExecutionProductsTest()) && p('1[branches]:1') && e('Test branch'); //测试拿到的数据是否正确 +r($tutorial->getExecutionProductsTest()) && p('1[plans]:1') && e('Test plan'); //测试拿到的数据是否正确 diff --git a/test/model/tutorial/getexecutionstories.php b/test/model/tutorial/getexecutionstories.php new file mode 100644 index 0000000000..c635786a6b --- /dev/null +++ b/test/model/tutorial/getexecutionstories.php @@ -0,0 +1,17 @@ +#!/usr/bin/env php +getExecutionStories(); +cid=1 +pid=1 + +*/ + +$tutorial = new tutorialTest(); + +r($tutorial->getExecutionStoriesTest()) && p('1:stage') && e('wait'); //检查是否获取到数据 diff --git a/test/model/tutorial/getexecutionstorypairs.php b/test/model/tutorial/getexecutionstorypairs.php new file mode 100644 index 0000000000..6a5e186093 --- /dev/null +++ b/test/model/tutorial/getexecutionstorypairs.php @@ -0,0 +1,17 @@ +#!/usr/bin/env php +getExecutionStoryPairs(); +cid=1 +pid=1 + +*/ + +$tutorial = new tutorialTest(); + +r($tutorial->getExecutionStoryPairsTest()) && p('1') && e('Test story'); diff --git a/test/model/tutorial/getmodulepairs.php b/test/model/tutorial/getmodulepairs.php new file mode 100644 index 0000000000..119538b2f8 --- /dev/null +++ b/test/model/tutorial/getmodulepairs.php @@ -0,0 +1,17 @@ +#!/usr/bin/env php +getModulePairs(); +cid=1 +pid=1 + +*/ + +$tutorial = new tutorialTest(); + +r($tutorial->getModulePairsTest()) && p('1') && e('Test module'); //测试是否能拿到数据 diff --git a/test/model/tutorial/getproduct.php b/test/model/tutorial/getproduct.php new file mode 100644 index 0000000000..e0c51c7741 --- /dev/null +++ b/test/model/tutorial/getproduct.php @@ -0,0 +1,18 @@ +#!/usr/bin/env php +getProduct(); +cid=1 +pid=1 + +*/ + +$tutorial = new tutorialTest(); + +r($tutorial->getProductTest()) && p('id') && e('1'); //测试是否能拿到数据 +r($tutorial->getProductTest()) && p('branches:1') && e('Test branch'); //测试是否能拿到数据 diff --git a/test/model/tutorial/getproductpairs.php b/test/model/tutorial/getproductpairs.php new file mode 100644 index 0000000000..58248fe8f1 --- /dev/null +++ b/test/model/tutorial/getproductpairs.php @@ -0,0 +1,17 @@ +#!/usr/bin/env php +getProductPairs(); +cid=1 +pid=1 + +*/ + +$tutorial = new tutorialTest(); + +r($tutorial->getProductPairsTest()) && p('1') && e('Test product'); //测试是否能拿到数据 diff --git a/test/model/tutorial/getproductstats.php b/test/model/tutorial/getproductstats.php new file mode 100644 index 0000000000..ba1edf796b --- /dev/null +++ b/test/model/tutorial/getproductstats.php @@ -0,0 +1,17 @@ +#!/usr/bin/env php +getProductStats(); +cid=1 +pid=1 + +*/ + +$tutorial = new tutorialTest(); + +r($tutorial->getProductStatsTest()) && p() && e(); diff --git a/test/model/tutorial/getproject.php b/test/model/tutorial/getproject.php new file mode 100644 index 0000000000..d2962ce551 --- /dev/null +++ b/test/model/tutorial/getproject.php @@ -0,0 +1,17 @@ +#!/usr/bin/env php +getProject(); +cid=1 +pid=1 + +*/ + +$tutorial = new tutorialTest(); + +r($tutorial->getProjectTest()) && p('type') && e('project'); //测试是否能拿到数据 diff --git a/test/model/tutorial/getprojectpairs.php b/test/model/tutorial/getprojectpairs.php new file mode 100644 index 0000000000..26ddf80e1d --- /dev/null +++ b/test/model/tutorial/getprojectpairs.php @@ -0,0 +1,17 @@ +#!/usr/bin/env php +getProjectPairs(); +cid=1 +pid=1 + +*/ + +$tutorial = new tutorialTest(); + +r($tutorial->getProjectPairsTest()) && p('2') && e('Test Project'); //测试是否能拿到数据 diff --git a/test/model/tutorial/getprojectstats.php b/test/model/tutorial/getprojectstats.php new file mode 100644 index 0000000000..4c6b2613d0 --- /dev/null +++ b/test/model/tutorial/getprojectstats.php @@ -0,0 +1,19 @@ +#!/usr/bin/env php +getProjectStats(); +cid=1 +pid=1 + +*/ + +$tutorial = new tutorialTest(); + +r($tutorial->getProjectStatsTest()) && p('2:model') && e('scrum'); //测试是否能拿到数据 +r($tutorial->getProjectStatsTest()) && p('2[hours]:totalLeft') && e('0'); //测试是否能拿到数据 +r($tutorial->getProjectStatsTest()) && p('2[teamMembers]:0') && e('admin'); //测试是否能拿到数据 diff --git a/test/model/tutorial/getstories.php b/test/model/tutorial/getstories.php new file mode 100644 index 0000000000..8485a1248a --- /dev/null +++ b/test/model/tutorial/getstories.php @@ -0,0 +1,18 @@ +#!/usr/bin/env php +getStories(); +cid=1 +pid=1 + +*/ + +$tutorial = new tutorialTest(); + +r($tutorial->getStoriesTest()) && p('0:module') && e('1'); //测试是否能拿到数据 +r($tutorial->getStoriesTest()) && p('1:pri') && e('3'); //测试是否能拿到数据 diff --git a/test/model/tutorial/getteammembers.php b/test/model/tutorial/getteammembers.php new file mode 100644 index 0000000000..1672027d2a --- /dev/null +++ b/test/model/tutorial/getteammembers.php @@ -0,0 +1,17 @@ +#!/usr/bin/env php +getTeamMembers(); +cid=1 +pid=1 + +*/ + +$tutorial = new tutorialTest(); + +r($tutorial->getTeamMembersTest()) && p('admin:days') && e('10'); //测试是否能拿到数据 diff --git a/test/model/tutorial/getteammemberspairs.php b/test/model/tutorial/getteammemberspairs.php new file mode 100644 index 0000000000..77ea12413f --- /dev/null +++ b/test/model/tutorial/getteammemberspairs.php @@ -0,0 +1,17 @@ +#!/usr/bin/env php +getTeamMembersPairs(); +cid=1 +pid=1 + +*/ + +$tutorial = new tutorialTest(); + +r($tutorial->getTeamMembersPairsTest()) && p('admin') && e('admin'); diff --git a/test/model/tutorial/gettutorialed.php b/test/model/tutorial/gettutorialed.php new file mode 100644 index 0000000000..5393a33f7b --- /dev/null +++ b/test/model/tutorial/gettutorialed.php @@ -0,0 +1,17 @@ +#!/usr/bin/env php +getTutorialed(); +cid=1 +pid=1 + +*/ + +$tutorial = new tutorialTest(); + +r($tutorial->getTutorialedTest()) && p() && e('0'); diff --git a/test/model/tutorial/getuserpairs.php b/test/model/tutorial/getuserpairs.php new file mode 100644 index 0000000000..12634a76d5 --- /dev/null +++ b/test/model/tutorial/getuserpairs.php @@ -0,0 +1,17 @@ +#!/usr/bin/env php +getUserPairs(); +cid=1 +pid=1 + +*/ + +$tutorial = new tutorialTest(); + +r($tutorial->getUserPairsTest()) && p('admin') && e('admin'); //测试是否能拿到数据 diff --git a/test/ztest b/test/ztest index cfb9cad01a..2dd1c291ef 100755 --- a/test/ztest +++ b/test/ztest @@ -64,6 +64,9 @@ switch($argv[1]) case 'kanban': ztfRun('model/kanban'); break; + case 'message': + ztfRun('model/message'); + break; case 'model': ztfRun('model'); break; @@ -112,8 +115,8 @@ switch($argv[1]) case 'todo': ztfRun('model/todo'); break; - case 'message': - ztfRun('model/message'); + case 'tutorial': + ztfRun('model/tutorial'); break; case 'tree': ztfRun('model/tree'); From b482db69c87813999b512968ee72d812470d1984 Mon Sep 17 00:00:00 2001 From: zhouxudong Date: Sat, 7 May 2022 02:41:12 +0000 Subject: [PATCH 2/3] * Add tutorial auto test. --- test/class/tutorial.class.php | 109 ++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/test/class/tutorial.class.php b/test/class/tutorial.class.php index b3f26312a0..c2d3157252 100644 --- a/test/class/tutorial.class.php +++ b/test/class/tutorial.class.php @@ -7,6 +7,12 @@ class tutorialTest $this->objectModel = $tester->loadModel('tutorial'); } + /** + * Check novice. + * + * @access public + * @return void + */ public function checkNoviceTest() { $this->app->user->modifyPassword = 1; @@ -17,6 +23,12 @@ class tutorialTest return $objects; } + /** + * Get tutorial product pairs. + * + * @access public + * @return void + */ public function getProductPairsTest() { $objects = $this->objectModel->getProductPairs(); @@ -26,6 +38,12 @@ class tutorialTest return $objects; } + /** + * Get module pairs for tutorial. + * + * @access public + * @return void + */ public function getModulePairsTest() { $objects = $this->objectModel->getModulePairs(); @@ -35,6 +53,12 @@ class tutorialTest return $objects; } + /** + * Get tutorial product. + * + * @access public + * @return void + */ public function getProductTest() { $objects = $this->objectModel->getProduct(); @@ -44,6 +68,12 @@ class tutorialTest return $objects; } + /** + * Get product stats for tutorial. + * + * @access public + * @return void + */ public function getProductStatsTest() { $objects = $this->objectModel->getProductStats(); @@ -53,6 +83,12 @@ class tutorialTest return $objects; } + /** + * Get project for tutorial. + * + * @access public + * @return void + */ public function getProjectTest() { $objects = $this->objectModel->getProject(); @@ -62,6 +98,12 @@ class tutorialTest return $objects; } + /** + * Get tutorial project pairs. + * + * @access public + * @return void + */ public function getProjectPairsTest() { $objects = $this->objectModel->getProjectPairs(); @@ -71,6 +113,13 @@ class tutorialTest return $objects; } + /** + * Get project stats for tutorial. + * + * @param string $browseType + * @access public + * @return void + */ public function getProjectStatsTest($browseType = '') { $objects = $this->objectModel->getProjectStats($browseType = ''); @@ -80,6 +129,12 @@ class tutorialTest return $objects; } + /** + * Get tutorial stories. + * + * @access public + * @return void + */ public function getStoriesTest() { $objects = $this->objectModel->getStories(); @@ -89,6 +144,12 @@ class tutorialTest return $objects; } + /** + * Get tutorial Execution pairs. + * + * @access public + * @return void + */ public function getExecutionPairsTest() { $objects = $this->objectModel->getExecutionPairs(); @@ -98,6 +159,12 @@ class tutorialTest return $objects; } + /** + * Get tutorial execution. + * + * @access public + * @return void + */ public function getExecutionTest() { $objects = $this->objectModel->getExecution(); @@ -107,6 +174,12 @@ class tutorialTest return $objects; } + /** + * Get tutorial execution products. + * + * @access public + * @return void + */ public function getExecutionProductsTest() { $objects = $this->objectModel->getExecutionProducts(); @@ -116,6 +189,12 @@ class tutorialTest return $objects; } + /** + * Get tutorial execution stories. + * + * @access public + * @return void + */ public function getExecutionStoriesTest() { $objects = $this->objectModel->getExecutionStories(); @@ -125,6 +204,12 @@ class tutorialTest return $objects; } + /** + * Get tutorial execution story pairs. + * + * @access public + * @return void + */ public function getExecutionStoryPairsTest() { $objects = $this->objectModel->getExecutionStoryPairs(); @@ -134,6 +219,12 @@ class tutorialTest return $objects; } + /** + * Get tutorial team members. + * + * @access public + * @return void + */ public function getTeamMembersTest() { $objects = $this->objectModel->getTeamMembers(); @@ -143,6 +234,12 @@ class tutorialTest return $objects; } + /** + * Get team members pairs. + * + * @access public + * @return void + */ public function getTeamMembersPairsTest() { $objects = $this->objectModel->getTeamMembersPairs(); @@ -152,6 +249,12 @@ class tutorialTest return $objects; } + /** + * Get tutorial user pairs. + * + * @access public + * @return void + */ public function getUserPairsTest() { $objects = $this->objectModel->getUserPairs(); @@ -161,6 +264,12 @@ class tutorialTest return $objects; } + /** + * Get tutorialed. + * + * @access public + * @return void + */ public function getTutorialedTest() { $objects = $this->objectModel->getTutorialed(); From db997a1fb00db81d78d3c4022296fa324f6aae18 Mon Sep 17 00:00:00 2001 From: zhouxudong Date: Sat, 7 May 2022 02:54:01 +0000 Subject: [PATCH 3/3] * Add tutorial auto test. --- test/class/tutorial.class.php | 2 +- test/model/tutorial/getexecutionstorypairs.php | 2 +- test/model/tutorial/getproductstats.php | 3 ++- test/model/tutorial/getteammemberspairs.php | 2 +- test/model/tutorial/gettutorialed.php | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/test/class/tutorial.class.php b/test/class/tutorial.class.php index c2d3157252..b7c646167f 100644 --- a/test/class/tutorial.class.php +++ b/test/class/tutorial.class.php @@ -80,7 +80,7 @@ class tutorialTest if(dao::isError()) return dao::getError(); - return $objects; + return $objects[0][0]['products']; } /** diff --git a/test/model/tutorial/getexecutionstorypairs.php b/test/model/tutorial/getexecutionstorypairs.php index 6a5e186093..186628d4a0 100644 --- a/test/model/tutorial/getexecutionstorypairs.php +++ b/test/model/tutorial/getexecutionstorypairs.php @@ -14,4 +14,4 @@ pid=1 $tutorial = new tutorialTest(); -r($tutorial->getExecutionStoryPairsTest()) && p('1') && e('Test story'); +r($tutorial->getExecutionStoryPairsTest()) && p('1') && e('Test story'); //测试是否能拿到数据 diff --git a/test/model/tutorial/getproductstats.php b/test/model/tutorial/getproductstats.php index ba1edf796b..7308866323 100644 --- a/test/model/tutorial/getproductstats.php +++ b/test/model/tutorial/getproductstats.php @@ -14,4 +14,5 @@ pid=1 $tutorial = new tutorialTest(); -r($tutorial->getProductStatsTest()) && p() && e(); +r($tutorial->getProductStatsTest()) && p('1:code') && e('test'); //测试是否能拿到数据 +r($tutorial->getProductStatsTest()) && p('1[branches]:1') && e('Test branch'); //测试是否能拿到数据 diff --git a/test/model/tutorial/getteammemberspairs.php b/test/model/tutorial/getteammemberspairs.php index 77ea12413f..ce359fa5eb 100644 --- a/test/model/tutorial/getteammemberspairs.php +++ b/test/model/tutorial/getteammemberspairs.php @@ -14,4 +14,4 @@ pid=1 $tutorial = new tutorialTest(); -r($tutorial->getTeamMembersPairsTest()) && p('admin') && e('admin'); +r($tutorial->getTeamMembersPairsTest()) && p('admin') && e('admin'); //测试是否能拿到数据 diff --git a/test/model/tutorial/gettutorialed.php b/test/model/tutorial/gettutorialed.php index 5393a33f7b..2db34cf134 100644 --- a/test/model/tutorial/gettutorialed.php +++ b/test/model/tutorial/gettutorialed.php @@ -14,4 +14,4 @@ pid=1 $tutorial = new tutorialTest(); -r($tutorial->getTutorialedTest()) && p() && e('0'); +r($tutorial->getTutorialedTest()) && p() && e('0'); //测试是否能拿到数据