summaryrefslogtreecommitdiff
path: root/core/src/test/java/org/elasticsearch/action/ingest
diff options
context:
space:
mode:
authorJason Tedor <jason@tedor.me>2016-06-06 10:59:28 -0400
committerJason Tedor <jason@tedor.me>2016-06-06 11:16:22 -0400
commita60b8948ba1d836a6eac7cff095519e618939ed8 (patch)
tree5bfe46169b7b23a2d4e4f7f2f81c7dffa928bd4a /core/src/test/java/org/elasticsearch/action/ingest
parent48443259217e431146c8d3b13c01cdd5ecd7a637 (diff)
parent0a8afa2e7269ddbec3755b8f10033e93f55149c2 (diff)
Merge branch 'master' into feature/seq_no
* master: (184 commits) Add back pending deletes (#18698) refactor matrix agg documentation from modules to main agg section Implement ctx.op = "delete" on _update_by_query and _reindex Close SearchContext if query rewrite failed Wrap lines at 140 characters (:qa projects) Remove log file painless: Add support for the new Java 9 MethodHandles#arrayLength() factory (see https://bugs.openjdk.java.net/browse/JDK-8156915) More complete exception message in settings tests Use java from path if JAVA_HOME is not set Fix uncaught checked exception in AzureTestUtils [TEST] wait for yellow after setup doc tests (#18726) Fix recovery throttling to properly handle relocating non-primary shards (#18701) Fix merge stats rendering in RestIndicesAction (#18720) [TEST] mute RandomAllocationDeciderTests.testRandomDecisions Reworked docs for index-shrink API (#18705) Improve painless compile-time exceptions Adds UUIDs to snapshots Add test rethrottle test case for delete-by-query Do not start scheduled pings until transport start Adressing review comments ...
Diffstat (limited to 'core/src/test/java/org/elasticsearch/action/ingest')
-rw-r--r--core/src/test/java/org/elasticsearch/action/ingest/SimulateExecutionServiceTests.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/core/src/test/java/org/elasticsearch/action/ingest/SimulateExecutionServiceTests.java b/core/src/test/java/org/elasticsearch/action/ingest/SimulateExecutionServiceTests.java
index 56e67bb4ad..f7f2f0212d 100644
--- a/core/src/test/java/org/elasticsearch/action/ingest/SimulateExecutionServiceTests.java
+++ b/core/src/test/java/org/elasticsearch/action/ingest/SimulateExecutionServiceTests.java
@@ -19,6 +19,7 @@
package org.elasticsearch.action.ingest;
+import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.ingest.RandomDocumentPicks;
import org.elasticsearch.ingest.TestProcessor;
@@ -127,7 +128,7 @@ public class SimulateExecutionServiceTests extends ESTestCase {
TestProcessor processor2 = new TestProcessor("processor_1", "mock", ingestDocument -> {});
TestProcessor processor3 = new TestProcessor("processor_2", "mock", ingestDocument -> {});
Pipeline pipeline = new Pipeline("_id", "_description",
- new CompoundProcessor(new CompoundProcessor(Collections.singletonList(processor1),
+ new CompoundProcessor(new CompoundProcessor(false, Collections.singletonList(processor1),
Collections.singletonList(processor2)), processor3));
SimulateDocumentResult actualItemResponse = executionService.executeDocument(pipeline, ingestDocument, true);
assertThat(processor1.getInvokedCounter(), equalTo(1));
@@ -167,7 +168,8 @@ public class SimulateExecutionServiceTests extends ESTestCase {
SimulateDocumentBaseResult simulateDocumentBaseResult = (SimulateDocumentBaseResult) actualItemResponse;
assertThat(simulateDocumentBaseResult.getIngestDocument(), nullValue());
assertThat(simulateDocumentBaseResult.getFailure(), instanceOf(RuntimeException.class));
- RuntimeException runtimeException = (RuntimeException) simulateDocumentBaseResult.getFailure();
- assertThat(runtimeException.getMessage(), equalTo("processor failed"));
+ Exception exception = simulateDocumentBaseResult.getFailure();
+ assertThat(exception, instanceOf(ElasticsearchException.class));
+ assertThat(exception.getMessage(), equalTo("java.lang.IllegalArgumentException: java.lang.RuntimeException: processor failed"));
}
}