From d67b31dedc40baf668b8481aa48dd83fc1e3cb01 Mon Sep 17 00:00:00 2001 From: wangxuepeng Date: Mon, 23 Oct 2023 19:34:07 +0800 Subject: [PATCH] * Fixed unit test of messageModel::getToList. --- module/message/test/model/getmessages.php | 11 ++- module/message/test/model/gettolist.php | 10 +- .../test/model/yaml/getmessages/notify.yaml | 19 ++++ .../test/model/yaml/gettolist/meeting.yaml | 13 +++ .../test/model/yaml/gettolist/notify.yaml | 98 +++++++++++++++++++ test/data/meeting.yaml | 1 + 6 files changed, 147 insertions(+), 5 deletions(-) create mode 100644 module/message/test/model/yaml/getmessages/notify.yaml create mode 100644 module/message/test/model/yaml/gettolist/meeting.yaml create mode 100644 module/message/test/model/yaml/gettolist/notify.yaml diff --git a/module/message/test/model/getmessages.php b/module/message/test/model/getmessages.php index a9113cf0ed..9bf4d3ff62 100755 --- a/module/message/test/model/getmessages.php +++ b/module/message/test/model/getmessages.php @@ -2,7 +2,9 @@ config('notify')->gen(10); /** @@ -11,11 +13,12 @@ cid=1 pid=1 拿取status为wait的数据信息 >> 1 -拿取status为wait的数据信息 >> 114 +拿取status为wait的数据信息 >> wait;wait;wait */ + $message = new messageTest(); -r($message->getMessagesTest('wait')) && p('1:id') && e('1'); //拿取status为wait的数据信息 -r($message->getMessagesTest('wait')) && p('2:action') && e('114'); //拿取status为wait的数据信息 \ No newline at end of file +r($message->getMessagesTest('wait')) && p('1:id') && e('1'); //拿取status为wait的数据信息 +r($message->getMessagesTest('wait')) && p('1:status;3:status;5:status') && e('wait;wait;wait'); //拿取status为wait的数据信息 diff --git a/module/message/test/model/gettolist.php b/module/message/test/model/gettolist.php index e732797f56..29cab96656 100755 --- a/module/message/test/model/gettolist.php +++ b/module/message/test/model/gettolist.php @@ -4,6 +4,14 @@ include dirname(__FILE__, 5) . '/test/lib/init.php'; include dirname(__FILE__, 2) . '/message.class.php'; su('admin'); +zdTable('todo')->gen(1); +zdTable('testtask')->gen(1); +zdTable('meeting')->config('meeting')->gen(1); +zdTable('mr')->gen(1); +zdTable('release')->gen(1); +zdTable('task')->gen(1); +zdTable('story')->gen(1); + /** title=测试 messageModel->getToList(); @@ -26,4 +34,4 @@ r($message->getToListTest('testtask')) && p() && e('user3'); //通过一 r($message->getToListTest('meeting')) && p() && e('admin,admin,'); //通过一条meeting数据展示$toList r($message->getToListTest('mr')) && p() && e('admin,admin'); //通过一条mr数据展示$toList r($message->getToListTest('release')) && p() && e('po1'); //通过一条release数据展示$toList -r($message->getToListTest('task')) && p() && e('po82'); //通过一条task数据展示$toList \ No newline at end of file +r($message->getToListTest('task')) && p() && e('0'); //通过一条task数据展示$toList diff --git a/module/message/test/model/yaml/getmessages/notify.yaml b/module/message/test/model/yaml/getmessages/notify.yaml new file mode 100644 index 0000000000..8cf19fd429 --- /dev/null +++ b/module/message/test/model/yaml/getmessages/notify.yaml @@ -0,0 +1,19 @@ +title: table zt_notify +desc: "消息通知" +author: automated export +version: "1.0" +fields: + - field: objectType + note: "对象类型" + range: message + prefix: "" + postfix: "" + loop: 0 + format: "" + - field: toList + note: "指派用户" + range: admin{5},user10,test10,dev10,top10 + prefix: "," + postfix: "," + loop: 0 + format: "" diff --git a/module/message/test/model/yaml/gettolist/meeting.yaml b/module/message/test/model/yaml/gettolist/meeting.yaml new file mode 100644 index 0000000000..2bf72a8bc9 --- /dev/null +++ b/module/message/test/model/yaml/gettolist/meeting.yaml @@ -0,0 +1,13 @@ +title: table_meeting +desc: "" +author: Wang XuePeng +version: "1.0" +fields: + - field: minutedDate + range: "(-1M)-(+1w)" + type: timestamp + format: "YYYY-MM-DD hh:mm:ss" + - field: editedDate + range: "(-1M)-(+1w)" + type: timestamp + format: "YYYY-MM-DD hh:mm:ss" diff --git a/module/message/test/model/yaml/gettolist/notify.yaml b/module/message/test/model/yaml/gettolist/notify.yaml new file mode 100644 index 0000000000..fca26c1104 --- /dev/null +++ b/module/message/test/model/yaml/gettolist/notify.yaml @@ -0,0 +1,98 @@ +title: table zt_notify +desc: "消息通知" +author: automated export +version: "1.0" +fields: + - field: id + note: "ID" + range: 1-10000 + prefix: "" + postfix: "" + loop: 0 + format: "" + - field: objectType + note: "对象类型" + range: mail + prefix: "" + postfix: "" + loop: 0 + format: "" + - field: objectID + note: "对象ID" + range: 0 + prefix: "" + postfix: "" + loop: 0 + format: "" + - field: action + note: "操作记录ID" + range: 0 + prefix: "" + postfix: "" + loop: 0 + format: "" + - field: toList + note: "指派用户" + range: admin,user10,test10,dev10,top10 + prefix: "" + postfix: "" + loop: 0 + format: "" + - field: ccList + range: 0 + note: "" + prefix: "" + postfix: "" + loop: 0 + format: "" + - field: subject + note: "主题" + range: 1-100 + prefix: "主题" + postfix: "" + loop: 0 + format: "" + - field: data + note: "记录数据" + range: 1-100 + prefix: "用户创建了任务" + postfix: "" + loop: 0 + format: "" + - field: createdBy + note: "创建者" + range: dev12,test12,admin + prefix: "" + postfix: "" + loop: 0 + format: "" + - field: createdDate + note: "创建日期" + range: "(1M)-(1w)" + type: timestamp + format: "YYYY-MM-DD hh:mm:ss" + prefix: "" + postfix: "" + loop: 0 + - field: sendTime + note: "发送日期" + range: "(1M)-(1w)" + type: timestamp + format: "YYYY-MM-DD hh:mm:ss" + prefix: "" + postfix: "" + loop: 0 + - field: status + note: "状态" + range: wait,fail + prefix: "" + postfix: "" + loop: 0 + format: "" + - field: failReason + note: "失败原因" + range: "" + prefix: "" + postfix: "" + loop: 0 + format: "" diff --git a/test/data/meeting.yaml b/test/data/meeting.yaml index 81db5a6581..e89026c89b 100644 --- a/test/data/meeting.yaml +++ b/test/data/meeting.yaml @@ -1,4 +1,5 @@ title: table_meeting +author: Wang XuePeng desc: "" version: "1.0" fields: