Permalink
Browse files

Merge ChangeLog

  • Loading branch information...
2 parents c3c1284 + 33e1eaf commit 300f78219271fcbabf5c48acaffd31ac20263cc0 Ryan Morgan committed Nov 24, 2009
Showing with 13 additions and 2 deletions.
  1. +5 −0 ChangeLog
  2. +1 −1 hqu/hqapi1/app/MetricController.groovy
  3. +7 −1 src/org/hyperic/hq/hqapi1/test/Metric_test.java
View
5 ChangeLog
@@ -40,6 +40,11 @@ Changes in HQApi 3.0
*) [HHQ-3144] Add ServerConfigApi to allow manipulation of HQ server config
settings.
+Changes in HQApi 2.4
+
+ *) [HHQ-3565] Fix issue in MetricAPI causing all metrics to be shown as
+ defaultOn=false.
+
Changes in HQApi 2.3
*) [HQ-3076] Add ApplicationApi.
View
2 hqu/hqapi1/app/MetricController.groovy
@@ -10,7 +10,7 @@ class MetricController extends ApiController {
interval : m.interval,
enabled : m.enabled,
name : m.template.name,
- defalutOn : m.template.defaultOn,
+ defaultOn : m.template.defaultOn,
indicator : m.template.designate,
collectionType : m.template.collectionType) {
MetricTemplate(id : m.template.id,
View
8 src/org/hyperic/hq/hqapi1/test/Metric_test.java
@@ -63,13 +63,19 @@ public void testListMetrics() throws Exception {
hqAssertSuccess(resp);
int numNotDefaultOn = 0;
+ int numDefaultOn = 0;
for (Metric m : resp.getMetric()) {
validateMetric(m);
if (!m.isDefaultOn()) {
numNotDefaultOn++;
+ } else {
+ numDefaultOn++;
}
}
- assertTrue("All metrics are defaultOn", numNotDefaultOn > 0);
+ assertTrue("All metrics are defaultOn, on = " + numDefaultOn +
+ " off = " + numNotDefaultOn, numNotDefaultOn > 0);
+ assertTrue("No metrics are not defaultOn, on = " + numDefaultOn +
+ " off = " + numNotDefaultOn, numDefaultOn > 0);
}
public void testListEnabledMetrics() throws Exception {

0 comments on commit 300f782

Please sign in to comment.