Cwikius-Spring/spring-data-elasticsearch
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-data-elasticsearch.git synced 2025-06-30 07:42:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

DATAES-563 - Polishing.

Browse Source 
Merge test methods. Add author name. Formatting, javadoc.

Original pull request: #271.
This commit is contained in:
Mark Paluch 2019-04-23 16:02:12 +02:00
parent deefeb462e
commit 17d9022181
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/test/java/org/springframework/data/elasticsearch/config/ElasticsearchConfigurationSupportUnitTests.java
View File

@ -24,6 +24,7 @@ import java.util.Collections;
import org.apache.commons.lang.ClassUtils; import org.apache.commons.lang.ClassUtils;
import org.elasticsearch.client.RestHighLevelClient; import org.elasticsearch.client.RestHighLevelClient;
import org.junit.Test; import org.junit.Test;
import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
@ -39,7 +40,10 @@ import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverte
import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext; import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext;
/** /**
* Unit tests for {@link ElasticsearchConfigurationSupport}.
*
* @author Christoph Strobl * @author Christoph Strobl
* @author Peter-Josef Meisch
*/ */
public class ElasticsearchConfigurationSupportUnitTests { public class ElasticsearchConfigurationSupportUnitTests {
@ -86,16 +90,11 @@ public class ElasticsearchConfigurationSupportUnitTests {
} }
@Test // DATAES-563 @Test // DATAES-563
public void restConfigContainsElasticsearchOperationsByName() { public void restConfigContainsElasticsearchOperationsByNameAndAlias() {
AbstractApplicationContext context = new AnnotationConfigApplicationContext(RestConfig.class); AbstractApplicationContext context = new AnnotationConfigApplicationContext(RestConfig.class);
assertThat(context.getBean("elasticsearchOperations")).isNotNull(); assertThat(context.getBean("elasticsearchOperations")).isNotNull();
}
@Test // DATAES-563
public void restConfigContainsElasticsearchTemplateByName() {
AbstractApplicationContext context = new AnnotationConfigApplicationContext(RestConfig.class);
assertThat(context.getBean("elasticsearchTemplate")).isNotNull(); assertThat(context.getBean("elasticsearchTemplate")).isNotNull();
} }

3
src/test/java/org/springframework/data/elasticsearch/config/ElasticsearchConfigurationTests.java
View File

@ -22,6 +22,7 @@ import static org.mockito.Mockito.*;
import org.elasticsearch.client.RestHighLevelClient; import org.elasticsearch.client.RestHighLevelClient;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.data.elasticsearch.repositories.existing.index.CreateIndexFalseRepository; import org.springframework.data.elasticsearch.repositories.existing.index.CreateIndexFalseRepository;
@ -30,6 +31,8 @@ import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
/** /**
* Tests for {@link AbstractElasticsearchConfiguration}.
*
* @author Peter-Josef Meisch * @author Peter-Josef Meisch
*/ */
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)