mirror of
https://github.com/spring-projects/spring-data-elasticsearch.git
synced 2025-06-29 15:22:11 +00:00
DATAES-563 - Polishing.
Merge test methods. Add author name. Formatting, javadoc. Original pull request: #271.
This commit is contained in:
parent
deefeb462e
commit
17d9022181
@ -24,6 +24,7 @@ import java.util.Collections;
|
||||
import org.apache.commons.lang.ClassUtils;
|
||||
import org.elasticsearch.client.RestHighLevelClient;
|
||||
import org.junit.Test;
|
||||
|
||||
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
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;
|
||||
|
||||
/**
|
||||
* Unit tests for {@link ElasticsearchConfigurationSupport}.
|
||||
*
|
||||
* @author Christoph Strobl
|
||||
* @author Peter-Josef Meisch
|
||||
*/
|
||||
public class ElasticsearchConfigurationSupportUnitTests {
|
||||
|
||||
@ -86,16 +90,11 @@ public class ElasticsearchConfigurationSupportUnitTests {
|
||||
}
|
||||
|
||||
@Test // DATAES-563
|
||||
public void restConfigContainsElasticsearchOperationsByName() {
|
||||
public void restConfigContainsElasticsearchOperationsByNameAndAlias() {
|
||||
|
||||
AbstractApplicationContext context = new AnnotationConfigApplicationContext(RestConfig.class);
|
||||
|
||||
assertThat(context.getBean("elasticsearchOperations")).isNotNull();
|
||||
}
|
||||
|
||||
@Test // DATAES-563
|
||||
public void restConfigContainsElasticsearchTemplateByName() {
|
||||
|
||||
AbstractApplicationContext context = new AnnotationConfigApplicationContext(RestConfig.class);
|
||||
assertThat(context.getBean("elasticsearchTemplate")).isNotNull();
|
||||
}
|
||||
|
||||
|
@ -22,6 +22,7 @@ import static org.mockito.Mockito.*;
|
||||
import org.elasticsearch.client.RestHighLevelClient;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
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;
|
||||
|
||||
/**
|
||||
* Tests for {@link AbstractElasticsearchConfiguration}.
|
||||
*
|
||||
* @author Peter-Josef Meisch
|
||||
*/
|
||||
@RunWith(SpringJUnit4ClassRunner.class)
|
||||
|
Loading…
x
Reference in New Issue
Block a user