From 09f38fb67b1caeb4ccd33b83120842fbad306f78 Mon Sep 17 00:00:00 2001 From: SerenaFeng Date: Thu, 19 May 2016 18:13:27 +0800 Subject: add unittests of project & refactor response post body: {'href':''} get body: Pod/Project list body: list of Pod/Project update body: Pod/Project delete: no body JIRA: FUNCTEST-253 Change-Id: I28c6f5b35d8909d827f2f803197d95be4abd44bb Signed-off-by: SerenaFeng --- result_collection_api/tests/unit/test_base.py | 89 ++++++++++++++++++++++----- 1 file changed, 74 insertions(+), 15 deletions(-) (limited to 'result_collection_api/tests/unit/test_base.py') diff --git a/result_collection_api/tests/unit/test_base.py b/result_collection_api/tests/unit/test_base.py index 98190fb..04caa39 100644 --- a/result_collection_api/tests/unit/test_base.py +++ b/result_collection_api/tests/unit/test_base.py @@ -4,6 +4,7 @@ from tornado.testing import AsyncHTTPTestCase from resources.handlers import VersionHandler, PodHandler, \ TestProjectHandler, TestCasesHandler, TestResultsHandler, DashboardHandler +from resources.models import CreateResponse import fake_pymongo @@ -11,6 +12,13 @@ class TestBase(AsyncHTTPTestCase): headers = {'Content-Type': 'application/json; charset=UTF-8'} def setUp(self): + self.basePath = '' + self.create_res = CreateResponse + self.get_res = None + self.list_res = None + self.update_res = None + self.req_d = None + self.req_e = None self.addCleanup(self._clear) super(TestBase, self).setUp() @@ -20,10 +28,10 @@ class TestBase(AsyncHTTPTestCase): (r"/version", VersionHandler), (r"/pods", PodHandler), (r"/pods/([^/]+)", PodHandler), - (r"/test_projects", TestProjectHandler), - (r"/test_projects/([^/]+)", TestProjectHandler), - (r"/test_projects/([^/]+)/cases", TestCasesHandler), - (r"/test_projects/([^/]+)/cases/([^/]+)", TestCasesHandler), + (r"/projects", TestProjectHandler), + (r"/projects/([^/]+)", TestProjectHandler), + (r"/projects/([^/]+)/cases", TestCasesHandler), + (r"/projects/([^/]+)/cases/([^/]+)", TestCasesHandler), (r"/results", TestResultsHandler), (r"/results([^/]*)", TestResultsHandler), (r"/results/([^/]*)", TestResultsHandler), @@ -35,20 +43,71 @@ class TestBase(AsyncHTTPTestCase): debug=True, ) - def create(self, uri, body=None): - return self.fetch(uri, - method='POST', - body=json.dumps(body), - headers=self.headers) + def create_d(self): + return self.create(self.req_d) - def get(self, uri): - return self.fetch(uri, - method='GET', - headers=self.headers) + def create_e(self): + return self.create(self.req_e) + + def create(self, req=None): + if req: + req = req.format() + + res = self.fetch(self.basePath, + method='POST', + body=json.dumps(req), + headers=self.headers) + + return self._get_return(res, self.create_res) + + def get(self, item=None): + res = self.fetch(self._get_uri(item), + method='GET', + headers=self.headers) + + def inner(): + return self.get_res if item else self.list_res + return self._get_return(res, inner()) + + def update(self, item, new=None): + if new: + new = new.format() + res = self.fetch(self._get_uri(item), + method='PUT', + body=json.dumps(new), + headers=self.headers) + return self._get_return(res, self.update_res) + + def delete(self, item): + res = self.fetch(self._get_uri(item), + method='DELETE', + headers=self.headers) + return res.code + + def _get_uri(self, item=None): + uri = self.basePath + if item: + uri += '/{}'.format(item) + return uri + + def _get_return(self, res, cls): + code = res.code + body = res.body + return code, self._get_return_body(code, body, cls) + + @staticmethod + def _get_return_body(code, body, cls): + return cls.from_dict(json.loads(body)) if code < 300 else body + + def assert_create_body(self, body, req=None): + print(body.href) + if not req: + req = self.req_d + self.assertIn(self._get_uri(req.name), body.href) @staticmethod def _clear(): - fake_pymongo.pod.clear() - fake_pymongo.test_projects.clear() + fake_pymongo.pods.clear() + fake_pymongo.projects.clear() fake_pymongo.test_cases.clear() fake_pymongo.test_results.clear() -- cgit 1.2.3-korg