整个业务代码重构

WorkCase/APP/Businesses/test_businesses_delete.py

@@ -7,6 +7,7 @@
 from __future__ import division
 
 from WorkCase import CaseBase
+from WorkCase.APP import AppBase
 from WorkUtils.UtilsLog import UtilsLog
 from WorkUtils.UtilsDataBase import UtilsDataBase
 from WorkUtils.UtilsResponse import UtilsResponse
@@ -36,11 +37,9 @@ class TestBusinessesDelete(object):
     base_id = 10
     base_password = "123456"
 
-    base_name = "SS自动化测试业务名称"
+    base_name = "SS OA系统"
     base_type_1 = 1
-    base_type_name_1 = "SS自动化业务类型01"
     base_type_2 = 2
-    base_type_name_2 = "SS自动化业务类型02"
 
     @classmethod
     def setup_class(cls):
@@ -51,65 +50,20 @@ class TestBusinessesDelete(object):
     @classmethod
     def teardown_class(cls):
         cls.log.debug("结束执行测试套件.......")
-        session = UtilsDataBase().conn_mysql(db_url=cls.db_url, db_port=cls.db_port, db_base=cls.db_base, db_user=cls.db_user, db_pw=cls.db_pw)
-        DataBusinesses().delete_like_name(session=session, name=cls.base_name)
 
     def setup_method(self):
         self.log.debug("测试用例执行开始...")
-        self.update_members_del_flag(members_id=self.base_id, value=CaseBase().del_flag["OFF"])
-        self.update_members_status(members_id=self.base_id, value=CaseBase().status["ON"])
+
+        self.app = AppBase(host=self.host)
+        self.app.update_members_del_flag(session=self.db_session(), members_id=self.base_id, value=CaseBase().del_flag["OFF"])
+        self.app.update_members_status(session=self.db_session(), members_id=self.base_id, value=CaseBase().status["ON"])
+        self.token = self.app.get_base_token(login_name=self.login_name, base_password=self.base_password)
 
     def teardown_method(self):
         self.log.debug("测试用例执行结束...")
-        self.update_members_del_flag(members_id=self.base_id, value=CaseBase().del_flag["OFF"])
-        self.update_members_status(members_id=self.base_id, value=CaseBase().status["ON"])
-
-    @allure.step("调用接口：api.login")
-    def api_login(self, name=None, password=None):
-        api = ApiLogin(_host=self.host)
-        api.name = name
-        api.password = password
-        api.get_response()
-        return api.response
-
-    @allure.step("更新表数据：members -- del_flag")
-    def update_members_del_flag(self, members_id=None, value=None):
-        session = self.db_session()
-        sql = DataMembers().update_del_flag(session=session, _id=members_id, value=value)
-        return sql
-
-    @allure.step("更新表数据：members -- status")
-    def update_members_status(self, members_id=None, value=None):
-        session = self.db_session()
-        sql = DataMembers().update_status(session=session, _id=members_id, value=value)
-        return sql
 
-    @allure.step("调用接口：businesses.create")
-    def businesses_create(self, token=None, name=None, description=None, _type=None, principalName=None, principalPhone=None,
-                          memberid=None):
-        api = BusinessesCreate(_host=self.host)
-        api.token = token
-        api.name = name
-        api.description = description
-        api.type = _type
-        api.principalName = principalName
-        api.principalPhone = principalPhone
-        api.memberid = memberid
-        api.get_response()
-        return api.response
-
-    @allure.step("调用接口：businesses.delete")
-    def businesses_delete(self, token=None, businessidList=None):
-        api = BusinessesDelete(_host=self.host)
-        api.token = token
-        api.businessidList = businessidList
-        api.get_response()
-        return api.response
-
-    @allure.step("获取token")
-    def get_base_token(self):
-        response = self.api_login(name=self.login_name, password=self.base_password)
-        self.token = UtilsResponse().get_data(response=response)
+        self.app.update_members_del_flag(session=self.db_session(), members_id=self.base_id, value=CaseBase().del_flag["OFF"])
+        self.app.update_members_status(session=self.db_session(), members_id=self.base_id, value=CaseBase().status["ON"])
 
     @allure.step("连接数据库：Argus")
     def db_session(self):
