diff options
Diffstat (limited to 'utils/test/result_collection_api/opnfv_testapi/tests/unit/test_result.py')
| -rw-r--r-- | utils/test/result_collection_api/opnfv_testapi/tests/unit/test_result.py | 44 |
1 files changed, 30 insertions, 14 deletions
diff --git a/utils/test/result_collection_api/opnfv_testapi/tests/unit/test_result.py b/utils/test/result_collection_api/opnfv_testapi/tests/unit/test_result.py index 5a5dd3852..dbc4431ce 100644 --- a/utils/test/result_collection_api/opnfv_testapi/tests/unit/test_result.py +++ b/utils/test/result_collection_api/opnfv_testapi/tests/unit/test_result.py @@ -196,16 +196,30 @@ class TestResultGet(TestResultBase): def test_queryCriteria(self): self._query_and_assert(self._set_query('criteria')) + def test_queryPeriodNotInt(self): + code, body = self.query(self._set_query('period=a')) + self.assertEqual(code, HTTP_BAD_REQUEST) + self.assertIn('period must be int', body) + def test_queryPeriodFail(self): self._query_and_assert(self._set_query('period=1'), - aheadof=True, - found=False) + found=False, days=-10) def test_queryPeriodSuccess(self): self._query_and_assert(self._set_query('period=1'), - aheadof=False, found=True) + def test_queryLastNotInt(self): + code, body = self.query(self._set_query('last=a')) + self.assertEqual(code, HTTP_BAD_REQUEST) + self.assertIn('last must be int', body) + + def test_queryLast(self): + self._create_changed_date() + req = self._create_changed_date(minutes=20) + self._create_changed_date(minutes=-20) + self._query_and_assert(self._set_query('last=1'), req=req) + def test_combination(self): self._query_and_assert(self._set_query('pod', 'project', @@ -231,17 +245,9 @@ class TestResultGet(TestResultBase): 'period=1'), found=False) - def _query_and_assert(self, query, aheadof=False, found=True): - import copy - from datetime import datetime, timedelta - req = copy.deepcopy(self.req_d) - if aheadof: - req.start_date = datetime.now() - timedelta(days=10) - else: - req.start_date = datetime.now() - req.stop_date = str(req.start_date + timedelta(minutes=10)) - req.start_date = str(req.start_date) - _, res = self.create(req) + def _query_and_assert(self, query, found=True, req=None, **kwargs): + if req is None: + req = self._create_changed_date(**kwargs) code, body = self.query(query) if not found: self.assertEqual(code, HTTP_OK) @@ -251,6 +257,16 @@ class TestResultGet(TestResultBase): for result in body.results: self.assert_res(code, result, req) + def _create_changed_date(self, **kwargs): + import copy + from datetime import datetime, timedelta + req = copy.deepcopy(self.req_d) + req.start_date = datetime.now() + timedelta(**kwargs) + req.stop_date = str(req.start_date + timedelta(minutes=10)) + req.start_date = str(req.start_date) + self.create(req) + return req + def _set_query(self, *args): uri = '' for arg in args: |