Validate the alert definition from the response (backport from master 1…

…d1e8fa)
hyperic · Feb 12, 2010 · e5f92e0 · e5f92e0
1 parent 90fefde
commit e5f92e0
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/src/org/hyperic/hq/hqapi1/test/AlertDefinitionSyncBaselineCondition_test.java b/src/org/hyperic/hq/hqapi1/test/AlertDefinitionSyncBaselineCondition_test.java
@@ -79,7 +79,7 @@ public void testValidBaselineConditon() throws Exception {
         hqAssertSuccess(response);
 
         for (AlertDefinition def : response.getAlertDefinition()) {
-            validateDefinition(d);
+            validateDefinition(def);
             for (AlertCondition c : def.getAlertCondition()) {
                 assertNotNull("Condition was null", c);
                 assertEquals(c.getType(), AlertConditionType.BASELINE.getType());
@@ -125,7 +125,7 @@ public void testValidBaselineConditonTypeAlert() throws Exception {
         hqAssertSuccess(response);
 
         for (AlertDefinition def : response.getAlertDefinition()) {
-            validateDefinition(d);
+            validateDefinition(def);
             for (AlertCondition c : def.getAlertCondition()) {
                 assertNotNull("Condition was null", c);
                 assertEquals(c.getType(), AlertConditionType.BASELINE.getType());

diff --git a/src/org/hyperic/hq/hqapi1/test/AlertDefinitionSyncConfigCondition_test.java b/src/org/hyperic/hq/hqapi1/test/AlertDefinitionSyncConfigCondition_test.java
@@ -64,7 +64,7 @@ public void testValidConfigCondition() throws Exception {
         hqAssertSuccess(response);
 
         for (AlertDefinition def : response.getAlertDefinition()) {
-            validateDefinition(d);
+            validateDefinition(def);
             for (AlertCondition c : def.getAlertCondition()) {
                 assertNotNull("Condition was null", c);
                 assertEquals(c.getType(), AlertConditionType.CONFIG_CHANGE.getType());
@@ -95,7 +95,7 @@ public void testValidConfigConditionTypeAlert() throws Exception {
         hqAssertSuccess(response);
 
         for (AlertDefinition def : response.getAlertDefinition()) {
-            validateDefinition(d);
+            validateDefinition(def);
             for (AlertCondition c : def.getAlertCondition()) {
                 assertNotNull("Condition was null", c);
                 assertEquals(c.getType(), AlertConditionType.CONFIG_CHANGE.getType());
@@ -126,7 +126,7 @@ public void testConfigConditionOptionalAttribute() throws Exception {
         hqAssertSuccess(response);
 
         for (AlertDefinition def : response.getAlertDefinition()) {
-            validateDefinition(d);
+            validateDefinition(def);
             for (AlertCondition c : def.getAlertCondition()) {
                 assertNotNull("Condition was null", c);
                 assertEquals(c.getType(), AlertConditionType.CONFIG_CHANGE.getType());

diff --git a/src/org/hyperic/hq/hqapi1/test/AlertDefinitionSyncControlCondition_test.java b/src/org/hyperic/hq/hqapi1/test/AlertDefinitionSyncControlCondition_test.java
@@ -67,7 +67,7 @@ public void testValidControlConditon() throws Exception {
         hqAssertSuccess(response);
 
         for (AlertDefinition def : response.getAlertDefinition()) {
-            validateDefinition(d);
+            validateDefinition(def);
             for (AlertCondition c : def.getAlertCondition()) {
                 assertNotNull("Condition was null", c);
                 assertEquals(c.getType(), AlertConditionType.CONTROL.getType());
@@ -101,7 +101,7 @@ public void testValidControlConditonTypeAlert() throws Exception {
         hqAssertSuccess(response);
 
         for (AlertDefinition def : response.getAlertDefinition()) {
-            validateDefinition(d);
+            validateDefinition(def);
             for (AlertCondition c : def.getAlertCondition()) {
                 assertNotNull("Condition was null", c);
                 assertEquals(c.getType(), AlertConditionType.CONTROL.getType());

diff --git a/src/org/hyperic/hq/hqapi1/test/AlertDefinitionSyncLogCondition_test.java b/src/org/hyperic/hq/hqapi1/test/AlertDefinitionSyncLogCondition_test.java
@@ -65,7 +65,7 @@ public void testValidPropertyConditon() throws Exception {
         hqAssertSuccess(response);
 
         for (AlertDefinition def : response.getAlertDefinition()) {
-            validateDefinition(d);
+            validateDefinition(def);
             for (AlertCondition c : def.getAlertCondition()) {
                 assertNotNull("Condition was null", c);
                 assertEquals(c.getType(), AlertConditionType.LOG.getType());
@@ -97,7 +97,7 @@ public void testValidPropertyConditonTypeAlert() throws Exception {
         hqAssertSuccess(response);
 
         for (AlertDefinition def : response.getAlertDefinition()) {
-            validateDefinition(d);
+            validateDefinition(def);
             for (AlertCondition c : def.getAlertCondition()) {
                 assertNotNull("Condition was null", c);
                 assertEquals(c.getType(), AlertConditionType.LOG.getType());

diff --git a/src/org/hyperic/hq/hqapi1/test/AlertDefinitionSyncMetricChangeCondition_test.java b/src/org/hyperic/hq/hqapi1/test/AlertDefinitionSyncMetricChangeCondition_test.java
@@ -73,7 +73,7 @@ public void testValidMetricChangeConditon() throws Exception {
         hqAssertSuccess(response);
 
         for (AlertDefinition def : response.getAlertDefinition()) {
-            validateDefinition(d);
+            validateDefinition(def);
             for (AlertCondition c : def.getAlertCondition()) {
                 assertNotNull("Condition was null", c);
                 assertEquals(c.getType(), AlertConditionType.METRIC_CHANGE.getType());
@@ -110,7 +110,7 @@ public void testValidMetricChangeConditonTypeAlert() throws Exception {
         hqAssertSuccess(response);
 
         for (AlertDefinition def : response.getAlertDefinition()) {
-            validateDefinition(d);
+            validateDefinition(def);
             for (AlertCondition c : def.getAlertCondition()) {
                 assertNotNull("Condition was null", c);
                 assertEquals(c.getType(), AlertConditionType.METRIC_CHANGE.getType());

diff --git a/src/org/hyperic/hq/hqapi1/test/AlertDefinitionSyncPropertyCondition_test.java b/src/org/hyperic/hq/hqapi1/test/AlertDefinitionSyncPropertyCondition_test.java
@@ -64,7 +64,7 @@ public void testValidPropertyConditon() throws Exception {
         hqAssertSuccess(response);
 
         for (AlertDefinition def : response.getAlertDefinition()) {
-            validateDefinition(d);
+            validateDefinition(def);
             for (AlertCondition c : def.getAlertCondition()) {
                 assertNotNull("Condition was null", c);
                 assertEquals(c.getProperty(), PROP_NAME);
@@ -94,7 +94,7 @@ public void testValidPropertyConditonTypeAlert() throws Exception {
         hqAssertSuccess(response);
 
         for (AlertDefinition def : response.getAlertDefinition()) {
-            validateDefinition(d);
+            validateDefinition(def);
             for (AlertCondition c : def.getAlertCondition()) {
                 assertNotNull("Condition was null", c);
                 assertEquals(c.getProperty(), PROP_NAME);

diff --git a/src/org/hyperic/hq/hqapi1/test/AlertDefinitionSyncThresholdCondition_test.java b/src/org/hyperic/hq/hqapi1/test/AlertDefinitionSyncThresholdCondition_test.java
@@ -77,7 +77,7 @@ public void testValidThresholdConditon() throws Exception {
         hqAssertSuccess(response);
 
         for (AlertDefinition def : response.getAlertDefinition()) {
-            validateDefinition(d);
+            validateDefinition(def);
             for (AlertCondition c : def.getAlertCondition()) {
                 assertNotNull("Condition was null", c);
                 assertEquals(c.getType(), AlertConditionType.THRESHOLD.getType());
@@ -120,7 +120,7 @@ public void testValidThresholdConditonTypeAlert() throws Exception {
         hqAssertSuccess(response);
 
         for (AlertDefinition def : response.getAlertDefinition()) {
-            validateDefinition(d);
+            validateDefinition(def);
             for (AlertCondition c : def.getAlertCondition()) {
                 assertNotNull("Condition was null", c);
                 assertEquals(c.getType(), AlertConditionType.THRESHOLD.getType());