From af07ceb1e88c864c8abe0c4ba5a6e2096d2e3ee8 Mon Sep 17 00:00:00 2001 From: ieemoo Date: Tue, 26 Nov 2024 18:03:16 +0800 Subject: [PATCH] Arthur-Wu committed this file on 2024-11-26 --- YiMao/businessFunc/ServiceApiLib.py | 35 +++++++------- YiMao/data/JiajiaYue.yaml | 2 + YiMao/data/WuShang.yaml | 4 ++ YiMao/data/YongHui.yaml | 2 + YiMao/data/ZhongBai.yaml | 3 ++ ...CAnon001_AddShoppingBagAndSettlePayment.py | 29 ++++++++++-- ...002_AddNonDiscountedProductsForPurchase.py | 4 +- ...t_CAnon003_AddMemberProductsForPurchase.py | 4 +- ...st_CAnon004_AddMultipleItemsForPurchase.py | 4 +- ...non005_AddDiscountedProductsForPurchase.py | 4 +- ...Anon006_AddPromotionalWhitelistProducts.py | 4 +- .../test_CAnon007_AddWeightToTheProduct.py | 4 +- .../test_CAnon008_ReturnShoppingBag.py | 4 +- ..._CAnon009_ReturnPurchaseOfOrdinaryGoods.py | 4 +- .../test_CAnon010_ReturnOfMemberProducts.py | 4 +- ...n011_ReturnOneItemFromMultiplePurchases.py | 4 +- ...est_CAnon012_ReturnOfDiscountedProducts.py | 4 +- ...non013_ReturnPromotionWhitelistProducts.py | 4 +- ...test_CAnon014_ReturnWeightOfTheProducte.py | 4 +- ...Anon015_AddPieceRateProductsForPurchase.py | 39 ++++++++-------- ...on016_AddPieceRateProductsAndReturnThem.py | 46 ++++++++++--------- ...on017_AddWeightBasedProductsForPurchase.py | 4 +- ...n018_PurchaseWeightedGoodsAndReturnThem.py | 4 +- .../test_CNoLogin001_CheckADs.py | 4 +- ..._CVip001_AddShoppingBagAndSettlePayment.py | 7 +-- ...002_AddNonDiscountedProductsForPurchase.py | 4 +- ...st_CVip003_AddMemberProductsForPurchase.py | 4 +- ...est_CVip004_AddMultipleItemsForPurchase.py | 4 +- ...Vip005_AddDiscountedProductsForPurchase.py | 4 +- ...CVip006_AddPromotionalWhitelistProducts.py | 4 +- .../test_CVip007_AddWeightToTheProduct.py | 4 +- .../test_CVip008_ReturnShoppingBag.py | 4 +- ...t_CVip009_ReturnPurchaseOfOrdinaryGoods.py | 4 +- .../test_CVip010_ReturnOfMemberProducts.py | 4 +- ...p011_ReturnOneItemFromMultiplePurchases.py | 4 +- ...test_CVip012_ReturnOfDiscountedProducts.py | 4 +- ...Vip013_ReturnPromotionWhitelistProducts.py | 4 +- .../test_CVip014_ReturnWeightOfTheProducte.py | 4 +- ...CVip015_AddPieceRateProductsForPurchase.py | 4 +- ...ip016_AddPieceRateProductsAndReturnThem.py | 4 +- ...ip017_AddWeightBasedProductsForPurchase.py | 4 +- ...p018_PurchaseWeightedGoodsAndReturnThem.py | 4 +- .../test_CVip019_ReceiveCoupon.py | 4 +- 43 files changed, 171 insertions(+), 132 deletions(-) diff --git a/YiMao/businessFunc/ServiceApiLib.py b/YiMao/businessFunc/ServiceApiLib.py index 79f8375..5af9b84 100644 --- a/YiMao/businessFunc/ServiceApiLib.py +++ b/YiMao/businessFunc/ServiceApiLib.py @@ -110,7 +110,7 @@ class YMServiceApi(object): logging.info(f"---接口返回状态码为:: {response.status_code}") logging.info(f"---接口返回体为:: {response.json()}\n\n") - def update_the_store_to_which_the_shopping_cart_belongs(self, CartMac, NewStoreId): + def update_the_store_to_which_the_shopping_cart_belongs(self, CartId, CartMac, NewStoreId): ''' NewStoreInfo={ "CartMac": "b8:2d:28:04:c7:5c", @@ -127,18 +127,18 @@ class YMServiceApi(object): ''' logging.info("========== [更新购物车 所属门店 信息] ==========") payload = json.dumps({ - "id": 1213, + "id": int(CartId), "mac": CartMac, # "storeId": int(NewStoreId), "cartModelId": 5, - "serialNum": "MMAT3FC10100003101023491", - "storeCartNo": "QH97", - "rfid": "0104e26401440143010000001", + "serialNum": "autoTest", + "storeCartNo": "ieemooTest_009", + "rfid": "autoTest", "status": 1, "motherboardType": "3568", "activationDate": "2024-08-01" }) - url = self.Domain + "admin/cart/1213" + url = self.Domain + f"admin/cart/{int(CartId)}" response = requests.request("PUT", url, headers=self.headerss, data=payload) logging.info(f"-----------接口返回状态码：{response.status_code}") logging.info(f"-----------接口返回数据：{response.json()}\n\n") @@ -225,26 +225,27 @@ class YMServiceApi(object): - - - if __name__ == '__main__': ''' + 1、购物车ID + 1）70:f7:54:07:a6:c0 - 1214 + 1）b8:2d:28:04:c7:5c - 1213 + {'code': 2007, 'msg': '设备的mac,sn,rfid不允许重复', 'data': None} + 亿猫超市-国秀广场-storeId: 9017, + 武商-梦时代-storeId: 69, - 家家悦-青岛乐客-storeId: 9022, 中百-中百测试店-storeId: 68, + 永辉-龙湖天街-storeId: 9010, + 家家悦-青岛乐客-storeId: 9022, ''' yms = YMServiceApi() GoodsInfo = {"GoodsInputcode": "6924743915848"} MarketAndStoreDetails = {"putMarketId": 50, "putStoreId": ["69"]} - NewStoreInfo = { - "CartMac": "70:f7:54:07:a6:c0", - # "CartMac": "b8:2d:28:04:c7:5c", - "StoreId": 69, - } + CartId = 1214 CartMac = "70:f7:54:07:a6:c0" - NewStoreId = 69 - yms.update_the_store_to_which_the_shopping_cart_belongs(CartMac, NewStoreId) \ No newline at end of file + NewStoreId = 68 + resp = yms.update_the_store_to_which_the_shopping_cart_belongs(CartId, CartMac, NewStoreId) + print(f"-----------更新购物车所属门店信息返回结果为:: \n{resp}\n\n") \ No newline at end of file diff --git a/YiMao/data/JiajiaYue.yaml b/YiMao/data/JiajiaYue.yaml index bf9e607..fbb9f61 100644 --- a/YiMao/data/JiajiaYue.yaml +++ b/YiMao/data/JiajiaYue.yaml @@ -1,5 +1,7 @@ # which is the data file for Wu Shang. +MarketName: 家家悦 + # 1-购物车Mac地址 #ShoppingCartMac: b8:2d:28:04:c7:5c ShoppingCartMac: 70:f7:54:07:a6:c0 diff --git a/YiMao/data/WuShang.yaml b/YiMao/data/WuShang.yaml index 13fab8b..59e71c3 100644 --- a/YiMao/data/WuShang.yaml +++ b/YiMao/data/WuShang.yaml @@ -6,8 +6,12 @@ #adsAreaId-5: 扫码广告 #adsAreaId-6: 支付后广告 #adsAreaId-7: 小票广告 + +MarketName: 武商梦时代门店 + # 1-购物车Mac地址 ShoppingCartMac: 70:f7:54:07:a6:c0 +CartId: 1214 # 2-武商会员账号 VIPPhoneNumber: 17786408673 diff --git a/YiMao/data/YongHui.yaml b/YiMao/data/YongHui.yaml index bf9e607..08ff7b5 100644 --- a/YiMao/data/YongHui.yaml +++ b/YiMao/data/YongHui.yaml @@ -1,5 +1,7 @@ # which is the data file for Wu Shang. +MarketName: 永辉龙湖天街店 + # 1-购物车Mac地址 #ShoppingCartMac: b8:2d:28:04:c7:5c ShoppingCartMac: 70:f7:54:07:a6:c0 diff --git a/YiMao/data/ZhongBai.yaml b/YiMao/data/ZhongBai.yaml index 0477a64..e701dae 100644 --- a/YiMao/data/ZhongBai.yaml +++ b/YiMao/data/ZhongBai.yaml @@ -1,7 +1,10 @@ # which is the data file for Wu Shang. +MarketName: 中百测试店 + # 1-购物车Mac地址 ShoppingCartMac: 70:f7:54:07:a6:c0 +CartId: 1214 # 2-武商会员账号 VIPPhoneNumber: 13237135934 diff --git a/YiMao/scripts/BusiScenarios/test_CAnon001_AddShoppingBagAndSettlePayment.py b/YiMao/scripts/BusiScenarios/test_CAnon001_AddShoppingBagAndSettlePayment.py index 9d336c4..c66ea75 100644 --- a/YiMao/scripts/BusiScenarios/test_CAnon001_AddShoppingBagAndSettlePayment.py +++ b/YiMao/scripts/BusiScenarios/test_CAnon001_AddShoppingBagAndSettlePayment.py @@ -6,20 +6,32 @@ import unittest,allure,time,pytest,ddt from configs.globalParams import DataInit from YiMao.businessFunc.ClientApiLib import YMClientApi +from YiMao.businessFunc.ServiceApiLib import YMServiceApi DescName = "Anon001-非会员加购购物袋并试算" @ddt.ddt -@allure.story(f'[场景测试] {DescName}验证') class Test_CAnon001_AddShoppingBagAndSettlePayment(unittest.TestCase): f'''@Date:: 2024/11/15 @Author:: Arthur Wu @Desc:: [购物车客户端] {DescName} ''' + @ddt.data(*DataInit) def test_CAnon00101_AddMidShoppingbagsForPurchase(self, data): - allure.dynamic.description(f"描述：加购中号购物袋") + allure.dynamic.story(f'[{data['MarketName']}-场景测试] {DescName}验证') + allure.dynamic.description(f"描述：{data['MarketName']}-{DescName}\n") ymc = YMClientApi(data["ShoppingCartMac"]) + # yms = YMServiceApi() + # CartId = data["CartId"] + # CartMac = data["ShoppingCartMac"] + # NewStoreId = data["MarketAndStoreDetails"]["putStoreId"][0] + # print(f"---切换购物车商超信息为：\n" + # f"CartId: {CartId}\n " + # f"CartMac: {CartMac}\n " + # f"NewStoreId: {NewStoreId}\n") + # yms.update_the_store_to_which_the_shopping_cart_belongs(CartId, CartMac, NewStoreId) + # time.sleep(1) goodsbag_mid = data["ShoppingBag"]["mid"] allure.step("步骤1：session开始") @@ -41,8 +53,19 @@ class Test_CAnon001_AddShoppingBagAndSettlePayment(unittest.TestCase): @ddt.data(*DataInit) def test_CAnon00102_AddMaxShoppingbagsForPurchase(self, data): - allure.dynamic.description("描述：加购大号购物袋") + allure.dynamic.story(f'[{data['MarketName']}-场景测试] {DescName}验证') + allure.dynamic.description(f"描述：{data['MarketName']}-{DescName}\n") ymc = YMClientApi(data["ShoppingCartMac"]) + # yms = YMServiceApi() + # CartId = data["CartId"] + # CartMac = data["ShoppingCartMac"] + # NewStoreId = data["MarketAndStoreDetails"]["putStoreId"][0] + # print(f"---切换购物车商超信息为：\n" + # f"CartId: {CartId}\n" + # f"CartMac: {CartMac}\n" + # f"NewStoreId: {NewStoreId}\n") + # yms.update_the_store_to_which_the_shopping_cart_belongs(CartId, CartMac, NewStoreId) + # time.sleep(1) goodsbag_max = data["ShoppingBag"]["max"] allure.step("步骤1：session开始") diff --git a/YiMao/scripts/BusiScenarios/test_CAnon002_AddNonDiscountedProductsForPurchase.py b/YiMao/scripts/BusiScenarios/test_CAnon002_AddNonDiscountedProductsForPurchase.py index c166f06..85a11bf 100644 --- a/YiMao/scripts/BusiScenarios/test_CAnon002_AddNonDiscountedProductsForPurchase.py +++ b/YiMao/scripts/BusiScenarios/test_CAnon002_AddNonDiscountedProductsForPurchase.py @@ -9,7 +9,6 @@ from configs.globalParams import DataInit DescName = "Anon002-非会员加购无优惠商品并试算" @ddt.ddt -@allure.story(f'[场景测试] {DescName}验证') class Test_CAnon002(unittest.TestCase): f'''@Date:: 2024/11/15 @Author:: Arthur Wu @@ -18,7 +17,8 @@ class Test_CAnon002(unittest.TestCase): ''' @ddt.data(*DataInit) def test_CAnon002_AddNonDiscountedProductsForPurchase(self, data): - allure.dynamic.description(f"描述：{DescName}") + allure.dynamic.story(f'[{data['MarketName']}-场景测试] {DescName}验证') + allure.dynamic.description(f"描述：{data['MarketName']}-{DescName}\n") ymc = YMClientApi(data["ShoppingCartMac"]) NormalGoodsInputcode01 = data["NormalGoods"]["goods01"] diff --git a/YiMao/scripts/BusiScenarios/test_CAnon003_AddMemberProductsForPurchase.py b/YiMao/scripts/BusiScenarios/test_CAnon003_AddMemberProductsForPurchase.py index 064e6d2..b84e584 100644 --- a/YiMao/scripts/BusiScenarios/test_CAnon003_AddMemberProductsForPurchase.py +++ b/YiMao/scripts/BusiScenarios/test_CAnon003_AddMemberProductsForPurchase.py @@ -9,7 +9,6 @@ from configs.globalParams import DataInit DescName = "Anon003-非会员加购会员商品并结算" @ddt.ddt -@allure.story(f'[场景测试] {DescName}验证') class Test_CAnon003(unittest.TestCase): f'''@Date:: 2024/11/15 @Author:: Arthur Wu @@ -18,7 +17,8 @@ class Test_CAnon003(unittest.TestCase): ''' @ddt.data(*DataInit) def test_CAnon003_AddMemberProductsForPurchase(self, data): - allure.dynamic.description(f"描述：{DescName}") + allure.dynamic.story(f'[{data['MarketName']}-场景测试] {DescName}验证') + allure.dynamic.description(f"描述：{data['MarketName']}-{DescName}\n") ymc = YMClientApi(data["ShoppingCartMac"]) vip_goods_inputcode = data["VipGoods"]["goods01"] diff --git a/YiMao/scripts/BusiScenarios/test_CAnon004_AddMultipleItemsForPurchase.py b/YiMao/scripts/BusiScenarios/test_CAnon004_AddMultipleItemsForPurchase.py index ec5c903..c39fecb 100644 --- a/YiMao/scripts/BusiScenarios/test_CAnon004_AddMultipleItemsForPurchase.py +++ b/YiMao/scripts/BusiScenarios/test_CAnon004_AddMultipleItemsForPurchase.py @@ -9,7 +9,6 @@ from configs.globalParams import DataInit DescName = "Anon004-非会员加购多件商品并结算" @ddt.ddt -@allure.story(f'[场景测试] {DescName}验证') class Test_CAnon004(unittest.TestCase): f'''@Date:: 2024/11/15 @Author:: Arthur Wu @@ -18,7 +17,8 @@ class Test_CAnon004(unittest.TestCase): ''' @ddt.data(*DataInit) def test_CAnon004_AddMultipleItemsForPurchase(self, data): - allure.dynamic.description(f"描述：{DescName}") + allure.dynamic.story(f'[{data['MarketName']}-场景测试] {DescName}验证') + allure.dynamic.description(f"描述：{data['MarketName']}-{DescName}\n") ymc = YMClientApi(data["ShoppingCartMac"]) goods_inputcode1 = data["NormalGoods"]["goods01"] goods_inputcode2 = data["NormalGoods"]["goods02"] diff --git a/YiMao/scripts/BusiScenarios/test_CAnon005_AddDiscountedProductsForPurchase.py b/YiMao/scripts/BusiScenarios/test_CAnon005_AddDiscountedProductsForPurchase.py index 36c715c..29bef8d 100644 --- a/YiMao/scripts/BusiScenarios/test_CAnon005_AddDiscountedProductsForPurchase.py +++ b/YiMao/scripts/BusiScenarios/test_CAnon005_AddDiscountedProductsForPurchase.py @@ -9,7 +9,6 @@ from configs.globalParams import DataInit DescName = "Anon005-非会员加购打折商品并结算" @ddt.ddt -@allure.story(f'[场景测试] {DescName}验证') class Test_CAnon005(unittest.TestCase): f'''@Date:: 2024/11/15 @Author:: Arthur Wu @@ -18,7 +17,8 @@ class Test_CAnon005(unittest.TestCase): ''' @ddt.data(*DataInit) def test_CAnon005_AddDiscountedProductsForPurchase(self, data): - allure.dynamic.description(f"描述：{DescName}") + allure.dynamic.story(f'[{data['MarketName']}-场景测试] {DescName}验证') + allure.dynamic.description(f"描述：{data['MarketName']}-{DescName}\n") ymc = YMClientApi(data["ShoppingCartMac"]) sale_goods_inputCode = data["SaleGoods"]["goods01"] diff --git a/YiMao/scripts/BusiScenarios/test_CAnon006_AddPromotionalWhitelistProducts.py b/YiMao/scripts/BusiScenarios/test_CAnon006_AddPromotionalWhitelistProducts.py index 57f2725..5c32223 100644 --- a/YiMao/scripts/BusiScenarios/test_CAnon006_AddPromotionalWhitelistProducts.py +++ b/YiMao/scripts/BusiScenarios/test_CAnon006_AddPromotionalWhitelistProducts.py @@ -10,7 +10,6 @@ from configs.globalParams import DataInit DescName = "Anon006-非会员加购促销白名单商品并结算" @ddt.ddt -@allure.story(f'[场景测试] {DescName}验证') class Test_CAnon006(unittest.TestCase): f'''@Date:: 2024/11/15 @Author:: Arthur Wu @@ -19,7 +18,8 @@ class Test_CAnon006(unittest.TestCase): ''' @ddt.data(*DataInit) def test_CAnon006_AddPromotionalWhitelistProducts(self, data): - allure.dynamic.description(f"描述：{DescName}") + allure.dynamic.story(f'[{data['MarketName']}-场景测试] {DescName}验证') + allure.dynamic.description(f"描述：{data['MarketName']}-{DescName}\n") ymc = YMClientApi(data["ShoppingCartMac"]) yms = YMServiceApi() promotional_whitelist_goods = data["PromotionalWhitelistGoods"] diff --git a/YiMao/scripts/BusiScenarios/test_CAnon007_AddWeightToTheProduct.py b/YiMao/scripts/BusiScenarios/test_CAnon007_AddWeightToTheProduct.py index 38191ec..55e62ea 100644 --- a/YiMao/scripts/BusiScenarios/test_CAnon007_AddWeightToTheProduct.py +++ b/YiMao/scripts/BusiScenarios/test_CAnon007_AddWeightToTheProduct.py @@ -11,7 +11,6 @@ from configs.globalParams import DataInit DescName = "Anon007-非会员加购重量放通商品并结算" @ddt.ddt -@allure.story(f'[场景测试] {DescName}验证') class Test_CAnon007(unittest.TestCase): f'''@Date:: 2024/11/15 @Author:: Arthur Wu @@ -20,7 +19,8 @@ class Test_CAnon007(unittest.TestCase): ''' @ddt.data(*DataInit) def test_CAnon007_AddWeightToTheProduct(self, data): - allure.dynamic.description(f"描述：{DescName}") + allure.dynamic.story(f'[{data['MarketName']}-场景测试] {DescName}验证') + allure.dynamic.description(f"描述：{data['MarketName']}-{DescName}\n") ymc = YMClientApi(data["ShoppingCartMac"]) yms = YMServiceApi() weight_to_whitelist_goods = data["WeightToWhitelistGoods"] diff --git a/YiMao/scripts/BusiScenarios/test_CAnon008_ReturnShoppingBag.py b/YiMao/scripts/BusiScenarios/test_CAnon008_ReturnShoppingBag.py index c3182b0..6ef8c89 100644 --- a/YiMao/scripts/BusiScenarios/test_CAnon008_ReturnShoppingBag.py +++ b/YiMao/scripts/BusiScenarios/test_CAnon008_ReturnShoppingBag.py @@ -9,7 +9,6 @@ from configs.globalParams import DataInit DescName = "Anon008-非会员，加购2个购物袋，退购一个购物袋，并结算" @ddt.ddt -@allure.story(f'[场景测试] {DescName}验证') class Test_CAnon008(unittest.TestCase): f'''@Date:: 2024/11/20 @Author:: Arthur Wu @@ -18,7 +17,8 @@ class Test_CAnon008(unittest.TestCase): ''' @ddt.data(*DataInit) def test_CAnon008_ReturnShoppingBag(self, data): - allure.dynamic.description(f"描述：{DescName}") + allure.dynamic.story(f'[{data['MarketName']}-场景测试] {DescName}验证') + allure.dynamic.description(f"描述：{data['MarketName']}-{DescName}\n") ymc = YMClientApi(data["ShoppingCartMac"]) shoppingbag_mid = data["ShoppingBag"]["mid"] shoppingbag_max = data["ShoppingBag"]["max"] diff --git a/YiMao/scripts/BusiScenarios/test_CAnon009_ReturnPurchaseOfOrdinaryGoods.py b/YiMao/scripts/BusiScenarios/test_CAnon009_ReturnPurchaseOfOrdinaryGoods.py index 965f7e1..fdaee0b 100644 --- a/YiMao/scripts/BusiScenarios/test_CAnon009_ReturnPurchaseOfOrdinaryGoods.py +++ b/YiMao/scripts/BusiScenarios/test_CAnon009_ReturnPurchaseOfOrdinaryGoods.py @@ -9,7 +9,6 @@ from configs.globalParams import DataInit DescName = "Anon009-非会员，加购2个普通商品，退购一个，并结算" @ddt.ddt -@allure.story(f'[场景测试] {DescName}验证') class Test_CAnon009(unittest.TestCase): f'''@Date:: 2024/11/20 @Author:: Arthur Wu @@ -18,7 +17,8 @@ class Test_CAnon009(unittest.TestCase): ''' @ddt.data(*DataInit) def test_CAnon009_ReturnPurchaseOfOrdinaryGoods(self, data): - allure.dynamic.description(f"描述：{DescName}") + allure.dynamic.story(f'[{data['MarketName']}-场景测试] {DescName}验证') + allure.dynamic.description(f"描述：{data['MarketName']}-{DescName}\n") ymc = YMClientApi(data["ShoppingCartMac"]) goods_01 = data["NormalGoods"]["goods01"] goods_02 = data["NormalGoods"]["goods02"] diff --git a/YiMao/scripts/BusiScenarios/test_CAnon010_ReturnOfMemberProducts.py b/YiMao/scripts/BusiScenarios/test_CAnon010_ReturnOfMemberProducts.py index ea505e1..02aaf9a 100644 --- a/YiMao/scripts/BusiScenarios/test_CAnon010_ReturnOfMemberProducts.py +++ b/YiMao/scripts/BusiScenarios/test_CAnon010_ReturnOfMemberProducts.py @@ -10,7 +10,6 @@ from configs.globalParams import DataInit DescName = "Anon010-非会员，加购2个会员商品，退购一个，并结算" @ddt.ddt -@allure.story(f'[场景测试] {DescName}验证') class Test_CAnon010(unittest.TestCase): f'''@Date:: 2024/11/20 @Author:: Arthur Wu @@ -19,7 +18,8 @@ class Test_CAnon010(unittest.TestCase): ''' @ddt.data(*DataInit) def test_CAnon010_ReturnOfMemberProducts(self, data): - allure.dynamic.description(f"描述：{DescName}") + allure.dynamic.story(f'[{data['MarketName']}-场景测试] {DescName}验证') + allure.dynamic.description(f"描述：{data['MarketName']}-{DescName}\n") ymc = YMClientApi(data["ShoppingCartMac"]) vip_goods_01 = data["VipGoods"]["goods01"] vip_goods_02 = data["VipGoods"]["goods02"] diff --git a/YiMao/scripts/BusiScenarios/test_CAnon011_ReturnOneItemFromMultiplePurchases.py b/YiMao/scripts/BusiScenarios/test_CAnon011_ReturnOneItemFromMultiplePurchases.py index e906359..0dcff0b 100644 --- a/YiMao/scripts/BusiScenarios/test_CAnon011_ReturnOneItemFromMultiplePurchases.py +++ b/YiMao/scripts/BusiScenarios/test_CAnon011_ReturnOneItemFromMultiplePurchases.py @@ -10,7 +10,6 @@ from configs.globalParams import DataInit DescName = "Anon011-非会员，加购多件商品，退购一个商品，并结算" @ddt.ddt -@allure.story(f'[场景测试] {DescName}验证') class Test_CAnon011(unittest.TestCase): f'''@Date:: 2024/11/20 @Author:: Arthur Wu @@ -19,7 +18,8 @@ class Test_CAnon011(unittest.TestCase): ''' @ddt.data(*DataInit) def test_CAnon011_ReturnOneItemFromMultiplePurchases(self, data): - allure.dynamic.description(f"描述：{DescName}") + allure.dynamic.story(f'[{data['MarketName']}-场景测试] {DescName}验证') + allure.dynamic.description(f"描述：{data['MarketName']}-{DescName}\n") ymc = YMClientApi(data["ShoppingCartMac"]) goods_inputcode1 = data["NormalGoods"]["goods01"] goods_inputcode2 = data["NormalGoods"]["goods02"] diff --git a/YiMao/scripts/BusiScenarios/test_CAnon012_ReturnOfDiscountedProducts.py b/YiMao/scripts/BusiScenarios/test_CAnon012_ReturnOfDiscountedProducts.py index 8b09f66..a6b56bf 100644 --- a/YiMao/scripts/BusiScenarios/test_CAnon012_ReturnOfDiscountedProducts.py +++ b/YiMao/scripts/BusiScenarios/test_CAnon012_ReturnOfDiscountedProducts.py @@ -10,7 +10,6 @@ from configs.globalParams import DataInit DescName = "Anon012-非会员，加购2个打折商品，退购一个，并结算" @ddt.ddt -@allure.story(f'[场景测试] {DescName}验证') class Test_CAnon012(unittest.TestCase): f'''@Date:: 2024/11/20 @Author:: Arthur Wu @@ -19,7 +18,8 @@ class Test_CAnon012(unittest.TestCase): ''' @ddt.data(*DataInit) def test_CAnon012_ReturnOfDiscountedProducts(self, data): - allure.dynamic.description(f"描述：{DescName}") + allure.dynamic.story(f'[{data['MarketName']}-场景测试] {DescName}验证') + allure.dynamic.description(f"描述：{data['MarketName']}-{DescName}\n") ymc = YMClientApi(data["ShoppingCartMac"]) sale_goods_inputCode = data["SaleGoods"]["goods01"] diff --git a/YiMao/scripts/BusiScenarios/test_CAnon013_ReturnPromotionWhitelistProducts.py b/YiMao/scripts/BusiScenarios/test_CAnon013_ReturnPromotionWhitelistProducts.py index 84220e6..281a8a9 100644 --- a/YiMao/scripts/BusiScenarios/test_CAnon013_ReturnPromotionWhitelistProducts.py +++ b/YiMao/scripts/BusiScenarios/test_CAnon013_ReturnPromotionWhitelistProducts.py @@ -11,7 +11,6 @@ from configs.globalParams import DataInit DescName = "Anon013-非会员加购2个促销白名单商品，退购一个" @ddt.ddt -@allure.story(f'[场景测试] {DescName}验证') class Test_CAnon013(unittest.TestCase): f'''@Date:: 2024/11/20 @Author:: Arthur Wu @@ -20,7 +19,8 @@ class Test_CAnon013(unittest.TestCase): ''' @ddt.data(*DataInit) def test_CAnon013_ReturnPromotionWhitelistProducts(self, data): - allure.dynamic.description(f"描述：{DescName}") + allure.dynamic.story(f'[{data['MarketName']}-场景测试] {DescName}验证') + allure.dynamic.description(f"描述：{data['MarketName']}-{DescName}\n") ymc = YMClientApi(data["ShoppingCartMac"]) yms = YMServiceApi() promotional_whitelist_goods = data["PromotionalWhitelistGoods"] diff --git a/YiMao/scripts/BusiScenarios/test_CAnon014_ReturnWeightOfTheProducte.py b/YiMao/scripts/BusiScenarios/test_CAnon014_ReturnWeightOfTheProducte.py index c1bb919..d0182e0 100644 --- a/YiMao/scripts/BusiScenarios/test_CAnon014_ReturnWeightOfTheProducte.py +++ b/YiMao/scripts/BusiScenarios/test_CAnon014_ReturnWeightOfTheProducte.py @@ -11,7 +11,6 @@ from configs.globalParams import DataInit DescName = "Anon014-非会员加购2个重量放通商品，退购一个" @ddt.ddt -@allure.story(f'[场景测试] {DescName}验证') class Test_CAnon014(unittest.TestCase): f'''@Date:: 2024/11/20 @Author:: Arthur Wu @@ -20,7 +19,8 @@ class Test_CAnon014(unittest.TestCase): ''' @ddt.data(*DataInit) def test_CAnon014_ReturnWeightOfTheProducte(self,data): - allure.dynamic.description(f"描述：{DescName}") + allure.dynamic.story(f'[{data['MarketName']}-场景测试] {DescName}验证') + allure.dynamic.description(f"描述：{data['MarketName']}-{DescName}\n") ymc = YMClientApi(data["ShoppingCartMac"]) yms = YMServiceApi() weight_to_whitelist_goods = data["WeightToWhitelistGoods"] diff --git a/YiMao/scripts/BusiScenarios/test_CAnon015_AddPieceRateProductsForPurchase.py b/YiMao/scripts/BusiScenarios/test_CAnon015_AddPieceRateProductsForPurchase.py index dcb583b..9e8e3a0 100644 --- a/YiMao/scripts/BusiScenarios/test_CAnon015_AddPieceRateProductsForPurchase.py +++ b/YiMao/scripts/BusiScenarios/test_CAnon015_AddPieceRateProductsForPurchase.py @@ -10,7 +10,6 @@ from configs.globalParams import DataInit DescName = "Anon015-匿名登录加购计件商品，并结算" @ddt.ddt -@allure.story(f'[场景测试] {DescName}验证') class Test_CAnon015(unittest.TestCase): f'''@Date:: 2024/11/22 @Author:: Arthur Wu @@ -19,27 +18,29 @@ class Test_CAnon015(unittest.TestCase): ''' @ddt.data(*DataInit) def test_CAnon015(self,data): - allure.dynamic.description(f"描述：{DescName}\n") + allure.dynamic.story(f'[{data['MarketName']}-场景测试] {DescName}验证') + allure.dynamic.description(f"描述：{data['MarketName']}-{DescName}\n") ymc = YMClientApi(data["ShoppingCartMac"]) piece_rate_goods = data["PieceRateGoods"]["GoodsInputcode"] - - allure.step("步骤1：session开始") - ymc.session_start() - allure.step("步骤2：匿名登录") - Payload01 = {"action": 0, "isAnon": True} - LoginData = ymc.login_app_v2(Payload01) - allure.step("步骤3：获取商品信息") - GetGoodsInfoResp_01 = ymc.get_goods_info(piece_rate_goods) - if GetGoodsInfoResp_01['msg'] != '加购商品不存在': - allure.step("步骤4：添加会员有优惠商品") - ymc.add_cart_goods(GetGoodsInfoResp_01, 1, LoginData) - allure.step("步骤5：获取购物车商品信息") - ymc.get_cart_goods_info([GetGoodsInfoResp_01]) - allure.step("步骤6：请求订单结算") - ymc.request_order_settlement(LoginData) + if piece_rate_goods is not None: + allure.step("步骤1：session开始") + ymc.session_start() + allure.step("步骤2：匿名登录") + Payload01 = {"action": 0, "isAnon": True} + LoginData = ymc.login_app_v2(Payload01) + allure.step("步骤3：获取商品信息") + GetGoodsInfoResp_01 = ymc.get_goods_info(piece_rate_goods) + if GetGoodsInfoResp_01['msg'] != '加购商品不存在': + allure.step("步骤4：添加会员有优惠商品") + ymc.add_cart_goods(GetGoodsInfoResp_01, 1, LoginData) + allure.step("步骤5：获取购物车商品信息") + ymc.get_cart_goods_info([GetGoodsInfoResp_01]) + allure.step("步骤6：请求订单结算") + ymc.request_order_settlement(LoginData) + else: + pytest.fail(f"---商品 {data["PieceRateGoods"]} 不存在") else: - LOGGER.info(f"---商品 {data["PieceRateGoods"]} 不存在") - pytest.fail(f"---商品 {data["PieceRateGoods"]} 不存在") + pytest.skip("---该商超未提供 计件商品 该场景跳过测试") if __name__ == '__main__': diff --git a/YiMao/scripts/BusiScenarios/test_CAnon016_AddPieceRateProductsAndReturnThem.py b/YiMao/scripts/BusiScenarios/test_CAnon016_AddPieceRateProductsAndReturnThem.py index c0297ba..b28a8ae 100644 --- a/YiMao/scripts/BusiScenarios/test_CAnon016_AddPieceRateProductsAndReturnThem.py +++ b/YiMao/scripts/BusiScenarios/test_CAnon016_AddPieceRateProductsAndReturnThem.py @@ -10,7 +10,6 @@ from configs.globalParams import DataInit DescName = "Anon016-匿名登录,加购计件商品，并退购" @ddt.ddt -@allure.story(f'[场景测试] {DescName}验证') class Test_CAnon016(unittest.TestCase): f'''@Date:: 2024/11/22 @Author:: Arthur Wu @@ -20,32 +19,35 @@ class Test_CAnon016(unittest.TestCase): @ddt.data(*DataInit) def test_CAnon016(self,data): - allure.dynamic.description(f"描述：{DescName}\n") + allure.dynamic.story(f'[{data['MarketName']}-场景测试] {DescName}验证') + allure.dynamic.description(f"描述：{data['MarketName']}-{DescName}\n") ymc = YMClientApi(data["ShoppingCartMac"]) piece_rate_goods = data["PieceRateGoods"]["GoodsInputcode"] + if piece_rate_goods is not None: + allure.step("步骤1：session开始") + ymc.session_start() + allure.step("步骤2：匿名登录") + Payload01 = {"action": 0, "isAnon": True} + LoginData = ymc.login_app_v2(Payload01) + allure.step("步骤3：获取商品信息") + GetGoodsInfoResp_01 = ymc.get_goods_info(piece_rate_goods) + if GetGoodsInfoResp_01['msg'] != '加购商品不存在': + allure.step("步骤4：添加会员有优惠商品") + AddGoodsResp = ymc.add_cart_goods(GetGoodsInfoResp_01, 2, LoginData) - allure.step("步骤1：session开始") - ymc.session_start() - allure.step("步骤2：匿名登录") - Payload01 = {"action": 0, "isAnon": True} - LoginData = ymc.login_app_v2(Payload01) - allure.step("步骤3：获取商品信息") - GetGoodsInfoResp_01 = ymc.get_goods_info(piece_rate_goods) - if GetGoodsInfoResp_01['msg'] != '加购商品不存在': - allure.step("步骤4：添加会员有优惠商品") - AddGoodsResp = ymc.add_cart_goods(GetGoodsInfoResp_01, 2, LoginData) + allure.step("\n步骤7：退购一件商品") + GetGoodsInfoList = [GetGoodsInfoResp_01] + AddGoodsResp_List = [AddGoodsResp] + ymc.delete_cart_goods(GetGoodsInfoList, LoginData, AddGoodsResp_List) - allure.step("\n步骤7：退购一件商品") - GetGoodsInfoList = [GetGoodsInfoResp_01] - AddGoodsResp_List = [AddGoodsResp] - ymc.delete_cart_goods(GetGoodsInfoList, LoginData, AddGoodsResp_List) - - allure.step("步骤5：获取购物车商品信息") - ymc.get_cart_goods_info() - allure.step("步骤6：请求订单结算") - ymc.request_order_settlement(LoginData) + allure.step("步骤5：获取购物车商品信息") + ymc.get_cart_goods_info() + allure.step("步骤6：请求订单结算") + ymc.request_order_settlement(LoginData) + else: + pytest.fail(f"---商品 {data["PieceRateGoods"]} 不存在") else: - pytest.fail(f"---商品 {data["PieceRateGoods"]} 不存在") + pytest.skip("---该商超未提供 计件商品 该场景跳过测试") if __name__ == '__main__': diff --git a/YiMao/scripts/BusiScenarios/test_CAnon017_AddWeightBasedProductsForPurchase.py b/YiMao/scripts/BusiScenarios/test_CAnon017_AddWeightBasedProductsForPurchase.py index 4ce993e..f2d116d 100644 --- a/YiMao/scripts/BusiScenarios/test_CAnon017_AddWeightBasedProductsForPurchase.py +++ b/YiMao/scripts/BusiScenarios/test_CAnon017_AddWeightBasedProductsForPurchase.py @@ -9,7 +9,6 @@ from configs.globalParams import DataInit DescName = "Anon017-匿名登录，加购计重商品，并结算" @ddt.ddt -@allure.story(f'[场景测试] {DescName}验证') class Test_CAnon017(unittest.TestCase): f'''@Date:: 2024/11/22 @Author:: Arthur Wu @@ -18,7 +17,8 @@ class Test_CAnon017(unittest.TestCase): ''' @ddt.data(*DataInit) def test_CAnon017(self,data): - allure.dynamic.description(f"描述：{DescName}\n") + allure.dynamic.story(f'[{data['MarketName']}-场景测试] {DescName}验证') + allure.dynamic.description(f"描述：{data['MarketName']}-{DescName}\n") ymc = YMClientApi(data["ShoppingCartMac"]) bulk_goods = data["MisspellingWeightGoods"]["GoodsInputcode"] diff --git a/YiMao/scripts/BusiScenarios/test_CAnon018_PurchaseWeightedGoodsAndReturnThem.py b/YiMao/scripts/BusiScenarios/test_CAnon018_PurchaseWeightedGoodsAndReturnThem.py index 6c2f8b5..cff526e 100644 --- a/YiMao/scripts/BusiScenarios/test_CAnon018_PurchaseWeightedGoodsAndReturnThem.py +++ b/YiMao/scripts/BusiScenarios/test_CAnon018_PurchaseWeightedGoodsAndReturnThem.py @@ -10,7 +10,6 @@ from configs.globalParams import DataInit DescName = "Anon018-匿名登录，加购计重商品，并退购" @ddt.ddt -@allure.story(f'[场景测试] {DescName}验证') class Test_CAnon018(unittest.TestCase): f'''@Date:: 2024/11/15 @Author:: Arthur Wu @@ -19,7 +18,8 @@ class Test_CAnon018(unittest.TestCase): ''' @ddt.data(*DataInit) def test_CAnon018(self,data): - allure.dynamic.description(f"描述：{DescName}\n") + allure.dynamic.story(f'[{data['MarketName']}-场景测试] {DescName}验证') + allure.dynamic.description(f"描述：{data['MarketName']}-{DescName}\n") ymc = YMClientApi(data["ShoppingCartMac"]) bulk_goods = data["MisspellingWeightGoods"]["GoodsInputcode"] diff --git a/YiMao/scripts/BusiScenarios/test_CNoLogin001_CheckADs.py b/YiMao/scripts/BusiScenarios/test_CNoLogin001_CheckADs.py index b108237..fbd7d94 100644 --- a/YiMao/scripts/BusiScenarios/test_CNoLogin001_CheckADs.py +++ b/YiMao/scripts/BusiScenarios/test_CNoLogin001_CheckADs.py @@ -10,7 +10,6 @@ from configs.globalParams import DataInit DescName = "NoLogin001-购物车客户端-广告" @ddt.ddt -@allure.story(f'[场景测试] {DescName}验证') class Test_CNoLogin001(unittest.TestCase): f'''@Date:: 2024/11/15 @Author:: Arthur Wu @@ -19,7 +18,8 @@ class Test_CNoLogin001(unittest.TestCase): ''' @ddt.data(*DataInit) def test_CNoLogin001_CheckADs(self,data): - allure.dynamic.description(f"描述：{DescName}") + allure.dynamic.story(f'[{data['MarketName']}-场景测试] {DescName}验证') + allure.dynamic.description(f"描述：{data['MarketName']}-{DescName}\n") ymc = YMClientApi(data["ShoppingCartMac"]) AdListData = ymc.get_ads_list() diff --git a/YiMao/scripts/BusiScenarios/test_CVip001_AddShoppingBagAndSettlePayment.py b/YiMao/scripts/BusiScenarios/test_CVip001_AddShoppingBagAndSettlePayment.py index b9de8b1..f3ab90a 100644 --- a/YiMao/scripts/BusiScenarios/test_CVip001_AddShoppingBagAndSettlePayment.py +++ b/YiMao/scripts/BusiScenarios/test_CVip001_AddShoppingBagAndSettlePayment.py @@ -10,7 +10,6 @@ from configs.globalParams import DataInit DescName = "Vip001-游客转会员登录，加购购物袋，并结算" @ddt.ddt -@allure.story(f'[场景测试] {DescName}验证') class Test_CVip001_AddShoppingBagAndSettlePayment(unittest.TestCase): f'''@Date:: 2024/11/20 @Author:: Arthur Wu @@ -19,7 +18,8 @@ class Test_CVip001_AddShoppingBagAndSettlePayment(unittest.TestCase): ''' @ddt.data(*DataInit) def test_CVip00101_AddMidShoppingbagsForPurchase(self,data): - allure.dynamic.description(f"描述：加购中号购物袋") + allure.dynamic.story(f'[{data['MarketName']}-场景测试] {DescName}验证') + allure.dynamic.description(f"描述：{data['MarketName']}-{DescName}\n") ymc = YMClientApi(data["ShoppingCartMac"]) vip_phone_num = data["VIPPhoneNumber"] goodsbag_mid = data["ShoppingBag"]["mid"] @@ -49,7 +49,8 @@ class Test_CVip001_AddShoppingBagAndSettlePayment(unittest.TestCase): @ddt.data(*DataInit) def test_CVip00102_AddMaxShoppingbagsForPurchase(self,data): - allure.dynamic.description("描述：加购大号购物袋") + allure.dynamic.story(f'[{data['MarketName']}-场景测试] {DescName}验证') + allure.dynamic.description(f"描述：{data['MarketName']}-{DescName}\n") ymc = YMClientApi(data["ShoppingCartMac"]) vip_phone_num = data["VIPPhoneNumber"] goodsbag_mid = data["ShoppingBag"]["mid"] diff --git a/YiMao/scripts/BusiScenarios/test_CVip002_AddNonDiscountedProductsForPurchase.py b/YiMao/scripts/BusiScenarios/test_CVip002_AddNonDiscountedProductsForPurchase.py index cc89636..37617bf 100644 --- a/YiMao/scripts/BusiScenarios/test_CVip002_AddNonDiscountedProductsForPurchase.py +++ b/YiMao/scripts/BusiScenarios/test_CVip002_AddNonDiscountedProductsForPurchase.py @@ -9,7 +9,6 @@ from configs.globalParams import DataInit DescName = "Vip002-游客转会员登录，加购普通商品，并结算" @ddt.ddt -@allure.story(f'[场景测试] {DescName}验证') class Test_CVip002(unittest.TestCase): f'''@Date:: 2024/11/15 @Author:: Arthur Wu @@ -18,7 +17,8 @@ class Test_CVip002(unittest.TestCase): ''' @ddt.data(*DataInit) def test_CVip002_AddNonDiscountedProductsForPurchase(self,data): - allure.dynamic.description(f"描述：{DescName}") + allure.dynamic.story(f'[{data['MarketName']}-场景测试] {DescName}验证') + allure.dynamic.description(f"描述：{data['MarketName']}-{DescName}\n") ymc = YMClientApi(data["ShoppingCartMac"]) vip_phone_num = data["VIPPhoneNumber"] NormalGoodsInputcode01 = data["NormalGoods"]["goods01"] diff --git a/YiMao/scripts/BusiScenarios/test_CVip003_AddMemberProductsForPurchase.py b/YiMao/scripts/BusiScenarios/test_CVip003_AddMemberProductsForPurchase.py index 710878a..be7ee49 100644 --- a/YiMao/scripts/BusiScenarios/test_CVip003_AddMemberProductsForPurchase.py +++ b/YiMao/scripts/BusiScenarios/test_CVip003_AddMemberProductsForPurchase.py @@ -9,7 +9,6 @@ from configs.globalParams import DataInit DescName = "Vip003-游客转会员登录，加购会员商品，并结算" @ddt.ddt -@allure.story(f'[场景测试] {DescName}验证') class Test_CVip003(unittest.TestCase): f'''@Date:: 2024/11/20 @Author:: Arthur Wu @@ -18,7 +17,8 @@ class Test_CVip003(unittest.TestCase): ''' @ddt.data(*DataInit) def test_CVip003_AddMemberProductsForPurchase(self,data): - allure.dynamic.description(f"描述：{DescName}") + allure.dynamic.story(f'[{data['MarketName']}-场景测试] {DescName}验证') + allure.dynamic.description(f"描述：{data['MarketName']}-{DescName}\n") ymc = YMClientApi(data["ShoppingCartMac"]) vip_phone_num = data["VIPPhoneNumber"] vip_goods_inputcode = data["VipGoods"]["goods01"] diff --git a/YiMao/scripts/BusiScenarios/test_CVip004_AddMultipleItemsForPurchase.py b/YiMao/scripts/BusiScenarios/test_CVip004_AddMultipleItemsForPurchase.py index 7363cf5..f74a8b0 100644 --- a/YiMao/scripts/BusiScenarios/test_CVip004_AddMultipleItemsForPurchase.py +++ b/YiMao/scripts/BusiScenarios/test_CVip004_AddMultipleItemsForPurchase.py @@ -9,7 +9,6 @@ from configs.globalParams import DataInit DescName = "Vip004-游客转会员登录，加购多件商品，并结算" @ddt.ddt -@allure.story(f'[场景测试] {DescName}验证') class Test_CVip004(unittest.TestCase): f'''@Date:: 2024/11/15 @Author:: Arthur Wu @@ -18,7 +17,8 @@ class Test_CVip004(unittest.TestCase): ''' @ddt.data(*DataInit) def test_CVip004_AddMultipleItemsForPurchase(self,data): - allure.dynamic.description(f"描述：{DescName}") + allure.dynamic.story(f'[{data['MarketName']}-场景测试] {DescName}验证') + allure.dynamic.description(f"描述：{data['MarketName']}-{DescName}\n") ymc = YMClientApi(data["ShoppingCartMac"]) vip_phone_num = data["VIPPhoneNumber"] goods_inputcode1 = data["NormalGoods"]["goods01"] diff --git a/YiMao/scripts/BusiScenarios/test_CVip005_AddDiscountedProductsForPurchase.py b/YiMao/scripts/BusiScenarios/test_CVip005_AddDiscountedProductsForPurchase.py index 30818f8..91d8280 100644 --- a/YiMao/scripts/BusiScenarios/test_CVip005_AddDiscountedProductsForPurchase.py +++ b/YiMao/scripts/BusiScenarios/test_CVip005_AddDiscountedProductsForPurchase.py @@ -10,7 +10,6 @@ from configs.globalParams import DataInit DescName = "Vip005-游客转会员登录，加购打折商品，并结算" @ddt.ddt -@allure.story(f'[场景测试] {DescName}验证') class Test_CVip005(unittest.TestCase): f'''@Date:: 2024/11/21 @Author:: Arthur Wu @@ -19,7 +18,8 @@ class Test_CVip005(unittest.TestCase): ''' @ddt.data(*DataInit) def test_CVip005_AddDiscountedProductsForPurchase(self,data): - allure.dynamic.description(f"描述：{DescName}") + allure.dynamic.story(f'[{data['MarketName']}-场景测试] {DescName}验证') + allure.dynamic.description(f"描述：{data['MarketName']}-{DescName}\n") ymc = YMClientApi(data["ShoppingCartMac"]) vip_phone_num = data["VIPPhoneNumber"] sale_goods_inputCode = data["SaleGoods"]["goods01"] diff --git a/YiMao/scripts/BusiScenarios/test_CVip006_AddPromotionalWhitelistProducts.py b/YiMao/scripts/BusiScenarios/test_CVip006_AddPromotionalWhitelistProducts.py index 9df9709..3532fad 100644 --- a/YiMao/scripts/BusiScenarios/test_CVip006_AddPromotionalWhitelistProducts.py +++ b/YiMao/scripts/BusiScenarios/test_CVip006_AddPromotionalWhitelistProducts.py @@ -11,7 +11,6 @@ from configs.globalParams import DataInit DescName = "Vip006-游客转会员登录，加购促销白名单商品，并结算" @ddt.ddt -@allure.story(f'[场景测试] {DescName}验证') class Test_CVip006(unittest.TestCase): f'''@Date:: 2024/11/15 @Author:: Arthur Wu @@ -20,7 +19,8 @@ class Test_CVip006(unittest.TestCase): ''' @ddt.data(*DataInit) def test_CVip006_AddPromotionalWhitelistProducts(self,data): - allure.dynamic.description(f"描述：{DescName}") + allure.dynamic.story(f'[{data['MarketName']}-场景测试] {DescName}验证') + allure.dynamic.description(f"描述：{data['MarketName']}-{DescName}\n") ymc = YMClientApi(data["ShoppingCartMac"]) yms = YMServiceApi() vip_phone_num = data["VIPPhoneNumber"] diff --git a/YiMao/scripts/BusiScenarios/test_CVip007_AddWeightToTheProduct.py b/YiMao/scripts/BusiScenarios/test_CVip007_AddWeightToTheProduct.py index 64dea96..fa4a3c3 100644 --- a/YiMao/scripts/BusiScenarios/test_CVip007_AddWeightToTheProduct.py +++ b/YiMao/scripts/BusiScenarios/test_CVip007_AddWeightToTheProduct.py @@ -11,7 +11,6 @@ from configs.globalParams import DataInit DescName = "Vip007-游客转会员登录，加购重量放通商品，并结算" @ddt.ddt -@allure.story(f'[场景测试] {DescName}验证') class Test_CVip007(unittest.TestCase): f'''@Date:: 2024/11/15 @Author:: Arthur Wu @@ -21,7 +20,8 @@ class Test_CVip007(unittest.TestCase): @ddt.data(*DataInit) def test_CVip007_AddWeightToTheProduct(self,data): - allure.dynamic.description(f"描述：{DescName}") + allure.dynamic.story(f'[{data['MarketName']}-场景测试] {DescName}验证') + allure.dynamic.description(f"描述：{data['MarketName']}-{DescName}\n") ymc = YMClientApi(data["ShoppingCartMac"]) yms = YMServiceApi() CartMac = data["ShoppingCartMac"] diff --git a/YiMao/scripts/BusiScenarios/test_CVip008_ReturnShoppingBag.py b/YiMao/scripts/BusiScenarios/test_CVip008_ReturnShoppingBag.py index 1ce956f..27b92bf 100644 --- a/YiMao/scripts/BusiScenarios/test_CVip008_ReturnShoppingBag.py +++ b/YiMao/scripts/BusiScenarios/test_CVip008_ReturnShoppingBag.py @@ -11,7 +11,6 @@ from configs.globalParams import DataInit DescName = "Vip008-游客转会员登录，加购2个购物袋，退购一个购物袋，并结算" @ddt.ddt -@allure.story(f'[场景测试] {DescName}验证') class Test_CVip008(unittest.TestCase): f'''@Date:: 2024/11/20 @Author:: Arthur Wu @@ -21,7 +20,8 @@ class Test_CVip008(unittest.TestCase): @ddt.data(*DataInit) def test_CVip008_ReturnShoppingBag(self,data): - allure.dynamic.description(f"描述：{DescName}") + allure.dynamic.story(f'[{data['MarketName']}-场景测试] {DescName}验证') + allure.dynamic.description(f"描述：{data['MarketName']}-{DescName}\n") ymc = YMClientApi(data["ShoppingCartMac"]) yms = YMServiceApi() CartMac = data["ShoppingCartMac"] diff --git a/YiMao/scripts/BusiScenarios/test_CVip009_ReturnPurchaseOfOrdinaryGoods.py b/YiMao/scripts/BusiScenarios/test_CVip009_ReturnPurchaseOfOrdinaryGoods.py index e085056..11a0513 100644 --- a/YiMao/scripts/BusiScenarios/test_CVip009_ReturnPurchaseOfOrdinaryGoods.py +++ b/YiMao/scripts/BusiScenarios/test_CVip009_ReturnPurchaseOfOrdinaryGoods.py @@ -11,7 +11,6 @@ from configs.globalParams import DataInit DescName = "Vip009-游客转会员登录，加购2个普通商品，退购一个，并结算" @ddt.ddt -@allure.story(f'[场景测试] {DescName}验证') class Test_CVip009(unittest.TestCase): f'''@Date:: 2024/11/20 @Author:: Arthur Wu @@ -21,7 +20,8 @@ class Test_CVip009(unittest.TestCase): @ddt.data(*DataInit) def test_CVip009_ReturnPurchaseOfOrdinaryGoods(self, data): - allure.dynamic.description(f"描述：{DescName}") + allure.dynamic.story(f'[{data['MarketName']}-场景测试] {DescName}验证') + allure.dynamic.description(f"描述：{data['MarketName']}-{DescName}\n") ymc = YMClientApi(data["ShoppingCartMac"]) yms = YMServiceApi() CartMac = data["ShoppingCartMac"] diff --git a/YiMao/scripts/BusiScenarios/test_CVip010_ReturnOfMemberProducts.py b/YiMao/scripts/BusiScenarios/test_CVip010_ReturnOfMemberProducts.py index dc0d05e..8c7c608 100644 --- a/YiMao/scripts/BusiScenarios/test_CVip010_ReturnOfMemberProducts.py +++ b/YiMao/scripts/BusiScenarios/test_CVip010_ReturnOfMemberProducts.py @@ -11,7 +11,6 @@ from configs.globalParams import DataInit DescName = "Vip010-游客转会员登录，加购2个会员商品，退购一个，并结算" @ddt.ddt -@allure.story(f'[场景测试] {DescName}验证') class Test_CVip010(unittest.TestCase): f'''@Date:: 2024/11/20 @Author:: Arthur Wu @@ -21,7 +20,8 @@ class Test_CVip010(unittest.TestCase): @ddt.data(*DataInit) def test_CVip010_ReturnOfMemberProducts(self,data): - allure.dynamic.description(f"描述：{DescName}") + allure.dynamic.story(f'[{data['MarketName']}-场景测试] {DescName}验证') + allure.dynamic.description(f"描述：{data['MarketName']}-{DescName}\n") ymc = YMClientApi(data["ShoppingCartMac"]) yms = YMServiceApi() CartMac = data["ShoppingCartMac"] diff --git a/YiMao/scripts/BusiScenarios/test_CVip011_ReturnOneItemFromMultiplePurchases.py b/YiMao/scripts/BusiScenarios/test_CVip011_ReturnOneItemFromMultiplePurchases.py index 49c7628..7867e82 100644 --- a/YiMao/scripts/BusiScenarios/test_CVip011_ReturnOneItemFromMultiplePurchases.py +++ b/YiMao/scripts/BusiScenarios/test_CVip011_ReturnOneItemFromMultiplePurchases.py @@ -9,7 +9,6 @@ from configs.globalParams import DataInit DescName = "Vip011-游客转会员登录，加购多件商品，退购一个商品，并结算" @ddt.ddt -@allure.story(f'[场景测试] {DescName}验证') class Test_CVip011(unittest.TestCase): f'''@Date:: 2024/11/20 @Author:: Arthur Wu @@ -19,7 +18,8 @@ class Test_CVip011(unittest.TestCase): @ddt.data(*DataInit) def test_CVip011_ReturnOneItemFromMultiplePurchases(self,data): - allure.dynamic.description(f"描述：{DescName}") + allure.dynamic.story(f'[{data['MarketName']}-场景测试] {DescName}验证') + allure.dynamic.description(f"描述：{data['MarketName']}-{DescName}\n") ymc = YMClientApi(data["ShoppingCartMac"]) vip_phone_num = data["VIPPhoneNumber"] goods_inputcode1 = data["NormalGoods"]['goods01'] diff --git a/YiMao/scripts/BusiScenarios/test_CVip012_ReturnOfDiscountedProducts.py b/YiMao/scripts/BusiScenarios/test_CVip012_ReturnOfDiscountedProducts.py index 6f2c3ef..505e49a 100644 --- a/YiMao/scripts/BusiScenarios/test_CVip012_ReturnOfDiscountedProducts.py +++ b/YiMao/scripts/BusiScenarios/test_CVip012_ReturnOfDiscountedProducts.py @@ -9,7 +9,6 @@ from configs.globalParams import DataInit DescName = "Vip012-游客转会员登录，加购2个打折商品，退购一个，并结算" @ddt.ddt -@allure.story(f'[场景测试] {DescName}验证') class Test_CVip012(unittest.TestCase): f'''@Date:: 2024/11/20 @Author:: Arthur Wu @@ -19,7 +18,8 @@ class Test_CVip012(unittest.TestCase): @ddt.data(*DataInit) def test_CVip012_ReturnOfDiscountedProducts(self, data): - allure.dynamic.description(f"描述：{DescName}") + allure.dynamic.story(f'[{data['MarketName']}-场景测试] {DescName}验证') + allure.dynamic.description(f"描述：{data['MarketName']}-{DescName}\n") ymc = YMClientApi(data["ShoppingCartMac"]) vip_phone_num = data["VIPPhoneNumber"] sale_goods_inputCode = data["SaleGoods"]['goods01'] diff --git a/YiMao/scripts/BusiScenarios/test_CVip013_ReturnPromotionWhitelistProducts.py b/YiMao/scripts/BusiScenarios/test_CVip013_ReturnPromotionWhitelistProducts.py index bd3ebfc..53596c2 100644 --- a/YiMao/scripts/BusiScenarios/test_CVip013_ReturnPromotionWhitelistProducts.py +++ b/YiMao/scripts/BusiScenarios/test_CVip013_ReturnPromotionWhitelistProducts.py @@ -11,7 +11,6 @@ from configs.globalParams import DataInit DescName = "Vip013-游客转会员登录，加购2个促销白名单商品，退购一个，并结算" @ddt.ddt -@allure.story(f'[场景测试] {DescName}验证') class Test_CVip013(unittest.TestCase): f'''@Date:: 2024/11/20 @Author:: Arthur Wu @@ -21,7 +20,8 @@ class Test_CVip013(unittest.TestCase): @ddt.data(*DataInit) def test_CVip013_ReturnPromotionWhitelistProducts(self,data): - allure.dynamic.description(f"描述：{DescName}") + allure.dynamic.story(f'[{data['MarketName']}-场景测试] {DescName}验证') + allure.dynamic.description(f"描述：{data['MarketName']}-{DescName}\n") ymc = YMClientApi(data["ShoppingCartMac"]) yms = YMServiceApi() vip_phone_num = data["VIPPhoneNumber"] diff --git a/YiMao/scripts/BusiScenarios/test_CVip014_ReturnWeightOfTheProducte.py b/YiMao/scripts/BusiScenarios/test_CVip014_ReturnWeightOfTheProducte.py index de33a4c..25c847e 100644 --- a/YiMao/scripts/BusiScenarios/test_CVip014_ReturnWeightOfTheProducte.py +++ b/YiMao/scripts/BusiScenarios/test_CVip014_ReturnWeightOfTheProducte.py @@ -11,7 +11,6 @@ from configs.globalParams import DataInit DescName = "Vip014-游客转会员登录，加购2个重量放通商品，退购一个，并结算" @ddt.ddt -@allure.story(f'[场景测试] {DescName}验证') class Test_CVip014(unittest.TestCase): f'''@Date:: 2024/11/20 @Author:: Arthur Wu @@ -21,7 +20,8 @@ class Test_CVip014(unittest.TestCase): @ddt.data(*DataInit) def test_CVip014_ReturnWeightOfTheProducte(self,data): - allure.dynamic.description(f"描述：{DescName}") + allure.dynamic.story(f'[{data['MarketName']}-场景测试] {DescName}验证') + allure.dynamic.description(f"描述：{data['MarketName']}-{DescName}\n") ymc = YMClientApi(data["ShoppingCartMac"]) yms = YMServiceApi() vip_phone_num = data["VIPPhoneNumber"] diff --git a/YiMao/scripts/BusiScenarios/test_CVip015_AddPieceRateProductsForPurchase.py b/YiMao/scripts/BusiScenarios/test_CVip015_AddPieceRateProductsForPurchase.py index 60dc40b..aae6d4d 100644 --- a/YiMao/scripts/BusiScenarios/test_CVip015_AddPieceRateProductsForPurchase.py +++ b/YiMao/scripts/BusiScenarios/test_CVip015_AddPieceRateProductsForPurchase.py @@ -10,7 +10,6 @@ from configs.globalParams import DataInit DescName = "Vip015-匿名转会员登录，加购计件商品，并结算" @ddt.ddt -@allure.story(f'[场景测试] {DescName}验证') class Test_CVip015(unittest.TestCase): f'''@Date:: 2024/11/22 @Author:: Arthur Wu @@ -20,7 +19,8 @@ class Test_CVip015(unittest.TestCase): @ddt.data(*DataInit) def test_CVip015(self,data): - allure.dynamic.description(f"描述：{DescName}\n") + allure.dynamic.story(f'[{data['MarketName']}-场景测试] {DescName}验证') + allure.dynamic.description(f"描述：{data['MarketName']}-{DescName}\n") ymc = YMClientApi(data["ShoppingCartMac"]) vip_phone_num = data["VIPPhoneNumber"] piece_rate_goods = data["PieceRateGoods"]["GoodsInputcode"] diff --git a/YiMao/scripts/BusiScenarios/test_CVip016_AddPieceRateProductsAndReturnThem.py b/YiMao/scripts/BusiScenarios/test_CVip016_AddPieceRateProductsAndReturnThem.py index 4ad6160..15ad4ed 100644 --- a/YiMao/scripts/BusiScenarios/test_CVip016_AddPieceRateProductsAndReturnThem.py +++ b/YiMao/scripts/BusiScenarios/test_CVip016_AddPieceRateProductsAndReturnThem.py @@ -9,7 +9,6 @@ from configs.globalParams import DataInit DescName = "Vip016-匿名转会员登录，加购计件商品，并退购" @ddt.ddt -@allure.story(f'[场景测试] {DescName}验证') class Test_CVip016(unittest.TestCase): f'''@Date:: 2024/11/22 @Author:: Arthur Wu @@ -19,7 +18,8 @@ class Test_CVip016(unittest.TestCase): @ddt.data(*DataInit) def test_CVip016(self,data): - allure.dynamic.description(f"描述：{DescName}\n") + allure.dynamic.story(f'[{data['MarketName']}-场景测试] {DescName}验证') + allure.dynamic.description(f"描述：{data['MarketName']}-{DescName}\n") ymc = YMClientApi(data["ShoppingCartMac"]) vip_phone_num = data["VIPPhoneNumber"] piece_rate_goods = data["PieceRateGoods"]["GoodsInputcode"] diff --git a/YiMao/scripts/BusiScenarios/test_CVip017_AddWeightBasedProductsForPurchase.py b/YiMao/scripts/BusiScenarios/test_CVip017_AddWeightBasedProductsForPurchase.py index 9341f9c..1f2ae5d 100644 --- a/YiMao/scripts/BusiScenarios/test_CVip017_AddWeightBasedProductsForPurchase.py +++ b/YiMao/scripts/BusiScenarios/test_CVip017_AddWeightBasedProductsForPurchase.py @@ -9,7 +9,6 @@ from configs.globalParams import DataInit DescName = "Vip017-匿名转会员登录，加购计重商品，并结算" @ddt.ddt -@allure.story(f'[场景测试] {DescName}验证') class Test_CVip017(unittest.TestCase): f'''@Date:: 2024/11/22 @Author:: Arthur Wu @@ -19,7 +18,8 @@ class Test_CVip017(unittest.TestCase): @ddt.data(*DataInit) def test_CVip017(self,data): - allure.dynamic.description(f"描述：{DescName}\n") + allure.dynamic.story(f'[{data['MarketName']}-场景测试] {DescName}验证') + allure.dynamic.description(f"描述：{data['MarketName']}-{DescName}\n") ymc = YMClientApi(data["ShoppingCartMac"]) vip_phone_num = data["VIPPhoneNumber"] bulk_goods = data["MisspellingWeightGoods"]["GoodsInputcode"] diff --git a/YiMao/scripts/BusiScenarios/test_CVip018_PurchaseWeightedGoodsAndReturnThem.py b/YiMao/scripts/BusiScenarios/test_CVip018_PurchaseWeightedGoodsAndReturnThem.py index cd237a0..56a47a8 100644 --- a/YiMao/scripts/BusiScenarios/test_CVip018_PurchaseWeightedGoodsAndReturnThem.py +++ b/YiMao/scripts/BusiScenarios/test_CVip018_PurchaseWeightedGoodsAndReturnThem.py @@ -9,7 +9,6 @@ from configs.globalParams import DataInit DescName = "Vip018-匿名转会员登录，加购计重商品，并退购" @ddt.ddt -@allure.story(f'[场景测试] {DescName}验证') class Test_CVip018(unittest.TestCase): f'''@Date:: 2024/11/22 @Author:: Arthur Wu @@ -19,7 +18,8 @@ class Test_CVip018(unittest.TestCase): @ddt.data(*DataInit) def test_CVip018(self,data): - allure.dynamic.description(f"描述：{DescName}\n") + allure.dynamic.story(f'[{data['MarketName']}-场景测试] {DescName}验证') + allure.dynamic.description(f"描述：{data['MarketName']}-{DescName}\n") ymc = YMClientApi(data["ShoppingCartMac"]) vip_phone_num = data["VIPPhoneNumber"] bulk_goods = data["MisspellingWeightGoods"]["GoodsInputcode"] diff --git a/YiMao/scripts/BusiScenarios/test_CVip019_ReceiveCoupon.py b/YiMao/scripts/BusiScenarios/test_CVip019_ReceiveCoupon.py index 9810542..1d7cc32 100644 --- a/YiMao/scripts/BusiScenarios/test_CVip019_ReceiveCoupon.py +++ b/YiMao/scripts/BusiScenarios/test_CVip019_ReceiveCoupon.py @@ -10,7 +10,6 @@ from configs.globalParams import DataInit DescName = "Vip019-匿名转会员登录，领取优惠券" @ddt.ddt -@allure.story(f'[场景测试] {DescName}验证') class Test_CVip019(unittest.TestCase): f'''@Date:: 2024/11/25 @Author:: Arthur Wu @@ -19,7 +18,8 @@ class Test_CVip019(unittest.TestCase): ''' @ddt.data(*DataInit) def test_CVip019_ReceiveCoupon(self, data): - allure.dynamic.description(f"描述：{DescName}\n") + allure.dynamic.story(f'[{data['MarketName']}-场景测试] {DescName}验证') + allure.dynamic.description(f"描述：{data['MarketName']}-{DescName}\n") ymc = YMClientApi(data["ShoppingCartMac"]) vip_phone_num = data["VIPPhoneNumber"] goodsbag_mid = data["ShoppingBag"]["mid"]