|
@@ -34,20 +34,28 @@ public class DateHistogramGroupSourceTests extends AbstractSerializingTestCase<D
|
|
|
return randomDateHistogramGroupSource(Version.CURRENT, false);
|
|
|
}
|
|
|
|
|
|
+ public static DateHistogramGroupSource randomDateHistogramGroupSourceNoScript(String fieldPrefix) {
|
|
|
+ return randomDateHistogramGroupSource(Version.CURRENT, false, fieldPrefix);
|
|
|
+ }
|
|
|
+
|
|
|
public static DateHistogramGroupSource randomDateHistogramGroupSource(Version version) {
|
|
|
return randomDateHistogramGroupSource(version, randomBoolean());
|
|
|
}
|
|
|
|
|
|
public static DateHistogramGroupSource randomDateHistogramGroupSource(Version version, boolean withScript) {
|
|
|
+ return randomDateHistogramGroupSource(version, withScript, "");
|
|
|
+ }
|
|
|
+
|
|
|
+ public static DateHistogramGroupSource randomDateHistogramGroupSource(Version version, boolean withScript, String fieldPrefix) {
|
|
|
ScriptConfig scriptConfig = null;
|
|
|
String field;
|
|
|
|
|
|
// either a field or a script must be specified, it's possible to have both, but disallowed to have none
|
|
|
if (version.onOrAfter(Version.V_7_7_0) && withScript) {
|
|
|
scriptConfig = ScriptConfigTests.randomScriptConfig();
|
|
|
- field = randomBoolean() ? null : randomAlphaOfLengthBetween(1, 20);
|
|
|
+ field = randomBoolean() ? null : fieldPrefix + randomAlphaOfLengthBetween(1, 20);
|
|
|
} else {
|
|
|
- field = randomAlphaOfLengthBetween(1, 20);
|
|
|
+ field = fieldPrefix + randomAlphaOfLengthBetween(1, 20);
|
|
|
}
|
|
|
boolean missingBucket = version.onOrAfter(Version.V_7_10_0) ? randomBoolean() : false;
|
|
|
|