Skip to content

Commit

Permalink
[HWKMETRICS-148] Adjust tests to showcase the exact line for failures…
Browse files Browse the repository at this point in the history 
… and use badPost to capture the expected request error.
  • Loading branch information
Stefan Negrea committed Apr 28, 2016
1 parent ef94d5f commit 7da0cb9
Showing 1 changed file with 27 additions and 25 deletions.
52 changes: 27 additions & 25 deletions ...s/rest-tests-jaxrs/src/test/groovy/org/hawkular/metrics/rest/CassandraBackendITest.groovy
View file
Expand Up @@ -629,51 +629,52 @@ class CassandraBackendITest extends RESTTest {
assertEquals(201, response.status)
assertEquals("http://$baseURI/tenants".toString(), response.getFirstHeader('location').value)

metricTypes.each {
for (metricType in metricTypes) {
//create metric
response = hawkularMetrics.post(path: it.path, body: [
response = hawkularMetrics.post(path: metricType.path, body: [
id: 'm2',
tags: [a: '1', b: '2'],
dataRetention: 24
], headers: [(tenantHeaderName): tenantId])
assertEquals(201, response.status)
assertEquals("http://$baseURI/${it.path}/m2".toString(), response.getFirstHeader('location').value)
assertEquals("http://$baseURI/${metricType.path}/m2".toString(), response.getFirstHeader('location').value)

response = hawkularMetrics.get(path: "${it.path}/m2", headers: [(tenantHeaderName): tenantId])
response = hawkularMetrics.get(path: "${metricType.path}/m2", headers: [(tenantHeaderName): tenantId])
assertEquals(200, response.status)
assertEquals([
dataRetention: 24,
id: 'm2',
tags: [a: '1', b: '2'],
tenantId: tenantId,
type: it.type
type: metricType.type
], response.data)

//try to create the metric again
response = hawkularMetrics.post(path: it.path, body: [
badPost(path: metricType.path, body: [
id: 'm2',
tags: [a: '1', b: '2'],
dataRetention: 24
], headers: [(tenantHeaderName): tenantId])
assertEquals(409, response.status)
], headers: [(tenantHeaderName): tenantId]) { exception ->
assertEquals(409, exception.response.status)
}

//try to create the metric again but with overwrite
response = hawkularMetrics.post(path: it.path, query: [overwrite: true], body: [
response = hawkularMetrics.post(path: metricType.path, query: [overwrite: true], body: [
id: 'm2',
tags: [c: '3', d: '4'],
dataRetention: 55
], headers: [(tenantHeaderName): tenantId])
assertEquals(201, response.status)
assertEquals("http://$baseURI/${it.path}/m2".toString(), response.getFirstHeader('location').value)
assertEquals("http://$baseURI/${metricType.path}/m2".toString(), response.getFirstHeader('location').value)

response = hawkularMetrics.get(path: "${it.path}/m2", headers: [(tenantHeaderName): tenantId])
response = hawkularMetrics.get(path: "${metricType.path}/m2", headers: [(tenantHeaderName): tenantId])
assertEquals(200, response.status)
assertEquals([
dataRetention: 55,
id: 'm2',
tags: [c: '3', d: '4'],
tenantId: tenantId,
type: it.type
type: metricType.type
], response.data)
}
}
Expand All @@ -686,54 +687,55 @@ class CassandraBackendITest extends RESTTest {
assertEquals(201, response.status)
assertEquals("http://$baseURI/tenants".toString(), response.getFirstHeader('location').value)

metricTypes.each {
for (metricType in metricTypes) {
//create metric
response = hawkularMetrics.post(path: 'metrics', body: [
id: 'm2',
tags: [a: '1', b: '2'],
dataRetention: 24,
type: it.type
type: metricType.type
], headers: [(tenantHeaderName): tenantId])
assertEquals(201, response.status)
assertEquals("http://$baseURI/${it.path}/m2".toString(), response.getFirstHeader('location').value)
assertEquals("http://$baseURI/${metricType.path}/m2".toString(), response.getFirstHeader('location').value)

response = hawkularMetrics.get(path: "${it.path}/m2", headers: [(tenantHeaderName): tenantId])
response = hawkularMetrics.get(path: "${metricType.path}/m2", headers: [(tenantHeaderName): tenantId])
assertEquals(200, response.status)
assertEquals([
dataRetention: 24,
id: 'm2',
tags: [a: '1', b: '2'],
tenantId: tenantId,
type: it.type
type: metricType.type
], response.data)

//try to create the metric again
response = hawkularMetrics.post(path: 'metrics', body: [
badPost(path: 'metrics', body: [
id: 'm2',
tags: [a: '1', b: '2'],
dataRetention: 24,
type: it.type
], headers: [(tenantHeaderName): tenantId])
assertEquals(409, response.status)
type: metricType.type
], headers: [(tenantHeaderName): tenantId]) { exception ->
assertEquals(409, exception.response.status)
}

//try to create the metric again but with overwrite
response = hawkularMetrics.post(path: 'metrics', query: [overwrite: true], body: [
id: 'm2',
tags: [c: '3', d: '4'],
dataRetention: 55,
type: it.type
type: metricType.type
], headers: [(tenantHeaderName): tenantId])
assertEquals(201, response.status)
assertEquals("http://$baseURI/${it.path}/m2".toString(), response.getFirstHeader('location').value)
assertEquals("http://$baseURI/${metricType.path}/m2".toString(), response.getFirstHeader('location').value)

response = hawkularMetrics.get(path: "${it.path}/m2", headers: [(tenantHeaderName): tenantId])
response = hawkularMetrics.get(path: "${metricType.path}/m2", headers: [(tenantHeaderName): tenantId])
assertEquals(200, response.status)
assertEquals([
dataRetention: 55,
id: 'm2',
tags: [c: '3', d: '4'],
tenantId: tenantId,
type: it.type
type: metricType.type
], response.data)
}
}
Expand Down

0 comments on commit 7da0cb9

Please sign in to comment.