This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 6da485b817a2c34e3e6d87da4037a1b028531a64 Author: exceptionfactory <[email protected]> AuthorDate: Mon Mar 3 15:09:38 2025 -0600 NIFI-14311 Fixed Elasticsearch verification message checks This closes #9761 - Replaced explicit message comparison with String.contains() checking --- .../elasticsearch/integration/ElasticSearchClientService_IT.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/test/java/org/apache/nifi/elasticsearch/integration/ElasticSearchClientService_IT.java b/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/test/java/org/apache/nifi/elasticsearch/integration/ElasticSearchClientService_IT.java index fe6c637acc..1dd7285173 100644 --- a/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/test/java/org/apache/nifi/elasticsearch/integration/ElasticSearchClientService_IT.java +++ b/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/test/java/org/apache/nifi/elasticsearch/integration/ElasticSearchClientService_IT.java @@ -166,7 +166,7 @@ class ElasticSearchClientService_IT extends AbstractElasticsearch_IT { assertEquals(3, results.stream().filter(result -> result.getOutcome() == ConfigVerificationResult.Outcome.SKIPPED).count(), results.toString()); assertEquals(1, results.stream().filter( result -> Objects.equals(result.getVerificationStepName(), ElasticSearchClientServiceImpl.VERIFICATION_STEP_CLIENT_SETUP) - && Objects.equals(result.getExplanation(), "Incorrect/invalid " + ElasticSearchClientService.HTTP_HOSTS.getDisplayName()) + && result.getExplanation().contains(ElasticSearchClientService.HTTP_HOSTS.getDisplayName()) && result.getOutcome() == ConfigVerificationResult.Outcome.FAILED).count(), results.toString() ); @@ -188,7 +188,6 @@ class ElasticSearchClientService_IT extends AbstractElasticsearch_IT { assertEquals(2, results.stream().filter(result -> result.getOutcome() == ConfigVerificationResult.Outcome.SKIPPED).count(), results.toString()); assertEquals(1, results.stream().filter( result -> Objects.equals(result.getVerificationStepName(), ElasticSearchClientServiceImpl.VERIFICATION_STEP_CONNECTION) - && Objects.equals(result.getExplanation(), "Unable to retrieve system summary from Elasticsearch root endpoint") && result.getOutcome() == ConfigVerificationResult.Outcome.FAILED).count(), results.toString() ); @@ -214,7 +213,6 @@ class ElasticSearchClientService_IT extends AbstractElasticsearch_IT { assertEquals(2, results.stream().filter(result -> result.getOutcome() == ConfigVerificationResult.Outcome.SKIPPED).count(), results.toString()); assertEquals(1, results.stream().filter( result -> Objects.equals(result.getVerificationStepName(), ElasticSearchClientServiceImpl.VERIFICATION_STEP_CONNECTION) - && Objects.equals(result.getExplanation(), "Unable to retrieve system summary from Elasticsearch root endpoint") && result.getOutcome() == ConfigVerificationResult.Outcome.FAILED).count(), results.toString() ); @@ -985,7 +983,7 @@ class ElasticSearchClientService_IT extends AbstractElasticsearch_IT { private void assertVerifySnifferSkipped(final List<ConfigVerificationResult> results) { assertEquals(1, results.stream().filter( result -> Objects.equals(result.getVerificationStepName(), ElasticSearchClientServiceImpl.VERIFICATION_STEP_SNIFFER) - && Objects.equals(result.getExplanation(), "Sniff on Connection not enabled") + && result.getExplanation().contains("Sniff") && result.getOutcome() == ConfigVerificationResult.Outcome.SKIPPED).count(), results.toString() );
