Skip to content

Commit 003d75f

Browse files
committed
Add @ContextConfiguration(…) to test classes that use @SpringIntegrationTest on super classes.
Closes #3212
1 parent 535b407 commit 003d75f

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,16 @@
2121
import org.springframework.context.annotation.Configuration;
2222
import org.springframework.context.annotation.Import;
2323
import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
24-
import org.springframework.data.elasticsearch.core.query.RepositoryPartQueryIntegrationTests;
2524
import org.springframework.data.elasticsearch.core.query.Query;
25+
import org.springframework.data.elasticsearch.core.query.RepositoryPartQueryIntegrationTests;
2626
import org.springframework.data.elasticsearch.junit.jupiter.ElasticsearchTemplateConfiguration;
27+
import org.springframework.test.context.ContextConfiguration;
2728

2829
/**
2930
* @author Peter-Josef Meisch
3031
* @since 4.4
3132
*/
33+
@ContextConfiguration(classes = ElasticsearchPartQueryELCIntegrationTests.Config.class)
3234
public class ElasticsearchPartQueryELCIntegrationTests extends RepositoryPartQueryIntegrationTests {
3335

3436
@Configuration

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,13 @@
2121
import org.springframework.data.elasticsearch.junit.jupiter.ElasticsearchTemplateConfiguration;
2222
import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
2323
import org.springframework.data.elasticsearch.utils.IndexNameProvider;
24+
import org.springframework.test.context.ContextConfiguration;
2425

2526
/**
2627
* @author Peter-Josef Meisch
2728
* @since 4.4
2829
*/
30+
@ContextConfiguration(classes = EnableRepositoriesELCIntegrationTests.Config.class)
2931
public class EnableRepositoriesELCIntegrationTests extends EnableRepositoriesIntegrationTests {
3032

3133
@Configuration

src/test/java/org/springframework/data/elasticsearch/core/IndexSettingsELCIntegrationTests.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@
44
import org.springframework.context.annotation.Configuration;
55
import org.springframework.context.annotation.Import;
66
import org.springframework.data.elasticsearch.junit.jupiter.ElasticsearchTemplateConfiguration;
7+
import org.springframework.test.context.ContextConfiguration;
78

9+
@ContextConfiguration(classes = { IndexSettingsELCIntegrationTests.Config.class })
810
public class IndexSettingsELCIntegrationTests extends IndexSettingsIntegrationTests {
11+
912
@Configuration
1013
@Import({ ElasticsearchTemplateConfiguration.class })
1114
static class Config {
@@ -14,4 +17,5 @@ public SpelSettingPath spelSettingPath() {
1417
return new SpelSettingPath();
1518
}
1619
}
20+
1721
}

0 commit comments

Comments
 (0)