From 2224176ebf23383dcff3508b3a5106f538122d4f Mon Sep 17 00:00:00 2001 From: ieemoo Date: Wed, 20 Nov 2024 10:40:26 +0800 Subject: [PATCH] Arthur-Wu committed this file on 2024-11-18 --- .../{WuShangSceneData.py => WuShangSceneTestData.py} | 6 ++---- ...test_C002_NonVipAddShoppingBagAndSettlePayment.py | 2 +- ...C003_NonVipAddNonDiscountedProductsForPurchase.py | 2 +- .../test_C004_NonVipAddMemberPproductsForPurchase.py | 2 +- .../test_C005_NonVipAddMultipleItemsForPurchase.py | 2 +- ...st_C006_NonVipAddDiscountedProductsForPurchase.py | 2 +- ...est_C007_NonVipAddPromotionalWhitelistProducts.py | 12 ++++++++---- .../test_C008_NonVipAddWeightToTheProduct.py | 12 ++++++++---- 8 files changed, 23 insertions(+), 17 deletions(-) rename YiMao/data/{WuShangSceneData.py => WuShangSceneTestData.py} (93%) diff --git a/YiMao/data/WuShangSceneData.py b/YiMao/data/WuShangSceneTestData.py similarity index 93% rename from YiMao/data/WuShangSceneData.py rename to YiMao/data/WuShangSceneTestData.py index 48a17d5..7b6d3f2 100644 --- a/YiMao/data/WuShangSceneData.py +++ b/YiMao/data/WuShangSceneTestData.py @@ -3,7 +3,7 @@ # @Author:: Arthur Wu # @Date:: 2024/11/15-14:46 # @Description:: -''' 武商场景数据集 +''' 武商场景测试数据集 adsAreaId-1: 登录页广告 adsAreaId-2: 登录后弹窗广告 adsAreaId-3: 购物车主页广告 @@ -14,9 +14,7 @@ adsAreaId-7: 小票广告 ''' ''' 1-商超、门店信息 ''' -MarketAndStoreInfo = {"MarketId": 50, "StoreId": 29} -MarketAndStoreDetail = {"putMarketId": 50, "putStoreId": ["29"]} - +MarketAndStoreDetails = {"putMarketId": 50, "putStoreId": ["29"]} ''' 2-购物袋 ''' GoodsBagInputcode_mid = '6971648922990' GoodsBagInputcode_max = '6971648922983' diff --git a/YiMao/scripts/BusiScenarios/test_C002_NonVipAddShoppingBagAndSettlePayment.py b/YiMao/scripts/BusiScenarios/test_C002_NonVipAddShoppingBagAndSettlePayment.py index 909dde3..38eaa92 100644 --- a/YiMao/scripts/BusiScenarios/test_C002_NonVipAddShoppingBagAndSettlePayment.py +++ b/YiMao/scripts/BusiScenarios/test_C002_NonVipAddShoppingBagAndSettlePayment.py @@ -6,7 +6,7 @@ import unittest,allure,time from configs.globalObj import LOGGER from YiMao.businessFunc.ClientApiLib import YMClientApi -from YiMao.data.WuShangSceneData import * +from YiMao.data.WuShangSceneTestData import * class Test_C002_NonVipAddShoppingBagAndSettlePayment(unittest.TestCase): diff --git a/YiMao/scripts/BusiScenarios/test_C003_NonVipAddNonDiscountedProductsForPurchase.py b/YiMao/scripts/BusiScenarios/test_C003_NonVipAddNonDiscountedProductsForPurchase.py index 3d15341..fcc9fa2 100644 --- a/YiMao/scripts/BusiScenarios/test_C003_NonVipAddNonDiscountedProductsForPurchase.py +++ b/YiMao/scripts/BusiScenarios/test_C003_NonVipAddNonDiscountedProductsForPurchase.py @@ -6,7 +6,7 @@ import unittest,allure,time from configs.globalObj import LOGGER from YiMao.businessFunc.ClientApiLib import YMClientApi -from YiMao.data.WuShangSceneData import * +from YiMao.data.WuShangSceneTestData import * class Test_C003_NonVipAddNonDiscountedProductsForPurchaset(unittest.TestCase): diff --git a/YiMao/scripts/BusiScenarios/test_C004_NonVipAddMemberPproductsForPurchase.py b/YiMao/scripts/BusiScenarios/test_C004_NonVipAddMemberPproductsForPurchase.py index c5f4b1c..b74d2a1 100644 --- a/YiMao/scripts/BusiScenarios/test_C004_NonVipAddMemberPproductsForPurchase.py +++ b/YiMao/scripts/BusiScenarios/test_C004_NonVipAddMemberPproductsForPurchase.py @@ -6,7 +6,7 @@ import unittest,allure,time from configs.globalObj import LOGGER from YiMao.businessFunc.ClientApiLib import YMClientApi -from YiMao.data.WuShangSceneData import * +from YiMao.data.WuShangSceneTestData import * class Test_C004_NonVipAddMemberPproductsForPurchase(unittest.TestCase): diff --git a/YiMao/scripts/BusiScenarios/test_C005_NonVipAddMultipleItemsForPurchase.py b/YiMao/scripts/BusiScenarios/test_C005_NonVipAddMultipleItemsForPurchase.py index db0dbd7..3dceb25 100644 --- a/YiMao/scripts/BusiScenarios/test_C005_NonVipAddMultipleItemsForPurchase.py +++ b/YiMao/scripts/BusiScenarios/test_C005_NonVipAddMultipleItemsForPurchase.py @@ -6,7 +6,7 @@ import unittest,allure,time from configs.globalObj import LOGGER from YiMao.businessFunc.ClientApiLib import YMClientApi -from YiMao.data.WuShangSceneData import * +from YiMao.data.WuShangSceneTestData import * class Test_C005_NonVipAddMultipleItemsForPurchase(unittest.TestCase): diff --git a/YiMao/scripts/BusiScenarios/test_C006_NonVipAddDiscountedProductsForPurchase.py b/YiMao/scripts/BusiScenarios/test_C006_NonVipAddDiscountedProductsForPurchase.py index 01a8212..e722ded 100644 --- a/YiMao/scripts/BusiScenarios/test_C006_NonVipAddDiscountedProductsForPurchase.py +++ b/YiMao/scripts/BusiScenarios/test_C006_NonVipAddDiscountedProductsForPurchase.py @@ -6,7 +6,7 @@ import unittest,allure,time from configs.globalObj import LOGGER from YiMao.businessFunc.ClientApiLib import YMClientApi -from YiMao.data.WuShangSceneData import * +from YiMao.data.WuShangSceneTestData import * class Test_C006_NonVipAddDiscountedProductsForPurchaset(unittest.TestCase): diff --git a/YiMao/scripts/BusiScenarios/test_C007_NonVipAddPromotionalWhitelistProducts.py b/YiMao/scripts/BusiScenarios/test_C007_NonVipAddPromotionalWhitelistProducts.py index eef35ec..bfd2ca8 100644 --- a/YiMao/scripts/BusiScenarios/test_C007_NonVipAddPromotionalWhitelistProducts.py +++ b/YiMao/scripts/BusiScenarios/test_C007_NonVipAddPromotionalWhitelistProducts.py @@ -7,7 +7,7 @@ import unittest,allure,time from configs.globalObj import LOGGER from YiMao.businessFunc.ClientApiLib import YMClientApi from YiMao.businessFunc.ServiceApiLib import YMServiceApi -from YiMao.data.WuShangSceneData import * +from YiMao.data.WuShangSceneTestData import * class Test_C007_NonVipAddPromotionalWhitelistProducts(unittest.TestCase): '''@Date:: 2024/11/15 @@ -23,14 +23,18 @@ class Test_C007_NonVipAddPromotionalWhitelistProducts(unittest.TestCase): self.yms = YMServiceApi() # 促销白名单商品暂未提供 self.promotional_whitelist_goods = PromotionalWhitelistGoods + self.market_and_store_info = { + "MarketId": MarketAndStoreDetails["putMarketId"], + "StoreId": MarketAndStoreDetails["putStoreId"][0] + } @allure.story('[场景测试] 007-非会员加购促销白名单商品并结算') def test_C007_NonVipAddPromotionalWhitelistProducts(self): allure.dynamic.description("描述：非会员加购促销白名单商品并结算") allure.step("[前置条件]：先调用管理平台接口，将指定商品添加到促销白名单中") - GoodsInfo = {"GoodsInputcode": "6925303796426", "GoodsName": "统一茄皇蕃茄牛肉面"} - MarketAndStoreInfo = {"MarketId": 50, "StoreId": 29} - pre_respomse = self.yms.add_promotional_product_whitelist(GoodsInfo, MarketAndStoreInfo) + pre_respomse = self.yms.add_promotional_product_whitelist( + self.promotional_whitelist_goods, self.market_and_store_info + ) if pre_respomse['data'] is not None: LOGGER.info(f"---商品 {self.promotional_whitelist_goods['GoodsInputcode']} " f"已添加到促销白名单中") diff --git a/YiMao/scripts/BusiScenarios/test_C008_NonVipAddWeightToTheProduct.py b/YiMao/scripts/BusiScenarios/test_C008_NonVipAddWeightToTheProduct.py index ed4ff72..c622f1a 100644 --- a/YiMao/scripts/BusiScenarios/test_C008_NonVipAddWeightToTheProduct.py +++ b/YiMao/scripts/BusiScenarios/test_C008_NonVipAddWeightToTheProduct.py @@ -7,7 +7,7 @@ import unittest,allure,time from configs.globalObj import LOGGER from YiMao.businessFunc.ClientApiLib import YMClientApi from YiMao.businessFunc.ServiceApiLib import YMServiceApi -from YiMao.data.WuShangSceneData import * +from YiMao.data.WuShangSceneTestData import * class Test_C008_NonVipAddWeightToTheProduct(unittest.TestCase): @@ -24,14 +24,18 @@ class Test_C008_NonVipAddWeightToTheProduct(unittest.TestCase): self.yms = YMServiceApi() # 重量放通白名单商品暂未提供 self.weight_to_whitelist_goods = WeightToWhitelistGoods + self.market_and_store_info = { + "MarketId": MarketAndStoreDetails["putMarketId"], + "StoreId": MarketAndStoreDetails["putStoreId"][0] + } @allure.story('[场景测试] 008-非会员加购重量放通商品并结算') def test_C008_NonVipAddWeightToTheProduct(self): allure.dynamic.description("描述：非会员加购重量放通商品并结算") allure.step("[前置条件]：先调用管理平台接口，将指定商品添加到重量放通白名单中") - GoodsInfo = {"GoodsInputcode": "6924743915848", "GoodsName": "乐事无限翡翠黄瓜味薯片"} - MarketAndStoreInfo = {"MarketId": 50, "StoreId": 29} - pre_respomse = self.yms.add_weight_to_whitelist(GoodsInfo, MarketAndStoreInfo) + pre_respomse = self.yms.add_weight_to_whitelist( + self.weight_to_whitelist_goods, self.market_and_store_info + ) if pre_respomse['data'] is not None: LOGGER.info(f"---商品 {self.weight_to_whitelist_goods['GoodsInputcode']} " f"已添加到重量放通白名单中")