Fix failing URLDecodeProcessorTests::testProcessor test (#78690)

elastic · Oct 7, 2021 · 4d24273 · 4d24273
1 parent b56d72a
commit 4d24273
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/...common/src/test/java/org/elasticsearch/ingest/common/AbstractStringProcessorTestCase.java b/...common/src/test/java/org/elasticsearch/ingest/common/AbstractStringProcessorTestCase.java
@@ -38,8 +38,14 @@ protected Class<?> expectedResultType() {
 
     public void testProcessor() throws Exception {
         IngestDocument ingestDocument = RandomDocumentPicks.randomIngestDocument(random());
-        String fieldValue = RandomDocumentPicks.randomString(random());
-        String fieldName = RandomDocumentPicks.addRandomField(random(), ingestDocument, modifyInput(fieldValue));
+        String fieldValue;
+        String fieldName;
+        String modifiedFieldValue;
+        do {
+            fieldValue = RandomDocumentPicks.randomString(random());
+            modifiedFieldValue = modifyInput(fieldValue);
+            fieldName = RandomDocumentPicks.addRandomField(random(), ingestDocument, modifiedFieldValue);
+        } while (isSupportedValue(modifiedFieldValue) == false);
         Processor processor = newProcessor(fieldName, randomBoolean(), fieldName);
         processor.execute(ingestDocument);
         assertThat(ingestDocument.getFieldValue(fieldName, expectedResultType()), equalTo(expectedResult(fieldValue)));
@@ -48,8 +54,13 @@ public void testProcessor() throws Exception {
         List<String> fieldValueList = new ArrayList<>();
         List<T> expectedList = new ArrayList<>();
         for (int i = 0; i < numItems; i++) {
-            String randomString = RandomDocumentPicks.randomString(random());
-            fieldValueList.add(modifyInput(randomString));
+            String randomString;
+            String modifiedRandomString;
+            do {
+                randomString = RandomDocumentPicks.randomString(random());
+                modifiedRandomString = modifyInput(randomString);
+            } while (isSupportedValue(modifiedRandomString) == false);
+            fieldValueList.add(modifiedRandomString);
             expectedList.add(expectedResult(randomString));
         }
         String multiValueFieldName = RandomDocumentPicks.addRandomField(random(), ingestDocument, fieldValueList);