Cwikius-Spring/spring-data-elasticsearch
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-data-elasticsearch.git synced 2025-06-14 08:02:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

DATAES-576 - Fix ElasticsearchTemplateTests.

Browse Source 
We now delete documents with a type query instead of a term query. Also, added index cleanup to ReactiveElasticsearchTemplateTests.
This commit is contained in:
Mark Paluch 2019-05-06 21:21:16 +02:00
parent b6fa4c8a74
commit 1f04e6453c
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateTests.java
View File

@ -74,7 +74,7 @@ import org.springframework.data.util.CloseableIterator;
/** /**
* Base for testing rest/transport templates * Base for testing rest/transport templates
* *
* @author Rizwan Idrees * @author Rizwan Idrees
* @author Mohsin Husen * @author Mohsin Husen
* @author Franck Marchand * @author Franck Marchand
@ -460,7 +460,7 @@ public class ElasticsearchTemplateTests {
// when // when
DeleteQuery deleteQuery = new DeleteQuery(); DeleteQuery deleteQuery = new DeleteQuery();
deleteQuery.setQuery(termQuery("message", "foo")); deleteQuery.setQuery(typeQuery(TYPE_NAME));
deleteQuery.setType(TYPE_NAME); deleteQuery.setType(TYPE_NAME);
deleteQuery.setIndex("test-index-*"); deleteQuery.setIndex("test-index-*");

17
src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplateTests.java
View File

@ -34,10 +34,12 @@ import java.util.UUID;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.IntStream; import java.util.stream.IntStream;
import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.core.convert.support.DefaultConversionService; import org.springframework.core.convert.support.DefaultConversionService;
import org.springframework.dao.DataAccessResourceFailureException; import org.springframework.dao.DataAccessResourceFailureException;
import org.springframework.data.annotation.Id; import org.springframework.data.annotation.Id;
@ -82,7 +84,7 @@ public class ReactiveElasticsearchTemplateTests {
@Before @Before
public void setUp() { public void setUp() {
TestUtils.deleteIndex(DEFAULT_INDEX, ALTERNATE_INDEX); deleteIndices();
restTemplate = new ElasticsearchRestTemplate(TestUtils.restHighLevelClient()); restTemplate = new ElasticsearchRestTemplate(TestUtils.restHighLevelClient());
restTemplate.createIndex(SampleEntity.class); restTemplate.createIndex(SampleEntity.class);
@ -94,6 +96,15 @@ public class ReactiveElasticsearchTemplateTests {
restTemplate.getElasticsearchConverter().getMappingContext(), new DefaultConversionService()))); restTemplate.getElasticsearchConverter().getMappingContext(), new DefaultConversionService())));
} }
@After
public void tearDown() {
deleteIndices();
}
private void deleteIndices() {
TestUtils.deleteIndex(DEFAULT_INDEX, ALTERNATE_INDEX, "rx-template-test-index-this", "rx-template-test-index-that");
}
@Test // DATAES-504 @Test // DATAES-504
public void executeShouldProvideResource() { public void executeShouldProvideResource() {
@ -547,6 +558,8 @@ public class ReactiveElasticsearchTemplateTests {
.as(StepVerifier::create) // .as(StepVerifier::create) //
.expectNext(2L) // .expectNext(2L) //
.verifyComplete(); .verifyComplete();
TestUtils.deleteIndex(thisIndex, thatIndex);
} }
@Test // DATAES-547 @Test // DATAES-547
@ -575,6 +588,8 @@ public class ReactiveElasticsearchTemplateTests {
.as(StepVerifier::create) // .as(StepVerifier::create) //
.expectNext(0L) // .expectNext(0L) //
.verifyComplete(); .verifyComplete();
TestUtils.deleteIndex(thisIndex, thatIndex);
} }
@Test // DATAES-504 @Test // DATAES-504