Merge "xci: Fix images directory permissions"

[releng.git] / utils / test / testapi / opnfv_testapi / tests / unit / test_token.py

diff --git a/utils/test/testapi/opnfv_testapi/tests/unit/test_token.py b/utils/test/testapi/opnfv_testapi/tests/unit/test_token.py
index 19b9e3e..ed3eda0 100644 (file)
--- a/utils/test/testapi/opnfv_testapi/tests/unit/test_token.py
+++ b/utils/test/testapi/opnfv_testapi/tests/unit/test_token.py
@@ -3,12 +3,13 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 
+import httplib
 import unittest
 
 from tornado import web
 
 import fake_pymongo
-from opnfv_testapi.common import constants
+from opnfv_testapi.common import message
 from opnfv_testapi.resources import project_models
 from opnfv_testapi.router import url_mappings
 import test_base as base
@@ -34,19 +35,19 @@ class TestTokenCreateProject(TestToken):
     def test_projectCreateTokenInvalid(self):
         self.headers['X-Auth-Token'] = '1234'
         code, body = self.create_d()
-        self.assertEqual(code, constants.HTTP_FORBIDDEN)
-        self.assertIn('Invalid Token.', body)
+        self.assertEqual(code, httplib.FORBIDDEN)
+        self.assertIn(message.invalid_token(), body)
 
     def test_projectCreateTokenUnauthorized(self):
         self.headers.pop('X-Auth-Token')
         code, body = self.create_d()
-        self.assertEqual(code, constants.HTTP_UNAUTHORIZED)
-        self.assertIn('No Authentication Header.', body)
+        self.assertEqual(code, httplib.UNAUTHORIZED)
+        self.assertIn(message.unauthorized(), body)
 
     def test_projectCreateTokenSuccess(self):
         self.headers['X-Auth-Token'] = '12345'
         code, body = self.create_d()
-        self.assertEqual(code, constants.HTTP_OK)
+        self.assertEqual(code, httplib.OK)
 
 
 class TestTokenDeleteProject(TestToken):
@@ -61,22 +62,22 @@ class TestTokenDeleteProject(TestToken):
         self.create_d()
         self.headers['X-Auth-Token'] = '1234'
         code, body = self.delete(self.req_d.name)
-        self.assertEqual(code, constants.HTTP_FORBIDDEN)
-        self.assertIn('Invalid Token.', body)
+        self.assertEqual(code, httplib.FORBIDDEN)
+        self.assertIn(message.invalid_token(), body)
 
     def test_projectDeleteTokenUnauthorized(self):
         self.headers['X-Auth-Token'] = '12345'
         self.create_d()
         self.headers.pop('X-Auth-Token')
         code, body = self.delete(self.req_d.name)
-        self.assertEqual(code, constants.HTTP_UNAUTHORIZED)
-        self.assertIn('No Authentication Header.', body)
+        self.assertEqual(code, httplib.UNAUTHORIZED)
+        self.assertIn(message.unauthorized(), body)
 
     def test_projectDeleteTokenSuccess(self):
         self.headers['X-Auth-Token'] = '12345'
         self.create_d()
         code, body = self.delete(self.req_d.name)
-        self.assertEqual(code, constants.HTTP_OK)
+        self.assertEqual(code, httplib.OK)
 
 
 class TestTokenUpdateProject(TestToken):
@@ -93,8 +94,8 @@ class TestTokenUpdateProject(TestToken):
         self.headers['X-Auth-Token'] = '1234'
         req = project_models.ProjectUpdateRequest('newName', 'new description')
         code, body = self.update(req, self.req_d.name)
-        self.assertEqual(code, constants.HTTP_FORBIDDEN)
-        self.assertIn('Invalid Token.', body)
+        self.assertEqual(code, httplib.FORBIDDEN)
+        self.assertIn(message.invalid_token(), body)
 
     def test_projectUpdateTokenUnauthorized(self):
         self.headers['X-Auth-Token'] = '12345'
@@ -103,8 +104,8 @@ class TestTokenUpdateProject(TestToken):
         self.headers.pop('X-Auth-Token')
         req = project_models.ProjectUpdateRequest('newName', 'new description')
         code, body = self.update(req, self.req_d.name)
-        self.assertEqual(code, constants.HTTP_UNAUTHORIZED)
-        self.assertIn('No Authentication Header.', body)
+        self.assertEqual(code, httplib.UNAUTHORIZED)
+        self.assertIn(message.unauthorized(), body)
 
     def test_projectUpdateTokenSuccess(self):
         self.headers['X-Auth-Token'] = '12345'
@@ -112,7 +113,7 @@ class TestTokenUpdateProject(TestToken):
         code, body = self.get(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)
 
 if __name__ == '__main__':
     unittest.main()