Cwikius-Spring/spring-data-elasticsearch
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-data-elasticsearch.git synced 2025-12-17 22:13:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add @ContextConfiguration(…) to test classes that use @SpringIntegrationTest on super classes.

Browse Source 
Closes #3212
This commit is contained in:
Mark Paluch 2025-12-11 08:59:58 +01:00
parent 6c7c323246
commit 1e5341ad07
No known key found for this signature in database
GPG Key ID: 55BC6374BAA9D973
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/test/java/org/springframework/data/elasticsearch/client/elc/ElasticsearchPartQueryELCIntegrationTests.java
View File

@ -21,14 +21,16 @@ import co.elastic.clients.json.jackson.JacksonJsonpMapper;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Import;
import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates; import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
import org.springframework.data.elasticsearch.core.query.RepositoryPartQueryIntegrationTests;
import org.springframework.data.elasticsearch.core.query.Query; import org.springframework.data.elasticsearch.core.query.Query;
import org.springframework.data.elasticsearch.core.query.RepositoryPartQueryIntegrationTests;
import org.springframework.data.elasticsearch.junit.jupiter.ElasticsearchTemplateConfiguration; import org.springframework.data.elasticsearch.junit.jupiter.ElasticsearchTemplateConfiguration;
import org.springframework.test.context.ContextConfiguration;
/** /**
* @author Peter-Josef Meisch * @author Peter-Josef Meisch
* @since 4.4 * @since 4.4
*/ */
@ContextConfiguration(classes = ElasticsearchPartQueryELCIntegrationTests.Config.class)
public class ElasticsearchPartQueryELCIntegrationTests extends RepositoryPartQueryIntegrationTests { public class ElasticsearchPartQueryELCIntegrationTests extends RepositoryPartQueryIntegrationTests {
@Configuration @Configuration

2
src/test/java/org/springframework/data/elasticsearch/config/notnested/EnableRepositoriesELCIntegrationTests.java
View File

@ -21,11 +21,13 @@ import org.springframework.context.annotation.Import;
import org.springframework.data.elasticsearch.junit.jupiter.ElasticsearchTemplateConfiguration; import org.springframework.data.elasticsearch.junit.jupiter.ElasticsearchTemplateConfiguration;
import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories; import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
import org.springframework.data.elasticsearch.utils.IndexNameProvider; import org.springframework.data.elasticsearch.utils.IndexNameProvider;
import org.springframework.test.context.ContextConfiguration;
/** /**
* @author Peter-Josef Meisch * @author Peter-Josef Meisch
* @since 4.4 * @since 4.4
*/ */
@ContextConfiguration(classes = EnableRepositoriesELCIntegrationTests.Config.class)
public class EnableRepositoriesELCIntegrationTests extends EnableRepositoriesIntegrationTests { public class EnableRepositoriesELCIntegrationTests extends EnableRepositoriesIntegrationTests {
@Configuration @Configuration

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

@ -4,8 +4,11 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Import;
import org.springframework.data.elasticsearch.junit.jupiter.ElasticsearchTemplateConfiguration; import org.springframework.data.elasticsearch.junit.jupiter.ElasticsearchTemplateConfiguration;
import org.springframework.test.context.ContextConfiguration;
@ContextConfiguration(classes = { IndexSettingsELCIntegrationTests.Config.class })
public class IndexSettingsELCIntegrationTests extends IndexSettingsIntegrationTests { public class IndexSettingsELCIntegrationTests extends IndexSettingsIntegrationTests {
@Configuration @Configuration
@Import({ ElasticsearchTemplateConfiguration.class }) @Import({ ElasticsearchTemplateConfiguration.class })
static class Config { static class Config {
@ -14,4 +17,5 @@ public class IndexSettingsELCIntegrationTests extends IndexSettingsIntegrationTe
return new SpelSettingPath(); return new SpelSettingPath();
} }
} }
} }