Skip to content

Commit eb457bc

Browse files
author
Hendrik Muhs
committed
fix recursive type lookup in unit tests
1 parent 46485a9 commit eb457bc

File tree

1 file changed

+14
-13
lines changed

1 file changed

+14
-13
lines changed

x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/pivot/AggregationResultUtilsTests.java

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -822,44 +822,45 @@ public void testSingleBucketAggExtractor() {
822822
Aggregation agg = createSingleBucketAgg("sba", 42L);
823823
assertThat(AggregationResultUtils.getExtractor(agg).value(agg, "long", Collections.emptyMap(), ""), equalTo(42L));
824824

825-
agg = createSingleBucketAgg("sba", 42L, createSingleMetricAgg("sub1", 100.0, "100.0"));
825+
agg = createSingleBucketAgg("sba1", 42L, createSingleMetricAgg("sub1", 100.0, "100.0"));
826826
assertThat(
827827
AggregationResultUtils.getExtractor(agg).value(agg, "object", Collections.emptyMap(), ""),
828828
equalTo(Collections.singletonMap("sub1", 100.0))
829829
);
830830

831831
agg = createSingleBucketAgg(
832-
"sba",
832+
"sba2",
833833
42L,
834-
createSingleMetricAgg("sub1", 100.0, "100.0"),
835-
createSingleMetricAgg("sub2", 33.33, "33.33")
834+
createSingleMetricAgg("sub1", 100.0, "hundred"),
835+
createSingleMetricAgg("sub2", 33.33, "thirty_three")
836836
);
837837
assertThat(
838-
AggregationResultUtils.getExtractor(agg).value(agg, "object", Collections.emptyMap(), ""),
838+
AggregationResultUtils.getExtractor(agg).value(agg, "object", asStringMap("sba2.sub1", "long", "sba2.sub2", "float"), ""),
839839
equalTo(asMap("sub1", 100.0, "sub2", 33.33))
840840
);
841841

842842
agg = createSingleBucketAgg(
843-
"sba",
843+
"sba3",
844844
42L,
845-
createSingleMetricAgg("sub1", 100.0, "100.0"),
846-
createSingleMetricAgg("sub2", 33.33, "33.33"),
845+
createSingleMetricAgg("sub1", 100.0, "hundred"),
846+
createSingleMetricAgg("sub2", 33.33, "thirty_three"),
847847
createSingleBucketAgg("sub3", 42L)
848848
);
849849
assertThat(
850-
AggregationResultUtils.getExtractor(agg).value(agg, "object", Collections.emptyMap(), ""),
850+
AggregationResultUtils.getExtractor(agg).value(agg, "object", asStringMap("sba3.sub1", "long", "sba3.sub2", "double"), ""),
851851
equalTo(asMap("sub1", 100.0, "sub2", 33.33, "sub3", 42L))
852852
);
853853

854854
agg = createSingleBucketAgg(
855-
"sba",
855+
"sba4",
856856
42L,
857-
createSingleMetricAgg("sub1", 100.0, "100.0"),
858-
createSingleMetricAgg("sub2", 33.33, "33.33"),
857+
createSingleMetricAgg("sub1", 100.0, "hundred"),
858+
createSingleMetricAgg("sub2", 33.33, "thirty_three"),
859859
createSingleBucketAgg("sub3", 42L, createSingleMetricAgg("subsub1", 11.1, "eleven_dot_eleven"))
860860
);
861861
assertThat(
862-
AggregationResultUtils.getExtractor(agg).value(agg, "object", Collections.singletonMap("subsub1", "double"), ""),
862+
AggregationResultUtils.getExtractor(agg)
863+
.value(agg, "object", asStringMap("sba4.sub3.subsub1", "double", "sba4.sub2", "float", "sba4.sub1", "long"), ""),
863864
equalTo(asMap("sub1", 100.0, "sub2", 33.33, "sub3", asMap("subsub1", 11.1)))
864865
);
865866
}

0 commit comments

Comments
 (0)