diff options
Diffstat (limited to 'test/framework/src/main/java')
10 files changed, 59 insertions, 60 deletions
diff --git a/test/framework/src/main/java/org/elasticsearch/action/bulk/byscroll/AbstractBulkByScrollRequestTestCase.java b/test/framework/src/main/java/org/elasticsearch/action/bulk/byscroll/AbstractBulkByScrollRequestTestCase.java index 8a12a32ad0..c4ac9587e8 100644 --- a/test/framework/src/main/java/org/elasticsearch/action/bulk/byscroll/AbstractBulkByScrollRequestTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/action/bulk/byscroll/AbstractBulkByScrollRequestTestCase.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.bulk.byscroll; -import org.elasticsearch.action.bulk.byscroll.AbstractBulkByScrollRequest; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.support.ActiveShardCount; import org.elasticsearch.tasks.TaskId; @@ -45,7 +44,7 @@ public abstract class AbstractBulkByScrollRequestTestCase<R extends AbstractBulk randomBoolean() ? Float.POSITIVE_INFINITY : randomValueOtherThanMany(r -> r < 0, ESTestCase::randomFloat)); original.setSize(randomBoolean() ? AbstractBulkByScrollRequest.SIZE_ALL_MATCHES : between(0, Integer.MAX_VALUE)); - TaskId slicingTask = new TaskId(randomAsciiOfLength(5), randomLong()); + TaskId slicingTask = new TaskId(randomAlphaOfLength(5), randomLong()); SearchRequest sliceRequest = new SearchRequest(); R forSliced = original.forSlice(slicingTask, sliceRequest); assertEquals(original.isAbortOnVersionConflict(), forSliced.isAbortOnVersionConflict()); diff --git a/test/framework/src/main/java/org/elasticsearch/cluster/routing/TestShardRouting.java b/test/framework/src/main/java/org/elasticsearch/cluster/routing/TestShardRouting.java index d0d6c02f63..a4ac6fad24 100644 --- a/test/framework/src/main/java/org/elasticsearch/cluster/routing/TestShardRouting.java +++ b/test/framework/src/main/java/org/elasticsearch/cluster/routing/TestShardRouting.java @@ -27,7 +27,7 @@ import org.elasticsearch.snapshots.Snapshot; import org.elasticsearch.snapshots.SnapshotId; import org.elasticsearch.test.ESTestCase; -import static org.elasticsearch.test.ESTestCase.randomAsciiOfLength; +import static org.elasticsearch.test.ESTestCase.randomAlphaOfLength; /** * A helper that allows to create shard routing instances within tests, while not requiring to expose @@ -131,7 +131,7 @@ public class TestShardRouting { RecoverySource.PeerRecoverySource.INSTANCE, RecoverySource.LocalShardsRecoverySource.INSTANCE, new RecoverySource.SnapshotRecoverySource( - new Snapshot("repo", new SnapshotId(randomAsciiOfLength(8), UUIDs.randomBase64UUID())), + new Snapshot("repo", new SnapshotId(randomAlphaOfLength(8), UUIDs.randomBase64UUID())), Version.CURRENT, "some_index")); } diff --git a/test/framework/src/main/java/org/elasticsearch/index/shard/IndexShardTestCase.java b/test/framework/src/main/java/org/elasticsearch/index/shard/IndexShardTestCase.java index 01c142133a..215551da35 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/shard/IndexShardTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/index/shard/IndexShardTestCase.java @@ -173,7 +173,7 @@ public abstract class IndexShardTestCase extends ESTestCase { * @param listeners an optional set of listeners to add to the shard */ protected IndexShard newShard(ShardId shardId, boolean primary, IndexingOperationListener... listeners) throws IOException { - ShardRouting shardRouting = TestShardRouting.newShardRouting(shardId, randomAsciiOfLength(5), primary, + ShardRouting shardRouting = TestShardRouting.newShardRouting(shardId, randomAlphaOfLength(5), primary, ShardRoutingState.INITIALIZING, primary ? RecoverySource.StoreRecoverySource.EMPTY_STORE_INSTANCE : RecoverySource.PeerRecoverySource.INSTANCE); return newShard(shardRouting, listeners); diff --git a/test/framework/src/main/java/org/elasticsearch/node/NodeTests.java b/test/framework/src/main/java/org/elasticsearch/node/NodeTests.java index 69291ccaba..ae4aff917a 100644 --- a/test/framework/src/main/java/org/elasticsearch/node/NodeTests.java +++ b/test/framework/src/main/java/org/elasticsearch/node/NodeTests.java @@ -48,7 +48,7 @@ public class NodeTests extends ESTestCase { public void testNodeName() throws IOException { final Path tempDir = createTempDir(); - final String name = randomBoolean() ? randomAsciiOfLength(10) : null; + final String name = randomBoolean() ? randomAlphaOfLength(10) : null; Settings.Builder settings = Settings.builder() .put(ClusterName.CLUSTER_NAME_SETTING.getKey(), InternalTestCluster.clusterName("single-node-cluster", randomLong())) .put(Environment.PATH_HOME_SETTING.getKey(), tempDir) @@ -88,7 +88,7 @@ public class NodeTests extends ESTestCase { public void testLoadPluginBootstrapChecks() throws IOException { final Path tempDir = createTempDir(); - final String name = randomBoolean() ? randomAsciiOfLength(10) : null; + final String name = randomBoolean() ? randomAlphaOfLength(10) : null; Settings.Builder settings = Settings.builder() .put(ClusterName.CLUSTER_NAME_SETTING.getKey(), InternalTestCluster.clusterName("single-node-cluster", randomLong())) .put(Environment.PATH_HOME_SETTING.getKey(), tempDir) @@ -139,7 +139,7 @@ public class NodeTests extends ESTestCase { } public void testNodeAttributes() throws IOException { - String attr = randomAsciiOfLength(5); + String attr = randomAlphaOfLength(5); Settings.Builder settings = baseSettings().put(Node.NODE_ATTRIBUTES.getKey() + "test_attr", attr); try (Node node = new MockNode(settings.build(), Collections.singleton(MockTcpTransportPlugin.class))) { final Settings nodeSettings = randomBoolean() ? node.settings() : node.getEnvironment().settings(); diff --git a/test/framework/src/main/java/org/elasticsearch/repositories/blobstore/ESBlobStoreRepositoryIntegTestCase.java b/test/framework/src/main/java/org/elasticsearch/repositories/blobstore/ESBlobStoreRepositoryIntegTestCase.java index 1bb5bb58ea..c79f432278 100644 --- a/test/framework/src/main/java/org/elasticsearch/repositories/blobstore/ESBlobStoreRepositoryIntegTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/repositories/blobstore/ESBlobStoreRepositoryIntegTestCase.java @@ -222,7 +222,7 @@ public abstract class ESBlobStoreRepositoryIntegTestCase extends ESIntegTestCase IndexRequestBuilder[] indexRequestBuilders = new IndexRequestBuilder[numDocs]; for (int i = 0; i < numDocs; i++) { indexRequestBuilders[i] = client().prepareIndex(name, name, Integer.toString(i)) - .setRouting(randomAsciiOfLength(randomIntBetween(1, 10))).setSource("field", "value"); + .setRouting(randomAlphaOfLength(randomIntBetween(1, 10))).setSource("field", "value"); } indexRandom(true, indexRequestBuilders); } @@ -262,6 +262,6 @@ public abstract class ESBlobStoreRepositoryIntegTestCase extends ESIntegTestCase } public static String randomAsciiName() { - return randomAsciiOfLength(randomIntBetween(1, 10)).toLowerCase(Locale.ROOT); + return randomAlphaOfLength(randomIntBetween(1, 10)).toLowerCase(Locale.ROOT); } } diff --git a/test/framework/src/main/java/org/elasticsearch/search/RandomSearchRequestGenerator.java b/test/framework/src/main/java/org/elasticsearch/search/RandomSearchRequestGenerator.java index f49cd174b7..2a072a1d3b 100644 --- a/test/framework/src/main/java/org/elasticsearch/search/RandomSearchRequestGenerator.java +++ b/test/framework/src/main/java/org/elasticsearch/search/RandomSearchRequestGenerator.java @@ -52,7 +52,7 @@ import java.util.function.Supplier; import static org.elasticsearch.test.ESTestCase.between; import static org.elasticsearch.test.ESTestCase.generateRandomStringArray; -import static org.elasticsearch.test.ESTestCase.randomAsciiOfLengthBetween; +import static org.elasticsearch.test.ESTestCase.randomAlphaOfLengthBetween; import static org.elasticsearch.test.ESTestCase.randomBoolean; import static org.elasticsearch.test.ESTestCase.randomByte; import static org.elasticsearch.test.ESTestCase.randomDouble; @@ -89,13 +89,13 @@ public class RandomSearchRequestGenerator { searchRequest.types(generateRandomStringArray(10, 10, false, false)); } if (randomBoolean()) { - searchRequest.preference(randomAsciiOfLengthBetween(3, 10)); + searchRequest.preference(randomAlphaOfLengthBetween(3, 10)); } if (randomBoolean()) { searchRequest.requestCache(randomBoolean()); } if (randomBoolean()) { - searchRequest.routing(randomAsciiOfLengthBetween(3, 10)); + searchRequest.routing(randomAlphaOfLengthBetween(3, 10)); } if (randomBoolean()) { searchRequest.scroll(randomPositiveTimeValue()); @@ -152,7 +152,7 @@ public class RandomSearchRequestGenerator { 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)); } builder.storedFields(fields); break; @@ -164,9 +164,9 @@ public class RandomSearchRequestGenerator { int scriptFieldsSize = randomInt(25); for (int i = 0; i < scriptFieldsSize; i++) { if (randomBoolean()) { - builder.scriptField(randomAsciiOfLengthBetween(5, 50), new Script("foo"), randomBoolean()); + builder.scriptField(randomAlphaOfLengthBetween(5, 50), new Script("foo"), randomBoolean()); } else { - builder.scriptField(randomAsciiOfLengthBetween(5, 50), new Script("foo")); + builder.scriptField(randomAlphaOfLengthBetween(5, 50), new Script("foo")); } } } @@ -175,11 +175,11 @@ public class RandomSearchRequestGenerator { 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: @@ -189,8 +189,8 @@ public class RandomSearchRequestGenerator { 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); @@ -199,7 +199,7 @@ public class RandomSearchRequestGenerator { 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(); @@ -210,21 +210,21 @@ public class RandomSearchRequestGenerator { int size = randomIntBetween(0, 20); List<String> statsGroups = new ArrayList<>(size); for (int i = 0; i < size; i++) { - statsGroups.add(randomAsciiOfLengthBetween(5, 20)); + statsGroups.add(randomAlphaOfLengthBetween(5, 20)); } builder.stats(statsGroups); } if (randomBoolean()) { int indexBoostSize = randomIntBetween(1, 10); for (int i = 0; i < indexBoostSize; i++) { - builder.indexBoost(randomAsciiOfLengthBetween(5, 20), randomFloat() * 10); + builder.indexBoost(randomAlphaOfLengthBetween(5, 20), randomFloat() * 10); } } if (randomBoolean()) { - builder.query(QueryBuilders.termQuery(randomAsciiOfLengthBetween(5, 20), randomAsciiOfLengthBetween(5, 20))); + builder.query(QueryBuilders.termQuery(randomAlphaOfLengthBetween(5, 20), randomAlphaOfLengthBetween(5, 20))); } if (randomBoolean()) { - builder.postFilter(QueryBuilders.termQuery(randomAsciiOfLengthBetween(5, 20), randomAsciiOfLengthBetween(5, 20))); + builder.postFilter(QueryBuilders.termQuery(randomAlphaOfLengthBetween(5, 20), randomAlphaOfLengthBetween(5, 20))); } if (randomBoolean()) { int numSorts = randomIntBetween(1, 5); @@ -232,10 +232,10 @@ public class RandomSearchRequestGenerator { int branch = randomInt(5); switch (branch) { case 0: - builder.sort(SortBuilders.fieldSort(randomAsciiOfLengthBetween(5, 20)).order(randomFrom(SortOrder.values()))); + builder.sort(SortBuilders.fieldSort(randomAlphaOfLengthBetween(5, 20)).order(randomFrom(SortOrder.values()))); break; case 1: - builder.sort(SortBuilders.geoDistanceSort(randomAsciiOfLengthBetween(5, 20), + builder.sort(SortBuilders.geoDistanceSort(randomAlphaOfLengthBetween(5, 20), AbstractQueryTestCase.randomGeohash(1, 12)).order(randomFrom(SortOrder.values()))); break; case 2: @@ -246,10 +246,10 @@ public class RandomSearchRequestGenerator { ScriptSortBuilder.ScriptSortType.NUMBER).order(randomFrom(SortOrder.values()))); break; case 4: - builder.sort(randomAsciiOfLengthBetween(5, 20)); + builder.sort(randomAlphaOfLengthBetween(5, 20)); break; case 5: - builder.sort(randomAsciiOfLengthBetween(5, 20), randomFrom(SortOrder.values())); + builder.sort(randomAlphaOfLengthBetween(5, 20), randomFrom(SortOrder.values())); break; } } @@ -281,7 +281,7 @@ public class RandomSearchRequestGenerator { jsonBuilder.value(randomDouble()); break; case 4: - jsonBuilder.value(randomAsciiOfLengthBetween(5, 20)); + jsonBuilder.value(randomAlphaOfLengthBetween(5, 20)); break; case 5: jsonBuilder.value(randomBoolean()); @@ -293,7 +293,7 @@ public class RandomSearchRequestGenerator { jsonBuilder.value(randomShort()); break; case 8: - jsonBuilder.value(new Text(randomAsciiOfLengthBetween(5, 20))); + jsonBuilder.value(new Text(randomAlphaOfLengthBetween(5, 20))); break; } } @@ -322,13 +322,13 @@ public class RandomSearchRequestGenerator { } } if (randomBoolean()) { - builder.aggregation(AggregationBuilders.avg(randomAsciiOfLengthBetween(5, 20))); + builder.aggregation(AggregationBuilders.avg(randomAlphaOfLengthBetween(5, 20))); } if (randomBoolean()) { builder.ext(randomExtBuilders.get()); } if (randomBoolean()) { - String field = randomBoolean() ? null : randomAsciiOfLengthBetween(5, 20); + String field = randomBoolean() ? null : randomAlphaOfLengthBetween(5, 20); int max = between(2, 1000); int id = randomInt(max-1); if (field == null) { diff --git a/test/framework/src/main/java/org/elasticsearch/test/AbstractQueryTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/AbstractQueryTestCase.java index ad414db491..cb271b25b3 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/AbstractQueryTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/AbstractQueryTestCase.java @@ -183,12 +183,12 @@ public abstract class AbstractQueryTestCase<QB extends AbstractQueryBuilder<QB>> indexSettings = Settings.builder() .put(IndexMetaData.SETTING_VERSION_CREATED, indexVersionCreated).build(); - index = new Index(randomAsciiOfLengthBetween(1, 10), "_na_"); + index = new Index(randomAlphaOfLengthBetween(1, 10), "_na_"); //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; } //set some random types to be queried as part the search request, before each test @@ -248,7 +248,7 @@ public abstract class AbstractQueryTestCase<QB extends AbstractQueryBuilder<QB>> * make sure query names are unique by suffixing them with increasing counter */ private static String createUniqueRandomName() { - String queryName = randomAsciiOfLengthBetween(1, 10) + queryNameId; + String queryName = randomAlphaOfLengthBetween(1, 10) + queryNameId; queryNameId++; return queryName; } @@ -597,8 +597,8 @@ public abstract class AbstractQueryTestCase<QB extends AbstractQueryBuilder<QB>> QB secondQuery = copyQuery(firstQuery); // query _name never should affect the result of toQuery, we randomly set it to make sure if (randomBoolean()) { - secondQuery.queryName(secondQuery.queryName() == null ? randomAsciiOfLengthBetween(1, 30) : secondQuery.queryName() - + randomAsciiOfLengthBetween(1, 10)); + secondQuery.queryName(secondQuery.queryName() == null ? randomAlphaOfLengthBetween(1, 30) : secondQuery.queryName() + + randomAlphaOfLengthBetween(1, 10)); } searchContext = getSearchContext(randomTypes, context); Query secondLuceneQuery = rewriteQuery(secondQuery, context).toQuery(context); @@ -733,8 +733,8 @@ public abstract class AbstractQueryTestCase<QB extends AbstractQueryBuilder<QB>> private QB changeNameOrBoost(QB original) throws IOException { QB secondQuery = copyQuery(original); if (randomBoolean()) { - secondQuery.queryName(secondQuery.queryName() == null ? randomAsciiOfLengthBetween(1, 30) : secondQuery.queryName() - + randomAsciiOfLengthBetween(1, 10)); + secondQuery.queryName(secondQuery.queryName() == null ? randomAlphaOfLengthBetween(1, 30) : secondQuery.queryName() + + randomAlphaOfLengthBetween(1, 10)); } else { secondQuery.boost(original.boost() + 1f + randomFloat()); } @@ -773,7 +773,7 @@ public abstract class AbstractQueryTestCase<QB extends AbstractQueryBuilder<QB>> JsonStringEncoder encoder = JsonStringEncoder.getInstance(); value = new String(encoder.quoteAsString(randomUnicodeOfLength(10))); } else { - value = randomAsciiOfLengthBetween(1, 10); + value = randomAlphaOfLengthBetween(1, 10); } break; case INT_FIELD_NAME: @@ -789,7 +789,7 @@ public abstract class AbstractQueryTestCase<QB extends AbstractQueryBuilder<QB>> value = new DateTime(System.currentTimeMillis(), DateTimeZone.UTC).toString(); break; default: - value = randomAsciiOfLengthBetween(1, 10); + value = randomAlphaOfLengthBetween(1, 10); } return value; } @@ -798,7 +798,7 @@ public abstract class AbstractQueryTestCase<QB extends AbstractQueryBuilder<QB>> int terms = randomIntBetween(0, 3); StringBuilder builder = new StringBuilder(); for (int i = 0; i < terms; i++) { - builder.append(randomAsciiOfLengthBetween(1, 10)).append(" "); + builder.append(randomAlphaOfLengthBetween(1, 10)).append(" "); } return builder.toString().trim(); } @@ -809,7 +809,7 @@ public abstract class AbstractQueryTestCase<QB extends AbstractQueryBuilder<QB>> protected static String getRandomFieldName() { // if no type is set then return a random field name if (currentTypes.length == 0 || randomBoolean()) { - return randomAsciiOfLengthBetween(1, 10); + return randomAlphaOfLengthBetween(1, 10); } return randomFrom(MAPPED_LEAF_FIELD_NAMES); } diff --git a/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java index b4239ccd77..db15ac0c33 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java @@ -705,7 +705,7 @@ public abstract class ESIntegTestCase extends ESTestCase { } // 30% of the time if (randomInt(9) < 3) { - final String dataPath = randomAsciiOfLength(10); + final String dataPath = randomAlphaOfLength(10); logger.info("using custom data_path for index: [{}]", dataPath); builder.put(IndexMetaData.SETTING_DATA_PATH, dataPath); } @@ -1963,7 +1963,7 @@ public abstract class ESIntegTestCase extends ESTestCase { assert repoFiles.length > 0; Path path; do { - path = repoFiles[0].resolve(randomAsciiOfLength(10)); + path = repoFiles[0].resolve(randomAlphaOfLength(10)); } while (Files.exists(path)); return path; } diff --git a/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java index fa659e06fb..587d390f30 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java @@ -572,11 +572,11 @@ public abstract class ESTestCase extends LuceneTestCase { return RandomPicks.randomFrom(random, collection); } - public static String randomAsciiOfLengthBetween(int minCodeUnits, int maxCodeUnits) { + public static String randomAlphaOfLengthBetween(int minCodeUnits, int maxCodeUnits) { return RandomizedTest.randomAsciiOfLengthBetween(minCodeUnits, maxCodeUnits); } - public static String randomAsciiOfLength(int codeUnits) { + public static String randomAlphaOfLength(int codeUnits) { return RandomizedTest.randomAsciiOfLength(codeUnits); } diff --git a/test/framework/src/main/java/org/elasticsearch/test/disruption/NetworkDisruptionTests.java b/test/framework/src/main/java/org/elasticsearch/test/disruption/NetworkDisruptionTests.java index edc261c175..298ca869ae 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/disruption/NetworkDisruptionTests.java +++ b/test/framework/src/main/java/org/elasticsearch/test/disruption/NetworkDisruptionTests.java @@ -48,10 +48,10 @@ public class NetworkDisruptionTests extends ESTestCase { assertTrue(topology.disrupt(randomFrom(partition2), randomFrom(partition1))); assertFalse(topology.disrupt(randomFrom(partition1), randomFrom(partition1))); assertFalse(topology.disrupt(randomFrom(partition2), randomFrom(partition2))); - assertFalse(topology.disrupt(randomAsciiOfLength(10), randomFrom(partition1))); - assertFalse(topology.disrupt(randomAsciiOfLength(10), randomFrom(partition2))); - assertFalse(topology.disrupt(randomFrom(partition1), randomAsciiOfLength(10))); - assertFalse(topology.disrupt(randomFrom(partition2), randomAsciiOfLength(10))); + assertFalse(topology.disrupt(randomAlphaOfLength(10), randomFrom(partition1))); + assertFalse(topology.disrupt(randomAlphaOfLength(10), randomFrom(partition2))); + assertFalse(topology.disrupt(randomFrom(partition1), randomAlphaOfLength(10))); + assertFalse(topology.disrupt(randomFrom(partition2), randomAlphaOfLength(10))); } assertTrue(topology.getMajoritySide().size() >= topology.getMinoritySide().size()); } @@ -74,7 +74,7 @@ public class NetworkDisruptionTests extends ESTestCase { public void testBridge() { Set<String> partition1 = generateRandomStringSet(1, 10); Set<String> partition2 = generateRandomStringSet(1, 10); - String bridgeNode = randomAsciiOfLength(10); + String bridgeNode = randomAlphaOfLength(10); Bridge topology = new Bridge(bridgeNode, partition1, partition2); checkBridge(topology, bridgeNode, partition1, partition2); } @@ -97,12 +97,12 @@ public class NetworkDisruptionTests extends ESTestCase { assertFalse(topology.disrupt(randomFrom(partition2), randomFrom(partition2))); assertFalse(topology.disrupt(randomFrom(partition2), bridgeNode)); assertFalse(topology.disrupt(bridgeNode, randomFrom(partition2))); - assertFalse(topology.disrupt(randomAsciiOfLength(10), randomFrom(partition1))); - assertFalse(topology.disrupt(randomAsciiOfLength(10), randomFrom(partition2))); - assertFalse(topology.disrupt(randomAsciiOfLength(10), bridgeNode)); - assertFalse(topology.disrupt(randomFrom(partition1), randomAsciiOfLength(10))); - assertFalse(topology.disrupt(randomFrom(partition2), randomAsciiOfLength(10))); - assertFalse(topology.disrupt(bridgeNode, randomAsciiOfLength(10))); + assertFalse(topology.disrupt(randomAlphaOfLength(10), randomFrom(partition1))); + assertFalse(topology.disrupt(randomAlphaOfLength(10), randomFrom(partition2))); + assertFalse(topology.disrupt(randomAlphaOfLength(10), bridgeNode)); + assertFalse(topology.disrupt(randomFrom(partition1), randomAlphaOfLength(10))); + assertFalse(topology.disrupt(randomFrom(partition2), randomAlphaOfLength(10))); + assertFalse(topology.disrupt(bridgeNode, randomAlphaOfLength(10))); } } @@ -110,7 +110,7 @@ public class NetworkDisruptionTests extends ESTestCase { assert maxSize >= minSize; Set<String> result = new HashSet<>(); for (int i = 0; i < minSize + randomInt(maxSize - minSize); i++) { - result.add(randomAsciiOfLength(10)); + result.add(randomAlphaOfLength(10)); } return result; } |