From 4344a65dc2a197d39ce3340e8e4d76f432c7cb4b Mon Sep 17 00:00:00 2001 From: Peter-Josef Meisch Date: Fri, 28 Aug 2020 17:40:45 +0200 Subject: [PATCH] DATAES-919 - Fix error messages in test output. Original PR: #514 --- .../ElasticsearchConfigurationSupportUnitTests.java | 10 +++++++++- .../ReactiveElasticsearchTemplateCallbackTests.java | 7 +++++++ .../core/ReactiveElasticsearchTemplateUnitTests.java | 5 +++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/test/java/org/springframework/data/elasticsearch/config/ElasticsearchConfigurationSupportUnitTests.java b/src/test/java/org/springframework/data/elasticsearch/config/ElasticsearchConfigurationSupportUnitTests.java index 0ef81acc4..d1bbfe838 100644 --- a/src/test/java/org/springframework/data/elasticsearch/config/ElasticsearchConfigurationSupportUnitTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/config/ElasticsearchConfigurationSupportUnitTests.java @@ -18,11 +18,16 @@ package org.springframework.data.elasticsearch.config; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; +import reactor.core.publisher.Mono; + import java.util.Collection; import java.util.Collections; import org.apache.commons.lang.ClassUtils; +import org.elasticsearch.Version; +import org.elasticsearch.action.main.MainResponse; import org.elasticsearch.client.RestHighLevelClient; +import org.elasticsearch.cluster.ClusterName; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Configuration; @@ -110,7 +115,10 @@ public class ElasticsearchConfigurationSupportUnitTests { @Override public ReactiveElasticsearchClient reactiveElasticsearchClient() { - return mock(ReactiveElasticsearchClient.class); + ReactiveElasticsearchClient client = mock(ReactiveElasticsearchClient.class); + when(client.info()).thenReturn(Mono + .just(new MainResponse("mockNodename", Version.CURRENT, new ClusterName("mockCluster"), "mockUuid", null))); + return client; } } diff --git a/src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplateCallbackTests.java b/src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplateCallbackTests.java index 93724559a..ce24f82e9 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplateCallbackTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplateCallbackTests.java @@ -31,6 +31,7 @@ import java.util.HashMap; import java.util.List; import java.util.stream.Collectors; +import org.elasticsearch.Version; import org.elasticsearch.action.DocWriteResponse; import org.elasticsearch.action.bulk.BulkItemResponse; import org.elasticsearch.action.bulk.BulkRequest; @@ -39,7 +40,9 @@ import org.elasticsearch.action.get.GetRequest; import org.elasticsearch.action.get.MultiGetRequest; import org.elasticsearch.action.index.IndexRequest; import org.elasticsearch.action.index.IndexResponse; +import org.elasticsearch.action.main.MainResponse; import org.elasticsearch.action.search.SearchRequest; +import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.index.get.GetResult; import org.junit.jupiter.api.BeforeEach; @@ -66,6 +69,7 @@ import org.springframework.util.CollectionUtils; /** * @author Roman Puchkovskiy + * @author Peter-Josef Meisch */ @ExtendWith(MockitoExtension.class) @MockitoSettings(strictness = Strictness.LENIENT) @@ -90,6 +94,9 @@ public class ReactiveElasticsearchTemplateCallbackTests { @BeforeEach public void setUp() { + when(client.info()).thenReturn( + Mono.just(new MainResponse("mockNodename", Version.CURRENT, new ClusterName("mockCluster"), "mockUuid", null))); + template = new ReactiveElasticsearchTemplate(client); when(client.index(any(IndexRequest.class))).thenReturn(Mono.just(indexResponse)); diff --git a/src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplateUnitTests.java b/src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplateUnitTests.java index 62e9d05d7..6a9c5a54c 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplateUnitTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplateUnitTests.java @@ -35,9 +35,11 @@ import java.util.Collections; import org.elasticsearch.action.delete.DeleteRequest; import org.elasticsearch.action.index.IndexRequest; +import org.elasticsearch.action.main.MainResponse; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.action.support.WriteRequest.RefreshPolicy; +import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.index.reindex.DeleteByQueryRequest; import org.junit.jupiter.api.BeforeEach; @@ -76,6 +78,9 @@ public class ReactiveElasticsearchTemplateUnitTests { @BeforeEach public void setUp() { + when(client.info()).thenReturn(Mono.just(new MainResponse("mockNodename", org.elasticsearch.Version.CURRENT, + new ClusterName("mockCluster"), "mockUuid", null))); + template = new ReactiveElasticsearchTemplate(client); }