From 16b7a866eb38c80e7aa0fbb394ea15ef7bc1d9c3 Mon Sep 17 00:00:00 2001 From: chaideqing Date: Sat, 13 May 2023 00:56:22 +0800 Subject: [PATCH] * Refactor project-tao unit test classifyprojects. --- module/project/test/tao/classfyprojects.php | 32 ------------------- module/project/test/tao/classifyprojects.php | 26 +++++++++++++++ .../project.yaml | 2 +- 3 files changed, 27 insertions(+), 33 deletions(-) delete mode 100755 module/project/test/tao/classfyprojects.php create mode 100755 module/project/test/tao/classifyprojects.php rename module/project/test/tao/yaml/{classfyprojects => classifyprojects}/project.yaml (81%) diff --git a/module/project/test/tao/classfyprojects.php b/module/project/test/tao/classfyprojects.php deleted file mode 100755 index bdc3ba9996..0000000000 --- a/module/project/test/tao/classfyprojects.php +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env php -config('project')->gen(8); - -/** - -title=测试 projectTao::classfyProjects -timeout=0 -cid=1 - -- 执行$executions['myProjects'] @3 - -- 执行$executions['otherProjects'] @2 - -- 执行$executions['closedGroup'] @1 - -*/ - -global $tester; -$tester->loadModel('program'); -$tester->loadModel('project'); - -$projectsStats = $tester->program->getProjectStats(0, 'all', 0, 'order_asc'); -$executions = $tester->project->classfyProjects($projectsStats); - -r(count($executions['myProjects'])) && p() && e('3'); -r(count($executions['otherProjects'])) && p() && e('2'); -r(count($executions['closedGroup'])) && p() && e('1'); \ No newline at end of file diff --git a/module/project/test/tao/classifyprojects.php b/module/project/test/tao/classifyprojects.php new file mode 100755 index 0000000000..8f85d53cec --- /dev/null +++ b/module/project/test/tao/classifyprojects.php @@ -0,0 +1,26 @@ +#!/usr/bin/env php +config('project')->gen(8); + +/** + +title=测试 projectTao::classifyProjects +timeout=0 +cid=1 + +*/ + +global $tester; +$tester->loadModel('program'); +$tester->loadModel('project'); + +$projectsStats = $tester->program->getProjectStats(0, 'all', 0, 'order_asc'); +$projects = $tester->project->classifyProjects($projectsStats); + +r(count($projects['myProjects'])) && p() && e('3'); // 测试分类后myProjects包含的项目数是3 +r(count($projects['otherProjects'])) && p() && e('2'); // 测试分类后otherProjects包含的项目数是2 +r(count($projects['closedProjects'])) && p() && e('1'); // 测试分类后closedProjects包含的项目数是1 diff --git a/module/project/test/tao/yaml/classfyprojects/project.yaml b/module/project/test/tao/yaml/classifyprojects/project.yaml similarity index 81% rename from module/project/test/tao/yaml/classfyprojects/project.yaml rename to module/project/test/tao/yaml/classifyprojects/project.yaml index 3d0bfd3245..4d9e111a31 100644 --- a/module/project/test/tao/yaml/classfyprojects/project.yaml +++ b/module/project/test/tao/yaml/classifyprojects/project.yaml @@ -1,4 +1,4 @@ -title: classfyprojects-project +title: classifyprojects-project author: chaideqing version: "1.0" fields: