Commit 6934583c by sanshi

整个业务代码重构

parent 8662c822
......@@ -86,37 +86,11 @@ class TestHostTypeCreate(object):
assert y.sortid == sortid
assert x == 0
@allure.title("hosttype.create:token未传")
@allure.story("创建设备类型:token未传")
@allure.severity("blocker")
def test_case_01(self):
response = self.app.hostType_create()
self.app.check_code(response=response, code=2001)
self.app.check_msg(response=response, msg="token不存在")
@allure.title("hosttype.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.hostType_create(token=self.token)
self.app.check_code(response=response, code=2004)
self.app.check_msg(response=response, msg="用户不存在")
@allure.title("hosttype.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.hostType_create(token=self.token)
self.app.check_code(response=response, code=2003)
self.app.check_msg(response=response, msg="账户已被禁用")
@allure.title("hosttype.create:成功创建")
@allure.story("创建设备类型:成功创建")
@allure.severity("blocker")
def test_case_04(self):
title = self.base_title + "04"
def test_case_01(self):
title = self.base_title + "01"
response = self.app.hostType_create(token=self.token, title=title, parentId=0, templateIds="templateIds",
interfaces="interfaces", description="description", sortid=255)
self.app.check_code(response=response, code=0)
......
......@@ -78,37 +78,11 @@ class TestHostTypeDelete(object):
sql = self.select_hosttype(_id=hosttype_id)
assert sql == []
@allure.title("hosttype.delete:token未传")
@allure.story("删除设备类型:token未传")
@allure.severity("blocker")
def test_case_01(self):
response = self.app.hostType_delete()
self.app.check_code(response=response, code=2001)
self.app.check_msg(response=response, msg="token不存在")
@allure.title("hosttype.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.hostType_delete(token=self.token)
self.app.check_code(response=response, code=2004)
self.app.check_msg(response=response, msg="用户不存在")
@allure.title("hosttype.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.hostType_delete(token=self.token)
self.app.check_code(response=response, code=2003)
self.app.check_msg(response=response, msg="账户已被禁用")
@allure.title("hosttype.delete:成功删除一个")
@allure.story("删除设备类型:成功删除一个")
@allure.severity("blocker")
def test_case_04(self):
title = self.base_title + "04"
def test_case_01(self):
title = self.base_title + "01"
host_type_id = self.app.case_create_hostType(title=title, parentId=0, description=None)
response = self.app.hostType_delete(token=self.token, hosttypeids=[host_type_id])
......@@ -117,10 +91,10 @@ class TestHostTypeDelete(object):
@allure.title("hosttype.delete:成功删除多个")
@allure.story("删除设备类型:成功删除多个")
def test_case_05(self):
title_1 = self.base_title + "051"
title_2 = self.base_title + "052"
title_3 = self.base_title + "053"
def test_case_02(self):
title_1 = self.base_title + "021"
title_2 = self.base_title + "022"
title_3 = self.base_title + "023"
host_type_id_1 = self.app.case_create_hostType(title=title_1, parentId=0, description=None)
host_type_id_2 = self.app.case_create_hostType(title=title_2, parentId=0, description=None)
host_type_id_3 = self.app.case_create_hostType(title=title_3, parentId=0, description=None)
......
......@@ -87,44 +87,18 @@ class TestHostTypeGet(object):
assert y.sortid == sortid
assert x == 0
@allure.title("hosttype.get:token未传")
@allure.story("查询设备类型:token未传")
@allure.severity("blocker")
def test_case_01(self):
response = self.app.hostType_get()
self.app.check_code(response=response, code=2001)
self.app.check_msg(response=response, msg="token不存在")
@allure.title("hosttype.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.hostType_get(token=self.token)
self.app.check_code(response=response, code=2004)
self.app.check_msg(response=response, msg="用户不存在")
@allure.title("hosttype.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.hostType_get(token=self.token)
self.app.check_code(response=response, code=2003)
self.app.check_msg(response=response, msg="账户已被禁用")
@allure.title("hosttype.get:无参数调用")
@allure.story("查询设备类型:无参数调用")
@allure.severity("blocker")
def test_case_04(self):
def test_case_01(self):
response = self.app.hostType_get(token=self.token, title=self.base_title)
self.app.check_code(response=response, code=0)
@allure.title("hosttype.get:title模糊查询")
@allure.story("查询设备类型:title模糊查询")
@allure.severity("blocker")
def test_case_05(self):
title = self.base_title + "05"
def test_case_02(self):
title = self.base_title + "02"
self.app.case_create_hostType(title=title, parentId=0, description=None)
response = self.app.hostType_get(token=self.token, title=self.base_title)
......@@ -134,8 +108,8 @@ class TestHostTypeGet(object):
@allure.title("hosttype.get:title精确查询")
@allure.story("查询设备类型:title精确查询")
@allure.severity("blocker")
def test_case_06(self):
title = self.base_title + "06"
def test_case_03(self):
title = self.base_title + "03"
self.app.case_create_hostType(title=title, parentId=0, description=None)
response = self.app.hostType_get(token=self.token, title=title)
......@@ -144,8 +118,8 @@ class TestHostTypeGet(object):
@allure.title("hosttype.get:parentId成功查询")
@allure.story("查询设备类型:parentId成功查询")
def test_case_07(self):
title = self.base_title + "07"
def test_case_04(self):
title = self.base_title + "04"
self.app.case_create_hostType(title=title, parentId=999, description=None)
response = self.app.hostType_get(token=self.token, parentId=999)
......@@ -154,8 +128,8 @@ class TestHostTypeGet(object):
@allure.title("hosttype.get:description成功查询")
@allure.story("查询设备类型:description成功查询")
def test_case_08(self):
title = self.base_title + "08"
def test_case_05(self):
title = self.base_title + "05"
self.app.case_create_hostType(title=title, parentId=0, description="description")
response = self.app.hostType_get(token=self.token, description="description")
......
......@@ -84,40 +84,11 @@ class TestHostTypeList(object):
assert y.parent_id == w["parentId"]
assert w["parentId"] == parent_id
@allure.title("hosttype.list:token未传")
@allure.story("查询设备类型:token未传")
@allure.severity("blocker")
@pytest.mark.skip(reason="此接口未加入token验证")
def test_case_01(self):
response = self.app.hostType_list()
self.app.check_code(response=response, code=2001)
self.app.check_msg(response=response, msg="token不存在")
@allure.title("hosttype.list:token的用户已删除")
@allure.story("查询设备类型:token的用户已删除")
@allure.severity("blocker")
@pytest.mark.skip(reason="此接口未加入token验证")
def test_case_02(self):
self.app.update_members_status(session=self.db_session(), members_id=self.base_id, value=CaseBase().del_flag["ON"])
response = self.app.hostType_list(token=self.token)
self.app.check_code(response=response, code=2004)
self.app.check_msg(response=response, msg="用户不存在")
@allure.title("hosttype.list: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.hostType_list(token=self.token)
self.app.check_code(response=response, code=2003)
self.app.check_msg(response=response, msg="账户已被禁用")
@allure.title("hosttype.list:parentId成功查询")
@allure.story("查询设备类型:parentId成功查询")
@allure.severity("blocker")
def test_case_04(self):
title = self.base_title + "04"
def test_case_01(self):
title = self.base_title + "01"
self.app.case_create_hostType(title=title, parentId=998, description=None)
response = self.app.hostType_list(token=self.token, parentId=998)
......
......@@ -89,39 +89,10 @@ class TestHostTypeTree(object):
for x, y in enumerate([self.base_type_id_1, self.base_type_id_2]):
assert y in ids
@allure.title("hosttype.tree:token未传")
@allure.story("查询资产类型树:token未传")
@allure.severity("blocker")
@pytest.mark.skip(reason="此接口未加入token验证")
def test_case_01(self):
response = self.app.hostType_tree()
self.app.check_code(response=response, code=2001)
self.app.check_msg(response=response, msg="token不存在")
@allure.title("hosttype.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.hostType_tree(token=self.token)
self.app.check_code(response=response, code=2004)
self.app.check_msg(response=response, msg="用户不存在")
@allure.title("hosttype.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.hostType_tree(token=self.token)
self.app.check_code(response=response, code=2003)
self.app.check_msg(response=response, msg="账户已被禁用")
@allure.title("hosttype.tree:无参数调用")
@allure.story("查询资产类型树:无参数调用")
@allure.severity("blocker")
def test_case_04(self):
def test_case_01(self):
response = self.app.hostType_tree(token=self.token)
self.app.check_code(response=response, code=0)
self.check_data(response=response)
......
......@@ -87,37 +87,11 @@ class TestHostTypeUpdate(object):
assert y.sortid == sortid
assert x == 0
@allure.title("hosttype.update:token未传")
@allure.story("更新设备类型:token未传")
@allure.severity("blocker")
def test_case_01(self):
response = self.app.hostType_update()
self.app.check_code(response=response, code=2001)
self.app.check_msg(response=response, msg="token不存在")
@allure.title("hosttype.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.hostType_update(token=self.token)
self.app.check_code(response=response, code=2004)
self.app.check_msg(response=response, msg="用户不存在")
@allure.title("hosttype.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.hostType_update(token=self.token)
self.app.check_code(response=response, code=2003)
self.app.check_msg(response=response, msg="账户已被禁用")
@allure.title("hosttype.update:修改所有字段")
@allure.story("更新设备类型:修改所有字段")
@allure.severity("blocker")
def test_case_04(self):
title = self.base_title + "04"
def test_case_01(self):
title = self.base_title + "01"
host_type_id = self.app.case_create_hostType(title=title, parentId=0, description=None)
response = self.app.hostType_update(token=self.token, _id=host_type_id, title=title + "修改", parentId=1, templateIds="templateIds",
......@@ -128,8 +102,8 @@ class TestHostTypeUpdate(object):
@allure.title("hosttype.update:id为空,返回异常")
@allure.story("更新设备类型:id为空,返回异常")
def test_case_05(self):
title = self.base_title + "05"
def test_case_02(self):
title = self.base_title + "02"
self.app.case_create_hostType(title=title, parentId=1, description=None)
response = self.app.hostType_update(token=self.token)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment