Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Apex: enable ha for os-odl_l3-fdio"
[releng.git]
/
utils
/
test
/
testapi
/
opnfv_testapi
/
tests
/
unit
/
test_project.py
diff --git
a/utils/test/testapi/opnfv_testapi/tests/unit/test_project.py
b/utils/test/testapi/opnfv_testapi/tests/unit/test_project.py
index
afd4a66
..
9143f8a
100644
(file)
--- a/
utils/test/testapi/opnfv_testapi/tests/unit/test_project.py
+++ b/
utils/test/testapi/opnfv_testapi/tests/unit/test_project.py
@@
-6,11
+6,12
@@
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
+import httplib
import unittest
import unittest
-from opnfv_testapi.common import
constants
+from opnfv_testapi.common import
message
from opnfv_testapi.resources import project_models
from opnfv_testapi.resources import project_models
-import test_base as base
+
from opnfv_testapi.tests.unit
import test_base as base
class TestProjectBase(base.TestBase):
class TestProjectBase(base.TestBase):
@@
-37,41
+38,41
@@
class TestProjectBase(base.TestBase):
class TestProjectCreate(TestProjectBase):
def test_withoutBody(self):
(code, body) = self.create()
class TestProjectCreate(TestProjectBase):
def test_withoutBody(self):
(code, body) = self.create()
- self.assertEqual(code,
constants.HTTP_
BAD_REQUEST)
+ self.assertEqual(code,
httplib.
BAD_REQUEST)
def test_emptyName(self):
req_empty = project_models.ProjectCreateRequest('')
(code, body) = self.create(req_empty)
def test_emptyName(self):
req_empty = project_models.ProjectCreateRequest('')
(code, body) = self.create(req_empty)
- self.assertEqual(code,
constants.HTTP_
BAD_REQUEST)
- self.assertIn(
'name missing'
, body)
+ self.assertEqual(code,
httplib.
BAD_REQUEST)
+ self.assertIn(
message.missing('name')
, body)
def test_noneName(self):
req_none = project_models.ProjectCreateRequest(None)
(code, body) = self.create(req_none)
def test_noneName(self):
req_none = project_models.ProjectCreateRequest(None)
(code, body) = self.create(req_none)
- self.assertEqual(code,
constants.HTTP_
BAD_REQUEST)
- self.assertIn(
'name missing'
, body)
+ self.assertEqual(code,
httplib.
BAD_REQUEST)
+ self.assertIn(
message.missing('name')
, body)
def test_success(self):
(code, body) = self.create_d()
def test_success(self):
(code, body) = self.create_d()
- self.assertEqual(code,
constants.HTTP_
OK)
+ self.assertEqual(code,
httplib.
OK)
self.assert_create_body(body)
def test_alreadyExist(self):
self.create_d()
(code, body) = self.create_d()
self.assert_create_body(body)
def test_alreadyExist(self):
self.create_d()
(code, body) = self.create_d()
- self.assertEqual(code,
constants.HTTP_
FORBIDDEN)
- self.assertIn(
'already exists'
, body)
+ self.assertEqual(code,
httplib.
FORBIDDEN)
+ self.assertIn(
message.exist_base
, body)
class TestProjectGet(TestProjectBase):
def test_notExist(self):
code, body = self.get('notExist')
class TestProjectGet(TestProjectBase):
def test_notExist(self):
code, body = self.get('notExist')
- self.assertEqual(code,
constants.HTTP_
NOT_FOUND)
+ self.assertEqual(code,
httplib.
NOT_FOUND)
def test_getOne(self):
self.create_d()
code, body = self.get(self.req_d.name)
def test_getOne(self):
self.create_d()
code, body = self.get(self.req_d.name)
- self.assertEqual(code,
constants.HTTP_
OK)
+ self.assertEqual(code,
httplib.
OK)
self.assert_body(body)
def test_list(self):
self.assert_body(body)
def test_list(self):
@@
-88,24
+89,24
@@
class TestProjectGet(TestProjectBase):
class TestProjectUpdate(TestProjectBase):
def test_withoutBody(self):
code, _ = self.update(None, 'noBody')
class TestProjectUpdate(TestProjectBase):
def test_withoutBody(self):
code, _ = self.update(None, 'noBody')
- self.assertEqual(code,
constants.HTTP_
BAD_REQUEST)
+ self.assertEqual(code,
httplib.
BAD_REQUEST)
def test_notFound(self):
code, _ = self.update(self.req_e, 'notFound')
def test_notFound(self):
code, _ = self.update(self.req_e, 'notFound')
- self.assertEqual(code,
constants.HTTP_
NOT_FOUND)
+ self.assertEqual(code,
httplib.
NOT_FOUND)
def test_newNameExist(self):
self.create_d()
self.create_e()
code, body = self.update(self.req_e, self.req_d.name)
def test_newNameExist(self):
self.create_d()
self.create_e()
code, body = self.update(self.req_e, self.req_d.name)
- self.assertEqual(code,
constants.HTTP_
FORBIDDEN)
- self.assertIn(
"already exists"
, body)
+ self.assertEqual(code,
httplib.
FORBIDDEN)
+ self.assertIn(
message.exist_base
, body)
def test_noUpdate(self):
self.create_d()
code, body = self.update(self.req_d, self.req_d.name)
def test_noUpdate(self):
self.create_d()
code, body = self.update(self.req_d, self.req_d.name)
- self.assertEqual(code,
constants.HTTP_
FORBIDDEN)
- self.assertIn(
"Nothing to update"
, body)
+ self.assertEqual(code,
httplib.
FORBIDDEN)
+ self.assertIn(
message.no_update()
, body)
def test_success(self):
self.create_d()
def test_success(self):
self.create_d()
@@
-114,7
+115,7
@@
class TestProjectUpdate(TestProjectBase):
req = project_models.ProjectUpdateRequest('newName', 'new description')
code, body = self.update(req, self.req_d.name)
req = project_models.ProjectUpdateRequest('newName', 'new description')
code, body = self.update(req, self.req_d.name)
- self.assertEqual(code,
constants.HTTP_
OK)
+ self.assertEqual(code,
httplib.
OK)
self.assertEqual(_id, body._id)
self.assert_body(body, req)
self.assertEqual(_id, body._id)
self.assert_body(body, req)
@@
-126,16
+127,16
@@
class TestProjectUpdate(TestProjectBase):
class TestProjectDelete(TestProjectBase):
def test_notFound(self):
code, body = self.delete('notFound')
class TestProjectDelete(TestProjectBase):
def test_notFound(self):
code, body = self.delete('notFound')
- self.assertEqual(code,
constants.HTTP_
NOT_FOUND)
+ self.assertEqual(code,
httplib.
NOT_FOUND)
def test_success(self):
self.create_d()
code, body = self.delete(self.req_d.name)
def test_success(self):
self.create_d()
code, body = self.delete(self.req_d.name)
- self.assertEqual(code,
constants.HTTP_
OK)
+ self.assertEqual(code,
httplib.
OK)
self.assertEqual(body, '')
code, body = self.get(self.req_d.name)
self.assertEqual(body, '')
code, body = self.get(self.req_d.name)
- self.assertEqual(code,
constants.HTTP_
NOT_FOUND)
+ self.assertEqual(code,
httplib.
NOT_FOUND)
if __name__ == '__main__':
unittest.main()
if __name__ == '__main__':
unittest.main()