diff options
Diffstat (limited to 'qa')
5 files changed, 10 insertions, 14 deletions
diff --git a/qa/evil-tests/src/test/java/org/elasticsearch/bootstrap/EvilBootstrapChecksTests.java b/qa/evil-tests/src/test/java/org/elasticsearch/bootstrap/EvilBootstrapChecksTests.java index 79c3f9248b..8e346bf7d9 100644 --- a/qa/evil-tests/src/test/java/org/elasticsearch/bootstrap/EvilBootstrapChecksTests.java +++ b/qa/evil-tests/src/test/java/org/elasticsearch/bootstrap/EvilBootstrapChecksTests.java @@ -92,7 +92,7 @@ public class EvilBootstrapChecksTests extends ESTestCase { } public void testInvalidValue() { - final String value = randomAsciiOfLength(8); + final String value = randomAlphaOfLength(8); setEsEnforceBootstrapChecks(value); final boolean enforceLimits = randomBoolean(); final IllegalArgumentException e = expectThrows( diff --git a/qa/evil-tests/src/test/java/org/elasticsearch/bootstrap/EvilElasticsearchCliTests.java b/qa/evil-tests/src/test/java/org/elasticsearch/bootstrap/EvilElasticsearchCliTests.java index 2c00030973..02caeca808 100644 --- a/qa/evil-tests/src/test/java/org/elasticsearch/bootstrap/EvilElasticsearchCliTests.java +++ b/qa/evil-tests/src/test/java/org/elasticsearch/bootstrap/EvilElasticsearchCliTests.java @@ -33,7 +33,7 @@ public class EvilElasticsearchCliTests extends ESElasticsearchCliTestCase { @SuppressForbidden(reason = "manipulates system properties for testing") public void testPathHome() throws Exception { final String pathHome = System.getProperty("es.path.home"); - final String value = randomAsciiOfLength(16); + final String value = randomAlphaOfLength(16); System.setProperty("es.path.home", value); runTest( @@ -48,7 +48,7 @@ public class EvilElasticsearchCliTests extends ESElasticsearchCliTestCase { }); System.clearProperty("es.path.home"); - final String commandLineValue = randomAsciiOfLength(16); + final String commandLineValue = randomAlphaOfLength(16); runTest( ExitCodes.OK, true, diff --git a/qa/evil-tests/src/test/java/org/elasticsearch/common/logging/EvilLoggerConfigurationTests.java b/qa/evil-tests/src/test/java/org/elasticsearch/common/logging/EvilLoggerConfigurationTests.java index 9cd6ec630a..6270111a09 100644 --- a/qa/evil-tests/src/test/java/org/elasticsearch/common/logging/EvilLoggerConfigurationTests.java +++ b/qa/evil-tests/src/test/java/org/elasticsearch/common/logging/EvilLoggerConfigurationTests.java @@ -179,7 +179,7 @@ public class EvilLoggerConfigurationTests extends ESTestCase { assertThat(loggerConfigs, hasKey("bar")); assertThat(loggerConfigs.get("bar").getLevel(), equalTo(barLevel)); - assertThat(ctx.getLogger(randomAsciiOfLength(16)).getLevel(), equalTo(rootLevel)); + assertThat(ctx.getLogger(randomAlphaOfLength(16)).getLevel(), equalTo(rootLevel)); } } diff --git a/qa/evil-tests/src/test/java/org/elasticsearch/common/logging/EvilLoggerTests.java b/qa/evil-tests/src/test/java/org/elasticsearch/common/logging/EvilLoggerTests.java index f02ce6031c..6246f3e1dd 100644 --- a/qa/evil-tests/src/test/java/org/elasticsearch/common/logging/EvilLoggerTests.java +++ b/qa/evil-tests/src/test/java/org/elasticsearch/common/logging/EvilLoggerTests.java @@ -37,16 +37,12 @@ import org.elasticsearch.node.Node; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.hamcrest.RegexMatcher; -import javax.management.MBeanServerPermission; import java.io.IOException; import java.io.PrintWriter; import java.io.StringWriter; import java.nio.file.Files; import java.nio.file.Path; -import java.security.AccessControlException; -import java.security.Permission; import java.util.List; -import java.util.concurrent.atomic.AtomicBoolean; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -126,7 +122,7 @@ public class EvilLoggerTests extends ESTestCase { public void testPrefixLogger() throws IOException, IllegalAccessException, UserException { setupLogging("prefix"); - final String prefix = randomBoolean() ? null : randomAsciiOfLength(16); + final String prefix = randomBoolean() ? null : randomAlphaOfLength(16); final Logger logger = Loggers.getLogger("prefix", prefix); logger.info("test"); logger.info("{}", "test"); @@ -156,9 +152,9 @@ public class EvilLoggerTests extends ESTestCase { } public void testProperties() throws IOException, UserException { - final Settings.Builder builder = Settings.builder().put("cluster.name", randomAsciiOfLength(16)); + final Settings.Builder builder = Settings.builder().put("cluster.name", randomAlphaOfLength(16)); if (randomBoolean()) { - builder.put("node.name", randomAsciiOfLength(16)); + builder.put("node.name", randomAlphaOfLength(16)); } final Settings settings = builder.build(); setupLogging("minimal", settings); diff --git a/qa/smoke-test-http/src/test/java/org/elasticsearch/http/ContextAndHeaderTransportIT.java b/qa/smoke-test-http/src/test/java/org/elasticsearch/http/ContextAndHeaderTransportIT.java index 397838862c..28b5825513 100644 --- a/qa/smoke-test-http/src/test/java/org/elasticsearch/http/ContextAndHeaderTransportIT.java +++ b/qa/smoke-test-http/src/test/java/org/elasticsearch/http/ContextAndHeaderTransportIT.java @@ -76,9 +76,9 @@ import static org.hamcrest.Matchers.is; public class ContextAndHeaderTransportIT extends HttpSmokeTestCase { private static final List<RequestAndHeaders> requests = new CopyOnWriteArrayList<>(); private static final String CUSTOM_HEADER = "SomeCustomHeader"; - private String randomHeaderValue = randomAsciiOfLength(20); - private String queryIndex = "query-" + randomAsciiOfLength(10).toLowerCase(Locale.ROOT); - private String lookupIndex = "lookup-" + randomAsciiOfLength(10).toLowerCase(Locale.ROOT); + private String randomHeaderValue = randomAlphaOfLength(20); + private String queryIndex = "query-" + randomAlphaOfLength(10).toLowerCase(Locale.ROOT); + private String lookupIndex = "lookup-" + randomAlphaOfLength(10).toLowerCase(Locale.ROOT); @Override protected Settings nodeSettings(int nodeOrdinal) { |