From aa184d189a9a05bc81a0fe1d38de95d3948c93bb Mon Sep 17 00:00:00 2001
From: lixiaoyu <lixiaoyu@easycorp.ltd>
Date: Tue, 22 Jul 2025 15:27:05 +0800
Subject: [PATCH] *[task#146787,doing,0.5h,3h] modify close program

---
 module/program/test/lib/closeprogram.ui.class.php | 9 ++++-----
 module/program/test/ui/closeprogram.php           | 5 ++++-
 module/program/test/ui/startprogram.php           | 1 +
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/module/program/test/lib/closeprogram.ui.class.php b/module/program/test/lib/closeprogram.ui.class.php
index 67f24d8080..c649e0b47e 100755
--- a/module/program/test/lib/closeprogram.ui.class.php
+++ b/module/program/test/lib/closeprogram.ui.class.php
@@ -6,7 +6,6 @@ class createProgramTester extends tester
      * 关闭项目集。
      *
      * @param  string $programName
-     * @param  array  $whitelist
      * @access public
      * @return void
      */
@@ -15,15 +14,15 @@ class createProgramTester extends tester
         $this->openUrl('program', 'browse');
         $browsePage = $this->loadpage('program', 'browse');
         $browsePage->dom->fstStartBtn->click();
-        $browsePage->wait(1);
+        $browsePage->wait(3);
         $browsePage->dom->startProgramBtn->click();
-        $browsePage->wait(1);
+        $browsePage->wait(3);
         $browsePage->dom->fstStartBtn->click();
         $browsePage->wait(2);
         $browsePage->dom->startProgramBtn->click();
-        $browsePage->wait(1);
+        $browsePage->wait(2);
         $browsePage->dom->search(array("项目集名称,=,{$programName->name}"));
-        $browsePage->wait(1);
+        $browsePage->wait(2);
 
         if($browsePage->dom->fstStatus->getText() != '已关闭') return $this->failed('关闭项目集失败');
         return $this->success('关闭项目集成功');
diff --git a/module/program/test/ui/closeprogram.php b/module/program/test/ui/closeprogram.php
index 503eaf094e..cc6fe953a1 100755
--- a/module/program/test/ui/closeprogram.php
+++ b/module/program/test/ui/closeprogram.php
@@ -5,6 +5,7 @@
 
 title=关闭项目集测试
 timeout=0
+cid=0
 
 - 关闭项目集，关闭成功
  - 测试结果 @关闭项目集成功
@@ -21,6 +22,7 @@ $program->project->range('0');
 $program->type->range('program');
 $program->name->range('项目集1,项目集2');
 $program->acl->range('open');
+$program->status->range('doing');
 $program->gen(2);
 
 $tester = new createProgramTester();
@@ -29,4 +31,5 @@ $tester->login();
 $programName = new stdClass();
 $programName->name = '项目集1';
 
-r($tester->closeProgram($programName)) && p('message,status') && e ('关闭项目集成功，SUCCESS'); //关闭项目集成功
+r($tester->closeProgram($programName)) && p('message,status') && e('关闭项目集成功,SUCCESS'); //关闭项目集成功
+$tester->closeBrowser();
diff --git a/module/program/test/ui/startprogram.php b/module/program/test/ui/startprogram.php
index c7bf48e11c..1e55b7430f 100755
--- a/module/program/test/ui/startprogram.php
+++ b/module/program/test/ui/startprogram.php
@@ -21,6 +21,7 @@ $program->project->range('0');
 $program->type->range('program');
 $program->name->range('项目集1,项目集2');
 $program->acl->range('open');
+$program->status->range('wait');
 $program->gen(2);
 
 $tester = new createProgramTester();