diff options
author | Jason Tedor <jason@tedor.me> | 2017-04-04 11:04:18 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-04 11:04:18 -0400 |
commit | 3136ed1490e41b4c82b8ee05ff2d224e113ef1b8 (patch) | |
tree | 7cdbb7ae2c9421de67930ab386b0253713d048e5 /plugins/ingest-geoip | |
parent | a01f77210acc50e818ae3e1e9e3c48cb2498fee7 (diff) |
Rename random ASCII helper methods
This commit renames the random ASCII helper methods in ESTestCase. This
is because this method ultimately uses the random ASCII methods from
randomized runner, but these methods actually only produce random
strings generated from [a-zA-Z].
Relates #23886
Diffstat (limited to 'plugins/ingest-geoip')
2 files changed, 14 insertions, 15 deletions
diff --git a/plugins/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorFactoryTests.java b/plugins/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorFactoryTests.java index 8db0d15f79..3904b043a5 100644 --- a/plugins/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorFactoryTests.java +++ b/plugins/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorFactoryTests.java @@ -76,7 +76,7 @@ public class GeoIpProcessorFactoryTests extends ESTestCase { Map<String, Object> config = new HashMap<>(); config.put("field", "_field"); - String processorTag = randomAsciiOfLength(10); + String processorTag = randomAlphaOfLength(10); GeoIpProcessor processor = factory.create(null, processorTag, config); assertThat(processor.getTag(), equalTo(processorTag)); @@ -93,7 +93,7 @@ public class GeoIpProcessorFactoryTests extends ESTestCase { Map<String, Object> config = new HashMap<>(); config.put("field", "_field"); config.put("ignore_missing", true); - String processorTag = randomAsciiOfLength(10); + String processorTag = randomAlphaOfLength(10); GeoIpProcessor processor = factory.create(null, processorTag, config); assertThat(processor.getTag(), equalTo(processorTag)); @@ -110,7 +110,7 @@ public class GeoIpProcessorFactoryTests extends ESTestCase { Map<String, Object> config = new HashMap<>(); config.put("field", "_field"); config.put("database_file", "GeoLite2-Country.mmdb.gz"); - String processorTag = randomAsciiOfLength(10); + String processorTag = randomAlphaOfLength(10); GeoIpProcessor processor = factory.create(null, processorTag, config); diff --git a/plugins/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorTests.java b/plugins/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorTests.java index 221c06d3b6..54c504ca5c 100644 --- a/plugins/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorTests.java +++ b/plugins/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorTests.java @@ -20,7 +20,6 @@ package org.elasticsearch.ingest.geoip; import com.maxmind.geoip2.DatabaseReader; -import org.elasticsearch.ingest.Processor; import org.elasticsearch.ingest.RandomDocumentPicks; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.test.ESTestCase; @@ -42,7 +41,7 @@ public class GeoIpProcessorTests extends ESTestCase { public void testCity() throws Exception { InputStream database = getDatabaseFileInputStream("/GeoLite2-City.mmdb.gz"); - GeoIpProcessor processor = new GeoIpProcessor(randomAsciiOfLength(10), "source_field", + GeoIpProcessor processor = new GeoIpProcessor(randomAlphaOfLength(10), "source_field", new DatabaseReader.Builder(database).build(), "target_field", EnumSet.allOf(GeoIpProcessor.Property.class), false); Map<String, Object> document = new HashMap<>(); @@ -69,7 +68,7 @@ public class GeoIpProcessorTests extends ESTestCase { public void testNullValueWithIgnoreMissing() throws Exception { InputStream database = getDatabaseFileInputStream("/GeoLite2-City.mmdb.gz"); - GeoIpProcessor processor = new GeoIpProcessor(randomAsciiOfLength(10), "source_field", + GeoIpProcessor processor = new GeoIpProcessor(randomAlphaOfLength(10), "source_field", new DatabaseReader.Builder(database).build(), "target_field", EnumSet.allOf(GeoIpProcessor.Property.class), true); IngestDocument originalIngestDocument = RandomDocumentPicks.randomIngestDocument(random(), Collections.singletonMap("source_field", null)); @@ -80,7 +79,7 @@ public class GeoIpProcessorTests extends ESTestCase { public void testNonExistentWithIgnoreMissing() throws Exception { InputStream database = getDatabaseFileInputStream("/GeoLite2-City.mmdb.gz"); - GeoIpProcessor processor = new GeoIpProcessor(randomAsciiOfLength(10), "source_field", + GeoIpProcessor processor = new GeoIpProcessor(randomAlphaOfLength(10), "source_field", new DatabaseReader.Builder(database).build(), "target_field", EnumSet.allOf(GeoIpProcessor.Property.class), true); IngestDocument originalIngestDocument = RandomDocumentPicks.randomIngestDocument(random(), Collections.emptyMap()); IngestDocument ingestDocument = new IngestDocument(originalIngestDocument); @@ -90,7 +89,7 @@ public class GeoIpProcessorTests extends ESTestCase { public void testNullWithoutIgnoreMissing() throws Exception { InputStream database = getDatabaseFileInputStream("/GeoLite2-City.mmdb.gz"); - GeoIpProcessor processor = new GeoIpProcessor(randomAsciiOfLength(10), "source_field", + GeoIpProcessor processor = new GeoIpProcessor(randomAlphaOfLength(10), "source_field", new DatabaseReader.Builder(database).build(), "target_field", EnumSet.allOf(GeoIpProcessor.Property.class), false); IngestDocument originalIngestDocument = RandomDocumentPicks.randomIngestDocument(random(), Collections.singletonMap("source_field", null)); @@ -101,7 +100,7 @@ public class GeoIpProcessorTests extends ESTestCase { public void testNonExistentWithoutIgnoreMissing() throws Exception { InputStream database = getDatabaseFileInputStream("/GeoLite2-City.mmdb.gz"); - GeoIpProcessor processor = new GeoIpProcessor(randomAsciiOfLength(10), "source_field", + GeoIpProcessor processor = new GeoIpProcessor(randomAlphaOfLength(10), "source_field", new DatabaseReader.Builder(database).build(), "target_field", EnumSet.allOf(GeoIpProcessor.Property.class), false); IngestDocument originalIngestDocument = RandomDocumentPicks.randomIngestDocument(random(), Collections.emptyMap()); IngestDocument ingestDocument = new IngestDocument(originalIngestDocument); @@ -111,7 +110,7 @@ public class GeoIpProcessorTests extends ESTestCase { public void testCity_withIpV6() throws Exception { InputStream database = getDatabaseFileInputStream("/GeoLite2-City.mmdb.gz"); - GeoIpProcessor processor = new GeoIpProcessor(randomAsciiOfLength(10), "source_field", + GeoIpProcessor processor = new GeoIpProcessor(randomAlphaOfLength(10), "source_field", new DatabaseReader.Builder(database).build(), "target_field", EnumSet.allOf(GeoIpProcessor.Property.class), false); String address = "2602:306:33d3:8000::3257:9652"; @@ -139,7 +138,7 @@ public class GeoIpProcessorTests extends ESTestCase { public void testCityWithMissingLocation() throws Exception { InputStream database = getDatabaseFileInputStream("/GeoLite2-City.mmdb.gz"); - GeoIpProcessor processor = new GeoIpProcessor(randomAsciiOfLength(10), "source_field", + GeoIpProcessor processor = new GeoIpProcessor(randomAlphaOfLength(10), "source_field", new DatabaseReader.Builder(database).build(), "target_field", EnumSet.allOf(GeoIpProcessor.Property.class), false); Map<String, Object> document = new HashMap<>(); @@ -156,7 +155,7 @@ public class GeoIpProcessorTests extends ESTestCase { public void testCountry() throws Exception { InputStream database = getDatabaseFileInputStream("/GeoLite2-Country.mmdb.gz"); - GeoIpProcessor processor = new GeoIpProcessor(randomAsciiOfLength(10), "source_field", + GeoIpProcessor processor = new GeoIpProcessor(randomAlphaOfLength(10), "source_field", new DatabaseReader.Builder(database).build(), "target_field", EnumSet.allOf(GeoIpProcessor.Property.class), false); Map<String, Object> document = new HashMap<>(); @@ -176,7 +175,7 @@ public class GeoIpProcessorTests extends ESTestCase { public void testCountryWithMissingLocation() throws Exception { InputStream database = getDatabaseFileInputStream("/GeoLite2-Country.mmdb.gz"); - GeoIpProcessor processor = new GeoIpProcessor(randomAsciiOfLength(10), "source_field", + GeoIpProcessor processor = new GeoIpProcessor(randomAlphaOfLength(10), "source_field", new DatabaseReader.Builder(database).build(), "target_field", EnumSet.allOf(GeoIpProcessor.Property.class), false); Map<String, Object> document = new HashMap<>(); @@ -193,7 +192,7 @@ public class GeoIpProcessorTests extends ESTestCase { public void testAddressIsNotInTheDatabase() throws Exception { InputStream database = getDatabaseFileInputStream("/GeoLite2-City.mmdb.gz"); - GeoIpProcessor processor = new GeoIpProcessor(randomAsciiOfLength(10), "source_field", + GeoIpProcessor processor = new GeoIpProcessor(randomAlphaOfLength(10), "source_field", new DatabaseReader.Builder(database).build(), "target_field", EnumSet.allOf(GeoIpProcessor.Property.class), false); Map<String, Object> document = new HashMap<>(); @@ -206,7 +205,7 @@ public class GeoIpProcessorTests extends ESTestCase { /** Don't silently do DNS lookups or anything trappy on bogus data */ public void testInvalid() throws Exception { InputStream database = getDatabaseFileInputStream("/GeoLite2-City.mmdb.gz"); - GeoIpProcessor processor = new GeoIpProcessor(randomAsciiOfLength(10), "source_field", + GeoIpProcessor processor = new GeoIpProcessor(randomAlphaOfLength(10), "source_field", new DatabaseReader.Builder(database).build(), "target_field", EnumSet.allOf(GeoIpProcessor.Property.class), false); Map<String, Object> document = new HashMap<>(); |