From 8476f4b7228e1727c97bb04ea7d2438c2f6ef0a1 Mon Sep 17 00:00:00 2001 From: LG_lai Date: Wed, 10 Apr 2024 17:26:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E6=B4=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 0-Login/Login-interface.robot | 8 +- 2-Web/Mall/Activity.robot | 3 +- 2-Web/Mall/ActivityResource.robot | 73 +- output/log.html | 10 +- output/output.xml | 1287 +++++++++++++++++++---------- output/report.html | 8 +- 6 files changed, 938 insertions(+), 451 deletions(-) diff --git a/0-Login/Login-interface.robot b/0-Login/Login-interface.robot index 0b7661a..52c4d71 100644 --- a/0-Login/Login-interface.robot +++ b/0-Login/Login-interface.robot @@ -6,7 +6,6 @@ Library String Library Collections Library OperatingSystem Library ImageHorizonLibrary -Resource ../2-Web/Mall/ActivityResource.robot *** Variables *** @@ -113,9 +112,10 @@ Resource ../2-Web/Mall/ActivityResource.robot #${file_path} Set Variable ${EXECDIR}\\Phone.txt #Append To File ${file_path} ${phone},888888\n #将'改为" - #${ActivityData} Set Variable [{'productId': '975071861488619520', 'productSpecId': '975071861522173952', 'mainCategory': 1, 'subCategory': 101, 'productTitle': '学历认证', 'productDesc': '学历认证产品描述', 'detailDesc': '学历认证详细描述', 'status': 2, 'unitOriginalPrice': 2768.0, 'unitSellingPrice': 2.768, 'productSpecUnit': 102, 'validityPeriodValue': '174', 'freebie': 'true'}, {'productId': '975071862004518912', 'productSpecId': '975071862038073344', 'mainCategory': 2, 'subCategory': 201, 'productTitle': '头像修改', 'productDesc': '头像修改产品描述', 'detailDesc': '头像修改详细描述', 'status': 2, 'unitOriginalPrice': 3639.0, 'unitSellingPrice': 3.639, 'productSpecUnit': 102, 'validityPeriodValue': '131', 'freebie': 'true'}, {'productId': '975071862520418304', 'productSpecId': '975071862553972736', 'mainCategory': 3, 'subCategory': 301, 'productTitle': '解锁更多人数', 'productDesc': '解锁更多人数产品描述', 'detailDesc': '解锁更多人数详细描述', 'status': 2, 'unitOriginalPrice': 3868.0, 'unitSellingPrice': 3.868, 'productSpecUnit': 101, 'validityPeriodValue': '30', 'freebie': 'true'}, {'productId': '975071863040512000', 'productSpecId': '975071863078260736', 'mainCategory': 3, 'subCategory': 302, 'productTitle': '高级搜索', 'productDesc': '高级搜索产品描述', 'detailDesc': '高级搜索详细描述', 'status': 2, 'unitOriginalPrice': 3350.0, 'unitSellingPrice': 3.35, 'productSpecUnit': 102, 'validityPeriodValue': '94', 'freebie': 'true'}, {'productId': '975071863556411392', 'productSpecId': '975071863589965824', 'mainCategory': 4, 'subCategory': 401, 'productTitle': '线下约见面', 'productDesc': '线下约见面产品描述', 'detailDesc': '线下约见面详情描述', 'status': 2, 'unitOriginalPrice': 3792.0, 'unitSellingPrice': 0.01, 'productSpecUnit': 102, 'validityPeriodValue': '250', 'freebie': 'true'}, {'productId': '975071864596598784', 'productSpecId': '975071864630153216', 'mainCategory': 3, 'subCategory': 601, 'productTitle': '会员', 'productDesc': '会员产品描述', 'detailDesc': '会员详情描述', 'status': 2, 'unitOriginalPrice': 3781.0, 'unitSellingPrice': 0.03, 'productSpecUnit': 101, 'validityPeriodValue': '244', 'freebie': 'false'}] - 查询婚介平台商品定价列表 - ${data} Replace String Using Regexp ${activityProductList} ' " + ${ActivityData} Set Variable ['{"detailDesc":"学历认证详细描述","freebie":"true","mainCategory":1,"productDesc":"学历认证产品描述","productId":"975071861488619520","productSpecId":"975071861522173952","productSpecUnit":102,"productTitle":"学历认证","status":2,"subCategory":101,"unitOriginalPrice":2768.0,"unitSellingPrice":"0","validityPeriodValue":"174"}','{"detailDesc":"头像修改详细描述","freebie":"true","mainCategory":2,"productDesc":"头像修改产品描述","productId":"975071862004518912","productSpecId":"975071862038073344","productSpecUnit":102,"productTitle":"头像修改","status":2,"subCategory":201,"unitOriginalPrice":3639.0,"unitSellingPrice":"0","validityPeriodValue":"131"}','{"detailDesc":"解锁更多人数详细描述","freebie":"true","mainCategory":3,"productDesc":"解锁更多人数产品描述","productId":"975071862520418304","productSpecId":"975071862553972736","productSpecUnit":101,"productTitle":"解锁更多人数","status":2,"subCategory":301,"unitOriginalPrice":3868.0,"unitSellingPrice":"0","validityPeriodValue":"30"}','{"detailDesc":"高级搜索详细描述","freebie":"true","mainCategory":3,"productDesc":"高级搜索产品描述","productId":"975071863040512000","productSpecId":"975071863078260736","productSpecUnit":102,"productTitle":"高级搜索","status":2,"subCategory":302,"unitOriginalPrice":3350.0,"unitSellingPrice":"0","validityPeriodValue":"94"}','{"detailDesc":"线下约见面详情描述","freebie":"true","mainCategory":4,"productDesc":"线下约见面产品描述","productId":"975071863556411392","productSpecId":"975071863589965824","productSpecUnit":102,"productTitle":"线下约见面","status":2,"subCategory":401,"unitOriginalPrice":3792.0,"unitSellingPrice":"0","validityPeriodValue":"250"}','{"detailDesc":"会员详情描述","freebie":"false","mainCategory":3,"productDesc":"会员产品描述","productId":"975071864596598784","productSpecId":"975071864630153216","productSpecUnit":101,"productTitle":"会员","status":2,"subCategory":601,"unitOriginalPrice":3781.0,"unitSellingPrice":0.03,"validityPeriodValue":"1"}'] + ${data} Replace String Using Regexp ${ActivityData} '{ { + ${data} Replace String Using Regexp ${data} }' } + log ${data} 数据库删除用户 Given 读取TXT文件 diff --git a/2-Web/Mall/Activity.robot b/2-Web/Mall/Activity.robot index f52e292..f5bca97 100644 --- a/2-Web/Mall/Activity.robot +++ b/2-Web/Mall/Activity.robot @@ -5,4 +5,5 @@ Resource ActivityResource.robot *** Test Cases *** 创建会员活动 Given 查询婚介平台商品定价列表 - #When 运营创建婚介活动 + When 运营创建婚介活动 + Then 查询婚介平台活动列表 diff --git a/2-Web/Mall/ActivityResource.robot b/2-Web/Mall/ActivityResource.robot index dab7e4d..44e574b 100644 --- a/2-Web/Mall/ActivityResource.robot +++ b/2-Web/Mall/ActivityResource.robot @@ -25,28 +25,36 @@ Library HttpLibrary.HTTP ${productData} Set Variable ${records[${index}]} ${subCategory} Get From Dictionary ${productData} subCategory ${Data} Add Object To Json ${productData} $.freebie true #将freebie:true塞到商品json中 - #${Data} Evaluate demjson.encode(${Data},encoding='utf-8').decode() demjson Set Global Variable ${Data} - Run Keyword If ${subCategory}==601 更新数据 + Run Keyword If ${subCategory}==601 更新是否赠品数据 ... ELSE log ${Data} Append To List ${activityProductList} ${Data} - log ${activityProductList} Set Global Variable ${activityProductList} END #将'转换为" ${ActivityDataList} Create List FOR ${data} IN @{activityProductList} + ${freebie} Get From Dictionary ${data} freebie #是否时赠品 + Set Global Variable ${data} + Run Keyword If '${freebie}'=='true' 设置赠品时商品价格为0 ${data} Evaluate demjson.encode(${data},encoding='utf-8').decode() demjson Append To List ${ActivityDataList} ${data} - log ${ActivityDataList} END - ${ActivityDataList} Evaluate str(${ActivityDataList}).replace("[","").replace("]","").split(",") + ${ActivityDataList} Convert To String ${ActivityDataList} + ${ActivityDataList} Replace String Using Regexp ${ActivityDataList} '{ { + ${ActivityDataList} Replace String Using Regexp ${ActivityDataList} }' } log ${ActivityDataList} Set Global Variable ${ActivityDataList} -更新数据 +更新是否赠品数据 ${Data} Update Value To Json ${Data} $.freebie false Set Global Variable ${Data} + log ${Data} + +设置赠品时商品价格为0 + ${Data} Update Value To Json ${Data} $.unitSellingPrice 0 + Set Global Variable ${Data} + log ${Data} 运营创建${dating}活动 #创建活动 @@ -54,5 +62,56 @@ Library HttpLibrary.HTTP Create Session dating ${${dating}.dating域名} ${admin_header} ${data} Set Variable { \ \ \ \ "activityName":"测试活动", \ \ \ \ "startTime":"2024-04-11 00:00:00", \ \ \ \ "endTime":"2024-04-11 23:59:59", \ \ \ \ "remark":"创建测试活动2024-04-09", \ \ \ \ "activityProductList":${ActivityDataList} } log ${data} - ${reps} POST On Session dating dating-agency-mall/user/save/activity + ${reps} POST On Session dating dating-agency-mall/user/save/activity ${data.encode('utf-8')} + ${id} Get From Dictionary ${reps.json()} data + ${message} Get From Dictionary ${reps.json()} message + Should Be Equal As Strings ${message} successful + END + Set Global Variable ${id} + +查询${dating}平台活动列表 + #查询活动列表 + FOR ${admin_header} IN @{Aheader_list} + Create Session dating ${${dating}.dating域名} ${admin_header} + ${reps} GET On Session dating dating-agency-mall/user/get/activity/by/operator/page params=pageSize=10&pageNum=1 + ${activityData} Get From Dictionary ${reps.json()['data']} records + Set Global Variable ${activityData} + 遍历活动列表 + END + +遍历活动列表 + FOR ${activity} IN @{activityData} + ${activityId} Get From Dictionary ${activity} id + Exit For Loop If ${activityId}==${id} + END + +查询${dating}商品信息 + #查询商品列表 + FOR ${admin_header} IN @{Aheader_list} + Create Session dating ${${dating}.dating域名} ${admin_header} + ${reps} GET On Session dating dating-agency-mall/user/page/product/by/operator params=pageSize=10&pageNum=1 + ${records} Get From Dictionary ${reps.json()['data']} records #获取商品列表数据 + Set Global Variable ${records} + END + #获取指定下标数据 + ${activityProductList} Create List + ${indexs} Create List 0 1 2 3 4 6 + FOR ${index} IN @{indexs} + ${productData} Set Variable ${records[${index}]} + ${subCategory} Get From Dictionary ${productData} subCategory + ${Data} Add Object To Json ${productData} $.freebie true #将freebie:true塞到商品json中 + ${freebie} Get From Dictionary ${Data} freebie #是否时赠品 + Set Global Variable ${Data} + Run Keyword If ${subCategory}==601 更新是否赠品数据 + ... ELSE log ${Data} + Run Keyword If '${freebie}'=='true' 设置赠品时商品价格为0 + ${Data} Evaluate demjson.encode(${Data},encoding='utf-8').decode() demjson #转换城字符串 + Append To List ${activityProductList} ${Data} + log ${activityProductList} + Set Global Variable ${activityProductList} END + ${ActivityDataList} Convert To String ${activityProductList} + ${ActivityDataList} Replace String Using Regexp ${ActivityDataList} '{ { + ${ActivityDataList} Replace String Using Regexp ${ActivityDataList} }' } + log ${ActivityDataList} + Set Global Variable ${ActivityDataList} diff --git a/output/log.html b/output/log.html index 07b6ec1..0efc645 100644 --- a/output/log.html +++ b/output/log.html @@ -1806,25 +1806,25 @@ function stopPropagation(event) { window.output = {};