diff options
Diffstat (limited to 'core/src/test/java/org/elasticsearch/search/aggregations')
40 files changed, 101 insertions, 103 deletions
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/AggregatorFactoriesTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/AggregatorFactoriesTests.java index 2aba0ed59e..180e639eb3 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/AggregatorFactoriesTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/AggregatorFactoriesTests.java @@ -58,7 +58,7 @@ public class AggregatorFactoriesTests extends ESTestCase { // stick around for all of the subclasses currentTypes = new String[randomIntBetween(0, 5)]; for (int i = 0; i < currentTypes.length; i++) { - String type = randomAsciiOfLengthBetween(1, 10); + String type = randomAlphaOfLengthBetween(1, 10); currentTypes[i] = type; } xContentRegistry = new NamedXContentRegistry(new SearchModule(settings, false, emptyList()).getNamedXContents()); @@ -174,7 +174,7 @@ public class AggregatorFactoriesTests extends ESTestCase { public void testSameAggregationName() throws Exception { assumeFalse("Test only makes sense if XContent parser doesn't have strict duplicate checks enabled", XContent.isStrictDuplicateDetectionEnabled()); - final String name = randomAsciiOfLengthBetween(1, 10); + final String name = randomAlphaOfLengthBetween(1, 10); XContentBuilder source = JsonXContent.contentBuilder() .startObject() .startObject(name) diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/BaseAggregationTestCase.java b/core/src/test/java/org/elasticsearch/search/aggregations/BaseAggregationTestCase.java index 162b7bcd1b..651c261aa8 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/BaseAggregationTestCase.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/BaseAggregationTestCase.java @@ -85,7 +85,7 @@ public abstract class BaseAggregationTestCase<AB extends AbstractAggregationBuil //create some random type with some default field, those types will stick around for all of the subclasses currentTypes = new String[randomIntBetween(0, 5)]; for (int i = 0; i < currentTypes.length; i++) { - String type = randomAsciiOfLengthBetween(1, 10); + String type = randomAlphaOfLengthBetween(1, 10); currentTypes[i] = type; } } diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/BasePipelineAggregationTestCase.java b/core/src/test/java/org/elasticsearch/search/aggregations/BasePipelineAggregationTestCase.java index 41bbdaae66..0a738ec022 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/BasePipelineAggregationTestCase.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/BasePipelineAggregationTestCase.java @@ -87,7 +87,7 @@ public abstract class BasePipelineAggregationTestCase<AF extends AbstractPipelin //create some random type with some default field, those types will stick around for all of the subclasses currentTypes = new String[randomIntBetween(0, 5)]; for (int i = 0; i < currentTypes.length; i++) { - String type = randomAsciiOfLengthBetween(1, 10); + String type = randomAlphaOfLengthBetween(1, 10); currentTypes[i] = type; } } diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/InternalAggregationTestCase.java b/core/src/test/java/org/elasticsearch/search/aggregations/InternalAggregationTestCase.java index 48f48951c4..f899fde087 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/InternalAggregationTestCase.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/InternalAggregationTestCase.java @@ -51,7 +51,7 @@ public abstract class InternalAggregationTestCase<T extends InternalAggregation> } public void testReduceRandom() { - String name = randomAsciiOfLength(5); + String name = randomAlphaOfLength(5); List<T> inputs = new ArrayList<>(); List<InternalAggregation> toReduce = new ArrayList<>(); int toReduceSize = between(1, 200); @@ -92,7 +92,7 @@ public abstract class InternalAggregationTestCase<T extends InternalAggregation> @Override protected final T createTestInstance() { - return createTestInstance(randomAsciiOfLength(5)); + return createTestInstance(randomAlphaOfLength(5)); } private T createTestInstance(String name) { @@ -101,7 +101,7 @@ public abstract class InternalAggregationTestCase<T extends InternalAggregation> Map<String, Object> metaData = new HashMap<>(); int metaDataCount = randomBoolean() ? 0 : between(1, 10); while (metaData.size() < metaDataCount) { - metaData.put(randomAsciiOfLength(5), randomAsciiOfLength(5)); + metaData.put(randomAlphaOfLength(5), randomAlphaOfLength(5)); } return createTestInstance(name, pipelineAggregators, metaData); } @@ -113,7 +113,7 @@ public abstract class InternalAggregationTestCase<T extends InternalAggregation> Map<String, Object> metaData = new HashMap<>(); int metaDataCount = randomBoolean() ? 0 : between(1, 10); while (metaData.size() < metaDataCount) { - metaData.put(randomAsciiOfLength(5), randomAsciiOfLength(5)); + metaData.put(randomAlphaOfLength(5), randomAlphaOfLength(5)); } return createUnmappedInstance(name, pipelineAggregators, metaData); } diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ChildrenTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ChildrenTests.java index c7844f29d0..4098e85c62 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ChildrenTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ChildrenTests.java @@ -26,8 +26,8 @@ public class ChildrenTests extends BaseAggregationTestCase<ChildrenAggregationBu @Override protected ChildrenAggregationBuilder createTestAggregatorBuilder() { - String name = randomAsciiOfLengthBetween(3, 20); - String childType = randomAsciiOfLengthBetween(5, 40); + String name = randomAlphaOfLengthBetween(3, 20); + String childType = randomAlphaOfLengthBetween(5, 40); ChildrenAggregationBuilder factory = new ChildrenAggregationBuilder(name, childType); return factory; } diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateRangeTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateRangeTests.java index ee32915fdd..8987616b77 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateRangeTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateRangeTests.java @@ -32,7 +32,7 @@ public class DateRangeTests extends BaseAggregationTestCase<DateRangeAggregation for (int i = 0; i < numRanges; i++) { String key = null; if (randomBoolean()) { - key = randomAsciiOfLengthBetween(1, 20); + key = randomAlphaOfLengthBetween(1, 20); } double from = randomBoolean() ? Double.NEGATIVE_INFINITY : randomIntBetween(Integer.MIN_VALUE, Integer.MAX_VALUE - 1000); double to = randomBoolean() ? Double.POSITIVE_INFINITY diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/FilterAggregatorTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/FilterAggregatorTests.java index c561789050..54fd71d3e0 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/FilterAggregatorTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/FilterAggregatorTests.java @@ -54,7 +54,7 @@ public class FilterAggregatorTests extends AggregatorTestCase { indexWriter.close(); IndexReader indexReader = DirectoryReader.open(directory); IndexSearcher indexSearcher = newSearcher(indexReader, true, true); - QueryBuilder filter = QueryBuilders.termQuery("field", randomAsciiOfLength(5)); + QueryBuilder filter = QueryBuilders.termQuery("field", randomAlphaOfLength(5)); FilterAggregationBuilder builder = new FilterAggregationBuilder("test", filter); InternalFilter response = search(indexSearcher, new MatchAllDocsQuery(), builder, fieldType); diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/FiltersAggregatorTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/FiltersAggregatorTests.java index da41657275..7ade659a12 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/FiltersAggregatorTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/FiltersAggregatorTests.java @@ -62,7 +62,7 @@ public class FiltersAggregatorTests extends AggregatorTestCase { int numFilters = randomIntBetween(1, 10); QueryBuilder[] filters = new QueryBuilder[numFilters]; for (int i = 0; i < filters.length; i++) { - filters[i] = QueryBuilders.termQuery("field", randomAsciiOfLength(5)); + filters[i] = QueryBuilders.termQuery("field", randomAlphaOfLength(5)); } FiltersAggregationBuilder builder = new FiltersAggregationBuilder("test", filters); builder.otherBucketKey("other"); diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceRangeTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceRangeTests.java index 8a71739555..7f8af68b38 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceRangeTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceRangeTests.java @@ -37,7 +37,7 @@ public class GeoDistanceRangeTests extends BaseAggregationTestCase<GeoDistanceAg for (int i = 0; i < numRanges; i++) { String key = null; if (randomBoolean()) { - key = randomAsciiOfLengthBetween(1, 20); + key = randomAlphaOfLengthBetween(1, 20); } double from = randomBoolean() ? 0 : randomIntBetween(0, Integer.MAX_VALUE - 1000); double to = randomBoolean() ? Double.POSITIVE_INFINITY @@ -45,7 +45,7 @@ public class GeoDistanceRangeTests extends BaseAggregationTestCase<GeoDistanceAg : randomIntBetween((int) from, Integer.MAX_VALUE)); factory.addRange(new Range(key, from, to)); } - factory.field(randomAsciiOfLengthBetween(1, 20)); + factory.field(randomAlphaOfLengthBetween(1, 20)); if (randomBoolean()) { factory.keyed(randomBoolean()); } diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoHashGridTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoHashGridTests.java index 688289f02d..fb7b3984cd 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoHashGridTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoHashGridTests.java @@ -26,7 +26,7 @@ public class GeoHashGridTests extends BaseAggregationTestCase<GeoGridAggregation @Override protected GeoGridAggregationBuilder createTestAggregatorBuilder() { - String name = randomAsciiOfLengthBetween(3, 20); + String name = randomAlphaOfLengthBetween(3, 20); GeoGridAggregationBuilder factory = new GeoGridAggregationBuilder(name); if (randomBoolean()) { int precision = randomIntBetween(1, 12); diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GlobalTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GlobalTests.java index a874eff839..957f0f3663 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GlobalTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GlobalTests.java @@ -26,7 +26,7 @@ public class GlobalTests extends BaseAggregationTestCase<GlobalAggregationBuilde @Override protected GlobalAggregationBuilder createTestAggregatorBuilder() { - return new GlobalAggregationBuilder(randomAsciiOfLengthBetween(3, 20)); + return new GlobalAggregationBuilder(randomAlphaOfLengthBetween(3, 20)); } } diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/IpRangeTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/IpRangeTests.java index 4e9c1e00ea..eb07d059e5 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/IpRangeTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/IpRangeTests.java @@ -51,7 +51,7 @@ public class IpRangeTests extends BaseAggregationTestCase<IpRangeAggregationBuil for (int i = 0; i < numRanges; i++) { String key = null; if (randomBoolean()) { - key = randomAsciiOfLengthBetween(1, 20); + key = randomAlphaOfLengthBetween(1, 20); } switch (randomInt(3)) { case 0: diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/RangeTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/RangeTests.java index 22b4eae842..89bcf4ebc0 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/RangeTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/RangeTests.java @@ -32,7 +32,7 @@ public class RangeTests extends BaseAggregationTestCase<RangeAggregationBuilder> for (int i = 0; i < numRanges; i++) { String key = null; if (randomBoolean()) { - key = randomAsciiOfLengthBetween(1, 20); + key = randomAlphaOfLengthBetween(1, 20); } double from = randomBoolean() ? Double.NEGATIVE_INFINITY : randomIntBetween(Integer.MIN_VALUE, Integer.MAX_VALUE - 1000); double to = randomBoolean() ? Double.POSITIVE_INFINITY diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsTests.java index 29c8d74f98..f545ae500a 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsTests.java @@ -51,9 +51,9 @@ public class SignificantTermsTests extends BaseAggregationTestCase<SignificantTe @Override protected SignificantTermsAggregationBuilder createTestAggregatorBuilder() { - String name = randomAsciiOfLengthBetween(3, 20); + String name = randomAlphaOfLengthBetween(3, 20); SignificantTermsAggregationBuilder factory = new SignificantTermsAggregationBuilder(name, null); - String field = randomAsciiOfLengthBetween(3, 20); + String field = randomAlphaOfLengthBetween(3, 20); int randomFieldBranch = randomInt(2); switch (randomFieldBranch) { case 0: @@ -131,7 +131,7 @@ public class SignificantTermsTests extends BaseAggregationTestCase<SignificantTe SortedSet<BytesRef> includeValues = new TreeSet<>(); int numIncs = randomIntBetween(1, 20); for (int i = 0; i < numIncs; i++) { - includeValues.add(new BytesRef(randomAsciiOfLengthBetween(1, 30))); + includeValues.add(new BytesRef(randomAlphaOfLengthBetween(1, 30))); } SortedSet<BytesRef> excludeValues = null; incExc = new IncludeExclude(includeValues, excludeValues); @@ -141,7 +141,7 @@ public class SignificantTermsTests extends BaseAggregationTestCase<SignificantTe SortedSet<BytesRef> excludeValues2 = new TreeSet<>(); int numExcs2 = randomIntBetween(1, 20); for (int i = 0; i < numExcs2; i++) { - excludeValues2.add(new BytesRef(randomAsciiOfLengthBetween(1, 30))); + excludeValues2.add(new BytesRef(randomAlphaOfLengthBetween(1, 30))); } incExc = new IncludeExclude(includeValues2, excludeValues2); break; @@ -149,12 +149,12 @@ public class SignificantTermsTests extends BaseAggregationTestCase<SignificantTe SortedSet<BytesRef> includeValues3 = new TreeSet<>(); int numIncs3 = randomIntBetween(1, 20); for (int i = 0; i < numIncs3; i++) { - includeValues3.add(new BytesRef(randomAsciiOfLengthBetween(1, 30))); + includeValues3.add(new BytesRef(randomAlphaOfLengthBetween(1, 30))); } SortedSet<BytesRef> excludeValues3 = new TreeSet<>(); int numExcs3 = randomIntBetween(1, 20); for (int i = 0; i < numExcs3; i++) { - excludeValues3.add(new BytesRef(randomAsciiOfLengthBetween(1, 30))); + excludeValues3.add(new BytesRef(randomAlphaOfLengthBetween(1, 30))); } incExc = new IncludeExclude(includeValues3, excludeValues3); break; diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/StringTermsIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/StringTermsIT.java index 46af395c47..b6ff885638 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/StringTermsIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/StringTermsIT.java @@ -18,8 +18,6 @@ */ package org.elasticsearch.search.aggregations.bucket; -import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.StringHelper; import org.apache.lucene.util.automaton.RegExp; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.action.index.IndexRequestBuilder; @@ -1095,10 +1093,10 @@ public class StringTermsIT extends AbstractTermsTestCase { public void testSingleValuedFieldOrderedBySubAggregationAscMultiHierarchyLevelsSpecialChars() throws Exception { StringBuilder filter2NameBuilder = new StringBuilder("filt.er2"); - filter2NameBuilder.append(randomAsciiOfLengthBetween(3, 10).replace("[", "").replace("]", "").replace(">", "")); + filter2NameBuilder.append(randomAlphaOfLengthBetween(3, 10).replace("[", "").replace("]", "").replace(">", "")); String filter2Name = filter2NameBuilder.toString(); StringBuilder statsNameBuilder = new StringBuilder("st.ats"); - statsNameBuilder.append(randomAsciiOfLengthBetween(3, 10).replace("[", "").replace("]", "").replace(">", "")); + statsNameBuilder.append(randomAlphaOfLengthBetween(3, 10).replace("[", "").replace("]", "").replace(">", "")); String statsName = statsNameBuilder.toString(); boolean asc = randomBoolean(); SearchResponse response = client() @@ -1158,10 +1156,10 @@ public class StringTermsIT extends AbstractTermsTestCase { public void testSingleValuedFieldOrderedBySubAggregationAscMultiHierarchyLevelsSpecialCharsNoDotNotation() throws Exception { StringBuilder filter2NameBuilder = new StringBuilder("filt.er2"); - filter2NameBuilder.append(randomAsciiOfLengthBetween(3, 10).replace("[", "").replace("]", "").replace(">", "")); + filter2NameBuilder.append(randomAlphaOfLengthBetween(3, 10).replace("[", "").replace("]", "").replace(">", "")); String filter2Name = filter2NameBuilder.toString(); StringBuilder statsNameBuilder = new StringBuilder("st.ats"); - statsNameBuilder.append(randomAsciiOfLengthBetween(3, 10).replace("[", "").replace("]", "").replace(">", "")); + statsNameBuilder.append(randomAlphaOfLengthBetween(3, 10).replace("[", "").replace("]", "").replace(">", "")); String statsName = statsNameBuilder.toString(); boolean asc = randomBoolean(); SearchResponse response = client() diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsTests.java index 2241c0a2f9..d0a38d0890 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsTests.java @@ -47,9 +47,9 @@ public class TermsTests extends BaseAggregationTestCase<TermsAggregationBuilder> @Override protected TermsAggregationBuilder createTestAggregatorBuilder() { - String name = randomAsciiOfLengthBetween(3, 20); + String name = randomAlphaOfLengthBetween(3, 20); TermsAggregationBuilder factory = new TermsAggregationBuilder(name, null); - String field = randomAsciiOfLengthBetween(3, 20); + String field = randomAlphaOfLengthBetween(3, 20); int randomFieldBranch = randomInt(2); switch (randomFieldBranch) { case 0: @@ -131,7 +131,7 @@ public class TermsTests extends BaseAggregationTestCase<TermsAggregationBuilder> SortedSet<BytesRef> includeValues = new TreeSet<>(); int numIncs = randomIntBetween(1, 20); for (int i = 0; i < numIncs; i++) { - includeValues.add(new BytesRef(randomAsciiOfLengthBetween(1, 30))); + includeValues.add(new BytesRef(randomAlphaOfLengthBetween(1, 30))); } SortedSet<BytesRef> excludeValues = null; incExc = new IncludeExclude(includeValues, excludeValues); @@ -141,7 +141,7 @@ public class TermsTests extends BaseAggregationTestCase<TermsAggregationBuilder> SortedSet<BytesRef> excludeValues2 = new TreeSet<>(); int numExcs2 = randomIntBetween(1, 20); for (int i = 0; i < numExcs2; i++) { - excludeValues2.add(new BytesRef(randomAsciiOfLengthBetween(1, 30))); + excludeValues2.add(new BytesRef(randomAlphaOfLengthBetween(1, 30))); } incExc = new IncludeExclude(includeValues2, excludeValues2); break; @@ -149,12 +149,12 @@ public class TermsTests extends BaseAggregationTestCase<TermsAggregationBuilder> SortedSet<BytesRef> includeValues3 = new TreeSet<>(); int numIncs3 = randomIntBetween(1, 20); for (int i = 0; i < numIncs3; i++) { - includeValues3.add(new BytesRef(randomAsciiOfLengthBetween(1, 30))); + includeValues3.add(new BytesRef(randomAlphaOfLengthBetween(1, 30))); } SortedSet<BytesRef> excludeValues3 = new TreeSet<>(); int numExcs3 = randomIntBetween(1, 20); for (int i = 0; i < numExcs3; i++) { - excludeValues3.add(new BytesRef(randomAsciiOfLengthBetween(1, 30))); + excludeValues3.add(new BytesRef(randomAlphaOfLengthBetween(1, 30))); } incExc = new IncludeExclude(includeValues3, excludeValues3); break; @@ -188,10 +188,10 @@ public class TermsTests extends BaseAggregationTestCase<TermsAggregationBuilder> orders.add(Terms.Order.count(randomBoolean())); break; case 2: - orders.add(Terms.Order.aggregation(randomAsciiOfLengthBetween(3, 20), randomBoolean())); + orders.add(Terms.Order.aggregation(randomAlphaOfLengthBetween(3, 20), randomBoolean())); break; case 3: - orders.add(Terms.Order.aggregation(randomAsciiOfLengthBetween(3, 20), randomAsciiOfLengthBetween(3, 20), randomBoolean())); + orders.add(Terms.Order.aggregation(randomAlphaOfLengthBetween(3, 20), randomAlphaOfLengthBetween(3, 20), randomBoolean())); break; case 4: int numOrders = randomIntBetween(1, 3); diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedTests.java index 29dde100a0..ff2563fc4c 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedTests.java @@ -25,7 +25,7 @@ public class NestedTests extends BaseAggregationTestCase<NestedAggregationBuilde @Override protected NestedAggregationBuilder createTestAggregatorBuilder() { - return new NestedAggregationBuilder(randomAsciiOfLengthBetween(1, 20), randomAsciiOfLengthBetween(3, 40)); + return new NestedAggregationBuilder(randomAlphaOfLengthBetween(1, 20), randomAlphaOfLengthBetween(3, 40)); } } diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedTests.java index 97dbf3718a..76423a7005 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedTests.java @@ -25,9 +25,9 @@ public class ReverseNestedTests extends BaseAggregationTestCase<ReverseNestedAgg @Override protected ReverseNestedAggregationBuilder createTestAggregatorBuilder() { - ReverseNestedAggregationBuilder factory = new ReverseNestedAggregationBuilder(randomAsciiOfLengthBetween(1, 20)); + ReverseNestedAggregationBuilder factory = new ReverseNestedAggregationBuilder(randomAlphaOfLengthBetween(1, 20)); if (randomBoolean()) { - factory.path(randomAsciiOfLengthBetween(3, 40)); + factory.path(randomAlphaOfLengthBetween(3, 40)); } return factory; } diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalBinaryRangeTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalBinaryRangeTests.java index a0b23f38d2..2f8d4f9e65 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalBinaryRangeTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalBinaryRangeTests.java @@ -42,8 +42,8 @@ public class InternalBinaryRangeTests extends InternalAggregationTestCase<Intern Tuple<BytesRef, BytesRef>[] ranges = new Tuple[numRanges]; for (int i = 0; i < numRanges; i++) { BytesRef[] values = new BytesRef[2]; - values[0] = new BytesRef(randomAsciiOfLength(15)); - values[1] = new BytesRef(randomAsciiOfLength(15)); + values[0] = new BytesRef(randomAlphaOfLength(15)); + values[1] = new BytesRef(randomAlphaOfLength(15)); Arrays.sort(values); ranges[i] = new Tuple(values[0], values[1]); } @@ -60,7 +60,7 @@ public class InternalBinaryRangeTests extends InternalAggregationTestCase<Intern List<InternalBinaryRange.Bucket> buckets = new ArrayList<>(); for (int i = 0; i < RANGES.length; ++i) { final int docCount = randomIntBetween(1, 100); - buckets.add(new InternalBinaryRange.Bucket(format, keyed, randomAsciiOfLength(10), + buckets.add(new InternalBinaryRange.Bucket(format, keyed, randomAlphaOfLength(10), RANGES[i].v1(), RANGES[i].v2(), docCount, InternalAggregations.EMPTY)); } return new InternalBinaryRange(name, format, keyed, buckets, pipelineAggregators, Collections.emptyMap()); diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTermsTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTermsTests.java index f957836b3e..82cd21cdf3 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTermsTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTermsTests.java @@ -62,7 +62,7 @@ public class SignificantStringTermsTests extends InternalSignificantTermsTestCas List<SignificantStringTerms.Bucket> buckets = new ArrayList<>(numBuckets); Set<BytesRef> terms = new HashSet<>(); for (int i = 0; i < numBuckets; ++i) { - BytesRef term = randomValueOtherThanMany(b -> terms.add(b) == false, () -> new BytesRef(randomAsciiOfLength(10))); + BytesRef term = randomValueOtherThanMany(b -> terms.add(b) == false, () -> new BytesRef(randomAlphaOfLength(10))); int subsetDf = randomIntBetween(1, 10); int supersetDf = randomIntBetween(subsetDf, 20); diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsTests.java index d20f546a54..64e814bd81 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsTests.java @@ -50,7 +50,7 @@ public class StringTermsTests extends InternalTermsTestCase { final int numBuckets = randomInt(shardSize); Set<BytesRef> terms = new HashSet<>(); for (int i = 0; i < numBuckets; ++i) { - BytesRef term = randomValueOtherThanMany(b -> terms.add(b) == false, () -> new BytesRef(randomAsciiOfLength(10))); + BytesRef term = randomValueOtherThanMany(b -> terms.add(b) == false, () -> new BytesRef(randomAlphaOfLength(10))); int docCount = randomIntBetween(1, 100); buckets.add(new StringTerms.Bucket(term, docCount, InternalAggregations.EMPTY, showTermDocCountError, docCountError, format)); diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/AdjacencyMatrixTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/AdjacencyMatrixTests.java index 05390b1282..a12dbad59f 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/AdjacencyMatrixTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/AdjacencyMatrixTests.java @@ -36,10 +36,10 @@ public class AdjacencyMatrixTests extends BaseAggregationTestCase<AdjacencyMatri int size = randomIntBetween(1, 20); AdjacencyMatrixAggregationBuilder factory; Map<String, QueryBuilder> filters = new HashMap<>(size); - for (String key : randomUnique(() -> randomAsciiOfLengthBetween(1, 20), size)) { - filters.put(key, QueryBuilders.termQuery(randomAsciiOfLengthBetween(5, 20), randomAsciiOfLengthBetween(5, 20))); + for (String key : randomUnique(() -> randomAlphaOfLengthBetween(1, 20), size)) { + filters.put(key, QueryBuilders.termQuery(randomAlphaOfLengthBetween(5, 20), randomAlphaOfLengthBetween(5, 20))); } - factory = new AdjacencyMatrixAggregationBuilder(randomAsciiOfLengthBetween(1, 20), filters) + factory = new AdjacencyMatrixAggregationBuilder(randomAlphaOfLengthBetween(1, 20), filters) .separator(randomFrom("&","+","\t")); return factory; } diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/FilterTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/FilterTests.java index 1b563d531a..47b9ab07b1 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/FilterTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/FilterTests.java @@ -27,8 +27,8 @@ public class FilterTests extends BaseAggregationTestCase<FilterAggregationBuilde @Override protected FilterAggregationBuilder createTestAggregatorBuilder() { - FilterAggregationBuilder factory = new FilterAggregationBuilder(randomAsciiOfLengthBetween(1, 20), - QueryBuilders.termQuery(randomAsciiOfLengthBetween(5, 20), randomAsciiOfLengthBetween(5, 20))); + FilterAggregationBuilder factory = new FilterAggregationBuilder(randomAlphaOfLengthBetween(1, 20), + QueryBuilders.termQuery(randomAlphaOfLengthBetween(5, 20), randomAlphaOfLengthBetween(5, 20))); // NORELEASE make RandomQueryBuilder work outside of the // AbstractQueryTestCase // builder.query(RandomQueryBuilder.createQuery(getRandom())); diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/FiltersTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/FiltersTests.java index 226f3aeada..f6691d5b27 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/FiltersTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/FiltersTests.java @@ -43,23 +43,23 @@ public class FiltersTests extends BaseAggregationTestCase<FiltersAggregationBuil if (randomBoolean()) { KeyedFilter[] filters = new KeyedFilter[size]; int i = 0; - for (String key : randomUnique(() -> randomAsciiOfLengthBetween(1, 20), size)) { + for (String key : randomUnique(() -> randomAlphaOfLengthBetween(1, 20), size)) { filters[i++] = new KeyedFilter(key, - QueryBuilders.termQuery(randomAsciiOfLengthBetween(5, 20), randomAsciiOfLengthBetween(5, 20))); + QueryBuilders.termQuery(randomAlphaOfLengthBetween(5, 20), randomAlphaOfLengthBetween(5, 20))); } - factory = new FiltersAggregationBuilder(randomAsciiOfLengthBetween(1, 20), filters); + factory = new FiltersAggregationBuilder(randomAlphaOfLengthBetween(1, 20), filters); } else { QueryBuilder[] filters = new QueryBuilder[size]; for (int i = 0; i < size; i++) { - filters[i] = QueryBuilders.termQuery(randomAsciiOfLengthBetween(5, 20), randomAsciiOfLengthBetween(5, 20)); + filters[i] = QueryBuilders.termQuery(randomAlphaOfLengthBetween(5, 20), randomAlphaOfLengthBetween(5, 20)); } - factory = new FiltersAggregationBuilder(randomAsciiOfLengthBetween(1, 20), filters); + factory = new FiltersAggregationBuilder(randomAlphaOfLengthBetween(1, 20), filters); } if (randomBoolean()) { factory.otherBucket(randomBoolean()); } if (randomBoolean()) { - factory.otherBucketKey(randomAsciiOfLengthBetween(1, 20)); + factory.otherBucketKey(randomAlphaOfLengthBetween(1, 20)); } return factory; } diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsTests.java index e086598dbf..9f5bd13b5f 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsTests.java @@ -26,8 +26,8 @@ public class GeoBoundsTests extends BaseAggregationTestCase<GeoBoundsAggregation @Override protected GeoBoundsAggregationBuilder createTestAggregatorBuilder() { - GeoBoundsAggregationBuilder factory = new GeoBoundsAggregationBuilder(randomAsciiOfLengthBetween(1, 20)); - String field = randomAsciiOfLengthBetween(3, 20); + GeoBoundsAggregationBuilder factory = new GeoBoundsAggregationBuilder(randomAlphaOfLengthBetween(1, 20)); + String field = randomAlphaOfLengthBetween(3, 20); factory.field(field); if (randomBoolean()) { factory.wrapLongitude(randomBoolean()); diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoCentroidTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoCentroidTests.java index 1ea21a1ff1..c61336134f 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoCentroidTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoCentroidTests.java @@ -27,7 +27,7 @@ public class GeoCentroidTests extends BaseAggregationTestCase<GeoCentroidAggrega @Override protected GeoCentroidAggregationBuilder createTestAggregatorBuilder() { - GeoCentroidAggregationBuilder factory = new GeoCentroidAggregationBuilder(randomAsciiOfLengthBetween(1, 20)); + GeoCentroidAggregationBuilder factory = new GeoCentroidAggregationBuilder(randomAlphaOfLengthBetween(1, 20)); String field = randomNumericField(); int randomFieldBranch = randomInt(3); switch (randomFieldBranch) { diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/PercentileRanksTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/PercentileRanksTests.java index 1907733fbd..c4a8a2837a 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/PercentileRanksTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/PercentileRanksTests.java @@ -27,7 +27,7 @@ public class PercentileRanksTests extends BaseAggregationTestCase<PercentileRank @Override protected PercentileRanksAggregationBuilder createTestAggregatorBuilder() { - PercentileRanksAggregationBuilder factory = new PercentileRanksAggregationBuilder(randomAsciiOfLengthBetween(1, 20)); + PercentileRanksAggregationBuilder factory = new PercentileRanksAggregationBuilder(randomAlphaOfLengthBetween(1, 20)); if (randomBoolean()) { factory.keyed(randomBoolean()); } diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/PercentilesTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/PercentilesTests.java index b5539f8c1b..3c9b5dfeb4 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/PercentilesTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/PercentilesTests.java @@ -27,7 +27,7 @@ public class PercentilesTests extends BaseAggregationTestCase<PercentilesAggrega @Override protected PercentilesAggregationBuilder createTestAggregatorBuilder() { - PercentilesAggregationBuilder factory = new PercentilesAggregationBuilder(randomAsciiOfLengthBetween(1, 20)); + PercentilesAggregationBuilder factory = new PercentilesAggregationBuilder(randomAlphaOfLengthBetween(1, 20)); if (randomBoolean()) { factory.keyed(randomBoolean()); } diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricIT.java index f431cb0a47..be8ef38ef0 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricIT.java @@ -205,7 +205,7 @@ public class ScriptedMetricIT extends ESIntegTestCase { numDocs = randomIntBetween(10, 100); for (int i = 0; i < numDocs; i++) { builders.add(client().prepareIndex("idx", "type", "" + i).setSource( - jsonBuilder().startObject().field("value", randomAsciiOfLengthBetween(5, 15)) + jsonBuilder().startObject().field("value", randomAlphaOfLengthBetween(5, 15)) .field("l_value", i).endObject())); } indexRandom(true, builders); diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricTests.java index 8e09447fef..15a78a5d4f 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricTests.java @@ -32,7 +32,7 @@ public class ScriptedMetricTests extends BaseAggregationTestCase<ScriptedMetricA @Override protected ScriptedMetricAggregationBuilder createTestAggregatorBuilder() { - ScriptedMetricAggregationBuilder factory = new ScriptedMetricAggregationBuilder(randomAsciiOfLengthBetween(1, 20)); + ScriptedMetricAggregationBuilder factory = new ScriptedMetricAggregationBuilder(randomAlphaOfLengthBetween(1, 20)); if (randomBoolean()) { factory.initScript(randomScript("initScript")); } diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/TopHitsTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/TopHitsTests.java index 55fe1b44b7..50cdafe677 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/TopHitsTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/TopHitsTests.java @@ -73,7 +73,7 @@ public class TopHitsTests extends BaseAggregationTestCase<TopHitsAggregationBuil int fieldsSize = randomInt(25); List<String> fields = new ArrayList<>(fieldsSize); for (int i = 0; i < fieldsSize; i++) { - fields.add(randomAsciiOfLengthBetween(5, 50)); + fields.add(randomAlphaOfLengthBetween(5, 50)); } factory.storedFields(fields); break; @@ -83,16 +83,16 @@ public class TopHitsTests extends BaseAggregationTestCase<TopHitsAggregationBuil if (randomBoolean()) { int fieldDataFieldsSize = randomInt(25); for (int i = 0; i < fieldDataFieldsSize; i++) { - factory.fieldDataField(randomAsciiOfLengthBetween(5, 50)); + factory.fieldDataField(randomAlphaOfLengthBetween(5, 50)); } } if (randomBoolean()) { int scriptFieldsSize = randomInt(25); for (int i = 0; i < scriptFieldsSize; i++) { if (randomBoolean()) { - factory.scriptField(randomAsciiOfLengthBetween(5, 50), new Script("foo"), randomBoolean()); + factory.scriptField(randomAlphaOfLengthBetween(5, 50), new Script("foo"), randomBoolean()); } else { - factory.scriptField(randomAsciiOfLengthBetween(5, 50), new Script("foo")); + factory.scriptField(randomAlphaOfLengthBetween(5, 50), new Script("foo")); } } } @@ -101,11 +101,11 @@ public class TopHitsTests extends BaseAggregationTestCase<TopHitsAggregationBuil int branch = randomInt(5); String[] includes = new String[randomIntBetween(0, 20)]; for (int i = 0; i < includes.length; i++) { - includes[i] = randomAsciiOfLengthBetween(5, 20); + includes[i] = randomAlphaOfLengthBetween(5, 20); } String[] excludes = new String[randomIntBetween(0, 20)]; for (int i = 0; i < excludes.length; i++) { - excludes[i] = randomAsciiOfLengthBetween(5, 20); + excludes[i] = randomAlphaOfLengthBetween(5, 20); } switch (branch) { case 0: @@ -115,8 +115,8 @@ public class TopHitsTests extends BaseAggregationTestCase<TopHitsAggregationBuil fetchSourceContext = new FetchSourceContext(true, includes, excludes); break; case 2: - fetchSourceContext = new FetchSourceContext(true, new String[]{randomAsciiOfLengthBetween(5, 20)}, - new String[]{randomAsciiOfLengthBetween(5, 20)}); + fetchSourceContext = new FetchSourceContext(true, new String[]{randomAlphaOfLengthBetween(5, 20)}, + new String[]{randomAlphaOfLengthBetween(5, 20)}); break; case 3: fetchSourceContext = new FetchSourceContext(true, includes, excludes); @@ -125,7 +125,7 @@ public class TopHitsTests extends BaseAggregationTestCase<TopHitsAggregationBuil fetchSourceContext = new FetchSourceContext(true, includes, null); break; case 5: - fetchSourceContext = new FetchSourceContext(true, new String[] {randomAsciiOfLengthBetween(5, 20)}, null); + fetchSourceContext = new FetchSourceContext(true, new String[] {randomAlphaOfLengthBetween(5, 20)}, null); break; default: throw new IllegalStateException(); @@ -138,10 +138,10 @@ public class TopHitsTests extends BaseAggregationTestCase<TopHitsAggregationBuil int branch = randomInt(5); switch (branch) { case 0: - factory.sort(SortBuilders.fieldSort(randomAsciiOfLengthBetween(5, 20)).order(randomFrom(SortOrder.values()))); + factory.sort(SortBuilders.fieldSort(randomAlphaOfLengthBetween(5, 20)).order(randomFrom(SortOrder.values()))); break; case 1: - factory.sort(SortBuilders.geoDistanceSort(randomAsciiOfLengthBetween(5, 20), AbstractQueryTestCase.randomGeohash(1, 12)) + factory.sort(SortBuilders.geoDistanceSort(randomAlphaOfLengthBetween(5, 20), AbstractQueryTestCase.randomGeohash(1, 12)) .order(randomFrom(SortOrder.values()))); break; case 2: @@ -151,10 +151,10 @@ public class TopHitsTests extends BaseAggregationTestCase<TopHitsAggregationBuil factory.sort(SortBuilders.scriptSort(new Script("foo"), ScriptSortType.NUMBER).order(randomFrom(SortOrder.values()))); break; case 4: - factory.sort(randomAsciiOfLengthBetween(5, 20)); + factory.sort(randomAlphaOfLengthBetween(5, 20)); break; case 5: - factory.sort(randomAsciiOfLengthBetween(5, 20), randomFrom(SortOrder.values())); + factory.sort(randomAlphaOfLengthBetween(5, 20), randomFrom(SortOrder.values())); break; } } diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetricTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetricTests.java index b82e822f6b..be06bdd56b 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetricTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetricTests.java @@ -50,13 +50,13 @@ public class InternalScriptedMetricTests extends InternalAggregationTestCase<Int Map<String, Object> metaData) { Map<String, Object> params = new HashMap<>(); if (randomBoolean()) { - params.put(randomAsciiOfLength(5), randomAsciiOfLength(5)); + params.put(randomAlphaOfLength(5), randomAlphaOfLength(5)); } Script reduceScript = null; if (hasReduceScript) { reduceScript = new Script(ScriptType.INLINE, MockScriptEngine.NAME, REDUCE_SCRIPT_NAME, params); } - return new InternalScriptedMetric(name, randomAsciiOfLength(5), reduceScript, pipelineAggregators, metaData); + return new InternalScriptedMetric(name, randomAlphaOfLength(5), reduceScript, pipelineAggregators, metaData); } /** diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/tophits/InternalTopHitsTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/tophits/InternalTopHitsTests.java index ba729d3c97..8265933bfb 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/tophits/InternalTopHitsTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/tophits/InternalTopHitsTests.java @@ -122,9 +122,9 @@ public class InternalTopHitsTests extends InternalAggregationTestCase<InternalTo case SCORE: return randomFloat(); case STRING: - return new BytesRef(randomAsciiOfLength(5)); + return new BytesRef(randomAlphaOfLength(5)); case STRING_VAL: - return new BytesRef(randomAsciiOfLength(5)); + return new BytesRef(randomAlphaOfLength(5)); default: throw new UnsupportedOperationException("Unkown SortField.Type: " + type); } @@ -168,7 +168,7 @@ public class InternalTopHitsTests extends InternalAggregationTestCase<InternalTo SortField[] sortFields = new SortField[between(1, 5)]; Set<String> usedSortFields = new HashSet<>(); for (int i = 0; i < sortFields.length; i++) { - String sortField = randomValueOtherThanMany(usedSortFields::contains, () -> randomAsciiOfLength(5)); + String sortField = randomValueOtherThanMany(usedSortFields::contains, () -> randomAlphaOfLength(5)); usedSortFields.add(sortField); SortField.Type type = randomValueOtherThanMany(t -> t == SortField.Type.CUSTOM || t == SortField.Type.REWRITEABLE, () -> randomFrom(SortField.Type.values())); diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptTests.java index d1f3a31677..b6d133f171 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptTests.java @@ -32,11 +32,11 @@ public class BucketScriptTests extends BasePipelineAggregationTestCase<BucketScr @Override protected BucketScriptPipelineAggregationBuilder createTestAggregatorFactory() { - String name = randomAsciiOfLengthBetween(3, 20); + String name = randomAlphaOfLengthBetween(3, 20); Map<String, String> bucketsPaths = new HashMap<>(); int numBucketPaths = randomIntBetween(1, 10); for (int i = 0; i < numBucketPaths; i++) { - bucketsPaths.put(randomAsciiOfLengthBetween(1, 20), randomAsciiOfLengthBetween(1, 40)); + bucketsPaths.put(randomAlphaOfLengthBetween(1, 20), randomAlphaOfLengthBetween(1, 40)); } Script script; if (randomBoolean()) { @@ -52,7 +52,7 @@ public class BucketScriptTests extends BasePipelineAggregationTestCase<BucketScr } BucketScriptPipelineAggregationBuilder factory = new BucketScriptPipelineAggregationBuilder(name, bucketsPaths, script); if (randomBoolean()) { - factory.format(randomAsciiOfLengthBetween(1, 10)); + factory.format(randomAlphaOfLengthBetween(1, 10)); } if (randomBoolean()) { factory.gapPolicy(randomFrom(GapPolicy.values())); diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketSelectorTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketSelectorTests.java index 0311781455..c3e477a3a5 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketSelectorTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketSelectorTests.java @@ -32,11 +32,11 @@ public class BucketSelectorTests extends BasePipelineAggregationTestCase<BucketS @Override protected BucketSelectorPipelineAggregationBuilder createTestAggregatorFactory() { - String name = randomAsciiOfLengthBetween(3, 20); + String name = randomAlphaOfLengthBetween(3, 20); Map<String, String> bucketsPaths = new HashMap<>(); int numBucketPaths = randomIntBetween(1, 10); for (int i = 0; i < numBucketPaths; i++) { - bucketsPaths.put(randomAsciiOfLengthBetween(1, 20), randomAsciiOfLengthBetween(1, 40)); + bucketsPaths.put(randomAlphaOfLengthBetween(1, 20), randomAlphaOfLengthBetween(1, 40)); } Script script; if (randomBoolean()) { diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/CumulativeSumTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/CumulativeSumTests.java index 07cd9010ed..3b1514a8c3 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/CumulativeSumTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/CumulativeSumTests.java @@ -26,11 +26,11 @@ public class CumulativeSumTests extends BasePipelineAggregationTestCase<Cumulati @Override protected CumulativeSumPipelineAggregationBuilder createTestAggregatorFactory() { - String name = randomAsciiOfLengthBetween(3, 20); - String bucketsPath = randomAsciiOfLengthBetween(3, 20); + String name = randomAlphaOfLengthBetween(3, 20); + String bucketsPath = randomAlphaOfLengthBetween(3, 20); CumulativeSumPipelineAggregationBuilder factory = new CumulativeSumPipelineAggregationBuilder(name, bucketsPath); if (randomBoolean()) { - factory.format(randomAsciiOfLengthBetween(1, 10)); + factory.format(randomAlphaOfLengthBetween(1, 10)); } return factory; } diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/DerivativeTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/DerivativeTests.java index 678bb0b5c4..4b98e2ee6b 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/DerivativeTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/DerivativeTests.java @@ -27,11 +27,11 @@ public class DerivativeTests extends BasePipelineAggregationTestCase<DerivativeP @Override protected DerivativePipelineAggregationBuilder createTestAggregatorFactory() { - String name = randomAsciiOfLengthBetween(3, 20); - String bucketsPath = randomAsciiOfLengthBetween(3, 20); + String name = randomAlphaOfLengthBetween(3, 20); + String bucketsPath = randomAlphaOfLengthBetween(3, 20); DerivativePipelineAggregationBuilder factory = new DerivativePipelineAggregationBuilder(name, bucketsPath); if (randomBoolean()) { - factory.format(randomAsciiOfLengthBetween(1, 10)); + factory.format(randomAlphaOfLengthBetween(1, 10)); } if (randomBoolean()) { factory.gapPolicy(randomFrom(GapPolicy.values())); diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/SerialDifferenceTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/SerialDifferenceTests.java index 01b3174382..7e71be69b6 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/SerialDifferenceTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/SerialDifferenceTests.java @@ -27,11 +27,11 @@ public class SerialDifferenceTests extends BasePipelineAggregationTestCase<Seria @Override protected SerialDiffPipelineAggregationBuilder createTestAggregatorFactory() { - String name = randomAsciiOfLengthBetween(3, 20); - String bucketsPath = randomAsciiOfLengthBetween(3, 20); + String name = randomAlphaOfLengthBetween(3, 20); + String bucketsPath = randomAlphaOfLengthBetween(3, 20); SerialDiffPipelineAggregationBuilder factory = new SerialDiffPipelineAggregationBuilder(name, bucketsPath); if (randomBoolean()) { - factory.format(randomAsciiOfLengthBetween(1, 10)); + factory.format(randomAlphaOfLengthBetween(1, 10)); } if (randomBoolean()) { factory.gapPolicy(randomFrom(GapPolicy.values())); diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/AbstractBucketMetricsTestCase.java b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/AbstractBucketMetricsTestCase.java index 13ed4027b3..2b53a236c3 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/AbstractBucketMetricsTestCase.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/AbstractBucketMetricsTestCase.java @@ -27,11 +27,11 @@ public abstract class AbstractBucketMetricsTestCase<PAF extends BucketMetricsPip @Override protected final PAF createTestAggregatorFactory() { - String name = randomAsciiOfLengthBetween(3, 20); - String bucketsPath = randomAsciiOfLengthBetween(3, 20); + String name = randomAlphaOfLengthBetween(3, 20); + String bucketsPath = randomAlphaOfLengthBetween(3, 20); PAF factory = doCreateTestAggregatorFactory(name, bucketsPath); if (randomBoolean()) { - factory.format(randomAsciiOfLengthBetween(1, 10)); + factory.format(randomAlphaOfLengthBetween(1, 10)); } if (randomBoolean()) { factory.gapPolicy(randomFrom(GapPolicy.values())); diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgTests.java index cb9d99e07c..869a7cd58e 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgTests.java @@ -35,11 +35,11 @@ public class MovAvgTests extends BasePipelineAggregationTestCase<MovAvgPipelineA @Override protected MovAvgPipelineAggregationBuilder createTestAggregatorFactory() { - String name = randomAsciiOfLengthBetween(3, 20); - String bucketsPath = randomAsciiOfLengthBetween(3, 20); + String name = randomAlphaOfLengthBetween(3, 20); + String bucketsPath = randomAlphaOfLengthBetween(3, 20); MovAvgPipelineAggregationBuilder factory = new MovAvgPipelineAggregationBuilder(name, bucketsPath); if (randomBoolean()) { - factory.format(randomAsciiOfLengthBetween(1, 10)); + factory.format(randomAlphaOfLengthBetween(1, 10)); } if (randomBoolean()) { factory.gapPolicy(randomFrom(GapPolicy.values())); |