业务模块修改

WorkCase/APP/Businesses/test_businesses_create.py

@@ -55,16 +55,11 @@ class TestBusinessesCreate(object):
         self.log.debug("测试用例执行开始...")
 
         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.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):
         session = UtilsDataBase().conn_mysql(db_url=self.db_url, db_port=self.db_port, db_base=self.db_base, db_user=self.db_user, db_pw=self.db_pw)
@@ -90,37 +85,11 @@ class TestBusinessesCreate(object):
             assert y.memberid == memberid
             assert x == 0
 
-    @allure.title("businesses.create：token未传")
-    @allure.story("创建业务：token未传")
-    @allure.severity("blocker")
-    def test_case_01(self):
-        response = self.app.businesses_create()
-        self.app.check_code(response=response, code=2001)
-        self.app.check_msg(response=response, msg="token不存在")
-
-    @allure.title("businesses.create：token的用户已删除")
-    @allure.story("创建业务：token的用户已删除")
-    @allure.severity("blocker")
-    def test_case_02(self):
-        self.app.update_members_del_flag(session=self.db_session(), members_id=self.base_id, value=CaseBase().del_flag["ON"])
-        response = self.app.businesses_create(token=self.token)
-        self.app.check_code(response=response, code=2004)
-        self.app.check_msg(response=response, msg="用户不存在")
-
-    @allure.title("businesses.create：token的用户已禁用")
-    @allure.story("创建业务：token的用户已禁用")
-    @allure.severity("blocker")
-    def test_case_03(self):
-        self.app.update_members_status(session=self.db_session(), members_id=self.base_id, value=CaseBase().status["OFF"])
-        response = self.app.businesses_create(token=self.token)
-        self.app.check_code(response=response, code=2003)
-        self.app.check_msg(response=response, msg="账户已被禁用")
-
     @allure.title("businesses.create：填写name,type")
     @allure.story("创建业务：填写name,type")
     @allure.severity("blocker")
-    def test_case_04(self):
-        name = self.base_name + "04"
+    def test_case_01(self):
+        name = self.base_name + "01"
         response = self.app.businesses_create(token=self.token, name=name, _type=self.base_type_1)
         self.app.check_code(response=response, code=0)
         self.check_select(response=response, name=name, description=None, _type=self.base_type_1, principal_name=None,
@@ -128,8 +97,8 @@ class TestBusinessesCreate(object):
 
     @allure.title("businesses.create：填写所有字段")
     @allure.story("创建业务：填写所有字段")
-    def test_case_05(self):
-        name = self.base_name + "05"
+    def test_case_02(self):
+        name = self.base_name + "02"
         response = self.app.businesses_create(token=self.token, name=name, _type=self.base_type_1, description="description", principalName="负责人Name",
                                               principalPhone="15151969022 0519-", memberid=self.base_members_id)
         self.app.check_code(response=response, code=0)
@@ -138,8 +107,8 @@ class TestBusinessesCreate(object):
 
     @allure.title("businesses.create：同类型下创建名称相同的业务,返回异常")
     @allure.story("创建业务：同类型下创建名称相同的业务,返回异常")
-    def test_case_06(self):
-        name = self.base_name + "06"
+    def test_case_03(self):
+        name = self.base_name + "03"
         response = self.app.businesses_create(token=self.token, name=name, _type=self.base_type_1)
         self.app.check_code(response=response, code=0)
         response = self.app.businesses_create(token=self.token, name=name, _type=self.base_type_1)
@@ -148,8 +117,8 @@ class TestBusinessesCreate(object):
 
     @allure.title("businesses.create：不同类型下创建名称相同的业务,成功创建")
     @allure.story("创建业务：不同类型下创建名称相同的业务,成功创建")
-    def test_case_07(self):
-        name = self.base_name + "07"
+    def test_case_04(self):
+        name = self.base_name + "04"
         response = self.app.businesses_create(token=self.token, name=name, _type=self.base_type_1)
         self.app.check_code(response=response, code=0)
         self.check_select(response=response, name=name, description=None, _type=self.base_type_1, principal_name=None,
@@ -161,14 +130,14 @@ class TestBusinessesCreate(object):
 
     @allure.title("businesses.create：name为空,返回异常")
     @allure.story("创建业务：name为空,返回异常")
-    def test_case_08(self):
+    def test_case_05(self):
         response = self.app.businesses_create(token=self.token, _type=self.base_type_1)
         self.app.check_code(response=response, code=100)
 
     @allure.title("businesses.create：type为空,返回异常")
     @allure.story("创建业务：type为空,返回异常")
-    def test_case_09(self):
-        name = self.base_name + "09"
+    def test_case_06(self):
+        name = self.base_name + "06"
         response = self.app.businesses_create(token=self.token, name=name)
         self.app.check_code(response=response, code=100)
 

WorkCase/APP/Businesses/test_businesses_delete.py

@@ -55,16 +55,11 @@ class TestBusinessesDelete(object):
         self.log.debug("测试用例执行开始...")
 
         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.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):
         session = UtilsDataBase().conn_mysql(db_url=self.db_url, db_port=self.db_port, db_base=self.db_base, db_user=self.db_user, db_pw=self.db_pw)
@@ -81,37 +76,11 @@ class TestBusinessesDelete(object):
         sql = self.select_businesses(businessid=businessid)
         assert sql == []
 
-    @allure.title("businesses.delete：token未传")
-    @allure.story("删除业务：token未传")
-    @allure.severity("blocker")
-    def test_case_01(self):
-        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.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.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):
-        name = self.base_name + "04"
+    def test_case_01(self):
+        name = self.base_name + "01"
         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)
@@ -119,10 +88,10 @@ class TestBusinessesDelete(object):
 
     @allure.title("businesses.delete：删除多个")
     @allure.story("删除业务：删除多个")
-    def test_case_05(self):
-        name_1 = self.base_name + "051"
-        name_2 = self.base_name + "052"
-        name_3 = self.base_name + "053"
+    def test_case_02(self):
+        name_1 = self.base_name + "021"
+        name_2 = self.base_name + "022"
+        name_3 = self.base_name + "023"
         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)

WorkCase/APP/Businesses/test_businesses_get.py

@@ -56,16 +56,11 @@ class TestBusinessesGet(object):
         self.log.debug("测试用例执行开始...")
 
         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.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):
         session = UtilsDataBase().conn_mysql(db_url=self.db_url, db_port=self.db_port, db_base=self.db_base, db_user=self.db_user, db_pw=self.db_pw)
@@ -102,44 +97,18 @@ class TestBusinessesGet(object):
             # assert _type == w["type"]
             # assert typeName == w["typeName"]
 
-    @allure.title("businesses.get：token未传")
-    @allure.story("查询业务：token未传")
-    @allure.severity("blocker")
-    def test_case_01(self):
-        response = self.app.businesses_get()
-        self.app.check_code(response=response, code=2001)
-        self.app.check_msg(response=response, msg="token不存在")
-
-    @allure.title("businesses.get：token的用户已删除")
-    @allure.story("查询业务：token的用户已删除")
-    @allure.severity("blocker")
-    def test_case_02(self):
-        self.app.update_members_del_flag(session=self.db_session(), members_id=self.base_id, value=CaseBase().del_flag["ON"])
-        response = self.app.businesses_get(token=self.token)
-        self.app.check_code(response=response, code=2004)
-        self.app.check_msg(response=response, msg="用户不存在")
-
-    @allure.title("businesses.get：token的用户已禁用")
-    @allure.story("查询业务：token的用户已禁用")
-    @allure.severity("blocker")
-    def test_case_03(self):
-        self.app.update_members_status(session=self.db_session(), members_id=self.base_id, value=CaseBase().status["OFF"])
-        response = self.app.businesses_get(token=self.token)
-        self.app.check_code(response=response, code=2003)
-        self.app.check_msg(response=response, msg="账户已被禁用")
-
     @allure.title("businesses.get：无参数调用")
     @allure.story("查询业务：无参数调用")
     @allure.severity("blocker")
-    def test_case_04(self):
+    def test_case_01(self):
         response = self.app.businesses_get(token=self.token)
         self.app.check_code(response=response, code=0)
         self.check_select(response=response)
 
     @allure.title("businesses.get：businessesName查询")
     @allure.story("查询业务：businessesName查询")
-    def test_case_05(self):
-        name = self.base_name + "05"
+    def test_case_02(self):
+        name = self.base_name + "02"
         self.app.case_create_businesses(name=name, _type=self.base_type_1)
         response = self.app.businesses_get(token=self.token, businessesName=name)
         self.app.check_code(response=response, code=0)
@@ -147,8 +116,8 @@ class TestBusinessesGet(object):
 
     @allure.title("businesses.get：type查询")
     @allure.story("查询业务：type查询")
-    def test_case_06(self):
-        name = self.base_name + "06"
+    def test_case_03(self):
+        name = self.base_name + "03"
         self.app.case_create_businesses(name=name, _type=self.base_type_1)
         response = self.app.businesses_get(token=self.token, _type=self.base_type_1)
         self.app.check_code(response=response, code=0)
@@ -156,8 +125,8 @@ class TestBusinessesGet(object):
 
     @allure.title("businesses.get：principal查询手机号")
     @allure.story("查询业务：principal查询手机号")
-    def test_case_07(self):
-        name = self.base_name + "07"
+    def test_case_04(self):
+        name = self.base_name + "04"
         self.app.case_create_businesses(name=name, _type=self.base_type_1, principalName="Test", principalPhone="10086")
         response = self.app.businesses_get(token=self.token, principal="Test")
         self.app.check_code(response=response, code=0)
@@ -165,8 +134,8 @@ class TestBusinessesGet(object):
 
     @allure.title("businesses.get：principal查询姓名")
     @allure.story("查询业务：principal查询姓名")
-    def test_case_08(self):
-        name = self.base_name + "08"
+    def test_case_05(self):
+        name = self.base_name + "05"
         self.app.case_create_businesses(name=name, _type=self.base_type_1, principalName="Test", principalPhone="10087")
         response = self.app.businesses_get(token=self.token, principal="10087")
         self.app.check_code(response=response, code=0)

WorkCase/APP/Businesses/test_businesses_tree.py

@@ -60,16 +60,11 @@ class TestBusinessesTree(object):
         self.log.debug("测试用例执行开始...")
 
         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.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):
         session = UtilsDataBase().conn_mysql(db_url=self.db_url, db_port=self.db_port, db_base=self.db_base, db_user=self.db_user, db_pw=self.db_pw)
@@ -102,46 +97,17 @@ class TestBusinessesTree(object):
                 for x, y in enumerate(business_ids_2):
                     assert y in bids
 
-    @allure.title("businesses.tree：token未传")
-    @allure.story("查询业务：token未传")
-    @allure.severity("blocker")
-    @pytest.mark.skip(reason="此接口未加入token验证")
-    def test_case_01(self):
-        response = self.app.businesses_tree()
-        self.app.check_code(response=response, code=2001)
-        self.app.check_msg(response=response, msg="token不存在")
-
-    @allure.title("businesses.tree：token的用户已删除")
-    @allure.story("查询业务：token的用户已删除")
-    @allure.severity("blocker")
-    @pytest.mark.skip(reason="此接口未加入token验证")
-    def test_case_02(self):
-        self.app.update_members_del_flag(session=self.db_session(), members_id=self.base_id, value=CaseBase().del_flag["ON"])
-        response = self.app.businesses_tree(token=self.token)
-        self.app.check_code(response=response, code=2004)
-        self.app.check_msg(response=response, msg="用户不存在")
-
-    @allure.title("businesses.tree：token的用户已禁用")
-    @allure.story("查询业务：token的用户已禁用")
-    @allure.severity("blocker")
-    @pytest.mark.skip(reason="此接口未加入token验证")
-    def test_case_03(self):
-        self.app.update_members_status(session=self.db_session(), members_id=self.base_id, value=CaseBase().status["OFF"])
-        response = self.app.businesses_tree(token=self.token)
-        self.app.check_code(response=response, code=2003)
-        self.app.check_msg(response=response, msg="账户已被禁用")
-
     @allure.title("businesses.tree：无参数调用")
     @allure.story("查询业务：无参数调用")
     @allure.severity("blocker")
-    def test_case_04(self):
-        type_name_1 = self.base_type_name + "041"
-        type_name_2 = self.base_type_name + "042"
-        name_1_1 = self.base_name + "0411"
-        name_1_2 = self.base_name + "0412"
-        name_2_1 = self.base_name + "0421"
-        name_2_2 = self.base_name + "0422"
-        name_2_3 = self.base_name + "0423"
+    def test_case_01(self):
+        type_name_1 = self.base_type_name + "011"
+        type_name_2 = self.base_type_name + "012"
+        name_1_1 = self.base_name + "0111"
+        name_1_2 = self.base_name + "0112"
+        name_2_1 = self.base_name + "0121"
+        name_2_2 = self.base_name + "0122"
+        name_2_3 = self.base_name + "0123"
         type_1 = self.app.case_create_businesses_type(name=type_name_1)
         type_2 = self.app.case_create_businesses_type(name=type_name_2)
         business_id_1_1 = self.app.case_create_businesses(name=name_1_1, _type=type_1)
@@ -163,12 +129,12 @@ if __name__ == "__main__":
     import os
 
     # 执行自动化测试用例
-    # case_info = os.path.split(__file__)
-    # case = UtilsCmd().pytest_cmd()
-    # r = UtilsPyTest(case=case, case_info=case_info)
-    # r.run_main()
-
-    a = TestBusinessesTree()
-    a.setup_class()
-    a.setup_method()
-    a.test_case_04()
+    case_info = os.path.split(__file__)
+    case = UtilsCmd().pytest_cmd()
+    r = UtilsPyTest(case=case, case_info=case_info)
+    r.run_main()
+
+    # a = TestBusinessesTree()
+    # a.setup_class()
+    # a.setup_method()
+    # a.test_case_04()

WorkCase/APP/Businesses/test_businesses_type_create.py

@@ -51,16 +51,11 @@ class TestBusinessesTypeCreate(object):
         self.log.debug("测试用例执行开始...")
 
         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.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):
         session = UtilsDataBase().conn_mysql(db_url=self.db_url, db_port=self.db_port, db_base=self.db_base, db_user=self.db_user, db_pw=self.db_pw)
@@ -81,58 +76,32 @@ class TestBusinessesTypeCreate(object):
             assert y.name == name
             assert x == 0
 
-    @allure.title("businesses.type.create：token未传")
-    @allure.story("创建业务类型：token未传")
-    @allure.severity("blocker")
-    def test_case_01(self):
-        response = self.app.businesses_type_create()
-        self.app.check_code(response=response, code=2001)
-        self.app.check_msg(response=response, msg="token不存在")
-
-    @allure.title("businesses.type.create：token的用户已删除")
-    @allure.story("创建业务类型：token的用户已删除")
-    @allure.severity("blocker")
-    def test_case_02(self):
-        self.app.update_members_del_flag(session=self.db_session(), members_id=self.base_id, value=CaseBase().del_flag["ON"])
-        response = self.app.businesses_type_create(token=self.token)
-        self.app.check_code(response=response, code=2004)
-        self.app.check_msg(response=response, msg="用户不存在")
-
-    @allure.title("businesses.type.create：token的用户已禁用")
-    @allure.story("创建业务类型：token的用户已禁用")
-    @allure.severity("blocker")
-    def test_case_03(self):
-        self.app.update_members_status(session=self.db_session(), members_id=self.base_id, value=CaseBase().status["OFF"])
-        response = self.app.businesses_type_create(token=self.token)
-        self.app.check_code(response=response, code=2003)
-        self.app.check_msg(response=response, msg="账户已被禁用")
-
     @allure.title("businesses.type.create：正常创建")
     @allure.story("创建业务类型：正常创建")
     @allure.severity("blocker")
-    def test_case_04(self):
-        name = self.base_typeName + "04"
+    def test_case_01(self):
+        name = self.base_typeName + "01"
         response = self.app.businesses_type_create(token=self.token, typeName=name)
         self.app.check_code(response=response, code=0)
         self.check_select(response=response, name=name)
 
     @allure.title("businesses.type.create：typeName为空,返回异常")
     @allure.story("创建业务类型：typeName为空,返回异常")
-    def test_case_05(self):
+    def test_case_02(self):
         response = self.app.businesses_type_create(token=self.token)
         self.app.check_code(response=response, code=100)
 
     @allure.title("businesses.type.create：typeName为空字符串,返回异常")
     @allure.story("创建业务类型：typeName为空字符串,返回异常")
-    def test_case_06(self):
+    def test_case_03(self):
         response = self.app.businesses_type_create(token=self.token, typeName="")
         self.app.check_code(response=response, code=100)
 
     @allure.title("businesses.type.create：重复创建成功")
     @allure.story("创建业务类型：重复创建成功")
-    def test_case_07(self):
+    def test_case_04(self):
 
-        name = self.base_typeName + "07"
+        name = self.base_typeName + "04"
         response = self.app.businesses_type_create(token=self.token, typeName=name)
         self.app.check_code(response=response, code=0)
         self.check_select(response=response, name=name)

WorkCase/APP/Businesses/test_businesses_type_delete.py

@@ -48,16 +48,11 @@ class TestBusinessesTypeDelete(object):
         self.log.debug("测试用例执行开始...")
 
         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.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):
         session = UtilsDataBase().conn_mysql(db_url=self.db_url, db_port=self.db_port, db_base=self.db_base, db_user=self.db_user, db_pw=self.db_pw)
@@ -74,37 +69,11 @@ class TestBusinessesTypeDelete(object):
         sql = self.select_businesses_type(_id=type_id)
         assert sql == []
 
-    @allure.title("businesses.type.delete：token未传")
-    @allure.story("删除业务类型：token未传")
-    @allure.severity("blocker")
-    def test_case_01(self):
-        response = self.app.businesses_type_delete()
-        self.app.check_code(response=response, code=2001)
-        self.app.check_msg(response=response, msg="token不存在")
-
-    @allure.title("businesses.type.delete：token的用户已删除")
-    @allure.story("删除业务类型：token的用户已删除")
-    @allure.severity("blocker")
-    def test_case_02(self):
-        self.app.update_members_del_flag(session=self.db_session(), members_id=self.base_id, value=CaseBase().del_flag["ON"])
-        response = self.app.businesses_type_delete(token=self.token)
-        self.app.check_code(response=response, code=2004)
-        self.app.check_msg(response=response, msg="用户不存在")
-
-    @allure.title("businesses.type.delete：token的用户已禁用")
-    @allure.story("删除业务类型：token的用户已禁用")
-    @allure.severity("blocker")
-    def test_case_03(self):
-        self.app.update_members_status(session=self.db_session(), members_id=self.base_id, value=CaseBase().status["OFF"])
-        response = self.app.businesses_type_delete(token=self.token)
-        self.app.check_code(response=response, code=2003)
-        self.app.check_msg(response=response, msg="账户已被禁用")
-
     @allure.title("businesses.type.delete：删除一个")
     @allure.story("删除业务类型：删除一个")
     @allure.severity("blocker")
-    def test_case_04(self):
-        name = self.base_typeName + "04"
+    def test_case_01(self):
+        name = self.base_typeName + "01"
         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)
@@ -112,10 +81,10 @@ class TestBusinessesTypeDelete(object):
 
     @allure.title("businesses.type.delete：删除多个")
     @allure.story("删除业务类型：删除多个")
-    def test_case_05(self):
-        name_1 = self.base_typeName + "051"
-        name_2 = self.base_typeName + "052"
-        name_3 = self.base_typeName + "053"
+    def test_case_02(self):
+        name_1 = self.base_typeName + "021"
+        name_2 = self.base_typeName + "022"
+        name_3 = self.base_typeName + "023"
         type_id_1 = self.app.case_create_businesses_type(name=name_1)
         type_id_2 = self.app.case_create_businesses_type(name=name_2)
         type_id_3 = self.app.case_create_businesses_type(name=name_3)

WorkCase/APP/Businesses/test_businesses_type_get.py

@@ -53,16 +53,11 @@ class TestBusinessesTypeGet(object):
         self.log.debug("测试用例执行开始...")
 
         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.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):
         session = UtilsDataBase().conn_mysql(db_url=self.db_url, db_port=self.db_port, db_base=self.db_base, db_user=self.db_user, db_pw=self.db_pw)
@@ -83,37 +78,11 @@ class TestBusinessesTypeGet(object):
                 assert y.name == w["typeName"]
                 assert x == 0
 
-    @allure.title("businesses.type.get：token未传")
-    @allure.story("查询业务类型：token未传")
-    @allure.severity("blocker")
-    def test_case_01(self):
-        response = self.app.businesses_type_get()
-        self.app.check_code(response=response, code=2001)
-        self.app.check_msg(response=response, msg="token不存在")
-
-    @allure.title("businesses.type.get：token的用户已删除")
-    @allure.story("查询业务类型：token的用户已删除")
-    @allure.severity("blocker")
-    def test_case_02(self):
-        self.app.update_members_del_flag(session=self.db_session(), members_id=self.base_id, value=CaseBase().del_flag["ON"])
-        response = self.app.businesses_type_get(token=self.token)
-        self.app.check_code(response=response, code=2004)
-        self.app.check_msg(response=response, msg="用户不存在")
-
-    @allure.title("businesses.type.get：token的用户已禁用")
-    @allure.story("查询业务类型：token的用户已禁用")
-    @allure.severity("blocker")
-    def test_case_03(self):
-        self.app.update_members_status(session=self.db_session(), members_id=self.base_id, value=CaseBase().status["OFF"])
-        response = self.app.businesses_type_get(token=self.token)
-        self.app.check_code(response=response, code=2003)
-        self.app.check_msg(response=response, msg="账户已被禁用")
-
     @allure.title("businesses.type.get：无参数调用")
     @allure.story("查询业务类型：无参数调用")
     @allure.severity("blocker")
-    def test_case_04(self):
-        name = self.base_typeName + "04"
+    def test_case_01(self):
+        name = self.base_typeName + "01"
         self.app.case_create_businesses_type(name=name)
         response = self.app.businesses_type_get(token=self.token)
         self.app.check_code(response=response, code=0)

WorkCase/APP/Businesses/test_businesses_type_update.py

@@ -53,16 +53,11 @@ class TestBusinessesTypeUpdate(object):
         self.log.debug("测试用例执行开始...")
 
         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.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):
         session = UtilsDataBase().conn_mysql(db_url=self.db_url, db_port=self.db_port, db_base=self.db_base, db_user=self.db_user, db_pw=self.db_pw)
@@ -82,37 +77,11 @@ class TestBusinessesTypeUpdate(object):
             assert y.name == name
             assert x == 0
 
-    @allure.title("businesses.type.update：token未传")
-    @allure.story("更新业务类型：token未传")
-    @allure.severity("blocker")
-    def test_case_01(self):
-        response = self.app.businesses_type_update()
-        self.app.check_code(response=response, code=2001)
-        self.app.check_msg(response=response, msg="token不存在")
-
-    @allure.title("businesses.type.update：token的用户已删除")
-    @allure.story("更新业务类型：token的用户已删除")
-    @allure.severity("blocker")
-    def test_case_02(self):
-        self.app.update_members_del_flag(session=self.db_session(), members_id=self.base_id, value=CaseBase().del_flag["ON"])
-        response = self.app.businesses_type_update(token=self.token)
-        self.app.check_code(response=response, code=2004)
-        self.app.check_msg(response=response, msg="用户不存在")
-
-    @allure.title("businesses.type.update：token的用户已禁用")
-    @allure.story("更新业务类型：token的用户已禁用")
-    @allure.severity("blocker")
-    def test_case_03(self):
-        self.app.update_members_status(session=self.db_session(), members_id=self.base_id, value=CaseBase().status["OFF"])
-        response = self.app.businesses_type_update(token=self.token)
-        self.app.check_code(response=response, code=2003)
-        self.app.check_msg(response=response, msg="账户已被禁用")
-
     @allure.title("businesses.type.update：正常修改")
     @allure.story("更新业务类型：正常修改")
     @allure.severity("blocker")
-    def test_case_04(self):
-        name = self.base_typeName + "04"
+    def test_case_01(self):
+        name = self.base_typeName + "01"
         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)
@@ -120,32 +89,32 @@ class TestBusinessesTypeUpdate(object):
 
     @allure.title("businesses.type.update：id为空,返回正常 无数据修改")
     @allure.story("更新业务类型：id为空,返回正常 无数据修改")
-    def test_case_05(self):
-        name = self.base_typeName + "05"
+    def test_case_02(self):
+        name = self.base_typeName + "02"
         self.app.case_create_businesses_type(name=name)
         response = self.app.businesses_type_update(token=self.token, typeName=name + "修改")
         self.app.check_code(response=response, code=0)
 
     @allure.title("businesses.type.update：typeName为空,返回异常")
     @allure.story("更新业务类型：typeName为空,返回异常")
