diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/java/org/apache/nifi/processors/elasticsearch/AbstractByQueryElasticsearchTest.java b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/java/org/apache/nifi/processors/elasticsearch/AbstractByQueryElasticsearchTest.java index c464652a47..7b3c14bc3e 100644 --- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/java/org/apache/nifi/processors/elasticsearch/AbstractByQueryElasticsearchTest.java +++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/java/org/apache/nifi/processors/elasticsearch/AbstractByQueryElasticsearchTest.java @@ -135,12 +135,7 @@ public abstract class AbstractByQueryElasticsearchTest { runner.setProperty(ElasticsearchRestProcessor.QUERY, "not-json"); final AssertionError assertionError = assertThrows(AssertionError.class, runner::run); - final String expected = String.format("Processor has 1 validation failures:\n" + - "'%s' validated against 'not-json' is invalid because %s is not a valid JSON representation due to Unrecognized token 'not': was expecting" + - " (JSON String, Number, Array, Object or token 'null', 'true' or 'false')\n" + - " at [Source: (String)\"not-json\"; line: 1, column: 4]\n", - ElasticsearchRestProcessor.QUERY.getName(), ElasticsearchRestProcessor.QUERY.getName()); - assertEquals(expected, assertionError.getMessage()); + assertTrue(assertionError.getMessage().contains("not-json")); } @Test @@ -151,24 +146,7 @@ public abstract class AbstractByQueryElasticsearchTest { runner.setProperty(ElasticsearchRestProcessor.SCRIPT, "not-json-script"); final AssertionError assertionError = assertThrows(AssertionError.class, runner::run); - String expected; - if (getTestProcessor() instanceof DeleteByQueryElasticsearch) { - // no SCRIPT in Query Builder - expected = "Processor has 1 validation failures:\n"; - } else { - expected = "Processor has 2 validation failures:\n"; - } - expected += String.format("'%s' validated against 'not-json' is invalid because %s is not a valid JSON representation due to Unrecognized token 'not': was expecting" + - " (JSON String, Number, Array, Object or token 'null', 'true' or 'false')\n" + - " at [Source: (String)\"not-json\"; line: 1, column: 4]\n", - ElasticsearchRestProcessor.QUERY_CLAUSE.getName(), ElasticsearchRestProcessor.QUERY_CLAUSE.getName()); - if (getTestProcessor() instanceof UpdateByQueryElasticsearch) { - expected += String.format("'%s' validated against 'not-json-script' is invalid because %s is not a valid JSON representation due to Unrecognized token 'not': was expecting " + - "(JSON String, Number, Array, Object or token 'null', 'true' or 'false')\n" + - " at [Source: (String)\"not-json-script\"; line: 1, column: 4]\n", - ElasticsearchRestProcessor.SCRIPT.getName(), ElasticsearchRestProcessor.SCRIPT.getName()); - } - assertEquals(expected, assertionError.getMessage()); + assertTrue(assertionError.getMessage().contains("not-json")); } @Test diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/java/org/apache/nifi/processors/elasticsearch/AbstractJsonQueryElasticsearchTest.java b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/java/org/apache/nifi/processors/elasticsearch/AbstractJsonQueryElasticsearchTest.java index 6e12c3503a..b741566550 100644 --- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/java/org/apache/nifi/processors/elasticsearch/AbstractJsonQueryElasticsearchTest.java +++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/java/org/apache/nifi/processors/elasticsearch/AbstractJsonQueryElasticsearchTest.java @@ -169,12 +169,7 @@ public abstract class AbstractJsonQueryElasticsearchTest

testReadAccountJson("src/test/resources/json/bank-account-multiline.json", false, StreamReadConstraints.builder().maxStringLength(2).build())); - assertTrue(mre.getMessage().contains("maximum length")); - assertTrue(mre.getMessage().contains("(2)")); + assertTrue(mre.getMessage().contains("maximum")); + assertTrue(mre.getMessage().contains("2")); } @Test diff --git a/pom.xml b/pom.xml index 0c491a33d4..4244325f19 100644 --- a/pom.xml +++ b/pom.xml @@ -130,7 +130,7 @@ 10.17.1.0 2.4.0 10.0.18 - 2.15.3 + 2.16.1 1.11.3 2.3.9 1.3.2