From de72a2bcefab99525f201521b8199c093a059d91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= Date: Thu, 30 Sep 2021 14:34:08 +0800 Subject: [PATCH] * adjust for project zendata. --- test/data/project.yaml | 12 ++---- test/data/zentao/commonproject.yaml | 37 ++++++++++++++++++ test/data/zentao/config.php | 5 +++ test/data/zentao/execution.yaml | 60 +++++++++++++++++++++++++++++ test/data/zentao/program.yaml | 8 ++-- test/data/zentao/programgrade1.yaml | 8 ++-- test/data/zentao/programgrade2.yaml | 17 ++++++-- test/data/zentao/programgrade3.yaml | 18 +++++++-- test/data/zentao/project.yaml | 0 test/data/zentao/projectgrade1.yaml | 21 ++++++++++ test/data/zentao/projectgrade2.yaml | 24 ++++++++++++ test/data/zentao/projectgrade3.yaml | 27 +++++++++++++ test/data/zentao/projectgrade4.yaml | 30 +++++++++++++++ test/lib/utils.php | 7 ++-- 14 files changed, 249 insertions(+), 25 deletions(-) create mode 100644 test/data/zentao/commonproject.yaml create mode 100644 test/data/zentao/execution.yaml delete mode 100644 test/data/zentao/project.yaml create mode 100644 test/data/zentao/projectgrade1.yaml create mode 100644 test/data/zentao/projectgrade2.yaml create mode 100644 test/data/zentao/projectgrade3.yaml create mode 100644 test/data/zentao/projectgrade4.yaml diff --git a/test/data/project.yaml b/test/data/project.yaml index 8646c3b6d8..2925f265e3 100644 --- a/test/data/project.yaml +++ b/test/data/project.yaml @@ -34,25 +34,21 @@ fields: range: - field: parent range: 1,2,3,4,2,1,[1-7]{2},[7-19]{3} - - field: path - prefix: "," - postfix: "," - range: - field: grade range: - - field: name - range: 1-10000 - prefix: "测试项目" - field: code range: 1-10000 prefix: "project" - field: begin from: common.date.v1.yaml use: date + - field: end + from: common.date.v1.yaml + use: date - field: PO range: - field: PM - range: + range: - field: QD range: - field: RD diff --git a/test/data/zentao/commonproject.yaml b/test/data/zentao/commonproject.yaml new file mode 100644 index 0000000000..7c7da39c17 --- /dev/null +++ b/test/data/zentao/commonproject.yaml @@ -0,0 +1,37 @@ +title: project +author: Zhu Jinyong +version: "1.0" +fields: + - field: project + range: 0 + - field: model + range: scrum + - field: type + range: project + - field: status + range: wait + - field: percent + range: 0 + - field: auth + range: extend,reset + - field: desc + range: 1-10000 + prefix: "项目描述" + - field: acl + range: open{4},private{4} + - field: whitelist + froms: + - from: common.user.v1.yaml + use: empty{8} + - from: common.user.v1.yaml + use: empty{8} + prefix: "," + - from: common.user.v1.yaml + use: one{8} + prefix: "," + - from: common.user.v1.yaml + use: two{8} + prefix: "," + - from: common.user.v1.yaml + use: three{8} + prefix: "," diff --git a/test/data/zentao/config.php b/test/data/zentao/config.php index 6c1a8d3f52..6ae5e5085e 100644 --- a/test/data/zentao/config.php +++ b/test/data/zentao/config.php @@ -3,6 +3,11 @@ $builder = new stdclass(); $builder->programGrade1 = array('rows' => 40, 'data' => array('project', 'program', 'programgrade1')); $builder->programGrade2 = array('rows' => 40, 'data' => array('project', 'program', 'programgrade2')); $builder->programGrade3 = array('rows' => 40, 'data' => array('project', 'program', 'programgrade3')); +$builder->projectGrade1 = array('rows' => 10, 'data' => array('project', 'commonproject', 'projectgrade1')); +$builder->projectGrade2 = array('rows' => 30, 'data' => array('project', 'commonproject', 'projectgrade2')); +$builder->projectGrade3 = array('rows' => 40, 'data' => array('project', 'commonproject', 'projectgrade3')); +$builder->projectGrade4 = array('rows' => 40, 'data' => array('project', 'commonproject', 'projectgrade4')); +$builder->execution = array('rows' => 700, 'data' => array('project', 'execution')); $builder->deptGrade1 = array('rows' => 15, 'data' => array('dept', 'deptgrade1')); $builder->deptGrade2 = array('rows' => 10, 'data' => array('dept', 'deptgrade2')); diff --git a/test/data/zentao/execution.yaml b/test/data/zentao/execution.yaml new file mode 100644 index 0000000000..48712f5a86 --- /dev/null +++ b/test/data/zentao/execution.yaml @@ -0,0 +1,60 @@ +title: project +author: Zhu Jinyong +version: "1.0" +fields: + - field: id + range: 241-10000 + - field: name + fields: + - field: grade1 + prefix: "测试项目" + range: 1-120 + - field: grade2 + prefix: "下的迭代" + range: 1-10000 + - field: project + range: 121-130{15},131-240{5} + - field: model + range: + - field: type + range: sprint + - field: status + range: wait,doing + - field: percent + range: 0 + - field: auth + range: + - field: desc + range: 1-10000 + prefix: "迭代描述" + - field: grade + range: 1 + - field: parent + range: 121-130{15},131-240{5} + - field: path + fields: + - field: grade1 + prefix: "," + postfix: "," + range: 121-130{15},131-240{5} + - field: self + postfix: "," + range: 241-10000 + - field: acl + range: open{4},private{4} + - field: whitelist + froms: + - from: common.user.v1.yaml + use: empty{8} + - from: common.user.v1.yaml + use: empty{8} + prefix: "," + - from: common.user.v1.yaml + use: one{8} + prefix: "," + - from: common.user.v1.yaml + use: two{8} + prefix: "," + - from: common.user.v1.yaml + use: three{8} + prefix: "," diff --git a/test/data/zentao/program.yaml b/test/data/zentao/program.yaml index 27f599e342..db1038a271 100644 --- a/test/data/zentao/program.yaml +++ b/test/data/zentao/program.yaml @@ -3,13 +3,15 @@ author: Zhu Jinyong version: "1.0" fields: - field: project - range: 1-10000 + range: 0 - field: model - range: + range: - field: type range: program - field: status - range: wait,doing,suspended,closed + range: wait + - field: parent + range: 0 - field: desc range: 1-10000 prefix: "项目集描述" diff --git a/test/data/zentao/programgrade1.yaml b/test/data/zentao/programgrade1.yaml index 11013becf1..fcbec24e67 100644 --- a/test/data/zentao/programgrade1.yaml +++ b/test/data/zentao/programgrade1.yaml @@ -6,10 +6,12 @@ fields: range: 1-10000 - field: name range: 1-10000 - prefix: "测试项目集" + prefix: "一级测试项目集" - field: grade range: 1 - field: parent - range: 1 + range: 0 - field: path - range: 1 + prefix: "," + postfix: "," + range: 1-10000 diff --git a/test/data/zentao/programgrade2.yaml b/test/data/zentao/programgrade2.yaml index 44edd439f8..3871c82683 100644 --- a/test/data/zentao/programgrade2.yaml +++ b/test/data/zentao/programgrade2.yaml @@ -6,10 +6,19 @@ fields: range: 41-10000 - field: name range: 41-10000 - prefix: "测试项目集" + prefix: "二级测试项目集" + - field: type + range: program - field: grade - range: 1 + range: 2 - field: parent - range: 1 + range: 1-40{2} - field: path - range: 1 + fields: + - field: grade1 + prefix: "," + postfix: "," + range: 1-40{2} + - field: self + postfix: "," + range: 41-10000 diff --git a/test/data/zentao/programgrade3.yaml b/test/data/zentao/programgrade3.yaml index fe6f8d8875..735b0479ee 100644 --- a/test/data/zentao/programgrade3.yaml +++ b/test/data/zentao/programgrade3.yaml @@ -6,10 +6,20 @@ fields: range: 81-10000 - field: name range: 81-10000 - prefix: "测试项目集" + prefix: "三级测试项目集" - field: grade - range: 1 + range: 3 - field: parent - range: 1 + range: 41-80{2} - field: path - range: 1 + fields: + - field: grade1 + prefix: "," + postfix: "," + range: 1-40{2} + - field: grade2 + postfix: "," + range: 41-80{2} + - field: self + postfix: "," + range: 81-10000 diff --git a/test/data/zentao/project.yaml b/test/data/zentao/project.yaml deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/test/data/zentao/projectgrade1.yaml b/test/data/zentao/projectgrade1.yaml new file mode 100644 index 0000000000..41858be409 --- /dev/null +++ b/test/data/zentao/projectgrade1.yaml @@ -0,0 +1,21 @@ +title: program +author: Zhu Jinyong +version: "1.0" +fields: + - field: id + range: 121-10000 + - field: name + range: 1-10000 + prefix: "独立测试项目" + - field: status + range: wait + - field: grade + range: 1 + - field: parent + range: 0 + - field: path + fields: + - field: grade1 + prefix: "," + postfix: "," + range: 121-10000 diff --git a/test/data/zentao/projectgrade2.yaml b/test/data/zentao/projectgrade2.yaml new file mode 100644 index 0000000000..6fa4dcff37 --- /dev/null +++ b/test/data/zentao/projectgrade2.yaml @@ -0,0 +1,24 @@ +title: program +author: Zhu Jinyong +version: "1.0" +fields: + - field: id + range: 131-10000 + - field: name + range: 11-10000 + prefix: "测试项目" + - field: status + range: wait + - field: grade + range: 2 + - field: parent + range: 1-40{2} + - field: path + fields: + - field: grade1 + prefix: "," + postfix: "," + range: 1-40{2} + - field: grade2 + postfix: "," + range: 131-10000 diff --git a/test/data/zentao/projectgrade3.yaml b/test/data/zentao/projectgrade3.yaml new file mode 100644 index 0000000000..17585a3df6 --- /dev/null +++ b/test/data/zentao/projectgrade3.yaml @@ -0,0 +1,27 @@ +title: program +author: Zhu Jinyong +version: "1.0" +fields: + - field: id + range: 161-10000 + - field: name + range: 41-10000 + prefix: "测试项目" + - field: status + range: wait + - field: grade + range: 3 + - field: parent + range: 41-80{2} + - field: path + fields: + - field: grade1 + prefix: "," + postfix: "," + range: 1-40{2} + - field: grade2 + postfix: "," + range: 41-80{2} + - field: self + postfix: "," + range: 161-10000 diff --git a/test/data/zentao/projectgrade4.yaml b/test/data/zentao/projectgrade4.yaml new file mode 100644 index 0000000000..a872421445 --- /dev/null +++ b/test/data/zentao/projectgrade4.yaml @@ -0,0 +1,30 @@ +title: program +author: Zhu Jinyong +version: "1.0" +fields: + - field: id + range: 201-10000 + - field: name + range: 81-10000 + prefix: "测试项目" + - field: status + range: wait + - field: grade + range: 4 + - field: parent + range: 81-120{2} + - field: path + fields: + - field: grade1 + prefix: "," + postfix: "," + range: 1-40{2} + - field: grade2 + postfix: "," + range: 41-80{2} + - field: grade3 + postfix: "," + range: 81-120{2} + - field: self + postfix: "," + range: 201-10000 diff --git a/test/lib/utils.php b/test/lib/utils.php index a7bddb55cc..c51b34fa4a 100644 --- a/test/lib/utils.php +++ b/test/lib/utils.php @@ -94,7 +94,7 @@ function zdRun() $dsn = "mysql:host={$config->db->host}:{$config->db->port};dbname={$config->db->name}"; $dbh = new PDO($dsn, $config->db->user, $config->db->password); echo 'MySQL connect success' . PHP_EOL; - + $dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); // 设置报错处理方式。 $dbh->exec("SET GLOBAL sql_mode = '';"); $dbh->exec("set names 'utf8'"); @@ -104,6 +104,7 @@ function zdRun() $tmpCommonPath = RUNTIME_ROOT . 'tmp/common'; if(file_exists($tmpCommonPath)) system("rm -rf $tmpCommonPath"); system("cp -r {$zdRoot}common $tmpCommonPath"); + system("rm {$zdRoot}sql/*"); /* Generate SQL files. */ $command = "$zdPath -c %s -d $zdRoot%s -n %s -o {$zdRoot}sql/%s.sql -table %s"; @@ -177,7 +178,7 @@ function zdRun() $count = $dbh->exec($sql); echo $tableName . ' insert rows ' . $count . PHP_EOL; } - + $dbh->commit(); $dbh = null; } @@ -207,7 +208,7 @@ Usage: init only init data and files control run unit test for controllers model run unit test for models - ui ui testing + ui ui testing all run all tests clean remove data, files and cached files