modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java
| 124 +++-------
1 file changed, 40 insertions(+), 84 deletions(-)
New commits:
commit fbdaca367732aab378ea79e1931e44285f78ef8b
Author: John Sanda <jsanda(a)redhat.com>
Date: Thu Nov 29 17:41:32 2012 -0500
adding back test for fetching 6 hour graph data points
diff --git
a/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java
b/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java
index c2b1536..683a18b 100644
---
a/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java
+++
b/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java
@@ -393,7 +393,7 @@ public class MetricsServerTest extends CassandraIntegrationTest {
actualData.get(29));
}
- @Test(enabled = ENABLED)
+ @Test//(enabled = ENABLED)
public void find1HourDataComposites() {
DateTime beginTime = now().minusDays(11);
DateTime endTime = now();
@@ -419,9 +419,9 @@ public class MetricsServerTest extends CassandraIntegrationTest {
assertEquals(actualData.size(), buckets.getNumDataPoints(), "Expected to get
back 60 data points.");
MeasurementDataNumericHighLowComposite expectedBucket0Data = new
MeasurementDataNumericHighLowComposite(
- buckets.get(0).getStartTime(), (2.0 + 5.0 + 3.0) / 3, 5.0, 2.0);
+ buckets.get(0).getStartTime(), divide(2.0 + 5.0 + 3.0, 3), 5.0, 2.0);
MeasurementDataNumericHighLowComposite expectedBucket59Data = new
MeasurementDataNumericHighLowComposite(
- buckets.get(59).getStartTime(), (5.0 + 5.0 + 3.0) / 3, 5.0, 3.0);
+ buckets.get(59).getStartTime(), divide(5.0 + 5.0 + 3.0, 3), 5.0, 3.0);
MeasurementDataNumericHighLowComposite expectedBucket29Data = new
MeasurementDataNumericHighLowComposite(
buckets.get(29).getStartTime(), Double.NaN, Double.NaN, Double.NaN);
@@ -433,88 +433,44 @@ public class MetricsServerTest extends CassandraIntegrationTest {
actualData.get(29));
}
- @Test(enabled = ENABLED)
+ @Test//(enabled = ENABLED)
public void find6HourDataComposites() {
-// DateTime beginTime = now().minusDays(20);
-// DateTime endTime = now();
-//
-// Buckets buckets = new Buckets(beginTime, endTime);
-// DateTime bucket0Time = new DateTime(buckets.get(0).getStartTime());
-// DateTime bucket59Time = new DateTime(buckets.get(59).getStartTime());
-//
-// String scheduleName = getClass().getName() + "_SCHEDULE";
-// MeasurementSchedule schedule = new MeasurementSchedule();
-// schedule.setId(123);
-// long interval = MINUTE * 10;
-// boolean enabled = true;
-// DataType dataType = DataType.MEASUREMENT;
-// MeasurementScheduleRequest request = new
MeasurementScheduleRequest(schedule.getId(), scheduleName, interval,
-// enabled, dataType);
-//
-// // insert six hour data to be aggregated
-// Mutator<Integer> sixHourMutator = HFactory.createMutator(keyspace,
IntegerSerializer.get());
-// sixHourMutator.addInsertion(schedule.getId(), ONE_HOUR_METRIC_DATA_CF,
-// create6HourColumn(bucket0Time, AggregateType.MAX, 3.0));
-// sixHourMutator.addInsertion(schedule.getId(), ONE_HOUR_METRIC_DATA_CF,
-// create6HourColumn(bucket0Time, AggregateType.AVG, 2.0));
-// sixHourMutator.addInsertion(schedule.getId(), ONE_HOUR_METRIC_DATA_CF,
-// create6HourColumn(bucket0Time, AggregateType.MIN, 1.0));
-//
-// sixHourMutator.addInsertion(schedule.getId(), ONE_HOUR_METRIC_DATA_CF,
-// create6HourColumn(bucket0Time.plusHours(1), AggregateType.MAX, 6.0));
-// sixHourMutator.addInsertion(schedule.getId(), ONE_HOUR_METRIC_DATA_CF,
-// create6HourColumn(bucket0Time.plusHours(1), AggregateType.AVG, 5.0));
-// sixHourMutator.addInsertion(schedule.getId(), ONE_HOUR_METRIC_DATA_CF,
-// create6HourColumn(bucket0Time.plusHours(1), AggregateType.MIN, 4.0));
-//
-// sixHourMutator.addInsertion(schedule.getId(), ONE_HOUR_METRIC_DATA_CF,
-// create6HourColumn(bucket0Time.plusHours(2), AggregateType.MAX, 3.0));
-// sixHourMutator.addInsertion(schedule.getId(), ONE_HOUR_METRIC_DATA_CF,
-// create6HourColumn(bucket0Time.plusHours(2), AggregateType.AVG, 3.0));
-// sixHourMutator.addInsertion(schedule.getId(), ONE_HOUR_METRIC_DATA_CF,
-// create6HourColumn(bucket0Time.plusHours(2), AggregateType.MIN, 3.0));
-//
-// sixHourMutator.addInsertion(schedule.getId(), ONE_HOUR_METRIC_DATA_CF,
-// create6HourColumn(bucket59Time, AggregateType.MAX, 9.0));
-// sixHourMutator.addInsertion(schedule.getId(), ONE_HOUR_METRIC_DATA_CF,
-// create6HourColumn(bucket59Time, AggregateType.AVG, 5.0));
-// sixHourMutator.addInsertion(schedule.getId(), ONE_HOUR_METRIC_DATA_CF,
-// create6HourColumn(bucket59Time, AggregateType.MIN, 2.0));
-//
-// sixHourMutator.addInsertion(schedule.getId(), ONE_HOUR_METRIC_DATA_CF,
-// create6HourColumn(bucket59Time.plusHours(1), AggregateType.MAX, 6.0));
-// sixHourMutator.addInsertion(schedule.getId(), ONE_HOUR_METRIC_DATA_CF,
-// create6HourColumn(bucket59Time.plusHours(1), AggregateType.AVG, 5.0));
-// sixHourMutator.addInsertion(schedule.getId(), ONE_HOUR_METRIC_DATA_CF,
-// create6HourColumn(bucket59Time.plusHours(1), AggregateType.MIN, 4.0));
-//
-// sixHourMutator.addInsertion(schedule.getId(), ONE_HOUR_METRIC_DATA_CF,
-// create6HourColumn(bucket59Time.plusHours(2), AggregateType.MAX, 3.0));
-// sixHourMutator.addInsertion(schedule.getId(), ONE_HOUR_METRIC_DATA_CF,
-// create6HourColumn(bucket59Time.plusHours(2), AggregateType.AVG, 3.0));
-// sixHourMutator.addInsertion(schedule.getId(), ONE_HOUR_METRIC_DATA_CF,
-// create6HourColumn(bucket59Time.plusHours(2), AggregateType.MIN, 3.0));
-//
-// sixHourMutator.execute();
-//
-// List<MeasurementDataNumericHighLowComposite> actualData =
metricsServer.findDataForResource(null, null,
-// schedule, beginTime.getMillis(), endTime.getMillis());
-//
-// assertEquals(actualData.size(), buckets.getNumDataPoints(), "Expected to
get back 60 data points.");
-//
-// MeasurementDataNumericHighLowComposite expectedBucket0Data = new
MeasurementDataNumericHighLowComposite(
-// buckets.get(0).getStartTime(), (2.0 + 5.0 + 3.0) / 3, 5.0, 2.0);
-// MeasurementDataNumericHighLowComposite expectedBucket59Data = new
MeasurementDataNumericHighLowComposite(
-// buckets.get(59).getStartTime(), (5.0 + 5.0 + 3.0) / 3, 5.0, 3.0);
-// MeasurementDataNumericHighLowComposite expectedBucket29Data = new
MeasurementDataNumericHighLowComposite(
-// buckets.get(29).getStartTime(), Double.NaN, Double.NaN, Double.NaN);
-//
-// assertPropertiesMatch("The data for bucket 0 does not match the expected
values.", expectedBucket0Data,
-// actualData.get(0));
-// assertPropertiesMatch("The data for bucket 59 does not match the expected
values.", expectedBucket59Data,
-// actualData.get(59));
-// assertPropertiesMatch("The data for bucket 29 does not match the expected
values.", expectedBucket29Data,
-// actualData.get(29));
+ DateTime beginTime = now().minusDays(20);
+ DateTime endTime = now();
+
+ Buckets buckets = new Buckets(beginTime, endTime);
+ DateTime bucket0Time = new DateTime(buckets.get(0).getStartTime());
+ DateTime bucket59Time = new DateTime(buckets.get(59).getStartTime());
+
+ int scheduleId = 123;
+ List<AggregatedNumericMetric> metrics = asList(
+ new AggregatedNumericMetric(scheduleId, 2.0, 1.0, 3.0,
bucket0Time.getMillis()),
+ new AggregatedNumericMetric(scheduleId, 5.0, 4.0, 6.0,
bucket0Time.plusHours(1).getMillis()),
+ new AggregatedNumericMetric(scheduleId, 3.0, 3.0, 3.0,
bucket0Time.plusHours(2).getMillis()),
+ new AggregatedNumericMetric(scheduleId, 5.0, 2.0, 9.0,
bucket59Time.getMillis()),
+ new AggregatedNumericMetric(scheduleId, 5.0, 4.0, 6.0,
bucket59Time.plusHours(1).getMillis()),
+ new AggregatedNumericMetric(scheduleId, 3.0, 3.0, 3.0,
bucket59Time.plusHours(2).getMillis())
+ );
+ dao.insertAggregates(SIX_HOUR_METRICS_TABLE, metrics);
+
+ List<MeasurementDataNumericHighLowComposite> actualData =
metricsServer.findDataForResource(scheduleId,
+ beginTime.getMillis(), endTime.getMillis());
+
+ assertEquals(actualData.size(), buckets.getNumDataPoints(), "Expected to get
back 60 data points.");
+
+ MeasurementDataNumericHighLowComposite expectedBucket0Data = new
MeasurementDataNumericHighLowComposite(
+ buckets.get(0).getStartTime(), divide(2.0 + 5.0 + 3.0, 3), 5.0, 2.0);
+ MeasurementDataNumericHighLowComposite expectedBucket59Data = new
MeasurementDataNumericHighLowComposite(
+ buckets.get(59).getStartTime(), divide(5.0 + 5.0 + 3.0, 3), 5.0, 3.0);
+ MeasurementDataNumericHighLowComposite expectedBucket29Data = new
MeasurementDataNumericHighLowComposite(
+ buckets.get(29).getStartTime(), Double.NaN, Double.NaN, Double.NaN);
+
+ assertPropertiesMatch("The data for bucket 0 does not match the expected
values.", expectedBucket0Data,
+ actualData.get(0));
+ assertPropertiesMatch("The data for bucket 59 does not match the expected
values.", expectedBucket59Data,
+ actualData.get(59));
+ assertPropertiesMatch("The data for bucket 29 does not match the expected
values.", expectedBucket29Data,
+ actualData.get(29));
}
private HColumn<Long, Double> createRawDataColumn(DateTime timestamp, double
value) {