From e7331671157457ecd868443cb09994ad684f5bf3 Mon Sep 17 00:00:00 2001 From: pnguyen Date: Thu, 24 Sep 2009 16:25:03 -0700 Subject: [PATCH] Update test because disabled metrics could have data if it was previously enabled --- .../hq/hqapi1/test/MetricDataGetLastMulti_test.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/org/hyperic/hq/hqapi1/test/MetricDataGetLastMulti_test.java b/src/org/hyperic/hq/hqapi1/test/MetricDataGetLastMulti_test.java index 510b1c1f..1c7ba0f9 100644 --- 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); } }