Arthur-Wu committed this file on 2024-11-18

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}
+MarketAndStoreDetails = {"putMarketId": 50, "putStoreId": ["29"]}
-MarketAndStoreDetail = {"putMarketId": 50, "putStoreId": ["29"]}
-
 ''' 2-购物袋 '''
 GoodsBagInputcode_mid = '6971648922990'
 GoodsBagInputcode_max = '6971648922983'

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):

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):

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):

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):

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):

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": "统一茄皇蕃茄牛肉面"}
+        pre_respomse = self.yms.add_promotional_product_whitelist(
-        MarketAndStoreInfo = {"MarketId": 50, "StoreId": 29}
+            self.promotional_whitelist_goods, self.market_and_store_info
-        pre_respomse = self.yms.add_promotional_product_whitelist(GoodsInfo, MarketAndStoreInfo)
+        )
         if pre_respomse['data'] is not None:
             LOGGER.info(f"---商品 {self.promotional_whitelist_goods['GoodsInputcode']} "
                         f"已添加到促销白名单中")

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": "乐事无限翡翠黄瓜味薯片"}
+        pre_respomse = self.yms.add_weight_to_whitelist(
-        MarketAndStoreInfo = {"MarketId": 50, "StoreId": 29}
+            self.weight_to_whitelist_goods, self.market_and_store_info
-        pre_respomse = self.yms.add_weight_to_whitelist(GoodsInfo, MarketAndStoreInfo)
+        )
         if pre_respomse['data'] is not None:
             LOGGER.info(f"---商品 {self.weight_to_whitelist_goods['GoodsInputcode']} "
                         f"已添加到重量放通白名单中")