From b7b24215e35570142467eafcfbf9d837b88d9fc6 Mon Sep 17 00:00:00 2001 From: Thomas Darimont Date: Mon, 16 Feb 2015 16:32:50 +0100 Subject: [PATCH] DATAMONGO-1133 - Fixed broken tests, AggregationTests.shouldHonorFieldAliasesForFieldReferences() now correctly sets up 3 different instances of MeterData and correctly calculates the aggreated counter values. Original pull request: #279. --- .../data/mongodb/core/aggregation/AggregationTests.java | 5 ++--- .../data/mongodb/core/aggregation/MeterData.java | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationTests.java index d239c8f60..4f7ed0f49 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationTests.java @@ -1059,8 +1059,7 @@ public class AggregationTests { TypedAggregation agg = newAggregation(MeterData.class, // match(where("resourceId").is("m1")), // - group("counterName").sum("counterVolume").as("totalValue") // - ); + group("counterName").sum("counterVolume").as("totalValue")); AggregationResults results = mongoTemplate.aggregate(agg, DBObject.class); @@ -1068,7 +1067,7 @@ public class AggregationTests { DBObject result = results.getMappedResults().get(0); assertThat(result.get("_id"), is(equalTo((Object) "counter1"))); - assertThat(result.get("totalValue"), is(equalTo((Object) 42.0))); + assertThat(result.get("totalValue"), is(equalTo((Object) 100.0))); } private void assertLikeStats(LikeStats like, String id, long count) { diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/MeterData.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/MeterData.java index 4981e3eac..29744bd30 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/MeterData.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/MeterData.java @@ -23,12 +23,11 @@ import org.springframework.data.mongodb.core.mapping.Field; */ public class MeterData { - @Id String resourceId; + @Id String id; + String resourceId; @Field("counter_name") String counterName; double counterVolume; - public MeterData() {} - public MeterData(String resourceId, String counterName, double counterVolume) { this.resourceId = resourceId;