Skip to content

Commit b887fa7

Browse files
Thomas Darimontodrotbohm
Thomas Darimont
authored andcommitted
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: spring-projects#279.
1 parent 1c6ab25 commit b887fa7

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationTests.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -1057,16 +1057,15 @@ public void shouldHonorFieldAliasesForFieldReferences() {
10571057

10581058
TypedAggregation<MeterData> agg = newAggregation(MeterData.class, //
10591059
match(where("resourceId").is("m1")), //
1060-
group("counterName").sum("counterVolume").as("totalValue") //
1061-
);
1060+
group("counterName").sum("counterVolume").as("totalValue"));
10621061

10631062
AggregationResults<DBObject> results = mongoTemplate.aggregate(agg, DBObject.class);
10641063

10651064
assertThat(results.getMappedResults(), hasSize(1));
10661065
DBObject result = results.getMappedResults().get(0);
10671066

10681067
assertThat(result.get("_id"), is(equalTo((Object) "counter1")));
1069-
assertThat(result.get("totalValue"), is(equalTo((Object) 42.0)));
1068+
assertThat(result.get("totalValue"), is(equalTo((Object) 100.0)));
10701069
}
10711070

10721071
private void assertLikeStats(LikeStats like, String id, long count) {

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/MeterData.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,11 @@
2323
*/
2424
public class MeterData {
2525

26-
@Id String resourceId;
26+
@Id String id;
27+
String resourceId;
2728
@Field("counter_name") String counterName;
2829
double counterVolume;
2930

30-
public MeterData() {}
31-
3231
public MeterData(String resourceId, String counterName, double counterVolume) {
3332

3433
this.resourceId = resourceId;

0 commit comments

Comments
 (0)