资产

WorkCase/APP/Device/test_device_get.py

@@ -126,7 +126,7 @@ class TestDeviceGet(object):
                                   businessIds=self.base_business_id_1 + "," + self.base_business_id_2)
         response = self.app.device_get(token=self.token, name=self.base_name + "05")
         self.app.check_code(response=response, code=0)
-        self.app.check_data_keyValue(response=response, _key="name", _value=self.base_name + "05")
+        self.app.check_keyValue(response=UtilsResponse().get_data(response=response), _key="name", _value=self.base_name + "05")
 
     @allure.title("device.get：type查询")
     @allure.story("查询资产：type查询")
@@ -137,7 +137,7 @@ class TestDeviceGet(object):
                                   businessIds=self.base_business_id_1 + "," + self.base_business_id_2)
         response = self.app.device_get(token=self.token, _type=self.base_type_snmp)
         self.app.check_code(response=response, code=0)
-        self.app.check_data_keyValue(response=response, _key="hostType", _value=self.base_type_snmp)
+        self.app.check_keyValue(response=UtilsResponse().get_data(response=response), _key="hostType", _value=self.base_type_snmp)
 
     @allure.title("device.get：manageLevel查询")
     @allure.story("查询资产：manageLevel查询")
@@ -148,7 +148,7 @@ class TestDeviceGet(object):
                                   businessIds=self.base_business_id_1 + "," + self.base_business_id_2)
         response = self.app.device_get(token=self.token, manageLevel=1)
         self.app.check_code(response=response, code=0)
-        self.app.check_data_keyValue(response=response, _key="manageLevel", _value=1)
+        self.app.check_keyValue(response=UtilsResponse().get_data(response=response), _key="manageLevel", _value=1)
 
     @allure.title("device.get：monitorStatus查询")
     @allure.story("查询资产：monitorStatus查询")
@@ -159,7 +159,7 @@ class TestDeviceGet(object):
                                   businessIds=self.base_business_id_1 + "," + self.base_business_id_2)
         response = self.app.device_get(token=self.token, monitorStatus=1)
         self.app.check_code(response=response, code=0)
-        self.app.check_data_keyValue(response=response, _key="monitorStatus", _value=1)
+        self.app.check_keyValue(response=UtilsResponse().get_data(response=response), _key="monitorStatus", _value=1)
 
     @allure.title("device.get：available查询")
     @allure.story("查询资产：available查询")
@@ -170,7 +170,7 @@ class TestDeviceGet(object):
                                   businessIds=self.base_business_id_1 + "," + self.base_business_id_2)
         response = self.app.device_get(token=self.token, available=1)
         self.app.check_code(response=response, code=0)
-        self.app.check_data_keyValue(response=response, _key="available", _value=1)
+        self.app.check_keyValue(response=UtilsResponse().get_data(response=response), _key="available", _value=1)
 
     @allure.title("device.get：businessIds查询")
     @allure.story("查询资产：businessIds查询")
@@ -181,7 +181,7 @@ class TestDeviceGet(object):
                                   businessIds=self.base_business_id_1 + "," + self.base_business_id_2)
         response = self.app.device_get(token=self.token, businessIds=self.base_business_id_1 + "," + self.base_business_id_2)
         self.app.check_code(response=response, code=0)
-        self.app.check_data_keyValue(response=response, _key="businessesNames", _value=self.base_business_name_1 + "," + self.base_business_name_2)
+        self.app.check_keyValue(response=UtilsResponse().get_data(response=response), _key="businessesNames", _value=self.base_business_name_1 + "," + self.base_business_name_2)
 
     @allure.title("device.get：memberId查询")
     @allure.story("查询资产：memberId查询")
@@ -192,7 +192,7 @@ class TestDeviceGet(object):
                                   businessIds=self.base_business_id_1 + "," + self.base_business_id_2)
         response = self.app.device_get(token=self.token, memberId=11)
         self.app.check_code(response=response, code=0)
-        self.app.check_data_keyValue(response=response, _key="memberName", _value="sanshi")
+        self.app.check_keyValue(response=UtilsResponse().get_data(response=response), _key="memberName", _value="sanshi")
 
     @allure.title("device.get：factoryId查询")
     @allure.story("查询资产：factoryId查询")
@@ -203,7 +203,7 @@ class TestDeviceGet(object):
                                   businessIds=self.base_business_id_1 + "," + self.base_business_id_2)
         response = self.app.device_get(token=self.token, factoryId=1)
         self.app.check_code(response=response, code=0)
-        self.app.check_data_keyValue(response=response, _key="factoryId", _value=1)
+        self.app.check_keyValue(response=UtilsResponse().get_data(response=response), _key="factoryId", _value=1)
 
     @allure.title("device.get：manageIp查询")
     @allure.story("查询资产：manageIp查询")
@@ -214,7 +214,7 @@ class TestDeviceGet(object):
                                   businessIds=self.base_business_id_1 + "," + self.base_business_id_2)
         response = self.app.device_get(token=self.token, manageIp=self.base_ip)
         self.app.check_code(response=response, code=0)
-        self.app.check_data_keyValue(response=response, _key="manageIp", _value=self.base_ip)
+        self.app.check_keyValue(response=UtilsResponse().get_data(response=response), _key="manageIp", _value=self.base_ip)
 
     @allure.title("device.get：menuId查询")
     @allure.story("查询资产：menuId查询")

WorkCase/APP/__init__.py

@@ -406,15 +406,6 @@ class AppBase(object):
         assert _msg == msg
 
     @allure.step("校验数据")
-    def check_data_keyValue(self, response, _key, _value, isIn=None):
-        data = UtilsResponse().get_data(response=response)
-        for x, y in enumerate(data["list"]):
-            if isIn == 1:
-                assert _value in y[_key]
-            else:
-                assert y[_key] == _value
-
-    @allure.step("校验数据")
     def check_keyValue(self, _json, _key, _value, isIn=None):
         for x, y in enumerate(_json):
             if isIn == 1: