[HWKMETRICS-128] Fix failing test and update existing test to do a be…

…tter version check.
hawkular · Aug 26, 2015 · 664f742 · 664f742
1 parent 8215208
commit 664f742
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 22 deletions.
diff --git a/rest-tests/src/test/groovy/org/hawkular/metrics/rest/BaseITest.groovy b/rest-tests/src/test/groovy/org/hawkular/metrics/rest/BaseITest.groovy
@@ -18,8 +18,6 @@ package org.hawkular.metrics.rest
 
 import static org.joda.time.DateTime.now
 import static org.junit.Assert.assertEquals
-import static org.junit.Assert.assertNotEquals
-import static org.junit.Assert.assertNotNull
 
 import org.junit.Test
 
@@ -39,16 +37,4 @@ class BaseITest extends RESTTest {
 
         assertEquals(start + 10, response.data[0].timestamp)
     }
-
-    @Test
-    void getServiceInformation() {
-        def response = hawkularMetrics.get(path: "")
-
-        assertEquals(200, response.status)
-        assertEquals("Hawkular-Metrics", response.data.name)
-        assertNotNull(response.data["Implementation-Version"])
-        assertNotNull(response.data["Built-From-Git-SHA1"])
-        assertNotEquals("Unknown", response.data["Implementation-Version"])
-        assertNotEquals("Unknown", response.data["Built-From-Git-SHA1"])
-    }
 }
diff --git a/rest-tests/src/test/groovy/org/hawkular/metrics/rest/RootITest.groovy b/rest-tests/src/test/groovy/org/hawkular/metrics/rest/RootITest.groovy
@@ -17,23 +17,26 @@
 package org.hawkular.metrics.rest
 
 import static org.junit.Assert.assertEquals
+import static org.junit.Assert.assertNotEquals
+import static org.junit.Assert.assertNotNull
 
 import org.junit.Test
 
 /**
  * @author mwringe
  */
 class RootITest extends RESTTest {
+
     @Test
-    void getStatusTest() {
+    void getServiceInformation() {
         def response = hawkularMetrics.get(path: "");
 
         def version = System.properties.getProperty("project.version");
 
-        assertEquals(200, response.status);
-
-        def expectedData = ["name" : "Hawkular-Metrics", "version": version];
-
-        assertEquals(expectedData, response.data);
+        assertEquals(200, response.status)
+        assertEquals("Hawkular-Metrics", response.data.name)
+        assertEquals(version, response.data["Implementation-Version"])
+        assertNotNull(response.data["Built-From-Git-SHA1"])
+        assertNotEquals("Unknown", response.data["Built-From-Git-SHA1"])
     }
 }
diff --git a/rest-tests/src/test/groovy/org/hawkular/metrics/rest/StatusITest.groovy b/rest-tests/src/test/groovy/org/hawkular/metrics/rest/StatusITest.groovy
@@ -30,14 +30,15 @@ class StatusITest extends RESTTest {
     void getStatus() {
         def response = hawkularMetrics.get(path: "status")
 
+        def version = System.properties.getProperty("project.version");
+
         assertEquals(200, response.status)
 
         def expectedState = ["MetricsService" : "STARTED"]
 
         assertEquals(expectedState.MetricsService, response.data.MetricsService)
-        assertNotNull(response.data["Implementation-Version"])
+        assertEquals(version, response.data["Implementation-Version"])
         assertNotNull(response.data["Built-From-Git-SHA1"])
-        assertNotEquals("Unknown", response.data["Implementation-Version"])
         assertNotEquals("Unknown", response.data["Built-From-Git-SHA1"])
     }
 }