文件上传修改

WorkCase/APP/File/test_file_upload.py

@@ -8,6 +8,7 @@ from __future__ import division
 
 from WorkApi.APP.Api.api_login import ApiLogin
 from WorkCase import CaseBase
+from WorkCase.APP import AppBase
 from WorkUtils.UtilsLog import UtilsLog
 from WorkUtils.UtilsResponse import UtilsResponse
 from WorkUtils.UtilsDataBase import UtilsDataBase
@@ -42,39 +43,17 @@ class TestFileUpload(object):
 
     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("获取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)
-
-    @allure.step("调用接口：file.upload")
-    def file_upload(self, token=None, _file=None):
-        api = FileUpload(_host=self.host)
-        api.token = token
-        api.file = _file
-        api.get_response()
-        return api.response
-
-    @allure.step("断言返回结果")
-    def check_code(self, response, code):
-        _code = UtilsResponse().get_code(response=response)
-        assert _code == code
+
+        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):
@@ -85,41 +64,36 @@ class TestFileUpload(object):
     @allure.story("文件上传：token未传")
     @allure.severity("blocker")
     def test_case_01(self):
-        self.get_base_token()
-
-        response = self.file_upload()
-        self.check_code(response=response, code=2001)
-        self.check_msg(response=response, msg="无token，请重新登录")
+        response = self.app.file_upload()
+        self.app.check_code(response=response, code=2001)
+        self.app.check_msg(response=response, msg="无token，请重新登录")
 
     @allure.title("file.upload：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.file_upload(token=self.token)
-        self.check_code(response=response, code=2004)
-        self.check_msg(response=response, msg="用户不存在")
+        self.app.update_members_del_flag(members_id=self.base_id, value=CaseBase().del_flag["ON"])
+        response = self.app.file_upload(token=self.token)
+        self.app.check_code(response=response, code=2004)
+        self.app.check_msg(response=response, msg="用户不存在")
 
     @allure.title("file.upload：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.file_upload(token=self.token)
-        self.check_code(response=response, code=2003)
-        self.check_msg(response=response, msg="账户已被禁用")
+        self.app.update_members_status(members_id=self.base_id, value=CaseBase().status["OFF"])
+        response = self.app.file_upload(token=self.token)
+        self.app.check_code(response=response, code=2003)
+        self.app.check_msg(response=response, msg="账户已被禁用")
 
     @allure.title("file.upload：成功创建")
     @allure.story("文件上传：成功创建")
     @allure.severity("blocker")
     def test_case_04(self):
-        self.get_base_token()
         case_path = WorkBase().case_path
         _file = open(case_path + "APP\\File\\case.txt", "rb")
-        response = self.file_upload(token=self.token, _file=_file)
-        assert ".txt" in response
+        response = self.app.file_upload(token=self.token, _file=_file)
+        assert "txt" in response
 
 
 if __name__ == "__main__":
@@ -129,11 +103,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 = TestFileUpload()
-    # a.setup_class()
-    # 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 = TestFileUpload()
+    a.setup_class()
+    a.setup_method()
+    a.test_case_04()