From d67f60554d9d22807f92591b0825f7fb7c2090f5 Mon Sep 17 00:00:00 2001
From: liyang <“liyang@easycorp.ltd”>
Date: Wed, 3 Aug 2022 16:20:19 +0800
Subject: [PATCH] * Fix test of createbycycle.

---
 test/model/todo/createbycycle.php | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/test/model/todo/createbycycle.php b/test/model/todo/createbycycle.php
index a1639b9ed8..959f65f5d6 100755
--- a/test/model/todo/createbycycle.php
+++ b/test/model/todo/createbycycle.php
@@ -2,6 +2,7 @@
 <?php
 include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
 include dirname(dirname(dirname(__FILE__))) . '/class/todo.class.php';
+$db->switchDB();
 su('admin');
 
 /**
@@ -12,25 +13,28 @@ pid=1
 
 测试创建周期日待办 >> 11
 测试创建周期周待办 >> 9
-测试创建周期月待办 >> 70
+测试创建周期月待办 >> `%d`
 
 */
 
+$days  = 31;
+$begin = call_user_func_array('date', array('Y-m-d'));
+$end   = call_user_func_array('date', array('Y-m-d', strtotime("+$days days")));
 $todo1 = new stdclass();
 $todo1->name               = 'cycle生成的待办1';
-$todo1->config             = '{"specify":{"month":"0","day":"1"},"day":"1","type":"day","beforeDays":11,"end":"","begin":"2022-03-23"}';
+$todo1->config             = '{"specify":{"month":"0","day":"1"},"day":"1","type":"day","beforeDays":11,"end":"' . $end . '","begin":"' . $begin  . '"}';
 
 $todo2 = new stdclass();
 $todo2->name               = 'cycle生成的待办2';
-$todo2->config             = '{"specify":{"month":"0","day":"1"},"week":"2,4,7","type":"week","beforeDays":31,"end":"","begin":"2022-03-23"}';
+$todo2->config             = '{"specify":{"month":"0","day":"1"},"week":"2,4,7","type":"week","beforeDays":31,"end":"' . $end . '","begin":"' . $begin  . '"}';
 
 $todo3 = new stdclass();
 $todo3->name               = 'cycle生成的待办3';
-$todo3->config             = '{"specify":{"month":"0","day":"1"},"month":"1,8,13,15,27,29,30","type":"month","beforeDays":301,"end":"","begin":"2022-03-23"}';
+$todo3->config             = '{"specify":{"month":"0","day":"1"},"month":"1,8,13,15,27,29,30","type":"month","beforeDays":301,"end":"' . $end . '","begin":"' . $begin  . '"}';
 
 $todo = new todoTest();
 
-r($todo->createByCycleTest($todo1)) && p() && e('11'); // 测试创建周期日待办
-r($todo->createByCycleTest($todo2)) && p() && e('9');  // 测试创建周期周待办
-r($todo->createByCycleTest($todo3)) && p() && e('70'); // 测试创建周期月待办
-system("./ztest init");
+r($todo->createByCycleTest($todo1)) && p() && e('11');   // 测试创建周期日待办
+r($todo->createByCycleTest($todo2)) && p() && e('9');    // 测试创建周期周待办
+r($todo->createByCycleTest($todo3)) && p() && e('`%d`'); // 测试创建周期月待办
+$db->restoreDB();