@@ -122,83 +76,62 @@ class TestBusinessesDelete(object):
         sql = DataBusinesses().select_all_from_allKeys(session=session, businessid=businessid, name=name)
         return sql
 
-    @allure.step("创建测试数据")
-    def case_create(self, name):
-        response = self.businesses_create(token=self.token, name=name, _type=self.base_type_1)
-        self.businessid = UtilsResponse().get_data(response=response)
-        return self.businessid
-
     @allure.step("校验查询结果")
     def check_select(self, businessid):
         sql = self.select_businesses(businessid=businessid)
         assert sql == []
 
-    @allure.step("断言返回结果")
-    def check_code(self, response, code):
-        _code = UtilsResponse().get_code(response=response)
-        assert _code == code
-
-    @allure.step("断言返回结果数据")
-    def check_msg(self, response, msg):
-        _msg = UtilsResponse().get_msg(response=response)
-        assert _msg == msg
-
     @allure.title("businesses.delete：token未传")
     @allure.story("删除业务：token未传")
     @allure.severity("blocker")
     def test_case_01(self):
-        self.get_base_token()
-
-        response = self.businesses_delete()
-        self.check_code(response=response, code=2001)
-        self.check_msg(response=response, msg="无token，请重新登录")
+        response = self.app.businesses_delete()
+        self.app.check_code(response=response, code=2001)
+        self.app.check_msg(response=response, msg="无token，请重新登录")
 
     @allure.title("businesses.delete：token的用户已删除")
     @allure.story("删除业务：token的用户已删除")
     @allure.severity("blocker")
     def test_case_02(self):
-        self.get_base_token()
-        self.update_members_del_flag(members_id=self.base_id, value=CaseBase().del_flag["ON"])
-        response = self.businesses_delete(token=self.token)
-        self.check_code(response=response, code=2004)
-        self.check_msg(response=response, msg="用户不存在")
+        self.app.update_members_del_flag(session=self.db_session(), members_id=self.base_id, value=CaseBase().del_flag["ON"])
+        response = self.app.businesses_delete(token=self.token)
+        self.app.check_code(response=response, code=2004)
+        self.app.check_msg(response=response, msg="用户不存在")
 
     @allure.title("businesses.delete：token的用户已禁用")
     @allure.story("删除业务：token的用户已禁用")
     @allure.severity("blocker")
     def test_case_03(self):
-        self.get_base_token()
-        self.update_members_status(members_id=self.base_id, value=CaseBase().status["OFF"])
-        response = self.businesses_delete(token=self.token)
-        self.check_code(response=response, code=2003)
-        self.check_msg(response=response, msg="账户已被禁用")
+        self.app.update_members_status(session=self.db_session(), members_id=self.base_id, value=CaseBase().status["OFF"])
+        response = self.app.businesses_delete(token=self.token)
+        self.app.check_code(response=response, code=2003)
+        self.app.check_msg(response=response, msg="账户已被禁用")
 
     @allure.title("businesses.delete：删除一个")
     @allure.story("删除业务：删除一个")
     @allure.severity("blocker")
     def test_case_04(self):
-        self.get_base_token()
         name = self.base_name + "04"
-        self.case_create(name=name)
-        response = self.businesses_delete(token=self.token, businessidList=[self.businessid])
-        self.check_code(response=response, code=0)
-        self.check_select(businessid=self.businessid)
+        business_id = self.app.case_create_businesses(name=name, _type=self.base_type_1)
+        response = self.app.businesses_delete(token=self.token, businessidList=[business_id])
+        self.app.check_code(response=response, code=0)
+        self.check_select(businessid=business_id)
 
     @allure.title("businesses.delete：删除多个")
     @allure.story("删除业务：删除多个")
     def test_case_05(self):
