modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest.java
| 122 +++-------
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateMeasurementSubsystemTest.java
| 20 +
2 files changed, 54 insertions(+), 88 deletions(-)
New commits:
commit c9521537543c3787388116af86d8ff9238316c34
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Feb 28 16:32:46 2012 -0500
Fix some unit tests to expect the built-in _AvaiabilityType_ metric.
diff --git
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest.java
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest.java
index 290e66f..0664545 100644
---
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest.java
+++
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest.java
@@ -1,5 +1,7 @@
package org.rhq.enterprise.server.resource.metadata;
+import static java.util.Arrays.asList;
+
import java.util.List;
import org.testng.annotations.Test;
@@ -12,45 +14,34 @@ import org.rhq.core.domain.measurement.MeasurementUnits;
import org.rhq.core.domain.measurement.NumericType;
import org.rhq.test.AssertUtils;
-import static java.util.Arrays.asList;
-import static java.util.Collections.EMPTY_LIST;
-
public class MeasurementMetadataManagerBeanTest extends MetadataBeanTest {
- @Test(groups = {"plugin.metadata", "Metrics.NewPlugin"})
+ @Test(groups = { "plugin.metadata", "Metrics.NewPlugin" })
void registerMetricsPlugin() throws Exception {
createPlugin("metric-test-plugin", "1.0",
"plugin_v1.xml");
}
- @Test(groups = {"plugin.metadata", "Metrics.NewPlugin"},
dependsOnMethods = {"registerMetricsPlugin"})
+ @Test(groups = { "plugin.metadata", "Metrics.NewPlugin" },
dependsOnMethods = { "registerMetricsPlugin" })
public void persistNewMetrics() throws Exception {
- assertResourceTypeAssociationEquals(
- "MetricServer1",
- "MeasurementMetadataManagerBeanTestPlugin",
- "metricDefinitions",
- asList("metric1", "metric2", "metric3")
- );
+ assertResourceTypeAssociationEquals("MetricServer1",
"MeasurementMetadataManagerBeanTestPlugin",
+ "metricDefinitions", asList("metric1",
"metric2", "metric3", "_AvailabilityType_"));
}
- @Test(groups = {"plugin.metadata", "Metrics.NewPlugin"},
dependsOnMethods = {"persistNewMetrics"})
+ @Test(groups = { "plugin.metadata", "Metrics.NewPlugin" },
dependsOnMethods = { "persistNewMetrics" })
public void persistNewTraitDefinitionProperties() {
MeasurementDefinition traitDef = loadMeasurementDef("metric1",
"MetricServer1");
- MeasurementDefinition expected = new MeasurementDefinition("metric1",
MeasurementCategory.AVAILABILITY,
+ MeasurementDefinition expected = new MeasurementDefinition("metric1",
MeasurementCategory.AVAILABILITY,
MeasurementUnits.MILLISECONDS, DataType.TRAIT, NumericType.DYNAMIC, true,
30000, DisplayType.SUMMARY);
expected.setDescription("Metric 1");
expected.setDisplayName("metric1");
expected.setDisplayOrder(1);
- AssertUtils.assertPropertiesMatch(
- "Failed to persist properties for a trait metric definition",
- expected,
- traitDef,
- asList("id", "resourceType")
- );
+ AssertUtils.assertPropertiesMatch("Failed to persist properties for a trait
metric definition", expected,
+ traitDef, asList("id", "resourceType"));
}
- @Test(groups = {"plugin.metadata", "Metrics.NewPlugin"},
dependsOnMethods = {"persistNewMetrics"})
+ @Test(groups = { "plugin.metadata", "Metrics.NewPlugin" },
dependsOnMethods = { "persistNewMetrics" })
public void persistNewNumericMeasurementDef() {
MeasurementDefinition measurementDef = loadMeasurementDef("metric2",
"MetricServer1");
@@ -61,12 +52,8 @@ public class MeasurementMetadataManagerBeanTest extends
MetadataBeanTest {
expected.setDisplayName("metric2");
expected.setDisplayOrder(2);
- AssertUtils.assertPropertiesMatch(
- "Failed to persist properties for numeric metric definition",
- expected,
- measurementDef,
- asList("id", "resourceType")
- );
+ AssertUtils.assertPropertiesMatch("Failed to persist properties for numeric
metric definition", expected,
+ measurementDef, asList("id", "resourceType"));
MeasurementDefinition perMinuteDef = loadMeasurementDef("metric2",
"MetricServer1", "metric2 per Minute");
@@ -78,18 +65,15 @@ public class MeasurementMetadataManagerBeanTest extends
MetadataBeanTest {
expected.setRawNumericType(measurementDef.getNumericType());
AssertUtils.assertPropertiesMatch(
- "Failed to create and persist per minute metric definition for numeric
metric definition",
- expected,
- perMinuteDef,
- asList("id", "resourceType")
- );
+ "Failed to create and persist per minute metric definition for numeric
metric definition", expected,
+ perMinuteDef, asList("id", "resourceType"));
}
- @Test(groups = {"plugin.metadata", "Metrics.NewPlugin"},
dependsOnMethods = {"persistNewMetrics"})
+ @Test(groups = { "plugin.metadata", "Metrics.NewPlugin" },
dependsOnMethods = { "persistNewMetrics" })
public void persistNewCallTimeDef() {
MeasurementDefinition calltimeDef = loadMeasurementDef("metric3",
"MetricServer1");
- MeasurementDefinition expected = new MeasurementDefinition("metric3",
MeasurementCategory.THROUGHPUT,
+ MeasurementDefinition expected = new MeasurementDefinition("metric3",
MeasurementCategory.THROUGHPUT,
MeasurementUnits.MILLISECONDS, DataType.CALLTIME, true, 30000,
DisplayType.DETAIL);
expected.setNumericType(NumericType.DYNAMIC);
expected.setDestinationType("myMethod");
@@ -97,34 +81,26 @@ public class MeasurementMetadataManagerBeanTest extends
MetadataBeanTest {
expected.setDisplayName("metric3");
expected.setDisplayOrder(4);
- AssertUtils.assertPropertiesMatch(
- "Failed to create calltime metric definition",
- expected,
- calltimeDef,
- asList("id", "resourceType")
- );
+ AssertUtils.assertPropertiesMatch("Failed to create calltime metric
definition", expected, calltimeDef,
+ asList("id", "resourceType"));
}
- @Test(groups = {"plugin.metadata", "Metrics.UpgradePlugin"},
dependsOnGroups = {"Metrics.NewPlugin"})
+ @Test(groups = { "plugin.metadata", "Metrics.UpgradePlugin" },
dependsOnGroups = { "Metrics.NewPlugin" })
public void upgradeMetricsPlugin() throws Exception {
createPlugin("metric-test-plugin", "2.0",
"plugin_v2.xml");
}
- @Test(groups = {"plugin.metadata", "Metrics.UpradePlugin"},
dependsOnMethods = {"upgradeMetricsPlugin"})
+ @Test(groups = { "plugin.metadata", "Metrics.UpradePlugin" },
dependsOnMethods = { "upgradeMetricsPlugin" })
public void addNewMetricDef() throws Exception {
- assertResourceTypeAssociationEquals(
- "MetricServer2",
- "MeasurementMetadataManagerBeanTestPlugin",
- "metricDefinitions",
- asList("metric1")
- );
+ assertResourceTypeAssociationEquals("MetricServer2",
"MeasurementMetadataManagerBeanTestPlugin",
+ "metricDefinitions", asList("metric1",
"_AvailabilityType_"));
}
- @Test(groups = {"plugin.metadata", "Metrics.UpradePlugin"},
dependsOnMethods = {"upgradeMetricsPlugin"})
+ @Test(groups = { "plugin.metadata", "Metrics.UpradePlugin" },
dependsOnMethods = { "upgradeMetricsPlugin" })
public void changeTraitDefToMeasurementDef() {
MeasurementDefinition measurementDef = loadMeasurementDef("metric1",
"MetricServer3");
- MeasurementDefinition expected = new MeasurementDefinition("metric1",
MeasurementCategory.PERFORMANCE,
+ MeasurementDefinition expected = new MeasurementDefinition("metric1",
MeasurementCategory.PERFORMANCE,
MeasurementUnits.MILLISECONDS, DataType.MEASUREMENT, NumericType.TRENDSUP,
false, 30000, DisplayType.DETAIL);
expected.setRawNumericType(null);
expected.setDefaultInterval(30000);
@@ -132,12 +108,8 @@ public class MeasurementMetadataManagerBeanTest extends
MetadataBeanTest {
expected.setDisplayName("metric1");
expected.setDisplayOrder(1);
- AssertUtils.assertPropertiesMatch(
- "Failed to change trait definition to a measurement defintion",
- expected,
- measurementDef,
- asList("id", "resourceType")
- );
+ AssertUtils.assertPropertiesMatch("Failed to change trait definition to a
measurement defintion", expected,
+ measurementDef, asList("id", "resourceType"));
MeasurementDefinition perMinuteDef = loadMeasurementDef("metric1",
"MetricServer3", "metric1 per Minute");
expected.setDisplayName("metric1 per Minute");
@@ -148,29 +120,21 @@ public class MeasurementMetadataManagerBeanTest extends
MetadataBeanTest {
expected.setRawNumericType(measurementDef.getNumericType());
AssertUtils.assertPropertiesMatch(
- "Failed to create and persist per minute metric definition for updated
metric definition",
- expected,
- perMinuteDef,
- asList("id", "resourceType")
- );
+ "Failed to create and persist per minute metric definition for updated
metric definition", expected,
+ perMinuteDef, asList("id", "resourceType"));
}
- @Test(groups = {"plugin.metadata", "Metrics.UpradePlugin"},
dependsOnMethods = {"upgradeMetricsPlugin"})
+ @Test(groups = { "plugin.metadata", "Metrics.UpradePlugin" },
dependsOnMethods = { "upgradeMetricsPlugin" })
public void deleteMetricDefThatHasBeenRemovedFromResourceType() throws Exception {
- assertResourceTypeAssociationEquals(
- "MetricServer4",
- "MeasurementMetadataManagerBeanTestPlugin",
- "metricDefinitions",
- EMPTY_LIST
- );
+ assertResourceTypeAssociationEquals("MetricServer4",
"MeasurementMetadataManagerBeanTestPlugin",
+ "metricDefinitions", asList("_AvailabilityType_"));
}
- @Test(groups = {"plugin.metadata", "Metrics.UpradePlugin"},
dependsOnMethods = {"upgradeMetricsPlugin"})
+ @Test(groups = { "plugin.metadata", "Metrics.UpradePlugin" },
dependsOnMethods = { "upgradeMetricsPlugin" })
public void deleteMetricDefsForResourceTypeThatIsRemoved() {
- List metricDefs = getEntityManager().createQuery(
- "from MeasurementDefinition m where m.name = :metric1Name or name =
:metric2Name")
- .setParameter("metric1Name", "MetricServer5.metric1")
- .setParameter("metric2Name", "MetricServer5.metric3")
+ List metricDefs = getEntityManager()
+ .createQuery("from MeasurementDefinition m where m.name = :metric1Name
or name = :metric2Name")
+ .setParameter("metric1Name",
"MetricServer5.metric1").setParameter("metric2Name",
"MetricServer5.metric3")
.getResultList();
assertEquals("Failed to delete metric definitions", 0,
metricDefs.size());
@@ -181,15 +145,11 @@ public class MeasurementMetadataManagerBeanTest extends
MetadataBeanTest {
}
MeasurementDefinition loadMeasurementDef(String name, String resourceType, String
displayName) {
- return (MeasurementDefinition) getEntityManager().createQuery(
- "from MeasurementDefinition m " +
- "where m.name = :name and " +
- "m.displayName = :displayName and " +
- "m.resourceType.name = :resourceType")
- .setParameter("name", name)
- .setParameter("displayName", displayName)
- .setParameter("resourceType", resourceType)
- .getSingleResult();
+ return (MeasurementDefinition) getEntityManager()
+ .createQuery(
+ "from MeasurementDefinition m " + "where m.name = :name
and " + "m.displayName = :displayName and "
+ + "m.resourceType.name =
:resourceType").setParameter("name", name)
+ .setParameter("displayName",
displayName).setParameter("resourceType", resourceType).getSingleResult();
}
}
diff --git
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateMeasurementSubsystemTest.java
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateMeasurementSubsystemTest.java
index 0acd54c..d30fbf6 100644
---
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateMeasurementSubsystemTest.java
+++
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateMeasurementSubsystemTest.java
@@ -64,7 +64,8 @@ public class UpdateMeasurementSubsystemTest extends
UpdatePluginMetadataTestBase
registerPlugin("update-v1_0.xml");
ResourceType server1 = getResourceType("testServer1");
Set<MeasurementDefinition> definitions1 =
server1.getMetricDefinitions();
- assert definitions1.size() == 4 : "There should be 4 metrics for
v1";
+ // for metric counts, add one for the built in AvailabilityType metric
+ assert definitions1.size() == 5 : "There should be 5 metrics for
v1";
for (MeasurementDefinition def : definitions1) {
if (def.getDisplayName().equals("Three")) {
assert def.getDisplayType() == DisplayType.DETAIL : "DisplayType
for Three should be Detail in v1";
@@ -83,7 +84,8 @@ public class UpdateMeasurementSubsystemTest extends
UpdatePluginMetadataTestBase
ResourceType server2 = getResourceType("testServer1");
Set<MeasurementDefinition> definitions2 =
server2.getMetricDefinitions();
- assert definitions2.size() == 4 : "There should be four metrics in
v2";
+ // for metric counts, add one for the built in AvailabilityType metric
+ assert definitions2.size() == 5 : "There should be 5 metrics in
v2";
boolean foundFour = false;
for (MeasurementDefinition def : definitions2) {
@@ -110,7 +112,8 @@ public class UpdateMeasurementSubsystemTest extends
UpdatePluginMetadataTestBase
registerPlugin("update-v1_0.xml", "3.0");
ResourceType server3 = getResourceType("testServer1");
Set<MeasurementDefinition> definitions3 =
server3.getMetricDefinitions();
- assert definitions3.size() == 4 : "There should be 4 metrics for
v3";
+ // for metric counts, add one for the built in AvailabilityType metric
+ assert definitions3.size() == 5 : "There should be 5 metrics for
v3";
for (MeasurementDefinition def : definitions3) {
if (def.getDisplayName().equals("Three")) {
assert def.getDisplayType() == DisplayType.DETAIL : "DisplayType
for Three should be Detail in v3";
@@ -145,12 +148,14 @@ public class UpdateMeasurementSubsystemTest extends
UpdatePluginMetadataTestBase
// Note, plugins are registered in new transactions. for tests, this means
// you can't do everything in a trans and roll back at the end. You must
clean up
// manually.
+
+ // for metric counts, add one for the built in AvailabilityType metric
try {
{ // extra block for variable scoping purposes
registerPlugin("measurementDeletion-v1_0.xml");
ResourceType server = getResourceType("testServer1");
Set<MeasurementDefinition> def = server.getMetricDefinitions();
- assertEquals(4, def.size());
+ assertEquals(5, def.size());
}
{ // extra block for variable scoping purposes
@@ -158,14 +163,14 @@ public class UpdateMeasurementSubsystemTest extends
UpdatePluginMetadataTestBase
ResourceType server = getResourceType("testServer1");
Set<MeasurementDefinition> def = server.getMetricDefinitions();
- assertEquals(0, def.size());
+ assertEquals(1, def.size());
}
{ // extra block for variable scoping purposes
registerPlugin("measurementDeletion-v1_0.xml",
"3.0");
ResourceType server = getResourceType("testServer1");
Set<MeasurementDefinition> def = server.getMetricDefinitions();
- assertEquals(4, def.size());
+ assertEquals(5, def.size());
}
} finally {
// clean up
@@ -206,7 +211,8 @@ public class UpdateMeasurementSubsystemTest extends
UpdatePluginMetadataTestBase
getPluginId(entityManager);
Set<MeasurementDefinition> definitions1 =
server.getMetricDefinitions();
- assert definitions1.size() == 1;
+ // for metric counts, add one for the built in AvailabilityType metric
+ assert definitions1.size() == 2;
/*
* Create a Fake Resource and a MeasurementSchedule