-    def test_case_06(self):
-        name = self.base_typeName + "06"
+    def test_case_03(self):
+        name = self.base_typeName + "03"
         type_id = self.app.case_create_businesses_type(name=name)
         response = self.app.businesses_type_update(token=self.token, _id=type_id)
         self.app.check_code(response=response, code=100)
 
     @allure.title("businesses.type.update：typeName为空字符串,返回异常")
     @allure.story("更新业务类型：typeName为空字符串,返回异常")
-    def test_case_07(self):
-        name = self.base_typeName + "07"
+    def test_case_04(self):
+        name = self.base_typeName + "04"
         type_id = self.app.case_create_businesses_type(name=name)
         response = self.app.businesses_type_update(token=self.token, _id=type_id, typeName="")
         self.app.check_code(response=response, code=100)
 
     @allure.title("businesses.type.update：id字符串,返回异常")
     @allure.story("更新业务类型：id字符串,返回异常")
-    def test_case_08(self):
-        name = self.base_typeName + "08"
+    def test_case_05(self):
+        name = self.base_typeName + "05"
         self.app.case_create_businesses_type(name=name)
         response = self.app.businesses_type_update(token=self.token, _id="Test", typeName=name)
         self.app.check_code(response=response, code=100)

WorkCase/APP/Businesses/test_businesses_update.py

@@ -57,16 +57,11 @@ class TestBusinessesUpdate(object):
         self.log.debug("测试用例执行开始...")
 
         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.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):
         session = UtilsDataBase().conn_mysql(db_url=self.db_url, db_port=self.db_port, db_base=self.db_base, db_user=self.db_user, db_pw=self.db_pw)
@@ -98,37 +93,11 @@ class TestBusinessesUpdate(object):
             assert w.memberid == memberid
             assert q == 0
 
-    @allure.title("businesses.update：token未传")
-    @allure.story("更新业务：token未传")
-    @allure.severity("blocker")
-    def test_case_01(self):
-        response = self.app.businesses_update()
-        self.app.check_code(response=response, code=2001)
-        self.app.check_msg(response=response, msg="token不存在")
-
-    @allure.title("businesses.update：token的用户已删除")
-    @allure.story("更新业务：token的用户已删除")
-    @allure.severity("blocker")
-    def test_case_02(self):
-        self.app.update_members_del_flag(session=self.db_session(), members_id=self.base_id, value=CaseBase().del_flag["ON"])
-        response = self.app.businesses_update(token=self.token)
-        self.app.check_code(response=response, code=2004)
-        self.app.check_msg(response=response, msg="用户不存在")
-
-    @allure.title("businesses.update：token的用户已禁用")
-    @allure.story("更新业务：token的用户已禁用")
-    @allure.severity("blocker")
-    def test_case_03(self):
-        self.app.update_members_status(session=self.db_session(), members_id=self.base_id, value=CaseBase().status["OFF"])
-        response = self.app.businesses_update(token=self.token)
-        self.app.check_code(response=response, code=2003)
-        self.app.check_msg(response=response, msg="账户已被禁用")
-
     @allure.title("businesses.update：name, type修改")
     @allure.story("更新业务：name, type修改")
     @allure.severity("blocker")
-    def test_case_04(self):
-        name = self.base_name + "04"
+    def test_case_01(self):
+        name = self.base_name + "01"
         business_id = self.app.case_create_businesses(name=name, _type=self.base_type_1)
         response = self.app.businesses_update(token=self.token, businessid=business_id, name=name + "修改", _type=self.base_type_2)
         self.app.check_code(response=response, code=0)
@@ -137,15 +106,15 @@ class TestBusinessesUpdate(object):
 
     @allure.title("businesses.update：id为空,返回异常")
     @allure.story("更新业务：id为空,返回异常")
-    def test_case_05(self):
-        name = self.base_name + "05"
+    def test_case_02(self):
+        name = self.base_name + "02"
         response = self.app.businesses_update(token=self.token, name=name + "修改", _type=self.base_type_2)
         self.app.check_code(response=response, code=100)
 
     @allure.title("businesses.update：其他字段修改")
     @allure.story("更新业务：其他字段修改")
-    def test_case_06(self):
-        name = self.base_name + "06"
+    def test_case_03(self):
+        name = self.base_name + "03"
         business_id = self.app.case_create_businesses(name=name, _type=self.base_type_1)
         response = self.app.businesses_update(token=self.token, businessid=business_id, description="description", principalName="principalName",
                                               principalPhone="principalPhone", memberid=self.base_id)