Update test because disabled metrics could have data if it was previo…

…usly enabled
hyperic · Sep 24, 2009 · e733167 · e733167
1 parent 073589b
commit e733167
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/org/hyperic/hq/hqapi1/test/MetricDataGetLastMulti_test.java b/src/org/hyperic/hq/hqapi1/test/MetricDataGetLastMulti_test.java
@@ -87,10 +87,19 @@ public void testGetLastNoData() throws Exception {
 
         LastMetricsDataResponse dataResponse = dataApi.getData(disabledMetrics);
         hqAssertSuccess(dataResponse);
+
+        // disabled metrics could have data if it was previously enabled
+        int lastMetricNoDataCount = 0;
+
         // TODO: What is the correct behavior of the API if the last data point
         //       could not be found? Return an error for simply null?
         for (LastMetricData d : dataResponse.getLastMetricData()) {
-            assertNull("Metric datapoint not null", d.getDataPoint());
+            if (d.getDataPoint() == null) {
+                lastMetricNoDataCount++;
+            }
         }
+
+        assertTrue("No disabled metrics with no data could be found",
+                    lastMetricNoDataCount > 0);
     }
 }