-        self.get_base_token()
         name_1 = self.base_name + "051"
         name_2 = self.base_name + "052"
         name_3 = self.base_name + "053"
-        id_1 = self.case_create(name=name_1)
-        id_2 = self.case_create(name=name_2)
-        id_3 = self.case_create(name=name_3)
-        response = self.businesses_delete(token=self.token, businessidList=[id_1, id_2, id_3])
-        self.check_code(response=response, code=0)
-        self.check_select(businessid=id_1)
-        self.check_select(businessid=id_2)
-        self.check_select(businessid=id_3)
+        business_id_1 = self.app.case_create_businesses(name=name_1, _type=self.base_type_1)
+        business_id_2 = self.app.case_create_businesses(name=name_2, _type=self.base_type_1)
+        business_id_3 = self.app.case_create_businesses(name=name_3, _type=self.base_type_1)
+
+        response = self.app.businesses_delete(token=self.token, businessidList=[business_id_1, business_id_2, business_id_3])
+        self.app.check_code(response=response, code=0)
+        self.check_select(businessid=business_id_1)
+        self.check_select(businessid=business_id_2)
+        self.check_select(businessid=business_id_3)
 
 
 if __name__ == "__main__":

WorkCase/APP/Businesses/test_businesses_type_create.py

@@ -76,6 +76,7 @@ class TestBusinessesTypeCreate(object):
     def check_select(self, response, name):
         data = UtilsResponse().get_data(response=response)
         sql = self.select_businesses_type(_id=data)
+        assert sql != []
         for x, y in enumerate(sql):
             assert y.name == name
             assert x == 0

WorkCase/APP/Businesses/test_businesses_type_delete.py

@@ -70,8 +70,8 @@ class TestBusinessesTypeDelete(object):
         return sql
 
     @allure.step("校验查询结果")
-    def check_select(self, businessid):
-        sql = self.select_businesses(businessid=businessid)
+    def check_select(self, type_id):
+        sql = self.select_businesses_type(_id=type_id)
         assert sql == []
 
     @allure.title("businesses.type.delete：token未传")
@@ -108,7 +108,7 @@ class TestBusinessesTypeDelete(object):
         type_id = self.app.case_create_businesses_type(name=name)
         response = self.app.businesses_type_delete(token=self.token, typeIds=[type_id])
         self.app.check_code(response=response, code=0)
-        self.check_select(businessid=type_id)
+        self.check_select(type_id=type_id)
 
     @allure.title("businesses.type.delete：删除多个")
     @allure.story("删除业务类型：删除多个")

WorkCase/APP/Businesses/test_businesses_type_update.py

@@ -75,9 +75,9 @@ class TestBusinessesTypeUpdate(object):
         return sql
 
     @allure.step("校验查询结果")
-    def check_select(self, response, name):
-        data = UtilsResponse().get_data(response=response)
-        sql = self.select_businesses_type(_id=data)
+    def check_select(self, type_id, name):
+        sql = self.select_businesses_type(_id=type_id)
+        assert sql != []
         for x, y in enumerate(sql):
             assert y.name == name
             assert x == 0
@@ -116,7 +116,7 @@ class TestBusinessesTypeUpdate(object):
         type_id = self.app.case_create_businesses_type(name=name)
         response = self.app.businesses_type_update(token=self.token, _id=type_id, typeName=name + "修改")
         self.app.check_code(response=response, code=0)
-        self.check_select(response=response, name=name + "修改")
+        self.check_select(type_id=type_id, name=name + "修改")
 
     @allure.title("businesses.type.update：id为空,返回正常 无数据修改")
     @allure.story("更新业务类型：id为空,返回正常 无数据修改")