diff --git a/module/tutorial/model.php b/module/tutorial/model.php index 6c5c795de3..f74e9f87c2 100644 --- a/module/tutorial/model.php +++ b/module/tutorial/model.php @@ -108,7 +108,6 @@ class tutorialModel extends model $product->activeStories = 0; $product->changingStories = 0; $product->reviewingStories = 0; - $product->plans = 0; $product->releases = 0; $product->unresolvedBugs = 0; $product->fixedBugs = 0; diff --git a/module/tutorial/test/model/getexecution.php b/module/tutorial/test/model/getexecution.php index 8734f06d8f..ac626f3854 100755 --- a/module/tutorial/test/model/getexecution.php +++ b/module/tutorial/test/model/getexecution.php @@ -7,12 +7,12 @@ su('admin'); /** title=测试 tutorialModel->getExecution(); +timeout=0 cid=1 -pid=1 -检查获取数据的id >> 3 -检查获取数据的PM >> admin -检查获取数据的burns >> 35 +- 检查获取数据的id属性id @3 +- 检查获取数据的PM属性PM @admin +- 检查获取数据的burns第burns条的0属性 @35 */ diff --git a/module/tutorial/test/model/getproduct.php b/module/tutorial/test/model/getproduct.php index a96137dd7c..20816b4d58 100755 --- a/module/tutorial/test/model/getproduct.php +++ b/module/tutorial/test/model/getproduct.php @@ -7,15 +7,15 @@ su('admin'); /** title=测试 tutorialModel->getProduct(); +timeout=0 cid=1 -pid=1 -测试是否能拿到数据 >> 1 -测试是否能拿到数据 >> Test branch +- 测试是否能拿到数据属性id @1 +- 测试是否能拿到数据第plans条的1属性 @Test plan */ $tutorial = new tutorialTest(); -r($tutorial->getProductTest()) && p('id') && e('1'); //测试是否能拿到数据 -r($tutorial->getProductTest()) && p('branches:1') && e('Test branch'); //测试是否能拿到数据 \ No newline at end of file +r($tutorial->getProductTest()) && p('id') && e('1'); //测试是否能拿到数据 +r($tutorial->getProductTest()) && p('plans:1') && e('Test plan'); //测试是否能拿到数据 \ No newline at end of file diff --git a/module/tutorial/test/model/getproductstats.php b/module/tutorial/test/model/getproductstats.php index 1cd23cc61f..0812797ef3 100755 --- a/module/tutorial/test/model/getproductstats.php +++ b/module/tutorial/test/model/getproductstats.php @@ -7,15 +7,15 @@ su('admin'); /** title=测试 tutorialModel->getProductStats(); +timeout=0 cid=1 -pid=1 -测试是否能拿到数据 >> test -测试是否能拿到数据 >> Test branch +- 测试是否能拿到数据第1条的code属性 @test +- 测试是否能拿到数据第1[plans]条的1属性 @Test plan */ $tutorial = new tutorialTest(); -r($tutorial->getProductStatsTest()) && p('1:code') && e('test'); //测试是否能拿到数据 -r($tutorial->getProductStatsTest()) && p('1[branches]:1') && e('Test branch'); //测试是否能拿到数据 \ No newline at end of file +r($tutorial->getProductStatsTest()) && p('1:code') && e('test'); //测试是否能拿到数据 +r($tutorial->getProductStatsTest()) && p('1[plans]:1') && e('Test plan'); //测试是否能拿到数据 \ No newline at end of file diff --git a/module/tutorial/test/model/getprojectstats.php b/module/tutorial/test/model/getprojectstats.php index fe7dea34f7..64425fee22 100755 --- a/module/tutorial/test/model/getprojectstats.php +++ b/module/tutorial/test/model/getprojectstats.php @@ -7,17 +7,17 @@ su('admin'); /** title=测试 tutorialModel->getProjectStats(); +timeout=0 cid=1 -pid=1 -测试是否能拿到数据 >> scrum -测试是否能拿到数据 >> 0 -测试是否能拿到数据 >> admin +- 测试是否能拿到数据第2条的model属性 @scrum +- 测试是否能拿到数据第2条的left属性 @0 +- 测试是否能拿到数据第2[teamMembers]条的0属性 @admin */ $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'); //测试是否能拿到数据 \ No newline at end of file +r($tutorial->getProjectStatsTest()) && p('2:model') && e('scrum'); //测试是否能拿到数据 +r($tutorial->getProjectStatsTest()) && p('2:left') && e('0'); //测试是否能拿到数据 +r($tutorial->getProjectStatsTest()) && p('2[teamMembers]:0') && e('admin'); //测试是否能拿到数据 \ No newline at end of file diff --git a/module/tutorial/test/tutorial.class.php b/module/tutorial/test/tutorial.class.php index b7c646167f..c2d3157252 100644 --- a/module/tutorial/test/tutorial.class.php +++ b/module/tutorial/test/tutorial.class.php @@ -80,7 +80,7 @@ class tutorialTest if(dao::isError()) return dao::getError(); - return $objects[0][0]['products']; + return $objects; } /**