diff options
Diffstat (limited to 'core/src/test/java/org/elasticsearch/search')
82 files changed, 229 insertions, 235 deletions
diff --git a/core/src/test/java/org/elasticsearch/search/AbstractSearchTestCase.java b/core/src/test/java/org/elasticsearch/search/AbstractSearchTestCase.java index ba4c794a09..5fe9d9d75f 100644 --- a/core/src/test/java/org/elasticsearch/search/AbstractSearchTestCase.java +++ b/core/src/test/java/org/elasticsearch/search/AbstractSearchTestCase.java @@ -83,7 +83,7 @@ public abstract class AbstractSearchTestCase extends ESTestCase { } List<SearchExtBuilder> searchExtBuilders = new ArrayList<>(); for (String elementName : elementNames) { - searchExtBuilders.add(searchExtPlugin.getSupportedElements().get(elementName).apply(randomAsciiOfLengthBetween(3, 10))); + searchExtBuilders.add(searchExtPlugin.getSupportedElements().get(elementName).apply(randomAlphaOfLengthBetween(3, 10))); } return searchExtBuilders; }; diff --git a/core/src/test/java/org/elasticsearch/search/NestedIdentityTests.java b/core/src/test/java/org/elasticsearch/search/NestedIdentityTests.java index b062ace0f2..3e5943951a 100644 --- a/core/src/test/java/org/elasticsearch/search/NestedIdentityTests.java +++ b/core/src/test/java/org/elasticsearch/search/NestedIdentityTests.java @@ -40,7 +40,7 @@ import static org.elasticsearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashC public class NestedIdentityTests extends ESTestCase { public static NestedIdentity createTestItem(int depth) { - String field = frequently() ? randomAsciiOfLengthBetween(1, 20) : randomRealisticUnicodeOfCodepointLengthBetween(1, 20); + String field = frequently() ? randomAlphaOfLengthBetween(1, 20) : randomRealisticUnicodeOfCodepointLengthBetween(1, 20); int offset = randomInt(10); NestedIdentity child = null; if (depth > 0) { diff --git a/core/src/test/java/org/elasticsearch/search/SearchHitTests.java b/core/src/test/java/org/elasticsearch/search/SearchHitTests.java index f03190203b..84d40f0b9b 100644 --- a/core/src/test/java/org/elasticsearch/search/SearchHitTests.java +++ b/core/src/test/java/org/elasticsearch/search/SearchHitTests.java @@ -61,8 +61,8 @@ public class SearchHitTests extends ESTestCase { public static SearchHit createTestItem(boolean withOptionalInnerHits) { int internalId = randomInt(); - String uid = randomAsciiOfLength(10); - Text type = new Text(randomAsciiOfLengthBetween(5, 10)); + String uid = randomAlphaOfLength(10); + Text type = new Text(randomAlphaOfLengthBetween(5, 10)); NestedIdentity nestedIdentity = null; if (randomBoolean()) { nestedIdentity = NestedIdentityTests.createTestItem(randomIntBetween(0, 2)); @@ -77,7 +77,7 @@ public class SearchHitTests extends ESTestCase { String metaField = randomFrom(META_FIELDS); fields.put(metaField, new SearchHitField(metaField, values.v1())); } else { - String fieldName = randomAsciiOfLengthBetween(5, 10); + String fieldName = randomAlphaOfLengthBetween(5, 10); fields.put(fieldName, new SearchHitField(fieldName, values.v1())); } } @@ -103,7 +103,7 @@ public class SearchHitTests extends ESTestCase { int size = randomIntBetween(0, 5); Map<String, HighlightField> highlightFields = new HashMap<>(size); for (int i = 0; i < size; i++) { - highlightFields.put(randomAsciiOfLength(5), HighlightFieldTests.createTestItem()); + highlightFields.put(randomAlphaOfLength(5), HighlightFieldTests.createTestItem()); } hit.highlightFields(highlightFields); } @@ -111,7 +111,7 @@ public class SearchHitTests extends ESTestCase { int size = randomIntBetween(0, 5); String[] matchedQueries = new String[size]; for (int i = 0; i < size; i++) { - matchedQueries[i] = randomAsciiOfLength(5); + matchedQueries[i] = randomAlphaOfLength(5); } hit.matchedQueries(matchedQueries); } @@ -122,13 +122,13 @@ public class SearchHitTests extends ESTestCase { int innerHitsSize = randomIntBetween(0, 3); Map<String, SearchHits> innerHits = new HashMap<>(innerHitsSize); for (int i = 0; i < innerHitsSize; i++) { - innerHits.put(randomAsciiOfLength(5), SearchHitsTests.createTestItem()); + innerHits.put(randomAlphaOfLength(5), SearchHitsTests.createTestItem()); } hit.setInnerHits(innerHits); } if (randomBoolean()) { - hit.shard(new SearchShardTarget(randomAsciiOfLengthBetween(5, 10), - new ShardId(new Index(randomAsciiOfLengthBetween(5, 10), randomAsciiOfLengthBetween(5, 10)), randomInt()))); + hit.shard(new SearchShardTarget(randomAlphaOfLengthBetween(5, 10), + new ShardId(new Index(randomAlphaOfLengthBetween(5, 10), randomAlphaOfLengthBetween(5, 10)), randomInt()))); } return hit; } @@ -234,7 +234,7 @@ public class SearchHitTests extends ESTestCase { } private static Explanation createExplanation(int depth) { - String description = randomAsciiOfLengthBetween(5, 20); + String description = randomAlphaOfLengthBetween(5, 20); float value = randomFloat(); List<Explanation> details = new ArrayList<>(); if (depth > 0) { diff --git a/core/src/test/java/org/elasticsearch/search/SearchRequestTests.java b/core/src/test/java/org/elasticsearch/search/SearchRequestTests.java index 9e58bf2674..47fc61fb6a 100644 --- a/core/src/test/java/org/elasticsearch/search/SearchRequestTests.java +++ b/core/src/test/java/org/elasticsearch/search/SearchRequestTests.java @@ -87,12 +87,12 @@ public class SearchRequestTests extends AbstractSearchTestCase { private SearchRequest mutate(SearchRequest searchRequest) throws IOException { SearchRequest mutation = copyRequest(searchRequest); List<Runnable> mutators = new ArrayList<>(); - mutators.add(() -> mutation.indices(ArrayUtils.concat(searchRequest.indices(), new String[] { randomAsciiOfLength(10) }))); + mutators.add(() -> mutation.indices(ArrayUtils.concat(searchRequest.indices(), new String[] { randomAlphaOfLength(10) }))); mutators.add(() -> mutation.indicesOptions(randomValueOtherThan(searchRequest.indicesOptions(), () -> IndicesOptions.fromOptions(randomBoolean(), randomBoolean(), randomBoolean(), randomBoolean())))); - mutators.add(() -> mutation.types(ArrayUtils.concat(searchRequest.types(), new String[] { randomAsciiOfLength(10) }))); - mutators.add(() -> mutation.preference(randomValueOtherThan(searchRequest.preference(), () -> randomAsciiOfLengthBetween(3, 10)))); - mutators.add(() -> mutation.routing(randomValueOtherThan(searchRequest.routing(), () -> randomAsciiOfLengthBetween(3, 10)))); + mutators.add(() -> mutation.types(ArrayUtils.concat(searchRequest.types(), new String[] { randomAlphaOfLength(10) }))); + mutators.add(() -> mutation.preference(randomValueOtherThan(searchRequest.preference(), () -> randomAlphaOfLengthBetween(3, 10)))); + mutators.add(() -> mutation.routing(randomValueOtherThan(searchRequest.routing(), () -> randomAlphaOfLengthBetween(3, 10)))); mutators.add(() -> mutation.requestCache((randomValueOtherThan(searchRequest.requestCache(), () -> randomBoolean())))); mutators.add(() -> mutation .scroll(randomValueOtherThan(searchRequest.scroll(), () -> new Scroll(new TimeValue(randomNonNegativeLong() % 100000))))); diff --git a/core/src/test/java/org/elasticsearch/search/SearchSortValuesTests.java b/core/src/test/java/org/elasticsearch/search/SearchSortValuesTests.java index 96733a2ac6..654b3c9861 100644 --- a/core/src/test/java/org/elasticsearch/search/SearchSortValuesTests.java +++ b/core/src/test/java/org/elasticsearch/search/SearchSortValuesTests.java @@ -52,7 +52,7 @@ public class SearchSortValuesTests extends ESTestCase { valueSuppliers.add(() -> randomByte()); valueSuppliers.add(() -> randomShort()); valueSuppliers.add(() -> randomBoolean()); - valueSuppliers.add(() -> frequently() ? randomAsciiOfLengthBetween(1, 30) : randomRealisticUnicodeOfCodepointLength(30)); + valueSuppliers.add(() -> frequently() ? randomAlphaOfLengthBetween(1, 30) : randomRealisticUnicodeOfCodepointLength(30)); int size = randomIntBetween(1, 20); Object[] values = new Object[size]; 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())); diff --git a/core/src/test/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexIT.java b/core/src/test/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexIT.java index 96f6f055a3..c83b3ccc9e 100644 --- a/core/src/test/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexIT.java +++ b/core/src/test/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexIT.java @@ -56,11 +56,11 @@ public class SearchWhileCreatingIndexIT extends ESIntegTestCase { // TODO: randomize the wait for active shards value on index creation and ensure the appropriate // number of data nodes are started for the randomized active shard count value - String id = randomAsciiOfLength(5); + String id = randomAlphaOfLength(5); // we will go the primary or the replica, but in a // randomized re-creatable manner int counter = 0; - String preference = randomAsciiOfLength(5); + String preference = randomAlphaOfLength(5); logger.info("running iteration for id {}, preference {}", id, preference); diff --git a/core/src/test/java/org/elasticsearch/search/collapse/CollapseBuilderTests.java b/core/src/test/java/org/elasticsearch/search/collapse/CollapseBuilderTests.java index 0fe957e879..e8d8af2502 100644 --- a/core/src/test/java/org/elasticsearch/search/collapse/CollapseBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/search/collapse/CollapseBuilderTests.java @@ -67,7 +67,7 @@ public class CollapseBuilderTests extends AbstractWireSerializingTestCase { } public static CollapseBuilder randomCollapseBuilder() { - CollapseBuilder builder = new CollapseBuilder(randomAsciiOfLength(10)); + CollapseBuilder builder = new CollapseBuilder(randomAlphaOfLength(10)); builder.setMaxConcurrentGroupRequests(randomIntBetween(1, 48)); if (randomBoolean()) { InnerHitBuilder innerHit = InnerHitBuilderTests.randomInnerHits(false, false); diff --git a/core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilderTests.java b/core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilderTests.java index e33b201bf2..ddd24fdee9 100644 --- a/core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilderTests.java @@ -262,7 +262,7 @@ public class HighlightBuilderTests extends ESTestCase { public void testBuildSearchContextHighlight() throws IOException { Settings indexSettings = Settings.builder() .put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT).build(); - Index index = new Index(randomAsciiOfLengthBetween(1, 10), "_na_"); + Index index = new Index(randomAlphaOfLengthBetween(1, 10), "_na_"); IndexSettings idxSettings = IndexSettingsModule.newIndexSettings(index, indexSettings); // shard context will only need indicesQueriesRegistry for building Query objects nested in highlighter QueryShardContext mockShardContext = new QueryShardContext(0, idxSettings, null, null, null, null, null, xContentRegistry(), @@ -496,7 +496,7 @@ public class HighlightBuilderTests extends ESTestCase { } int numberOfFields = randomIntBetween(1,5); for (int i = 0; i < numberOfFields; i++) { - Field field = new Field(i + "_" + randomAsciiOfLengthBetween(1, 10)); + Field field = new Field(i + "_" + randomAlphaOfLengthBetween(1, 10)); setRandomCommonOptions(field); if (randomBoolean()) { field.fragmentOffset(randomIntBetween(1, 100)); @@ -523,10 +523,10 @@ public class HighlightBuilderTests extends ESTestCase { highlightBuilder.numOfFragments(randomIntBetween(0, 10)); } if (randomBoolean()) { - highlightBuilder.highlighterType(randomAsciiOfLengthBetween(1, 10)); + highlightBuilder.highlighterType(randomAlphaOfLengthBetween(1, 10)); } if (randomBoolean()) { - highlightBuilder.fragmenter(randomAsciiOfLengthBetween(1, 10)); + highlightBuilder.fragmenter(randomAlphaOfLengthBetween(1, 10)); } if (randomBoolean()) { QueryBuilder highlightQuery; @@ -539,7 +539,7 @@ public class HighlightBuilderTests extends ESTestCase { break; default: case 2: - highlightQuery = new TermQueryBuilder(randomAsciiOfLengthBetween(1, 10), randomAsciiOfLengthBetween(1, 10)); + highlightQuery = new TermQueryBuilder(randomAlphaOfLengthBetween(1, 10), randomAlphaOfLengthBetween(1, 10)); break; } highlightQuery.boost((float) randomDoubleBetween(0, 10, false)); @@ -571,7 +571,7 @@ public class HighlightBuilderTests extends ESTestCase { highlightBuilder.boundaryMaxScan(randomIntBetween(0, 10)); } if (randomBoolean()) { - highlightBuilder.boundaryChars(randomAsciiOfLengthBetween(1, 10).toCharArray()); + highlightBuilder.boundaryChars(randomAlphaOfLengthBetween(1, 10).toCharArray()); } if (randomBoolean()) { highlightBuilder.boundaryScannerLocale(randomLocale(random()).toLanguageTag()); @@ -589,7 +589,7 @@ public class HighlightBuilderTests extends ESTestCase { Object value = null; switch (randomInt(2)) { case 0: - value = randomAsciiOfLengthBetween(1, 10); + value = randomAlphaOfLengthBetween(1, 10); break; case 1: value = new Integer(randomInt(1000)); @@ -598,7 +598,7 @@ public class HighlightBuilderTests extends ESTestCase { value = new Boolean(randomBoolean()); break; } - options.put(randomAsciiOfLengthBetween(1, 10), value); + options.put(randomAlphaOfLengthBetween(1, 10), value); } } if (randomBoolean()) { @@ -622,13 +622,13 @@ public class HighlightBuilderTests extends ESTestCase { highlightBuilder.numOfFragments(randomIntBetween(11, 20)); break; case 5: - highlightBuilder.highlighterType(randomAsciiOfLengthBetween(11, 20)); + highlightBuilder.highlighterType(randomAlphaOfLengthBetween(11, 20)); break; case 6: - highlightBuilder.fragmenter(randomAsciiOfLengthBetween(11, 20)); + highlightBuilder.fragmenter(randomAlphaOfLengthBetween(11, 20)); break; case 7: - highlightBuilder.highlightQuery(new TermQueryBuilder(randomAsciiOfLengthBetween(11, 20), randomAsciiOfLengthBetween(11, 20))); + highlightBuilder.highlightQuery(new TermQueryBuilder(randomAlphaOfLengthBetween(11, 20), randomAlphaOfLengthBetween(11, 20))); break; case 8: if (highlightBuilder.order() == Order.NONE) { @@ -647,7 +647,7 @@ public class HighlightBuilderTests extends ESTestCase { highlightBuilder.boundaryMaxScan(randomIntBetween(11, 20)); break; case 12: - highlightBuilder.boundaryChars(randomAsciiOfLengthBetween(11, 20).toCharArray()); + highlightBuilder.boundaryChars(randomAlphaOfLengthBetween(11, 20).toCharArray()); break; case 13: highlightBuilder.noMatchSize(randomIntBetween(11, 20)); @@ -659,7 +659,7 @@ public class HighlightBuilderTests extends ESTestCase { int items = 6; Map<String, Object> options = new HashMap<>(items); for (int i = 0; i < items; i++) { - options.put(randomAsciiOfLengthBetween(1, 10), randomAsciiOfLengthBetween(1, 10)); + options.put(randomAlphaOfLengthBetween(1, 10), randomAlphaOfLengthBetween(1, 10)); } highlightBuilder.options(options); break; @@ -685,7 +685,7 @@ public class HighlightBuilderTests extends ESTestCase { int size = randomIntBetween(minSize, maxSize); Set<String> randomStrings = new HashSet<>(size); for (int f = 0; f < size; f++) { - randomStrings.add(randomAsciiOfLengthBetween(3, 10)); + randomStrings.add(randomAlphaOfLengthBetween(3, 10)); } return randomStrings.toArray(new String[randomStrings.size()]); } @@ -703,11 +703,11 @@ public class HighlightBuilderTests extends ESTestCase { case 0: mutation.useExplicitFieldOrder(!original.useExplicitFieldOrder()); break; case 1: - mutation.encoder(original.encoder() + randomAsciiOfLength(2)); break; + mutation.encoder(original.encoder() + randomAlphaOfLength(2)); break; case 2: if (randomBoolean()) { // add another field - mutation.field(new Field(randomAsciiOfLength(10))); + mutation.field(new Field(randomAlphaOfLength(10))); } else { // change existing fields List<Field> originalFields = original.fields(); diff --git a/core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightFieldTests.java b/core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightFieldTests.java index 027ae53a23..b4bf2950b7 100644 --- a/core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightFieldTests.java +++ b/core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightFieldTests.java @@ -38,14 +38,14 @@ import static org.elasticsearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashC public class HighlightFieldTests extends ESTestCase { public static HighlightField createTestItem() { - String name = frequently() ? randomAsciiOfLengthBetween(5, 20) : randomRealisticUnicodeOfCodepointLengthBetween(5, 20); + String name = frequently() ? randomAlphaOfLengthBetween(5, 20) : randomRealisticUnicodeOfCodepointLengthBetween(5, 20); Text[] fragments = null; if (frequently()) { int size = randomIntBetween(0, 5); fragments = new Text[size]; for (int i = 0; i < size; i++) { fragments[i] = new Text( - frequently() ? randomAsciiOfLengthBetween(10, 30) : randomRealisticUnicodeOfCodepointLengthBetween(10, 30)); + frequently() ? randomAlphaOfLengthBetween(10, 30) : randomRealisticUnicodeOfCodepointLengthBetween(10, 30)); } } return new HighlightField(name, fragments); diff --git a/core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlighterSearchIT.java b/core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlighterSearchIT.java index 11496309d4..c0c52928d2 100644 --- a/core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlighterSearchIT.java +++ b/core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlighterSearchIT.java @@ -2761,7 +2761,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { for (int i = 0; i < COUNT; i++) { //generating text with word to highlight in a different position //(https://github.com/elastic/elasticsearch/issues/4103) - String prefix = randomAsciiOfLengthBetween(5, 30); + String prefix = randomAlphaOfLengthBetween(5, 30); prefixes.put(String.valueOf(i), prefix); indexRequestBuilders[i] = client().prepareIndex("test", "type1", Integer.toString(i)).setSource("field1", "Sentence " + prefix + " test. Sentence two."); diff --git a/core/src/test/java/org/elasticsearch/search/internal/ShardSearchTransportRequestTests.java b/core/src/test/java/org/elasticsearch/search/internal/ShardSearchTransportRequestTests.java index d0132cca7a..b93b3795cb 100644 --- a/core/src/test/java/org/elasticsearch/search/internal/ShardSearchTransportRequestTests.java +++ b/core/src/test/java/org/elasticsearch/search/internal/ShardSearchTransportRequestTests.java @@ -87,7 +87,7 @@ public class ShardSearchTransportRequestTests extends AbstractSearchTestCase { private ShardSearchTransportRequest createShardSearchTransportRequest() throws IOException { SearchRequest searchRequest = createSearchRequest(); - ShardId shardId = new ShardId(randomAsciiOfLengthBetween(2, 10), randomAsciiOfLengthBetween(2, 10), randomInt()); + ShardId shardId = new ShardId(randomAlphaOfLengthBetween(2, 10), randomAlphaOfLengthBetween(2, 10), randomInt()); final AliasFilter filteringAliases; if (randomBoolean()) { String[] strings = generateRandomStringArray(10, 10, false, false); diff --git a/core/src/test/java/org/elasticsearch/search/profile/ProfileResultTests.java b/core/src/test/java/org/elasticsearch/search/profile/ProfileResultTests.java index fddbd6eaae..70375c6d20 100644 --- a/core/src/test/java/org/elasticsearch/search/profile/ProfileResultTests.java +++ b/core/src/test/java/org/elasticsearch/search/profile/ProfileResultTests.java @@ -41,8 +41,8 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertToXC public class ProfileResultTests extends ESTestCase { public static ProfileResult createTestItem(int depth) { - String type = randomAsciiOfLengthBetween(5, 10); - String description = randomAsciiOfLengthBetween(5, 10); + String type = randomAlphaOfLengthBetween(5, 10); + String description = randomAlphaOfLengthBetween(5, 10); int timingsSize = randomIntBetween(0, 5); Map<String, Long> timings = new HashMap<>(timingsSize); for (int i = 0; i < timingsSize; i++) { @@ -51,7 +51,7 @@ public class ProfileResultTests extends ESTestCase { // also often use "small" values in tests time = randomNonNegativeLong() % 10000; } - timings.put(randomAsciiOfLengthBetween(5, 10), time); // don't overflow Long.MAX_VALUE; + timings.put(randomAlphaOfLengthBetween(5, 10), time); // don't overflow Long.MAX_VALUE; } int childrenSize = depth > 0 ? randomIntBetween(0, 1) : 0; List<ProfileResult> children = new ArrayList<>(childrenSize); diff --git a/core/src/test/java/org/elasticsearch/search/profile/SearchProfileShardResultsTests.java b/core/src/test/java/org/elasticsearch/search/profile/SearchProfileShardResultsTests.java index 2d9cf84786..82ed118f55 100644 --- a/core/src/test/java/org/elasticsearch/search/profile/SearchProfileShardResultsTests.java +++ b/core/src/test/java/org/elasticsearch/search/profile/SearchProfileShardResultsTests.java @@ -51,7 +51,7 @@ public class SearchProfileShardResultsTests extends ESTestCase { queryProfileResults.add(QueryProfileShardResultTests.createTestItem()); } AggregationProfileShardResult aggProfileShardResult = AggregationProfileShardResultTests.createTestItem(1); - searchProfileResults.put(randomAsciiOfLengthBetween(5, 10), new ProfileShardResult(queryProfileResults, aggProfileShardResult)); + searchProfileResults.put(randomAlphaOfLengthBetween(5, 10), new ProfileShardResult(queryProfileResults, aggProfileShardResult)); } return new SearchProfileShardResults(searchProfileResults); } diff --git a/core/src/test/java/org/elasticsearch/search/profile/aggregation/AggregationProfilerIT.java b/core/src/test/java/org/elasticsearch/search/profile/aggregation/AggregationProfilerIT.java index 342da16f50..b09c177bf0 100644 --- a/core/src/test/java/org/elasticsearch/search/profile/aggregation/AggregationProfilerIT.java +++ b/core/src/test/java/org/elasticsearch/search/profile/aggregation/AggregationProfilerIT.java @@ -28,8 +28,6 @@ import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregator; import org.elasticsearch.search.aggregations.metrics.max.MaxAggregator; import org.elasticsearch.search.profile.ProfileResult; import org.elasticsearch.search.profile.ProfileShardResult; -import org.elasticsearch.search.profile.aggregation.AggregationProfileShardResult; -import org.elasticsearch.search.profile.aggregation.AggregationTimingType; import org.elasticsearch.test.ESIntegTestCase; import java.util.ArrayList; import java.util.List; @@ -68,7 +66,7 @@ public class AggregationProfilerIT extends ESIntegTestCase { String[] randomStrings = new String[randomIntBetween(2, 10)]; for (int i = 0; i < randomStrings.length; i++) { - randomStrings[i] = randomAsciiOfLength(10); + randomStrings[i] = randomAlphaOfLength(10); } for (int i = 0; i < 5; i++) { diff --git a/core/src/test/java/org/elasticsearch/search/profile/query/CollectorResultTests.java b/core/src/test/java/org/elasticsearch/search/profile/query/CollectorResultTests.java index 43e1e32db3..698e4a387a 100644 --- a/core/src/test/java/org/elasticsearch/search/profile/query/CollectorResultTests.java +++ b/core/src/test/java/org/elasticsearch/search/profile/query/CollectorResultTests.java @@ -39,8 +39,8 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertToXC public class CollectorResultTests extends ESTestCase { public static CollectorResult createTestItem(int depth) { - String name = randomAsciiOfLengthBetween(5, 10); - String reason = randomAsciiOfLengthBetween(5, 10); + String name = randomAlphaOfLengthBetween(5, 10); + String reason = randomAlphaOfLengthBetween(5, 10); long time = randomNonNegativeLong(); if (randomBoolean()) { // also often use relatively "small" values, otherwise we will mostly test huge longs diff --git a/core/src/test/java/org/elasticsearch/search/query/MultiMatchQueryIT.java b/core/src/test/java/org/elasticsearch/search/query/MultiMatchQueryIT.java index 2002e7ce50..7ae22485df 100644 --- a/core/src/test/java/org/elasticsearch/search/query/MultiMatchQueryIT.java +++ b/core/src/test/java/org/elasticsearch/search/query/MultiMatchQueryIT.java @@ -720,7 +720,7 @@ public class MultiMatchQueryIT extends ESIntegTestCase { private static List<String> fillRandom(List<String> list, int times) { for (int i = 0; i < times; i++) { - list.add(randomAsciiOfLength(5)); + list.add(randomAlphaOfLength(5)); } return list; } diff --git a/core/src/test/java/org/elasticsearch/search/rescore/QueryRescoreBuilderTests.java b/core/src/test/java/org/elasticsearch/search/rescore/QueryRescoreBuilderTests.java index 53277bd5b3..ee68ea6003 100644 --- a/core/src/test/java/org/elasticsearch/search/rescore/QueryRescoreBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/search/rescore/QueryRescoreBuilderTests.java @@ -135,7 +135,7 @@ public class QueryRescoreBuilderTests extends ESTestCase { final long nowInMillis = randomNonNegativeLong(); Settings indexSettings = Settings.builder() .put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT).build(); - IndexSettings idxSettings = IndexSettingsModule.newIndexSettings(randomAsciiOfLengthBetween(1, 10), indexSettings); + IndexSettings idxSettings = IndexSettingsModule.newIndexSettings(randomAlphaOfLengthBetween(1, 10), indexSettings); // shard context will only need indicesQueriesRegistry for building Query objects nested in query rescorer QueryShardContext mockShardContext = new QueryShardContext(0, idxSettings, null, null, null, null, null, xContentRegistry(), null, null, () -> nowInMillis) { @@ -303,7 +303,7 @@ public class QueryRescoreBuilderTests extends ESTestCase { */ public static QueryRescorerBuilder randomRescoreBuilder() { QueryBuilder queryBuilder = new MatchAllQueryBuilder().boost(randomFloat()) - .queryName(randomAsciiOfLength(20)); + .queryName(randomAlphaOfLength(20)); org.elasticsearch.search.rescore.QueryRescorerBuilder rescorer = new org.elasticsearch.search.rescore.QueryRescorerBuilder(queryBuilder); if (randomBoolean()) { diff --git a/core/src/test/java/org/elasticsearch/search/searchafter/SearchAfterBuilderTests.java b/core/src/test/java/org/elasticsearch/search/searchafter/SearchAfterBuilderTests.java index cb45208a39..2179444aad 100644 --- a/core/src/test/java/org/elasticsearch/search/searchafter/SearchAfterBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/search/searchafter/SearchAfterBuilderTests.java @@ -58,7 +58,7 @@ public class SearchAfterBuilderTests extends ESTestCase { values[i] = randomDouble(); break; case 4: - values[i] = randomAsciiOfLengthBetween(5, 20); + values[i] = randomAlphaOfLengthBetween(5, 20); break; case 5: values[i] = randomBoolean(); @@ -70,7 +70,7 @@ public class SearchAfterBuilderTests extends ESTestCase { values[i] = randomShort(); break; case 8: - values[i] = new Text(randomAsciiOfLengthBetween(5, 20)); + values[i] = new Text(randomAlphaOfLengthBetween(5, 20)); break; case 9: values[i] = null; @@ -106,7 +106,7 @@ public class SearchAfterBuilderTests extends ESTestCase { jsonBuilder.value(randomDouble()); break; case 4: - jsonBuilder.value(randomAsciiOfLengthBetween(5, 20)); + jsonBuilder.value(randomAlphaOfLengthBetween(5, 20)); break; case 5: jsonBuilder.value(randomBoolean()); @@ -118,7 +118,7 @@ public class SearchAfterBuilderTests extends ESTestCase { jsonBuilder.value(randomShort()); break; case 8: - jsonBuilder.value(new Text(randomAsciiOfLengthBetween(5, 20))); + jsonBuilder.value(new Text(randomAlphaOfLengthBetween(5, 20))); break; case 9: jsonBuilder.nullValue(); diff --git a/core/src/test/java/org/elasticsearch/search/searchafter/SearchAfterIT.java b/core/src/test/java/org/elasticsearch/search/searchafter/SearchAfterIT.java index 05a5c4acbe..76faac7341 100644 --- a/core/src/test/java/org/elasticsearch/search/searchafter/SearchAfterIT.java +++ b/core/src/test/java/org/elasticsearch/search/searchafter/SearchAfterIT.java @@ -31,7 +31,6 @@ import org.elasticsearch.search.SearchContextException; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.sort.SortOrder; import org.elasticsearch.test.ESIntegTestCase; -import org.elasticsearch.transport.RemoteTransportException; import org.hamcrest.Matchers; import java.util.List; @@ -201,7 +200,7 @@ public class SearchAfterIT extends ESIntegTestCase { values.add(randomDouble()); break; case 6: - values.add(randomAsciiOfLengthBetween(5, 20)); + values.add(randomAlphaOfLengthBetween(5, 20)); break; } } diff --git a/core/src/test/java/org/elasticsearch/search/slice/SearchSliceIT.java b/core/src/test/java/org/elasticsearch/search/slice/SearchSliceIT.java index aad6aa0982..aa166f6e1a 100644 --- a/core/src/test/java/org/elasticsearch/search/slice/SearchSliceIT.java +++ b/core/src/test/java/org/elasticsearch/search/slice/SearchSliceIT.java @@ -83,7 +83,7 @@ public class SearchSliceIT extends ESIntegTestCase { for (int i = 0; i < NUM_DOCS; i++) { XContentBuilder builder = jsonBuilder(); builder.startObject(); - builder.field("invalid_random_kw", randomAsciiOfLengthBetween(5, 20)); + builder.field("invalid_random_kw", randomAlphaOfLengthBetween(5, 20)); builder.field("random_int", randomInt()); builder.field("static_int", 0); builder.field("invalid_random_int", randomInt()); diff --git a/core/src/test/java/org/elasticsearch/search/slice/SliceBuilderTests.java b/core/src/test/java/org/elasticsearch/search/slice/SliceBuilderTests.java index 9de5ee2a58..f7ba4286c2 100644 --- a/core/src/test/java/org/elasticsearch/search/slice/SliceBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/search/slice/SliceBuilderTests.java @@ -64,7 +64,7 @@ public class SliceBuilderTests extends ESTestCase { private static SliceBuilder randomSliceBuilder() throws IOException { int max = randomIntBetween(2, MAX_SLICE); int id = randomIntBetween(1, max - 1); - String field = randomAsciiOfLengthBetween(5, 20); + String field = randomAlphaOfLengthBetween(5, 20); return new SliceBuilder(field, id, max); } diff --git a/core/src/test/java/org/elasticsearch/search/sort/AbstractSortTestCase.java b/core/src/test/java/org/elasticsearch/search/sort/AbstractSortTestCase.java index 17c60152aa..6f1087561c 100644 --- a/core/src/test/java/org/elasticsearch/search/sort/AbstractSortTestCase.java +++ b/core/src/test/java/org/elasticsearch/search/sort/AbstractSortTestCase.java @@ -70,7 +70,6 @@ import org.junit.BeforeClass; import java.io.IOException; import java.nio.file.Path; import java.util.Collections; -import java.util.Map; import static java.util.Collections.emptyList; import static org.elasticsearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; @@ -191,7 +190,7 @@ public abstract class AbstractSortTestCase<T extends SortBuilder<T>> extends EST } protected QueryShardContext createMockShardContext() { - Index index = new Index(randomAsciiOfLengthBetween(1, 10), "_na_"); + Index index = new Index(randomAlphaOfLengthBetween(1, 10), "_na_"); IndexSettings idxSettings = IndexSettingsModule.newIndexSettings(index, Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT).build()); IndicesFieldDataCache cache = new IndicesFieldDataCache(Settings.EMPTY, null); @@ -245,7 +244,7 @@ public abstract class AbstractSortTestCase<T extends SortBuilder<T>> extends EST case 0: return (new MatchAllQueryBuilder()).boost(randomFloat()); case 1: return (new IdsQueryBuilder()).boost(randomFloat()); case 2: return (new TermQueryBuilder( - randomAsciiOfLengthBetween(1, 10), + randomAlphaOfLengthBetween(1, 10), randomDouble()).boost(randomFloat())); default: throw new IllegalStateException("Only three query builders supported for testing sort"); } diff --git a/core/src/test/java/org/elasticsearch/search/sort/FieldSortBuilderTests.java b/core/src/test/java/org/elasticsearch/search/sort/FieldSortBuilderTests.java index 55e6b0eabf..57e79ce98c 100644 --- a/core/src/test/java/org/elasticsearch/search/sort/FieldSortBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/search/sort/FieldSortBuilderTests.java @@ -44,7 +44,7 @@ public class FieldSortBuilderTests extends AbstractSortTestCase<FieldSortBuilder public FieldSortBuilder randomFieldSortBuilder() { - String fieldName = rarely() ? FieldSortBuilder.DOC_FIELD_NAME : randomAsciiOfLengthBetween(1, 10); + String fieldName = rarely() ? FieldSortBuilder.DOC_FIELD_NAME : randomAlphaOfLengthBetween(1, 10); FieldSortBuilder builder = new FieldSortBuilder(fieldName); if (randomBoolean()) { builder.order(randomFrom(SortOrder.values())); @@ -55,7 +55,7 @@ public class FieldSortBuilderTests extends AbstractSortTestCase<FieldSortBuilder } if (randomBoolean()) { - builder.unmappedType(randomAsciiOfLengthBetween(1, 10)); + builder.unmappedType(randomAlphaOfLengthBetween(1, 10)); } if (randomBoolean()) { @@ -67,7 +67,7 @@ public class FieldSortBuilderTests extends AbstractSortTestCase<FieldSortBuilder } if (randomBoolean()) { - builder.setNestedPath(randomAsciiOfLengthBetween(1, 10)); + builder.setNestedPath(randomAlphaOfLengthBetween(1, 10)); } return builder; @@ -81,7 +81,7 @@ public class FieldSortBuilderTests extends AbstractSortTestCase<FieldSortBuilder case 0: mutated.setNestedPath(randomValueOtherThan( original.getNestedPath(), - () -> randomAsciiOfLengthBetween(1, 10))); + () -> randomAlphaOfLengthBetween(1, 10))); break; case 1: mutated.setNestedFilter(randomValueOtherThan( @@ -94,7 +94,7 @@ public class FieldSortBuilderTests extends AbstractSortTestCase<FieldSortBuilder case 3: mutated.unmappedType(randomValueOtherThan( original.unmappedType(), - () -> randomAsciiOfLengthBetween(1, 10))); + () -> randomAlphaOfLengthBetween(1, 10))); break; case 4: mutated.missing(randomValueOtherThan(original.missing(), () -> randomFrom(missingContent))); diff --git a/core/src/test/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderTests.java b/core/src/test/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderTests.java index cc0263c31f..99ab42c6e4 100644 --- a/core/src/test/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderTests.java @@ -50,7 +50,7 @@ public class GeoDistanceSortBuilderTests extends AbstractSortTestCase<GeoDistanc } public static GeoDistanceSortBuilder randomGeoDistanceSortBuilder() { - String fieldName = randomAsciiOfLengthBetween(1, 10); + String fieldName = randomAlphaOfLengthBetween(1, 10); GeoDistanceSortBuilder result = null; int id = randomIntBetween(0, 2); @@ -94,7 +94,7 @@ public class GeoDistanceSortBuilderTests extends AbstractSortTestCase<GeoDistanc result.setNestedPath( randomValueOtherThan( result.getNestedPath(), - () -> randomAsciiOfLengthBetween(1, 10))); + () -> randomAlphaOfLengthBetween(1, 10))); } if (randomBoolean()) { result.validation(randomValueOtherThan(result.validation(), () -> randomFrom(GeoValidationMethod.values()))); @@ -166,7 +166,7 @@ public class GeoDistanceSortBuilderTests extends AbstractSortTestCase<GeoDistanc case 7: result.setNestedPath(randomValueOtherThan( result.getNestedPath(), - () -> randomAsciiOfLengthBetween(1, 10))); + () -> randomAlphaOfLengthBetween(1, 10))); break; case 8: result.validation(randomValueOtherThan(result.validation(), () -> randomFrom(GeoValidationMethod.values()))); diff --git a/core/src/test/java/org/elasticsearch/search/sort/ScriptSortBuilderTests.java b/core/src/test/java/org/elasticsearch/search/sort/ScriptSortBuilderTests.java index 1ad5de4071..526be491f3 100644 --- a/core/src/test/java/org/elasticsearch/search/sort/ScriptSortBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/search/sort/ScriptSortBuilderTests.java @@ -43,7 +43,7 @@ public class ScriptSortBuilderTests extends AbstractSortTestCase<ScriptSortBuild public static ScriptSortBuilder randomScriptSortBuilder() { ScriptSortType type = randomBoolean() ? ScriptSortType.NUMBER : ScriptSortType.STRING; - ScriptSortBuilder builder = new ScriptSortBuilder(new Script(randomAsciiOfLengthBetween(5, 10)), + ScriptSortBuilder builder = new ScriptSortBuilder(new Script(randomAlphaOfLengthBetween(5, 10)), type); if (randomBoolean()) { builder.order(randomFrom(SortOrder.values())); @@ -63,7 +63,7 @@ public class ScriptSortBuilderTests extends AbstractSortTestCase<ScriptSortBuild builder.setNestedFilter(randomNestedFilter()); } if (randomBoolean()) { - builder.setNestedPath(randomAsciiOfLengthBetween(1, 10)); + builder.setNestedPath(randomAlphaOfLengthBetween(1, 10)); } return builder; } diff --git a/core/src/test/java/org/elasticsearch/search/sort/SortBuilderTests.java b/core/src/test/java/org/elasticsearch/search/sort/SortBuilderTests.java index cc62e546a3..b1a6af88de 100644 --- a/core/src/test/java/org/elasticsearch/search/sort/SortBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/search/sort/SortBuilderTests.java @@ -189,7 +189,7 @@ public class SortBuilderTests extends ESTestCase { list.add(new ScoreSortBuilder()); break; case 1: - String fieldName = rarely() ? FieldSortBuilder.DOC_FIELD_NAME : randomAsciiOfLengthBetween(1, 10); + String fieldName = rarely() ? FieldSortBuilder.DOC_FIELD_NAME : randomAlphaOfLengthBetween(1, 10); list.add(new FieldSortBuilder(fieldName)); break; case 2: diff --git a/core/src/test/java/org/elasticsearch/search/suggest/AbstractSuggestionBuilderTestCase.java b/core/src/test/java/org/elasticsearch/search/suggest/AbstractSuggestionBuilderTestCase.java index 530a505a69..7fd674486e 100644 --- a/core/src/test/java/org/elasticsearch/search/suggest/AbstractSuggestionBuilderTestCase.java +++ b/core/src/test/java/org/elasticsearch/search/suggest/AbstractSuggestionBuilderTestCase.java @@ -82,10 +82,10 @@ public abstract class AbstractSuggestionBuilderTestCase<SB extends SuggestionBui } public static void setCommonPropertiesOnRandomBuilder(SuggestionBuilder<?> randomSuggestion) { - randomSuggestion.text(randomAsciiOfLengthBetween(2, 20)); // have to set the text because we don't know if the global text was set - maybeSet(randomSuggestion::prefix, randomAsciiOfLengthBetween(2, 20)); - maybeSet(randomSuggestion::regex, randomAsciiOfLengthBetween(2, 20)); - maybeSet(randomSuggestion::analyzer, randomAsciiOfLengthBetween(2, 20)); + randomSuggestion.text(randomAlphaOfLengthBetween(2, 20)); // have to set the text because we don't know if the global text was set + maybeSet(randomSuggestion::prefix, randomAlphaOfLengthBetween(2, 20)); + maybeSet(randomSuggestion::regex, randomAlphaOfLengthBetween(2, 20)); + maybeSet(randomSuggestion::analyzer, randomAlphaOfLengthBetween(2, 20)); maybeSet(randomSuggestion::size, randomIntBetween(1, 20)); maybeSet(randomSuggestion::shardSize, randomIntBetween(1, 20)); } @@ -146,16 +146,16 @@ public abstract class AbstractSuggestionBuilderTestCase<SB extends SuggestionBui if (randomBoolean()) { switch (randomIntBetween(0, 5)) { case 0: - mutation.text(randomValueOtherThan(mutation.text(), () -> randomAsciiOfLengthBetween(2, 20))); + mutation.text(randomValueOtherThan(mutation.text(), () -> randomAlphaOfLengthBetween(2, 20))); break; case 1: - mutation.prefix(randomValueOtherThan(mutation.prefix(), () -> randomAsciiOfLengthBetween(2, 20))); + mutation.prefix(randomValueOtherThan(mutation.prefix(), () -> randomAlphaOfLengthBetween(2, 20))); break; case 2: - mutation.regex(randomValueOtherThan(mutation.regex(), () -> randomAsciiOfLengthBetween(2, 20))); + mutation.regex(randomValueOtherThan(mutation.regex(), () -> randomAlphaOfLengthBetween(2, 20))); break; case 3: - mutation.analyzer(randomValueOtherThan(mutation.analyzer(), () -> randomAsciiOfLengthBetween(2, 20))); + mutation.analyzer(randomValueOtherThan(mutation.analyzer(), () -> randomAlphaOfLengthBetween(2, 20))); break; case 4: mutation.size(randomValueOtherThan(mutation.size(), () -> randomIntBetween(1, 20))); diff --git a/core/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestionOptionTests.java b/core/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestionOptionTests.java index 4e93201a41..9aa4d9dc2b 100644 --- a/core/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestionOptionTests.java +++ b/core/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestionOptionTests.java @@ -42,7 +42,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertToXC public class CompletionSuggestionOptionTests extends ESTestCase { public static Option createTestItem() { - Text text = new Text(randomAsciiOfLengthBetween(5, 15)); + Text text = new Text(randomAlphaOfLengthBetween(5, 15)); int docId = randomInt(); int numberOfContexts = randomIntBetween(0, 3); Map<String, Set<CharSequence>> contexts = new HashMap<>(); @@ -50,9 +50,9 @@ public class CompletionSuggestionOptionTests extends ESTestCase { int numberOfValues = randomIntBetween(0, 3); Set<CharSequence> values = new HashSet<>(); for (int v = 0; v < numberOfValues; v++) { - values.add(randomAsciiOfLengthBetween(5, 15)); + values.add(randomAlphaOfLengthBetween(5, 15)); } - contexts.put(randomAsciiOfLengthBetween(5, 15), values); + contexts.put(randomAlphaOfLengthBetween(5, 15), values); } SearchHit hit = null; float score = randomFloat(); diff --git a/core/src/test/java/org/elasticsearch/search/suggest/ContextCompletionSuggestSearchIT.java b/core/src/test/java/org/elasticsearch/search/suggest/ContextCompletionSuggestSearchIT.java index fa94eabeb5..a3ea5e9932 100644 --- a/core/src/test/java/org/elasticsearch/search/suggest/ContextCompletionSuggestSearchIT.java +++ b/core/src/test/java/org/elasticsearch/search/suggest/ContextCompletionSuggestSearchIT.java @@ -631,7 +631,7 @@ public class ContextCompletionSuggestSearchIT extends ESIntegTestCase { refresh(); - String suggestionName = randomAsciiOfLength(10); + String suggestionName = randomAlphaOfLength(10); CompletionSuggestionBuilder context = SuggestBuilders.completionSuggestion(FIELD).text("h").size(10) .contexts(Collections.singletonMap("st", Collections.singletonList(GeoQueryContext.builder().setGeoPoint(new GeoPoint(52.52, 13.4)).build()))); SearchResponse searchResponse = client().prepareSearch(INDEX).suggest(new SuggestBuilder().addSuggestion(suggestionName, context)).get(); diff --git a/core/src/test/java/org/elasticsearch/search/suggest/CustomSuggesterSearchIT.java b/core/src/test/java/org/elasticsearch/search/suggest/CustomSuggesterSearchIT.java index dde5a73045..d5eee4d3de 100644 --- a/core/src/test/java/org/elasticsearch/search/suggest/CustomSuggesterSearchIT.java +++ b/core/src/test/java/org/elasticsearch/search/suggest/CustomSuggesterSearchIT.java @@ -82,9 +82,9 @@ public class CustomSuggesterSearchIT extends ESIntegTestCase { .endObject()) .setRefreshPolicy(IMMEDIATE).get(); - String randomText = randomAsciiOfLength(10); - String randomField = randomAsciiOfLength(10); - String randomSuffix = randomAsciiOfLength(10); + String randomText = randomAlphaOfLength(10); + String randomField = randomAlphaOfLength(10); + String randomSuffix = randomAlphaOfLength(10); SuggestBuilder suggestBuilder = new SuggestBuilder(); suggestBuilder.addSuggestion("someName", new CustomSuggestionBuilder(randomField, randomSuffix).text(randomText)); SearchRequestBuilder searchRequestBuilder = client().prepareSearch("test").setTypes("test").setFrom(0).setSize(1) diff --git a/core/src/test/java/org/elasticsearch/search/suggest/SuggestBuilderTests.java b/core/src/test/java/org/elasticsearch/search/suggest/SuggestBuilderTests.java index 9029a097ca..61094be8a3 100644 --- a/core/src/test/java/org/elasticsearch/search/suggest/SuggestBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/search/suggest/SuggestBuilderTests.java @@ -129,9 +129,9 @@ public class SuggestBuilderTests extends ESTestCase { mutation.addSuggestion(suggestionBuilder.getKey(), suggestionBuilder.getValue()); } if (randomBoolean()) { - mutation.setGlobalText(randomAsciiOfLengthBetween(5, 60)); + mutation.setGlobalText(randomAlphaOfLengthBetween(5, 60)); } else { - mutation.addSuggestion(randomAsciiOfLength(10), PhraseSuggestionBuilderTests.randomPhraseSuggestionBuilder()); + mutation.addSuggestion(randomAlphaOfLength(10), PhraseSuggestionBuilderTests.randomPhraseSuggestionBuilder()); } return mutation; } @@ -139,11 +139,11 @@ public class SuggestBuilderTests extends ESTestCase { public static SuggestBuilder randomSuggestBuilder() { SuggestBuilder builder = new SuggestBuilder(); if (randomBoolean()) { - builder.setGlobalText(randomAsciiOfLengthBetween(1, 20)); + builder.setGlobalText(randomAlphaOfLengthBetween(1, 20)); } final int numSuggestions = randomIntBetween(1, 5); for (int i = 0; i < numSuggestions; i++) { - builder.addSuggestion(randomAsciiOfLengthBetween(5, 10), randomSuggestionBuilder()); + builder.addSuggestion(randomAlphaOfLengthBetween(5, 10), randomSuggestionBuilder()); } return builder; } diff --git a/core/src/test/java/org/elasticsearch/search/suggest/SuggestTests.java b/core/src/test/java/org/elasticsearch/search/suggest/SuggestTests.java index 24e98899e8..8a6713caf5 100644 --- a/core/src/test/java/org/elasticsearch/search/suggest/SuggestTests.java +++ b/core/src/test/java/org/elasticsearch/search/suggest/SuggestTests.java @@ -125,9 +125,9 @@ public class SuggestTests extends ESTestCase { public void testFilter() throws Exception { List<Suggest.Suggestion<? extends Suggest.Suggestion.Entry<? extends Suggest.Suggestion.Entry.Option>>> suggestions; - CompletionSuggestion completionSuggestion = new CompletionSuggestion(randomAsciiOfLength(10), 2); - PhraseSuggestion phraseSuggestion = new PhraseSuggestion(randomAsciiOfLength(10), 2); - TermSuggestion termSuggestion = new TermSuggestion(randomAsciiOfLength(10), 2, SortBy.SCORE); + CompletionSuggestion completionSuggestion = new CompletionSuggestion(randomAlphaOfLength(10), 2); + PhraseSuggestion phraseSuggestion = new PhraseSuggestion(randomAlphaOfLength(10), 2); + TermSuggestion termSuggestion = new TermSuggestion(randomAlphaOfLength(10), 2, SortBy.SCORE); suggestions = Arrays.asList(completionSuggestion, phraseSuggestion, termSuggestion); Suggest suggest = new Suggest(suggestions); List<PhraseSuggestion> phraseSuggestions = suggest.filter(PhraseSuggestion.class); @@ -146,7 +146,7 @@ public class SuggestTests extends ESTestCase { suggestions = new ArrayList<>(); int n = randomIntBetween(2, 5); for (int i = 0; i < n; i++) { - suggestions.add(new CompletionSuggestion(randomAsciiOfLength(10), randomIntBetween(3, 5))); + suggestions.add(new CompletionSuggestion(randomAlphaOfLength(10), randomIntBetween(3, 5))); } Collections.shuffle(suggestions, random()); Suggest suggest = new Suggest(suggestions); diff --git a/core/src/test/java/org/elasticsearch/search/suggest/SuggestionEntryTests.java b/core/src/test/java/org/elasticsearch/search/suggest/SuggestionEntryTests.java index 07f310dfd0..ddb4904827 100644 --- a/core/src/test/java/org/elasticsearch/search/suggest/SuggestionEntryTests.java +++ b/core/src/test/java/org/elasticsearch/search/suggest/SuggestionEntryTests.java @@ -55,7 +55,7 @@ public class SuggestionEntryTests extends ESTestCase { */ @SuppressWarnings("unchecked") public static <O extends Option> Entry<O> createTestItem(Class<? extends Entry> entryType) { - Text entryText = new Text(randomAsciiOfLengthBetween(5, 15)); + Text entryText = new Text(randomAlphaOfLengthBetween(5, 15)); int offset = randomInt(); int length = randomInt(); Entry entry; diff --git a/core/src/test/java/org/elasticsearch/search/suggest/SuggestionOptionTests.java b/core/src/test/java/org/elasticsearch/search/suggest/SuggestionOptionTests.java index 9ffad11b07..268f7429d7 100644 --- a/core/src/test/java/org/elasticsearch/search/suggest/SuggestionOptionTests.java +++ b/core/src/test/java/org/elasticsearch/search/suggest/SuggestionOptionTests.java @@ -35,9 +35,9 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertToXC public class SuggestionOptionTests extends ESTestCase { public static Option createTestItem() { - Text text = new Text(randomAsciiOfLengthBetween(5, 15)); + Text text = new Text(randomAlphaOfLengthBetween(5, 15)); float score = randomFloat(); - Text highlighted = randomFrom((Text) null, new Text(randomAsciiOfLengthBetween(5, 15))); + Text highlighted = randomFrom((Text) null, new Text(randomAlphaOfLengthBetween(5, 15))); Boolean collateMatch = randomFrom((Boolean) null, randomBoolean()); return new Option(text, highlighted, score, collateMatch); } diff --git a/core/src/test/java/org/elasticsearch/search/suggest/SuggestionTests.java b/core/src/test/java/org/elasticsearch/search/suggest/SuggestionTests.java index 259ff50e0b..9f1607d9d6 100644 --- a/core/src/test/java/org/elasticsearch/search/suggest/SuggestionTests.java +++ b/core/src/test/java/org/elasticsearch/search/suggest/SuggestionTests.java @@ -65,7 +65,7 @@ public class SuggestionTests extends ESTestCase { @SuppressWarnings({ "unchecked", "rawtypes" }) public static Suggestion<? extends Entry<? extends Option>> createTestItem(Class<? extends Suggestion> type) { - String name = randomAsciiOfLengthBetween(5, 10); + String name = randomAlphaOfLengthBetween(5, 10); // note: size will not be rendered via "toXContent", only passed on internally on transport layer int size = randomInt(); Supplier<Entry> entrySupplier = null; diff --git a/core/src/test/java/org/elasticsearch/search/suggest/TermSuggestionOptionTests.java b/core/src/test/java/org/elasticsearch/search/suggest/TermSuggestionOptionTests.java index ad2aed0226..668629fe57 100644 --- a/core/src/test/java/org/elasticsearch/search/suggest/TermSuggestionOptionTests.java +++ b/core/src/test/java/org/elasticsearch/search/suggest/TermSuggestionOptionTests.java @@ -35,7 +35,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertToXC public class TermSuggestionOptionTests extends ESTestCase { public static Option createTestItem() { - Text text = new Text(randomAsciiOfLengthBetween(5, 15)); + Text text = new Text(randomAlphaOfLengthBetween(5, 15)); float score = randomFloat(); int freq = randomInt(); return new Option(text, freq, score); diff --git a/core/src/test/java/org/elasticsearch/search/suggest/completion/CategoryQueryContextTests.java b/core/src/test/java/org/elasticsearch/search/suggest/completion/CategoryQueryContextTests.java index 59d7bbd61b..658f145b1c 100644 --- a/core/src/test/java/org/elasticsearch/search/suggest/completion/CategoryQueryContextTests.java +++ b/core/src/test/java/org/elasticsearch/search/suggest/completion/CategoryQueryContextTests.java @@ -28,7 +28,7 @@ public class CategoryQueryContextTests extends QueryContextTestCase<CategoryQuer public static CategoryQueryContext randomCategoryQueryContext() { final CategoryQueryContext.Builder builder = CategoryQueryContext.builder(); - builder.setCategory(randomAsciiOfLength(10)); + builder.setCategory(randomAlphaOfLength(10)); maybeSet(builder::setBoost, randomIntBetween(1, 10)); maybeSet(builder::setPrefix, randomBoolean()); return builder.build(); diff --git a/core/src/test/java/org/elasticsearch/search/suggest/completion/CompletionSuggesterBuilderTests.java b/core/src/test/java/org/elasticsearch/search/suggest/completion/CompletionSuggesterBuilderTests.java index 8e0ff3953f..77c149df7a 100644 --- a/core/src/test/java/org/elasticsearch/search/suggest/completion/CompletionSuggesterBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/search/suggest/completion/CompletionSuggesterBuilderTests.java @@ -54,20 +54,20 @@ public class CompletionSuggesterBuilderTests extends AbstractSuggestionBuilderTe private static BuilderAndInfo randomSuggestionBuilderWithContextInfo() { final BuilderAndInfo builderAndInfo = new BuilderAndInfo(); - CompletionSuggestionBuilder testBuilder = new CompletionSuggestionBuilder(randomAsciiOfLengthBetween(2, 20)); + CompletionSuggestionBuilder testBuilder = new CompletionSuggestionBuilder(randomAlphaOfLengthBetween(2, 20)); setCommonPropertiesOnRandomBuilder(testBuilder); switch (randomIntBetween(0, 3)) { case 0: - testBuilder.prefix(randomAsciiOfLength(10)); + testBuilder.prefix(randomAlphaOfLength(10)); break; case 1: - testBuilder.prefix(randomAsciiOfLength(10), FuzzyOptionsTests.randomFuzzyOptions()); + testBuilder.prefix(randomAlphaOfLength(10), FuzzyOptionsTests.randomFuzzyOptions()); break; case 2: - testBuilder.prefix(randomAsciiOfLength(10), randomFrom(Fuzziness.ZERO, Fuzziness.ONE, Fuzziness.TWO)); + testBuilder.prefix(randomAlphaOfLength(10), randomFrom(Fuzziness.ZERO, Fuzziness.ONE, Fuzziness.TWO)); break; case 3: - testBuilder.regex(randomAsciiOfLength(10), RegexOptionsTests.randomRegexOptions()); + testBuilder.regex(randomAlphaOfLength(10), RegexOptionsTests.randomRegexOptions()); break; } Map<String, List<? extends ToXContent>> contextMap = new HashMap<>(); @@ -77,7 +77,7 @@ public class CompletionSuggesterBuilderTests extends AbstractSuggestionBuilderTe for (int i = 0; i < numContext; i++) { contexts.add(CategoryQueryContextTests.randomCategoryQueryContext()); } - String name = randomAsciiOfLength(10); + String name = randomAlphaOfLength(10); contextMap.put(name, contexts); builderAndInfo.catContexts.add(name); } @@ -87,7 +87,7 @@ public class CompletionSuggesterBuilderTests extends AbstractSuggestionBuilderTe for (int i = 0; i < numContext; i++) { contexts.add(GeoQueryContextTests.randomGeoQueryContext()); } - String name = randomAsciiOfLength(10); + String name = randomAlphaOfLength(10); contextMap.put(name, contexts); builderAndInfo.geoContexts.add(name); } @@ -114,7 +114,7 @@ public class CompletionSuggesterBuilderTests extends AbstractSuggestionBuilderTe for (int i = 0; i < nCatContext; i++) { contexts.add(CategoryQueryContextTests.randomCategoryQueryContext()); } - builder.contexts(Collections.singletonMap(randomAsciiOfLength(10), contexts)); + builder.contexts(Collections.singletonMap(randomAlphaOfLength(10), contexts)); break; case 1: int nGeoContext = randomIntBetween(1, 5); @@ -122,16 +122,16 @@ public class CompletionSuggesterBuilderTests extends AbstractSuggestionBuilderTe for (int i = 0; i < nGeoContext; i++) { geoContexts.add(GeoQueryContextTests.randomGeoQueryContext()); } - builder.contexts(Collections.singletonMap(randomAsciiOfLength(10), geoContexts)); + builder.contexts(Collections.singletonMap(randomAlphaOfLength(10), geoContexts)); break; case 2: - builder.prefix(randomAsciiOfLength(10), FuzzyOptionsTests.randomFuzzyOptions()); + builder.prefix(randomAlphaOfLength(10), FuzzyOptionsTests.randomFuzzyOptions()); break; case 3: - builder.prefix(randomAsciiOfLength(10), randomFrom(Fuzziness.ZERO, Fuzziness.ONE, Fuzziness.TWO)); + builder.prefix(randomAlphaOfLength(10), randomFrom(Fuzziness.ZERO, Fuzziness.ONE, Fuzziness.TWO)); break; case 4: - builder.regex(randomAsciiOfLength(10), RegexOptionsTests.randomRegexOptions()); + builder.regex(randomAlphaOfLength(10), RegexOptionsTests.randomRegexOptions()); break; default: throw new IllegalStateException("should not through"); diff --git a/core/src/test/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionTests.java b/core/src/test/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionTests.java index 60722fb5f6..4b0e60a1d0 100644 --- a/core/src/test/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionTests.java +++ b/core/src/test/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionTests.java @@ -35,7 +35,7 @@ public class CompletionSuggestionTests extends ESTestCase { public void testToReduce() throws Exception { List<Suggest.Suggestion<CompletionSuggestion.Entry>> shardSuggestions = new ArrayList<>(); int nShards = randomIntBetween(1, 10); - String name = randomAsciiOfLength(10); + String name = randomAlphaOfLength(10); int size = randomIntBetween(3, 5); for (int i = 0; i < nShards; i++) { CompletionSuggestion suggestion = new CompletionSuggestion(name, size); diff --git a/core/src/test/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGeneratorTests.java b/core/src/test/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGeneratorTests.java index 6c30ccb457..10022cc289 100644 --- a/core/src/test/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGeneratorTests.java +++ b/core/src/test/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGeneratorTests.java @@ -177,7 +177,7 @@ public class DirectCandidateGeneratorTests extends ESTestCase { * create random {@link DirectCandidateGeneratorBuilder} */ public static DirectCandidateGeneratorBuilder randomCandidateGenerator() { - DirectCandidateGeneratorBuilder generator = new DirectCandidateGeneratorBuilder(randomAsciiOfLength(10)); + DirectCandidateGeneratorBuilder generator = new DirectCandidateGeneratorBuilder(randomAlphaOfLength(10)); maybeSet(generator::accuracy, randomFloat()); maybeSet(generator::maxEdits, randomIntBetween(1, 2)); maybeSet(generator::maxInspections, randomIntBetween(1, 20)); @@ -185,8 +185,8 @@ public class DirectCandidateGeneratorTests extends ESTestCase { maybeSet(generator::minDocFreq, randomFloat()); maybeSet(generator::minWordLength, randomIntBetween(1, 20)); maybeSet(generator::prefixLength, randomIntBetween(1, 20)); - maybeSet(generator::preFilter, randomAsciiOfLengthBetween(1, 20)); - maybeSet(generator::postFilter, randomAsciiOfLengthBetween(1, 20)); + maybeSet(generator::preFilter, randomAlphaOfLengthBetween(1, 20)); + maybeSet(generator::postFilter, randomAlphaOfLengthBetween(1, 20)); maybeSet(generator::size, randomIntBetween(1, 20)); maybeSet(generator::sort, randomFrom("score", "frequency")); maybeSet(generator::stringDistance, randomFrom("internal", "damerau_levenshtein", "levenstein", "jarowinkler", "ngram")); diff --git a/core/src/test/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilderTests.java b/core/src/test/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilderTests.java index eab8440fa8..8b10a17064 100644 --- a/core/src/test/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilderTests.java @@ -33,13 +33,13 @@ public class PhraseSuggestionBuilderTests extends AbstractSuggestionBuilderTestC } public static PhraseSuggestionBuilder randomPhraseSuggestionBuilder() { - PhraseSuggestionBuilder testBuilder = new PhraseSuggestionBuilder(randomAsciiOfLengthBetween(2, 20)); + PhraseSuggestionBuilder testBuilder = new PhraseSuggestionBuilder(randomAlphaOfLengthBetween(2, 20)); setCommonPropertiesOnRandomBuilder(testBuilder); maybeSet(testBuilder::maxErrors, randomFloat()); - maybeSet(testBuilder::separator, randomAsciiOfLengthBetween(1, 10)); + maybeSet(testBuilder::separator, randomAlphaOfLengthBetween(1, 10)); maybeSet(testBuilder::realWordErrorLikelihood, randomFloat()); maybeSet(testBuilder::confidence, randomFloat()); - maybeSet(testBuilder::collateQuery, randomAsciiOfLengthBetween(3, 20)); + maybeSet(testBuilder::collateQuery, randomAlphaOfLengthBetween(3, 20)); // collate query prune and parameters will only be used when query is set if (testBuilder.collateQuery() != null) { maybeSet(testBuilder::collatePrune, randomBoolean()); @@ -47,14 +47,14 @@ public class PhraseSuggestionBuilderTests extends AbstractSuggestionBuilderTestC Map<String, Object> collateParams = new HashMap<>(); int numParams = randomIntBetween(1, 5); for (int i = 0; i < numParams; i++) { - collateParams.put(randomAsciiOfLength(5), randomAsciiOfLength(5)); + collateParams.put(randomAlphaOfLength(5), randomAlphaOfLength(5)); } testBuilder.collateParams(collateParams ); } } if (randomBoolean()) { // preTag, postTag - testBuilder.highlight(randomAsciiOfLengthBetween(3, 20), randomAsciiOfLengthBetween(3, 20)); + testBuilder.highlight(randomAlphaOfLengthBetween(3, 20), randomAlphaOfLengthBetween(3, 20)); } maybeSet(testBuilder::gramSize, randomIntBetween(1, 5)); maybeSet(testBuilder::forceUnigrams, randomBoolean()); @@ -106,14 +106,14 @@ public class PhraseSuggestionBuilderTests extends AbstractSuggestionBuilderTestC builder.tokenLimit(randomValueOtherThan(builder.tokenLimit(), () -> randomIntBetween(1, 20))); break; case 5: - builder.separator(randomValueOtherThan(builder.separator(), () -> randomAsciiOfLengthBetween(1, 10))); + builder.separator(randomValueOtherThan(builder.separator(), () -> randomAlphaOfLengthBetween(1, 10))); break; case 6: Script collateQuery = builder.collateQuery(); if (collateQuery != null) { - builder.collateQuery(randomValueOtherThan(collateQuery.getIdOrCode(), () -> randomAsciiOfLengthBetween(3, 20))); + builder.collateQuery(randomValueOtherThan(collateQuery.getIdOrCode(), () -> randomAlphaOfLengthBetween(3, 20))); } else { - builder.collateQuery(randomAsciiOfLengthBetween(3, 20)); + builder.collateQuery(randomAlphaOfLengthBetween(3, 20)); } break; case 7: @@ -126,7 +126,7 @@ public class PhraseSuggestionBuilderTests extends AbstractSuggestionBuilderTestC // simply double both values builder.highlight(builder.preTag() + builder.preTag(), builder.postTag() + builder.postTag()); } else { - builder.highlight(randomAsciiOfLengthBetween(3, 20), randomAsciiOfLengthBetween(3, 20)); + builder.highlight(randomAlphaOfLengthBetween(3, 20), randomAlphaOfLengthBetween(3, 20)); } break; case 9: @@ -134,7 +134,7 @@ public class PhraseSuggestionBuilderTests extends AbstractSuggestionBuilderTestC break; case 10: Map<String, Object> collateParams = builder.collateParams() == null ? new HashMap<>(1) : builder.collateParams(); - collateParams.put(randomAsciiOfLength(5), randomAsciiOfLength(5)); + collateParams.put(randomAlphaOfLength(5), randomAlphaOfLength(5)); builder.collateParams(collateParams); break; case 11: @@ -155,7 +155,7 @@ public class PhraseSuggestionBuilderTests extends AbstractSuggestionBuilderTestC e = expectThrows(IllegalArgumentException.class, () -> new PhraseSuggestionBuilder("")); assertEquals("suggestion field name is empty", e.getMessage()); - PhraseSuggestionBuilder builder = new PhraseSuggestionBuilder(randomAsciiOfLengthBetween(2, 20)); + PhraseSuggestionBuilder builder = new PhraseSuggestionBuilder(randomAlphaOfLengthBetween(2, 20)); e = expectThrows(IllegalArgumentException.class, () -> builder.gramSize(0)); assertEquals("gramSize must be >= 1", e.getMessage()); diff --git a/core/src/test/java/org/elasticsearch/search/suggest/term/TermSuggestionBuilderTests.java b/core/src/test/java/org/elasticsearch/search/suggest/term/TermSuggestionBuilderTests.java index f27d02fbe2..c5471f3ee0 100644 --- a/core/src/test/java/org/elasticsearch/search/suggest/term/TermSuggestionBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/search/suggest/term/TermSuggestionBuilderTests.java @@ -58,7 +58,7 @@ public class TermSuggestionBuilderTests extends AbstractSuggestionBuilderTestCas * Creates a random TermSuggestionBuilder */ public static TermSuggestionBuilder randomTermSuggestionBuilder() { - TermSuggestionBuilder testBuilder = new TermSuggestionBuilder(randomAsciiOfLengthBetween(2, 20)); + TermSuggestionBuilder testBuilder = new TermSuggestionBuilder(randomAlphaOfLengthBetween(2, 20)); setCommonPropertiesOnRandomBuilder(testBuilder); maybeSet(testBuilder::suggestMode, randomSuggestMode()); maybeSet(testBuilder::accuracy, randomFloat()); @@ -151,7 +151,7 @@ public class TermSuggestionBuilderTests extends AbstractSuggestionBuilderTestCas e = expectThrows(IllegalArgumentException.class, () -> new TermSuggestionBuilder("")); assertEquals("suggestion field name is empty", e.getMessage()); - TermSuggestionBuilder builder = new TermSuggestionBuilder(randomAsciiOfLengthBetween(2, 20)); + TermSuggestionBuilder builder = new TermSuggestionBuilder(randomAlphaOfLengthBetween(2, 20)); // test invalid accuracy values expectThrows(IllegalArgumentException.class, () -> builder.accuracy(-0.5f)); @@ -193,7 +193,7 @@ public class TermSuggestionBuilderTests extends AbstractSuggestionBuilderTestCas } public void testDefaultValuesSet() { - TermSuggestionBuilder builder = new TermSuggestionBuilder(randomAsciiOfLengthBetween(2, 20)); + TermSuggestionBuilder builder = new TermSuggestionBuilder(randomAlphaOfLengthBetween(2, 20)); assertEquals(DEFAULT_ACCURACY, builder.accuracy(), Float.MIN_VALUE); assertEquals(DEFAULT_MAX_EDITS, builder.maxEdits()); assertEquals(DEFAULT_MAX_INSPECTIONS, builder.maxInspections()); |