openstack/zaqar
Code Issues Proposed changes

V1 Tests JsonSchema

Browse Source 
Refactored V1 tests to include JsonSchema validation where appropriate
Added necessary schema entries to the schema dictionary

Implements: blueprint jsonschema-validation

Change-Id: I474265948253a932ef3dbb45bca34b27b798447d
This commit is contained in:
abettadapur 2014-05-19 11:43:31 -04:00
parent 74eb5eb77a
commit a4c43eae01
4 changed files with 181 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

198
marconi/queues/api/v1/response.py
View File

@ -22,37 +22,43 @@ class ResponseSchema(api.Api):
def __init__(self, limits): def __init__(self, limits):
self.limits = limits self.limits = limits
self.schema = {
'message_get_many': {
"type": "array",
"items": {
"type": "object",
"properties": {
"href": {
"type": "string",
"pattern": "^(/v1/queues/[a-zA-Z0-9_-]{1,64}"
"/messages/[a-zA-Z0-9_-]+)$"
},
"ttl": {
"type": "number",
"minimum": 1,
"maximum": self.limits.max_message_ttl
},
"age": {
"type": "number",
"minimum": 0
},
"body": {
"type": "object"
}
},
"required": ["href", "ttl", "age", "body"],
"additionalProperties": False,
},
"minItems": 1,
"maxItems": self.limits.max_messages_per_page
},
age = {
"type": "number",
"minimum": 0
}
message = {
"type": "object",
"properties": {
"href": {
"type": "string",
"pattern": "^(/v1/queues/[a-zA-Z0-9_-]"
"{1,64}/messages/[a-zA-Z0-9_-]+)$"
},
"age": age,
"ttl": {
"type": "number",
"minimum": 1,
"maximum": self.limits.max_message_ttl
},
"body": {
"type": "object"
}
},
"required": ["href", "ttl", "age", "body"],
"additionalProperties": False,
}
claim_href = {
"type": "string",
"pattern": "^(/v1/queues/[a-zA-Z0-9_-]{1,64}"
"/messages/[a-zA-Z0-9_-]+)"
"\?claim_id=[a-zA-Z0-9_-]+$"
}
self.schema = {
'queue_list': { 'queue_list': {
'type': 'object', 'type': 'object',
'properties': { 'properties': {
@ -103,5 +109,137 @@ class ResponseSchema(api.Api):
}, },
'required': ['links', 'queues'], 'required': ['links', 'queues'],
'additionalProperties': False, 'additionalProperties': False,
},
'queue_stats': {
'type': 'object',
'properties': {
'messages': {
'type': 'object',
'properties': {
'free': {
'type': 'number',
'minimum': 0
},
'claimed': {
'type': 'number',
'minimum': 0
},
'total': {
'type': 'number',
'minimum': 0
},
'oldest': {
'type': 'object'
},
'newest': {
'type': 'object'
}
},
'required': ['free', 'claimed', 'total'],
'additionalProperties': False
}
},
'required': ['messages'],
'additionalProperties': False
},
'message_list': {
'type': 'object',
'properties': {
'links': {
'type': 'array',
'items': {
'type': 'object',
'properties': {
'rel': {
'type': 'string'
},
'href': {
'type': 'string',
'pattern': '^/v1/queues/[a-zA-Z0-9_-]+'
'/messages\?(.)*$'
}
},
'required': ['rel', 'href'],
'additionalProperties': False
}
},
'messages': {
"type": "array",
"items": message,
"minItems": 1,
"maxItems": self.limits.max_messages_per_claim
}
}
},
'message_get_many': {
"type": "array",
"items": message,
"minItems": 1,
"maxItems": self.limits.max_messages_per_page
},
'claim_create': {
"type": "array",
"items": {
"type": "object",
"properties": {
"href": claim_href,
"ttl": {
"type": "number",
"minimum": 1,
"maximum": self.limits.max_message_ttl
},
"age": age,
"body": {
"type": "object"
}
},
"required": ["href", "ttl", "age", "body"],
"additionalProperties": False,
},
"minItems": 1,
"maxItems": self.limits.max_messages_per_page
},
'claim_get': {
'type': 'object',
'properties': {
'age': age,
'ttl': {
'type': 'number',
'minimum': 0,
'maximum': self.limits.max_claim_ttl
},
'href': {
'type': 'string',
'pattern': '^/v1/queues/[a-zA-Z0-9_-]+'
'/claims/[a-zA-Z0-9_-]+$'
},
'messages': {
"type": "array",
"items": {
"type": "object",
"properties": {
"href": claim_href,
"ttl": {
"type": "number",
"minimum": 1,
"maximum": self.limits.max_message_ttl
},
"age": age,
"body": {
"type": "object"
}
},
"required": ["href", "ttl", "age", "body"],
"additionalProperties": False,
},
"minItems": 1,
"maxItems": self.limits.max_messages_per_page
}
},
'required': ['age', 'ttl', 'messages', 'href'],
'additionalProperties': False
} }
} }

9
tests/functional/wsgi/v1/test_claims.py
View File

@ -52,7 +52,8 @@ class TestClaims(base.FunctionalTestBase):
@ddt.data({}, dict(limit=2)) @ddt.data({}, dict(limit=2))
def test_claim_messages(self, params): def test_claim_messages(self, params):
"""Claim messages.""" """Claim messages."""
message_count = params.get('limit', 10) message_count = params.get('limit',
self.limits.max_messages_per_claim)
doc = {"ttl": 300, "grace": 100} doc = {"ttl": 300, "grace": 100}
@ -65,6 +66,9 @@ class TestClaims(base.FunctionalTestBase):
response_headers = set(result.headers.keys()) response_headers = set(result.headers.keys())
self.assertIsSubset(self.headers_response_with_body, response_headers) self.assertIsSubset(self.headers_response_with_body, response_headers)
# NOTE(abettadapur) This fails because of Bug #1321840
# self.assertSchema(result.json(), 'claim_create')
test_claim_messages.tags = ['smoke', 'positive'] test_claim_messages.tags = ['smoke', 'positive']
def test_query_claim(self): def test_query_claim(self):
@ -80,6 +84,9 @@ class TestClaims(base.FunctionalTestBase):
result = self.client.get(url) result = self.client.get(url)
self.assertEqual(result.status_code, 200) self.assertEqual(result.status_code, 200)
# NOTE(abettadapur) This fails because of Bug #1321840
# self.assertSchema(result.json(), 'claim_get')
test_query_claim.tags = ['smoke', 'positive'] test_query_claim.tags = ['smoke', 'positive']
def test_claim_more_than_allowed(self): def test_claim_more_than_allowed(self):

4
tests/functional/wsgi/v1/test_messages.py
View File

@ -137,7 +137,7 @@ class TestMessages(base.FunctionalTestBase):
test_message_bulk_insert.tags = ['smoke', 'positive'] test_message_bulk_insert.tags = ['smoke', 'positive']
@ddt.data({}, {'limit': 5}) @ddt.data({'limit': 10}, {'limit': 5})
def test_get_message(self, params): def test_get_message(self, params):
"""Get Messages.""" """Get Messages."""
@ -161,6 +161,7 @@ class TestMessages(base.FunctionalTestBase):
if result.status_code == 200: if result.status_code == 200:
actual_msg_count = len(result.json()['messages']) actual_msg_count = len(result.json()['messages'])
self.assertMessageCount(actual_msg_count, expected_msg_count) self.assertMessageCount(actual_msg_count, expected_msg_count)
self.assertSchema(result.json(), 'message_list')
href = result.json()['links'][0]['href'] href = result.json()['links'][0]['href']
url = self.cfg.marconi.url + href url = self.cfg.marconi.url + href
@ -244,6 +245,7 @@ class TestMessages(base.FunctionalTestBase):
url += ',nonexisting' url += ',nonexisting'
result = self.client.get(url) result = self.client.get(url)
self.assertEqual(result.status_code, 200) self.assertEqual(result.status_code, 200)
self.assertSchema(result.json(), "message_get_many")
test_message_partial_get.tags = ['negative'] test_message_partial_get.tags = ['negative']

2
tests/functional/wsgi/v1/test_queues.py
View File

@ -369,6 +369,7 @@ class TestQueueMisc(base.FunctionalTestBase):
expected_response = {'messages': expected_response = {'messages':
{'claimed': 0, 'total': 0, 'free': 0}} {'claimed': 0, 'total': 0, 'free': 0}}
self.assertEqual(result.json(), expected_response) self.assertEqual(result.json(), expected_response)
self.assertSchema(result.json(), 'queue_stats')
test_get_stats_empty_queue.tags = ['positive'] test_get_stats_empty_queue.tags = ['positive']
@ -399,6 +400,7 @@ class TestQueueMisc(base.FunctionalTestBase):
self.assertEqual(result.status_code, 200) self.assertEqual(result.status_code, 200)
self.assertQueueStats(result.json(), claimed) self.assertQueueStats(result.json(), claimed)
self.assertSchema(result.json(), 'queue_stats')
test_get_queue_stats_claimed.tags = ['positive'] test_get_queue_stats_claimed.tags = ['positive']