From 40a362c7f2e91a4ebbff815ac64c2b9b66fefaec Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Sat, 9 Oct 2021 13:12:47 +0800
Subject: [PATCH] * Add data of deleted products.

---
 test/data/product.yaml      | 31 +++++++++++++++++--------------
 test/data/zentao/config.php |  2 +-
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/test/data/product.yaml b/test/data/product.yaml
index 3634102e3b..1e7a82a997 100644
--- a/test/data/product.yaml
+++ b/test/data/product.yaml
@@ -7,27 +7,30 @@ fields:
     range: 1-1000
   - field: program
     note: "所属项目集"
-    range: 1-40{3!},0{60},1{5},0{5}
+    range: 1-40{3!},0{60},1-5,0{5},1-5,0{5}
   - field: name
     note: "产品名称"
     fields:
     - field: name1
-      range: 正常产品{40},多分支产品{40},多平台产品{40},独立测试项目{7},独立产品{53},[@#$%%&&*测试名称长度能有多长并且包含特殊字符的一个长长的字符串（）！@#￥%……&*]{10}
+      range: 正常产品{40},多分支产品{40},多平台产品{40},独立测试项目{7},独立产品{53},[@#$%%&&*测试名称长度能有多长并且包含特殊字符的一个长长的字符串（）！@#￥%……&*]{10},已删除产品{10}
     - field: name2
       range: 1-120,1-7,128-1000
   - field: code
     note: "产品代号"
-    range: 1-300
-    prefix: "code"
+    fields:
+    - field: code1
+      range: code
+    - field: code2
+      range: 1-300
   - field: line
     note: "产品线"
     range: 0
   - field: type
     note: "产品类型"
-    range: normal{40},branch{40},platform{40},normal{20},branch{20},platform{20},normal{10}
+    range: normal{40},branch{40},platform{40},normal{20},branch{20},platform{20},normal{20}
   - field: status
     note: "状态"
-    range: normal{20},closed{20},normal{20},closed{20},normal{20},closed{20},normal{10},closed{10},normal{10},closed{10},normal{10},closed{10},normal{10}
+    range: normal{20},closed{20},normal{20},closed{20},normal{20},closed{20},normal{10},closed{10},normal{10},closed{10},normal{10},closed{10},normal{20}
   - field: subStatus
     note: "子状态"
     range: 0
@@ -56,19 +59,19 @@ fields:
       range: dev{120},[]{7},dev{80}
     - field: dev2
       range: 1-120,[]{7},121-200
-  - field: storyConcept
-    note: "需求概念"
-    range: 0
   - field: acl
     note: "访问控制"
-    range: open{10},private{10},open{10},private{10},open{10},private{10},open{10},private{10},open{10},private{10},open{10},private{10},open{5},private{5},open{5},private{5},open{5},private{5},open{5},private{5},open{5},private{5},open{5},private{5},open{10}
+    range: open{10},private{10},open{10},private{10},open{10},private{10},open{10},private{10},open{10},private{10},open{10},private{10},open{5},private{5},open{5},private{5},open{5},private{5},open{5},private{5},open{5},private{5},open{5},private{5},open{20}
   - field: whitelist
     note: "分组白名单"
-    range: []{15},`,test1,dev1,pm1,td1,pd2,qd2,top1,others1`{5},[]{15},`,test1,dev1,pm1,td1,pd2,qd2,top1,others1`{5},[]{15},`,test1,dev1,pm1,td1,pd2,qd2,top1,others1`{5},[]{15},`,test1,dev1,pm1,td1,pd2,qd2,top1,others1`{5},[]{15},`,test1,dev1,pm1,td1,pd2,qd2,top1,others1`{5},[]{15},`,test1,dev1,pm1,td1,pd2,qd2,top1,others1`{5},[]{7},`,test1,dev1,pm1,td1,pd2,qd2,top1,others1`{3},[]{7},`,test1,dev1,pm1,td1,pd2,qd2,top1,others1`{3},[]{7},`,test1,dev1,pm1,td1,pd2,qd2,top1,others1`{3},[]{7},`,test1,dev1,pm1,td1,pd2,qd2,top1,others1`{3},[]{7},`,test1,dev1,pm1,td1,pd2,qd2,top1,others1`{3},[]{7},`,test1,dev1,pm1,td1,pd2,qd2,top1,others1`{3},[]{10}
+    range: []{15},`,test1,dev1,pm1,td1,pd2,qd2,top1,others1`{5},[]{15},`,test1,dev1,pm1,td1,pd2,qd2,top1,others1`{5},[]{15},`,test1,dev1,pm1,td1,pd2,qd2,top1,others1`{5},[]{15},`,test1,dev1,pm1,td1,pd2,qd2,top1,others1`{5},[]{15},`,test1,dev1,pm1,td1,pd2,qd2,top1,others1`{5},[]{15},`,test1,dev1,pm1,td1,pd2,qd2,top1,others1`{5},[]{7},`,test1,dev1,pm1,td1,pd2,qd2,top1,others1`{3},[]{7},`,test1,dev1,pm1,td1,pd2,qd2,top1,others1`{3},[]{7},`,test1,dev1,pm1,td1,pd2,qd2,top1,others1`{3},[]{7},`,test1,dev1,pm1,td1,pd2,qd2,top1,others1`{3},[]{7},`,test1,dev1,pm1,td1,pd2,qd2,top1,others1`{3},[]{7},`,test1,dev1,pm1,td1,pd2,qd2,top1,others1`{3},[]{20}
   - field: createdBy
     note: "创建者"
-    from: user.yaml
-    user: account
+    fields:
+    - field: createdBy1
+      range: po
+    - field: createdBy2
+      range: 1-10
   - field: createdDate
     note: "创建日期"
     from: common.date.v1.yaml
@@ -81,4 +84,4 @@ fields:
     range: 5-10000:5
   - field: deleted
     note: "是否删除"
-    range: 0
+    range: 0{190},1{10}
diff --git a/test/data/zentao/config.php b/test/data/zentao/config.php
index 22dc3481e3..b08fe87f77 100644
--- a/test/data/zentao/config.php
+++ b/test/data/zentao/config.php
@@ -16,7 +16,7 @@ $builder->deptGrade3 = array('rows' => 10, 'data' => array('dept', 'deptgrade3')
 $builder->company     = array('rows' => 1,   'data' => array('company'));
 $builder->user        = array('rows' => 346, 'data' => array('user'));
 $builder->usergroup   = array('rows' => 349, 'data' => array('usergroup'));
-$builder->product     = array('rows' => 190, 'data' => array('product'));
+$builder->product     = array('rows' => 200, 'data' => array('product'));
 $builder->productplan = array('rows' => 120, 'data' => array('productplan'));
 $builder->branch      = array('rows' => 160, 'data' => array('branch'));