Cwikius-Spring/spring-data-elasticsearch
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-data-elasticsearch.git synced 2025-06-13 23:52:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

DATAES-619 - Migrate remaining tests to AssertJ.

Browse Source
This commit is contained in:
Mark Paluch 2019-10-14 14:21:23 +02:00
parent c4bb59e545
commit ba76986172
No known key found for this signature in database
GPG Key ID: 51A00FA751B91849
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/test/java/org/springframework/data/elasticsearch/client/util/RequestConvertersTest.java
View File

@ -15,62 +15,62 @@
*/ */
package org.springframework.data.elasticsearch.client.util; package org.springframework.data.elasticsearch.client.util;
import static org.hamcrest.Matchers.*; import java.util.Collections;
import static org.junit.Assert.*;
import java.util.HashMap;
import org.elasticsearch.action.delete.DeleteRequest; import org.elasticsearch.action.delete.DeleteRequest;
import org.elasticsearch.action.index.IndexRequest; import org.elasticsearch.action.index.IndexRequest;
import org.elasticsearch.client.Request; import org.elasticsearch.client.Request;
import org.junit.Test; import org.junit.Test;
import static org.assertj.core.api.Assertions.*;
/** /**
* Unit tests for {@link RequestConverters}. * Unit tests for {@link RequestConverters}.
* *
* @author Roman Puchkovskiy * @author Roman Puchkovskiy
* @author Mark Paluch
*/ */
public class RequestConvertersTest { public class RequestConvertersTest {
@Test // DATAES-652 @Test // DATAES-652
public void shouldNotAddIfSeqNoAndIfPrimaryTermToResultIfInputDoesNotcontainThemWhenConvertingIndexRequest() { public void shouldNotAddIfSeqNoAndIfPrimaryTermToResultIfInputDoesNotcontainThemWhenConvertingIndexRequest() {
IndexRequest request = createMinimalIndexRequest(); IndexRequest request = createMinimalIndexRequest();
Request result = RequestConverters.index(request); Request result = RequestConverters.index(request);
assertThat(result.getParameters(), not(hasKey("if_seq_no"))); assertThat(result.getParameters())
assertThat(result.getParameters(), not(hasKey("if_primary_term"))); .doesNotContainKeys("if_seq_no", "if_primary_term");
} }
private IndexRequest createMinimalIndexRequest() { private IndexRequest createMinimalIndexRequest() {
IndexRequest request = new IndexRequest("the-index", "the-type", "id"); IndexRequest request = new IndexRequest("the-index", "the-type", "id");
request.source(new HashMap<String, String>() { request.source(Collections.singletonMap("test", "test"));
{
put("test", "test");
}
});
return request; return request;
} }
@Test // DATAES-652 @Test // DATAES-652
public void shouldAddIfSeqNoAndIfPrimaryTermToResultIfInputcontainsThemWhenConvertingIndexRequest() { public void shouldAddIfSeqNoAndIfPrimaryTermToResultIfInputcontainsThemWhenConvertingIndexRequest() {
IndexRequest request = createMinimalIndexRequest(); IndexRequest request = createMinimalIndexRequest();
request.setIfSeqNo(3); request.setIfSeqNo(3);
request.setIfPrimaryTerm(4); request.setIfPrimaryTerm(4);
Request result = RequestConverters.index(request); Request result = RequestConverters.index(request);
assertThat(result.getParameters(), hasEntry("if_seq_no", "3")); assertThat(result.getParameters()).containsEntry("if_seq_no", "3")
assertThat(result.getParameters(), hasEntry("if_primary_term", "4")); .containsEntry("if_primary_term", "4");
} }
@Test // DATAES-652 @Test // DATAES-652
public void shouldNotAddIfSeqNoAndIfPrimaryTermToResultIfInputDoesNotcontainThemWhenConvertingDeleteRequest() { public void shouldNotAddIfSeqNoAndIfPrimaryTermToResultIfInputDoesNotcontainThemWhenConvertingDeleteRequest() {
DeleteRequest request = createMinimalDeleteRequest(); DeleteRequest request = createMinimalDeleteRequest();
Request result = RequestConverters.delete(request); Request result = RequestConverters.delete(request);
assertThat(result.getParameters(), not(hasKey("if_seq_no"))); assertThat(result.getParameters())
assertThat(result.getParameters(), not(hasKey("if_primary_term"))); .doesNotContainKeys("if_seq_no", "if_primary_term");
} }
private DeleteRequest createMinimalDeleteRequest() { private DeleteRequest createMinimalDeleteRequest() {
@ -79,13 +79,14 @@ public class RequestConvertersTest {
@Test // DATAES-652 @Test // DATAES-652
public void shouldAddIfSeqNoAndIfPrimaryTermToResultIfInputcontainsThemWhenConvertingDeleteRequest() { public void shouldAddIfSeqNoAndIfPrimaryTermToResultIfInputcontainsThemWhenConvertingDeleteRequest() {
DeleteRequest request = createMinimalDeleteRequest(); DeleteRequest request = createMinimalDeleteRequest();
request.setIfSeqNo(3); request.setIfSeqNo(3);
request.setIfPrimaryTerm(4); request.setIfPrimaryTerm(4);
Request result = RequestConverters.delete(request); Request result = RequestConverters.delete(request);
assertThat(result.getParameters(), hasEntry("if_seq_no", "3")); assertThat(result.getParameters()).containsEntry("if_seq_no", "3");
assertThat(result.getParameters(), hasEntry("if_primary_term", "4")); assertThat(result.getParameters()).containsEntry("if_primary_term", "4");
} }
} }