Merge branch ztflow-sunguangming-release/21.7.2#sunguangming of zentao/zentaopms (#9271)
This commit is contained in:
刘刚
@@ -4,6 +4,7 @@
|
||||
/**
|
||||
|
||||
title=测试productModel->fetchPairs();
|
||||
timeout=0
|
||||
cid=0
|
||||
|
||||
- 执行product模块的fetchPairsTest方法 @40
|
||||
@@ -15,8 +16,8 @@ cid=0
|
||||
- 执行product模块的fetchPairsTest方法，参数是'', 1, '23, 24' @5
|
||||
- 执行product模块的fetchPairsTest方法，参数是'noclosed', 1, '23, 24' @4
|
||||
- 执行product模块的fetchPairsTest方法，参数是'noclosed', 1, '23, 24', 'all' @4
|
||||
- 执行product模块的fetchPairsTest方法，参数是'noclosed', 1, '23, 24', '1' @0
|
||||
- 执行product模块的fetchPairsTest方法，参数是'noclosed', 1, '23, 24', '2' @0
|
||||
- 执行product模块的fetchPairsTest方法，参数是'noclosed', 1, '23, 24', '1' @2
|
||||
- 执行product模块的fetchPairsTest方法，参数是'noclosed', 1, '23, 24', '2' @2
|
||||
- 执行product模块的fetchPairsTest方法 @9
|
||||
- 执行product模块的fetchPairsTest方法，参数是'all' @12
|
||||
- 执行product模块的fetchPairsTest方法，参数是'noclosed' @9
|
||||
@@ -26,8 +27,8 @@ cid=0
|
||||
- 执行product模块的fetchPairsTest方法，参数是'', 1, '23, 24' @3
|
||||
- 执行product模块的fetchPairsTest方法，参数是'noclosed', 1, '23, 24' @3
|
||||
- 执行product模块的fetchPairsTest方法，参数是'noclosed', 1, '23, 24', 'all' @3
|
||||
- 执行product模块的fetchPairsTest方法，参数是'noclosed', 1, '23, 24', '1' @0
|
||||
- 执行product模块的fetchPairsTest方法，参数是'noclosed', 1, '23, 24', '2' @0
|
||||
- 执行product模块的fetchPairsTest方法，参数是'noclosed', 1, '23, 24', '1' @2
|
||||
- 执行product模块的fetchPairsTest方法，参数是'noclosed', 1, '23, 24', '2' @2
|
||||
|
||||
*/
|
||||
include dirname(__FILE__, 5) . '/test/lib/init.php';
|
||||
@@ -47,8 +48,8 @@ r(count($product->fetchPairsTest('all', 10001, '1'))) && p() && e('1'
|
||||
r(count($product->fetchPairsTest('', 1, '23,24'))) && p() && e('5');
|
||||
r(count($product->fetchPairsTest('noclosed', 1, '23,24'))) && p() && e('4');
|
||||
r(count($product->fetchPairsTest('noclosed', 1, '23,24', 'all')))&& p() && e('4');
|
||||
r(count($product->fetchPairsTest('noclosed', 1, '23,24', '1'))) && p() && e('0');
|
||||
r(count($product->fetchPairsTest('noclosed', 1, '23,24', '2'))) && p() && e('0');
|
||||
r(count($product->fetchPairsTest('noclosed', 1, '23,24', '1'))) && p() && e('2');
|
||||
r(count($product->fetchPairsTest('noclosed', 1, '23,24', '2'))) && p() && e('2');
|
||||
|
||||
$product->objectModel->app->user->admin = false;
|
||||
$product->objectModel->app->user->view->products = '1,2,3,4,5,6,7,8,9,20,21,48,49,50';
|
||||
@@ -61,5 +62,5 @@ r(count($product->fetchPairsTest('all', 10001, '1'))) && p() && e('1'
|
||||
r(count($product->fetchPairsTest('', 1, '23,24'))) && p() && e('3');
|
||||
r(count($product->fetchPairsTest('noclosed', 1, '23,24'))) && p() && e('3');
|
||||
r(count($product->fetchPairsTest('noclosed', 1, '23,24', 'all')))&& p() && e('3');
|
||||
r(count($product->fetchPairsTest('noclosed', 1, '23,24', '1'))) && p() && e('0');
|
||||
r(count($product->fetchPairsTest('noclosed', 1, '23,24', '2'))) && p() && e('0');
|
||||
r(count($product->fetchPairsTest('noclosed', 1, '23,24', '1'))) && p() && e('2');
|
||||
r(count($product->fetchPairsTest('noclosed', 1, '23,24', '2'))) && p() && e('2');
|
||||
Regular → Executable
+25
-24
@@ -4,32 +4,33 @@
|
||||
/**
|
||||
|
||||
title=productTao->getStoryStats();
|
||||
timeout=0
|
||||
cid=0
|
||||
|
||||
- 测试系统中所有产品下的需求统计信息
|
||||
- 第1条的draft属性 @0
|
||||
- 第1条的active属性 @1
|
||||
- 第1条的changing属性 @1
|
||||
- 第1条的reviewing属性 @0
|
||||
- 第1条的finished属性 @0
|
||||
- 第1条的closed属性 @0
|
||||
- 第1条的total属性 @2
|
||||
- 第story条的draft属性 @0
|
||||
- 第story条的active属性 @1
|
||||
- 第story条的changing属性 @1
|
||||
- 第story条的reviewing属性 @0
|
||||
- 第story条的finished属性 @0
|
||||
- 第story条的closed属性 @0
|
||||
- 第story条的total属性 @2
|
||||
- 测试产品id为1-10的产品下的需求统计信息
|
||||
- 第2条的draft属性 @0
|
||||
- 第2条的active属性 @1
|
||||
- 第2条的changing属性 @1
|
||||
- 第2条的reviewing属性 @0
|
||||
- 第2条的finished属性 @0
|
||||
- 第2条的closed属性 @0
|
||||
- 第2条的total属性 @2
|
||||
- 第story条的draft属性 @0
|
||||
- 第story条的active属性 @1
|
||||
- 第story条的changing属性 @1
|
||||
- 第story条的reviewing属性 @0
|
||||
- 第story条的finished属性 @0
|
||||
- 第story条的closed属性 @0
|
||||
- 第story条的total属性 @2
|
||||
- 测试产品id为11-20的产品下的需求统计信息
|
||||
- 第11条的draft属性 @0
|
||||
- 第11条的active属性 @1
|
||||
- 第11条的changing属性 @1
|
||||
- 第11条的reviewing属性 @0
|
||||
- 第11条的finished属性 @0
|
||||
- 第11条的closed属性 @0
|
||||
- 第11条的total属性 @2
|
||||
- 第story条的draft属性 @0
|
||||
- 第story条的active属性 @1
|
||||
- 第story条的changing属性 @1
|
||||
- 第story条的reviewing属性 @0
|
||||
- 第story条的finished属性 @0
|
||||
- 第story条的closed属性 @0
|
||||
- 第story条的total属性 @2
|
||||
|
||||
*/
|
||||
|
||||
@@ -46,6 +47,6 @@ $productIdList[] = range(1, 10);
|
||||
$productIdList[] = range(10, 20);
|
||||
|
||||
$productTester = new productTest();
|
||||
r($productTester->getStoryStatsTest($productIdList[0])) && p('1:draft,active,changing,reviewing,finished,closed,total') && e('0,1,1,0,0,0,2'); // 测试系统中所有产品下的需求统计信息
|
||||
r($productTester->getStoryStatsTest($productIdList[1])) && p('2:draft,active,changing,reviewing,finished,closed,total') && e('0,1,1,0,0,0,2'); // 测试产品id为1-10的产品下的需求统计信息
|
||||
r($productTester->getStoryStatsTest($productIdList[2])) && p('11:draft,active,changing,reviewing,finished,closed,total') && e('0,1,1,0,0,0,2'); // 测试产品id为11-20的产品下的需求统计信息
|
||||
r($productTester->getStoryStatsTest($productIdList[0])[1]) && p('story:draft,active,changing,reviewing,finished,closed,total') && e('0,1,1,0,0,0,2'); // 测试系统中所有产品下的需求统计信息
|
||||
r($productTester->getStoryStatsTest($productIdList[1])[2]) && p('story:draft,active,changing,reviewing,finished,closed,total') && e('0,1,1,0,0,0,2'); // 测试产品id为1-10的产品下的需求统计信息
|
||||
r($productTester->getStoryStatsTest($productIdList[2])[11]) && p('story:draft,active,changing,reviewing,finished,closed,total') && e('0,1,1,0,0,0,2'); // 测试产品id为11-20的产品下的需求统计信息
|
||||
@@ -8,7 +8,7 @@ timeout=0
|
||||
cid=0
|
||||
|
||||
- 无效重排，查看重排后的数量 @16
|
||||
- 无效重排，查看重排后索引为3的需求ID属性3 @40
|
||||
- 无效重排，查看重排后索引为3的需求ID属性3 @3
|
||||
- 有效重排，查看重排后的数量 @22
|
||||
- 有效重排，查看重排后索引为19的需求ID属性19 @19
|
||||
|
||||
@@ -18,54 +18,54 @@ include dirname(__FILE__, 2) . '/lib/story.unittest.class.php';
|
||||
|
||||
$onlyChildList = Array
|
||||
(
|
||||
71 => (object)['id' => 71, 'parent' => 0, 'grade' => 1],
|
||||
68 => (object)['id' => 68, 'parent' => 0, 'grade' => 1],
|
||||
41 => (object)['id' => 41, 'parent' => 31, 'grade' => 2],
|
||||
40 => (object)['id' => 40, 'parent' => 28, 'grade' => 2],
|
||||
35 => (object)['id' => 35, 'parent' => 0, 'grade' => 1],
|
||||
34 => (object)['id' => 34, 'parent' => 0, 'grade' => 1],
|
||||
33 => (object)['id' => 33, 'parent' => 0, 'grade' => 1],
|
||||
31 => (object)['id' => 31, 'parent' => 0, 'grade' => 1],
|
||||
7 => (object)['id' => 7, 'parent' => 0, 'grade' => 1],
|
||||
6 => (object)['id' => 6, 'parent' => 0, 'grade' => 1],
|
||||
5 => (object)['id' => 5, 'parent' => 0, 'grade' => 1],
|
||||
4 => (object)['id' => 4, 'parent' => 0, 'grade' => 1],
|
||||
3 => (object)['id' => 3, 'parent' => 0, 'grade' => 1],
|
||||
2 => (object)['id' => 2, 'parent' => 0, 'grade' => 1],
|
||||
290 => (object)['id' => 290, 'parent' => 31, 'grade' => 2],
|
||||
1 => (object)['id' => 1, 'parent' => 0, 'grade' => 1]
|
||||
71 => 0,
|
||||
68 => 0,
|
||||
41 => 31,
|
||||
40 => 28,
|
||||
35 => 0,
|
||||
34 => 0,
|
||||
33 => 0,
|
||||
31 => 0,
|
||||
7 => 0,
|
||||
6 => 0,
|
||||
5 => 0,
|
||||
4 => 0,
|
||||
3 => 0,
|
||||
2 => 0,
|
||||
290 => 31,
|
||||
1 => 0,
|
||||
);
|
||||
|
||||
$normalList = Array
|
||||
(
|
||||
49 => (object)['id' => 49, 'parent' => 0, 'grade' => 1],
|
||||
48 => (object)['id' => 48, 'parent' => 0, 'grade' => 1],
|
||||
36 => (object)['id' => 36, 'parent' => 0, 'grade' => 1],
|
||||
34 => (object)['id' => 34, 'parent' => 0, 'grade' => 1],
|
||||
33 => (object)['id' => 33, 'parent' => 0, 'grade' => 1],
|
||||
32 => (object)['id' => 32, 'parent' => 0, 'grade' => 1],
|
||||
31 => (object)['id' => 31, 'parent' => 0, 'grade' => 1],
|
||||
30 => (object)['id' => 30, 'parent' => 0, 'grade' => 1],
|
||||
29 => (object)['id' => 29, 'parent' => 0, 'grade' => 1],
|
||||
28 => (object)['id' => 28, 'parent' => 0, 'grade' => 1],
|
||||
27 => (object)['id' => 27, 'parent' => 0, 'grade' => 1],
|
||||
26 => (object)['id' => 26, 'parent' => 0, 'grade' => 1],
|
||||
19 => (object)['id' => 19, 'parent' => 18, 'grade' => 2],
|
||||
18 => (object)['id' => 18, 'parent' => 0, 'grade' => 1],
|
||||
17 => (object)['id' => 17, 'parent' => 0, 'grade' => 1],
|
||||
16 => (object)['id' => 16, 'parent' => 0, 'grade' => 1],
|
||||
15 => (object)['id' => 15, 'parent' => 0, 'grade' => 1],
|
||||
14 => (object)['id' => 14, 'parent' => 0, 'grade' => 1],
|
||||
21 => (object)['id' => 21, 'parent' => 20, 'grade' => 4],
|
||||
13 => (object)['id' => 13, 'parent' => 0, 'grade' => 1],
|
||||
20 => (object)['id' => 20, 'parent' => 19, 'grade' => 3],
|
||||
7 => (object)['id' => 7 , 'parent' => 0, 'grade' => 1]
|
||||
49 => 0,
|
||||
48 => 0,
|
||||
36 => 0,
|
||||
34 => 0,
|
||||
33 => 0,
|
||||
32 => 0,
|
||||
31 => 0,
|
||||
30 => 0,
|
||||
29 => 0,
|
||||
28 => 0,
|
||||
27 => 0,
|
||||
26 => 0,
|
||||
19 => 18,
|
||||
18 => 0,
|
||||
17 => 0,
|
||||
16 => 0,
|
||||
15 => 0,
|
||||
14 => 0,
|
||||
21 => 20,
|
||||
13 => 0,
|
||||
20 => 19,
|
||||
7 => 0,
|
||||
);
|
||||
|
||||
global $tester;
|
||||
$tester->loadModel('story');
|
||||
|
||||
r(count($tester->story->reorderStories($onlyChildList))) && p('') && e('16'); // 无效重排，查看重排后的数量
|
||||
r($tester->story->reorderStories($onlyChildList)) && p('3') && e('40'); // 无效重排，查看重排后索引为3的需求ID
|
||||
r($tester->story->reorderStories($onlyChildList)) && p('3') && e('3'); // 无效重排，查看重排后索引为3的需求ID
|
||||
r(count($tester->story->reorderStories($normalList))) && p('') && e('22'); // 有效重排，查看重排后的数量
|
||||
r($tester->story->reorderStories($normalList)) && p('19') && e('19'); // 有效重排，查看重排后索引为19的需求ID
|
||||
r($tester->story->reorderStories($normalList)) && p('19') && e('19'); // 有效重排，查看重排后索引为19的需求ID
|
||||
Reference in New Issue
Block a user