Skip to content

Commit 0b8bcf7

Browse files
retareta
committed
Extract cluster management for integration tests into JUnit test rule out of OpenSearchIntegTestCase (opensearch-project#11877)
* Extract cluster management for integration tests into JUnit test rule out of OpenSearchIntegTestCase Signed-off-by: Andriy Redko <andriy.redko@aiven.io> * Branched off parametrized tests into static / dynamic settings flavors Signed-off-by: Andriy Redko <andriy.redko@aiven.io> * Address code review comments Signed-off-by: Andriy Redko <andriy.redko@aiven.io> * Refactor internalCluster() method to return an Optional value Signed-off-by: Andriy Redko <andriy.redko@aiven.io> * Address code review comments Signed-off-by: Andriy Redko <andriy.redko@aiven.io> --------- Signed-off-by: Andriy Redko <andriy.redko@aiven.io> (cherry picked from commit c267c5a)
1 parent a2eb7f2 commit 0b8bcf7

File tree

157 files changed

+1068
-828
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

157 files changed

+1068
-828
lines changed

‎CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
112112
- Capture information for additional query types and aggregation types ([#11582](https://github.com/opensearch-project/OpenSearch/pull/11582))
113113
- Use slice_size == shard_size heuristic in terms aggs for concurrent segment search and properly calculate the doc_count_error ([#11732](https://github.com/opensearch-project/OpenSearch/pull/11732))
114114
- Ensure Jackson default maximums introduced in 2.16.0 do not conflict with OpenSearch settings ([#11890](https://github.com/opensearch-project/OpenSearch/pull/11890))
115+
- Extract cluster management for integration tests into JUnit test rule out of OpenSearchIntegTestCase ([#11877](https://github.com/opensearch-project/OpenSearch/pull/11877))
115116

116117
### Deprecated
117118

‎modules/analysis-common/src/internalClusterTest/java/org/opensearch/analysis/common/QueryStringWithAnalyzersIT.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
import org.opensearch.common.util.FeatureFlags;
4040
import org.opensearch.index.query.Operator;
4141
import org.opensearch.plugins.Plugin;
42-
import org.opensearch.test.ParameterizedOpenSearchIntegTestCase;
42+
import org.opensearch.test.ParameterizedStaticSettingsOpenSearchIntegTestCase;
4343

4444
import java.util.Arrays;
4545
import java.util.Collection;
@@ -49,10 +49,10 @@
4949
import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked;
5050
import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertHitCount;
5151

52-
public class QueryStringWithAnalyzersIT extends ParameterizedOpenSearchIntegTestCase {
52+
public class QueryStringWithAnalyzersIT extends ParameterizedStaticSettingsOpenSearchIntegTestCase {
5353

54-
public QueryStringWithAnalyzersIT(Settings dynamicSettings) {
55-
super(dynamicSettings);
54+
public QueryStringWithAnalyzersIT(Settings staticSettings) {
55+
super(staticSettings);
5656
}
5757

5858
@ParametersFactory

‎modules/analysis-common/src/test/java/org/opensearch/analysis/common/HighlighterWithAnalyzersTests.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
import org.opensearch.plugins.Plugin;
4545
import org.opensearch.search.builder.SearchSourceBuilder;
4646
import org.opensearch.search.fetch.subphase.highlight.HighlightBuilder;
47-
import org.opensearch.test.ParameterizedOpenSearchIntegTestCase;
47+
import org.opensearch.test.ParameterizedStaticSettingsOpenSearchIntegTestCase;
4848

4949
import java.io.IOException;
5050
import java.util.Arrays;
@@ -68,10 +68,10 @@
6868
import static org.hamcrest.Matchers.equalTo;
6969
import static org.hamcrest.Matchers.startsWith;
7070

71-
public class HighlighterWithAnalyzersTests extends ParameterizedOpenSearchIntegTestCase {
71+
public class HighlighterWithAnalyzersTests extends ParameterizedStaticSettingsOpenSearchIntegTestCase {
7272

73-
public HighlighterWithAnalyzersTests(Settings dynamicSettings) {
74-
super(dynamicSettings);
73+
public HighlighterWithAnalyzersTests(Settings staticSettings) {
74+
super(staticSettings);
7575
}
7676

7777
@ParametersFactory

‎modules/geo/src/internalClusterTest/java/org/opensearch/geo/GeoModulePluginIntegTestCase.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import org.opensearch.geometry.utils.WellKnownText;
1717
import org.opensearch.index.mapper.GeoShapeFieldMapper;
1818
import org.opensearch.plugins.Plugin;
19-
import org.opensearch.test.ParameterizedOpenSearchIntegTestCase;
19+
import org.opensearch.test.ParameterizedStaticSettingsOpenSearchIntegTestCase;
2020
import org.opensearch.test.TestGeoShapeFieldMapperPlugin;
2121

2222
import java.util.Arrays;
@@ -29,14 +29,14 @@
2929
* This is the base class for all the Geo related integration tests. Use this class to add the features and settings
3030
* for the test cluster on which integration tests are running.
3131
*/
32-
public abstract class GeoModulePluginIntegTestCase extends ParameterizedOpenSearchIntegTestCase {
32+
public abstract class GeoModulePluginIntegTestCase extends ParameterizedStaticSettingsOpenSearchIntegTestCase {
3333

3434
protected static final double GEOHASH_TOLERANCE = 1E-5D;
3535

3636
protected static final WellKnownText WKT = new WellKnownText(true, new StandardValidator(true));
3737

38-
public GeoModulePluginIntegTestCase(Settings dynamicSettings) {
39-
super(dynamicSettings);
38+
public GeoModulePluginIntegTestCase(Settings staticSettings) {
39+
super(staticSettings);
4040
}
4141

4242
@ParametersFactory

‎modules/geo/src/internalClusterTest/java/org/opensearch/geo/search/MissingValueIT.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ public class MissingValueIT extends GeoModulePluginIntegTestCase {
4444
private GeoPoint bottomRight;
4545
private GeoPoint topLeft;
4646

47-
public MissingValueIT(Settings dynamicSettings) {
48-
super(dynamicSettings);
47+
public MissingValueIT(Settings staticSettings) {
48+
super(staticSettings);
4949
}
5050

5151
@Override

‎modules/lang-expression/src/internalClusterTest/java/org/opensearch/script/expression/MoreExpressionIT.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
import org.opensearch.search.aggregations.pipeline.SimpleValue;
5858
import org.opensearch.search.sort.SortBuilders;
5959
import org.opensearch.search.sort.SortOrder;
60-
import org.opensearch.test.ParameterizedOpenSearchIntegTestCase;
60+
import org.opensearch.test.ParameterizedStaticSettingsOpenSearchIntegTestCase;
6161
import org.opensearch.test.hamcrest.OpenSearchAssertions;
6262

6363
import java.util.Arrays;
@@ -80,10 +80,10 @@
8080
import static org.hamcrest.Matchers.notNullValue;
8181

8282
// TODO: please convert to unit tests!
83-
public class MoreExpressionIT extends ParameterizedOpenSearchIntegTestCase {
83+
public class MoreExpressionIT extends ParameterizedStaticSettingsOpenSearchIntegTestCase {
8484

85-
public MoreExpressionIT(Settings dynamicSettings) {
86-
super(dynamicSettings);
85+
public MoreExpressionIT(Settings staticSettings) {
86+
super(staticSettings);
8787
}
8888

8989
@ParametersFactory

‎modules/lang-expression/src/internalClusterTest/java/org/opensearch/script/expression/StoredExpressionIT.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
import org.opensearch.script.ScriptType;
4444
import org.opensearch.search.aggregations.AggregationBuilders;
4545
import org.opensearch.search.builder.SearchSourceBuilder;
46-
import org.opensearch.test.ParameterizedOpenSearchIntegTestCase;
46+
import org.opensearch.test.ParameterizedStaticSettingsOpenSearchIntegTestCase;
4747

4848
import java.io.IOException;
4949
import java.util.Arrays;
@@ -54,10 +54,10 @@
5454
import static org.hamcrest.Matchers.containsString;
5555

5656
//TODO: please convert to unit tests!
57-
public class StoredExpressionIT extends ParameterizedOpenSearchIntegTestCase {
57+
public class StoredExpressionIT extends ParameterizedStaticSettingsOpenSearchIntegTestCase {
5858

59-
public StoredExpressionIT(Settings dynamicSettings) {
60-
super(dynamicSettings);
59+
public StoredExpressionIT(Settings staticSettings) {
60+
super(staticSettings);
6161
}
6262

6363
@ParametersFactory

‎modules/lang-mustache/src/internalClusterTest/java/org/opensearch/script/mustache/MultiSearchTemplateIT.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
import org.opensearch.index.IndexNotFoundException;
4242
import org.opensearch.plugins.Plugin;
4343
import org.opensearch.script.ScriptType;
44-
import org.opensearch.test.ParameterizedOpenSearchIntegTestCase;
44+
import org.opensearch.test.ParameterizedStaticSettingsOpenSearchIntegTestCase;
4545

4646
import java.util.Arrays;
4747
import java.util.Collection;
@@ -58,10 +58,10 @@
5858
import static org.hamcrest.Matchers.instanceOf;
5959
import static org.hamcrest.core.Is.is;
6060

61-
public class MultiSearchTemplateIT extends ParameterizedOpenSearchIntegTestCase {
61+
public class MultiSearchTemplateIT extends ParameterizedStaticSettingsOpenSearchIntegTestCase {
6262

63-
public MultiSearchTemplateIT(Settings dynamicSettings) {
64-
super(dynamicSettings);
63+
public MultiSearchTemplateIT(Settings staticSettings) {
64+
super(staticSettings);
6565
}
6666

6767
@ParametersFactory

‎modules/parent-join/src/internalClusterTest/java/org/opensearch/join/query/ParentChildTestCase.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
import org.opensearch.plugins.Plugin;
4242
import org.opensearch.test.InternalSettingsPlugin;
4343
import org.opensearch.test.OpenSearchIntegTestCase;
44-
import org.opensearch.test.ParameterizedOpenSearchIntegTestCase;
44+
import org.opensearch.test.ParameterizedStaticSettingsOpenSearchIntegTestCase;
4545

4646
import java.io.IOException;
4747
import java.util.Arrays;
@@ -51,10 +51,10 @@
5151
import java.util.Map;
5252

5353
@OpenSearchIntegTestCase.ClusterScope(scope = OpenSearchIntegTestCase.Scope.SUITE)
54-
public abstract class ParentChildTestCase extends ParameterizedOpenSearchIntegTestCase {
54+
public abstract class ParentChildTestCase extends ParameterizedStaticSettingsOpenSearchIntegTestCase {
5555

56-
public ParentChildTestCase(Settings dynamicSettings) {
57-
super(dynamicSettings);
56+
public ParentChildTestCase(Settings staticSettings) {
57+
super(staticSettings);
5858
}
5959

6060
@Override

‎modules/percolator/src/internalClusterTest/java/org/opensearch/percolator/PercolatorQuerySearchIT.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
import org.opensearch.plugins.Plugin;
5858
import org.opensearch.search.fetch.subphase.highlight.HighlightBuilder;
5959
import org.opensearch.search.sort.SortOrder;
60-
import org.opensearch.test.ParameterizedOpenSearchIntegTestCase;
60+
import org.opensearch.test.ParameterizedStaticSettingsOpenSearchIntegTestCase;
6161

6262
import java.io.IOException;
6363
import java.util.Arrays;
@@ -90,10 +90,10 @@
9090
import static org.hamcrest.Matchers.nullValue;
9191
import static org.hamcrest.core.IsNull.notNullValue;
9292

93-
public class PercolatorQuerySearchIT extends ParameterizedOpenSearchIntegTestCase {
93+
public class PercolatorQuerySearchIT extends ParameterizedStaticSettingsOpenSearchIntegTestCase {
9494

95-
public PercolatorQuerySearchIT(Settings dynamicSettings) {
96-
super(dynamicSettings);
95+
public PercolatorQuerySearchIT(Settings staticSettings) {
96+
super(staticSettings);
9797
}
9898

9999
@ParametersFactory

‎modules/rank-eval/src/internalClusterTest/java/org/opensearch/index/rankeval/RankEvalRequestIT.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
import org.opensearch.indices.IndexClosedException;
4848
import org.opensearch.plugins.Plugin;
4949
import org.opensearch.search.builder.SearchSourceBuilder;
50-
import org.opensearch.test.ParameterizedOpenSearchIntegTestCase;
50+
import org.opensearch.test.ParameterizedStaticSettingsOpenSearchIntegTestCase;
5151
import org.junit.Before;
5252

5353
import java.util.ArrayList;
@@ -62,14 +62,14 @@
6262
import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked;
6363
import static org.hamcrest.Matchers.instanceOf;
6464

65-
public class RankEvalRequestIT extends ParameterizedOpenSearchIntegTestCase {
65+
public class RankEvalRequestIT extends ParameterizedStaticSettingsOpenSearchIntegTestCase {
6666

6767
private static final String TEST_INDEX = "test";
6868
private static final String INDEX_ALIAS = "alias0";
6969
private static final int RELEVANT_RATING_1 = 1;
7070

71-
public RankEvalRequestIT(Settings dynamicSettings) {
72-
super(dynamicSettings);
71+
public RankEvalRequestIT(Settings staticSettings) {
72+
super(staticSettings);
7373
}
7474

7575
@ParametersFactory

‎server/src/internalClusterTest/java/org/opensearch/action/admin/cluster/node/tasks/CancellableTasksIT.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
import org.opensearch.tasks.TaskInfo;
7070
import org.opensearch.tasks.TaskManager;
7171
import org.opensearch.test.InternalTestCluster;
72-
import org.opensearch.test.ParameterizedOpenSearchIntegTestCase;
72+
import org.opensearch.test.ParameterizedStaticSettingsOpenSearchIntegTestCase;
7373
import org.opensearch.threadpool.ThreadPool;
7474
import org.opensearch.transport.TransportException;
7575
import org.opensearch.transport.TransportResponseHandler;
@@ -99,16 +99,16 @@
9999
import static org.hamcrest.Matchers.hasSize;
100100
import static org.hamcrest.Matchers.instanceOf;
101101

102-
public class CancellableTasksIT extends ParameterizedOpenSearchIntegTestCase {
102+
public class CancellableTasksIT extends ParameterizedStaticSettingsOpenSearchIntegTestCase {
103103

104104
static int idGenerator = 0;
105105
static final Map<TestRequest, CountDownLatch> beforeSendLatches = ConcurrentCollections.newConcurrentMap();
106106
static final Map<TestRequest, CountDownLatch> arrivedLatches = ConcurrentCollections.newConcurrentMap();
107107
static final Map<TestRequest, CountDownLatch> beforeExecuteLatches = ConcurrentCollections.newConcurrentMap();
108108
static final Map<TestRequest, CountDownLatch> completedLatches = ConcurrentCollections.newConcurrentMap();
109109

110-
public CancellableTasksIT(Settings dynamicSettings) {
111-
super(dynamicSettings);
110+
public CancellableTasksIT(Settings staticSettings) {
111+
super(staticSettings);
112112
}
113113

114114
@ParametersFactory

‎server/src/internalClusterTest/java/org/opensearch/action/termvectors/GetTermVectorsIT.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@
7474

7575
public class GetTermVectorsIT extends AbstractTermVectorsTestCase {
7676

77-
public GetTermVectorsIT(Settings dynamicSettings) {
78-
super(dynamicSettings);
77+
public GetTermVectorsIT(Settings staticSettings) {
78+
super(staticSettings);
7979
}
8080

8181
@Override

‎server/src/internalClusterTest/java/org/opensearch/action/termvectors/MultiTermVectorsIT.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
import static org.hamcrest.Matchers.nullValue;
5353

5454
public class MultiTermVectorsIT extends AbstractTermVectorsTestCase {
55-
public MultiTermVectorsIT(Settings dynamicSettings) {
56-
super(dynamicSettings);
55+
public MultiTermVectorsIT(Settings staticSettings) {
56+
super(staticSettings);
5757
}
5858

5959
public void testDuelESLucene() throws Exception {

‎server/src/internalClusterTest/java/org/opensearch/index/IndexSortIT.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
import org.opensearch.common.settings.Settings;
4242
import org.opensearch.common.util.FeatureFlags;
4343
import org.opensearch.core.xcontent.XContentBuilder;
44-
import org.opensearch.test.ParameterizedOpenSearchIntegTestCase;
44+
import org.opensearch.test.ParameterizedStaticSettingsOpenSearchIntegTestCase;
4545

4646
import java.io.IOException;
4747
import java.util.Arrays;
@@ -51,11 +51,11 @@
5151
import static org.opensearch.search.SearchService.CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING;
5252
import static org.hamcrest.Matchers.containsString;
5353

54-
public class IndexSortIT extends ParameterizedOpenSearchIntegTestCase {
54+
public class IndexSortIT extends ParameterizedStaticSettingsOpenSearchIntegTestCase {
5555
private static final XContentBuilder TEST_MAPPING = createTestMapping();
5656

57-
public IndexSortIT(Settings dynamicSettings) {
58-
super(dynamicSettings);
57+
public IndexSortIT(Settings staticSettings) {
58+
super(staticSettings);
5959
}
6060

6161
@ParametersFactory

‎server/src/internalClusterTest/java/org/opensearch/index/search/MatchPhraseQueryIT.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
import org.opensearch.common.util.FeatureFlags;
4242
import org.opensearch.index.query.MatchPhraseQueryBuilder;
4343
import org.opensearch.index.search.MatchQuery.ZeroTermsQuery;
44-
import org.opensearch.test.ParameterizedOpenSearchIntegTestCase;
44+
import org.opensearch.test.ParameterizedStaticSettingsOpenSearchIntegTestCase;
4545
import org.junit.Before;
4646

4747
import java.util.ArrayList;
@@ -55,12 +55,12 @@
5555
import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked;
5656
import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertHitCount;
5757

58-
public class MatchPhraseQueryIT extends ParameterizedOpenSearchIntegTestCase {
58+
public class MatchPhraseQueryIT extends ParameterizedStaticSettingsOpenSearchIntegTestCase {
5959

6060
private static final String INDEX = "test";
6161

62-
public MatchPhraseQueryIT(Settings dynamicSettings) {
63-
super(dynamicSettings);
62+
public MatchPhraseQueryIT(Settings staticSettings) {
63+
super(staticSettings);
6464
}
6565

6666
@ParametersFactory

‎server/src/internalClusterTest/java/org/opensearch/index/suggest/stats/SuggestStatsIT.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
import org.opensearch.search.suggest.phrase.PhraseSuggestionBuilder;
5151
import org.opensearch.search.suggest.term.TermSuggestionBuilder;
5252
import org.opensearch.test.OpenSearchIntegTestCase;
53-
import org.opensearch.test.ParameterizedOpenSearchIntegTestCase;
53+
import org.opensearch.test.ParameterizedStaticSettingsOpenSearchIntegTestCase;
5454

5555
import java.util.Arrays;
5656
import java.util.Collection;
@@ -68,10 +68,10 @@
6868
import static org.hamcrest.Matchers.lessThanOrEqualTo;
6969

7070
@OpenSearchIntegTestCase.ClusterScope(minNumDataNodes = 2)
71-
public class SuggestStatsIT extends ParameterizedOpenSearchIntegTestCase {
71+
public class SuggestStatsIT extends ParameterizedStaticSettingsOpenSearchIntegTestCase {
7272

73-
public SuggestStatsIT(Settings dynamicSettings) {
74-
super(dynamicSettings);
73+
public SuggestStatsIT(Settings staticSettings) {
74+
super(staticSettings);
7575
}
7676

7777
@ParametersFactory

‎server/src/internalClusterTest/java/org/opensearch/indices/IndicesRequestCacheIT.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
import org.opensearch.search.aggregations.bucket.histogram.DateHistogramInterval;
5050
import org.opensearch.search.aggregations.bucket.histogram.Histogram;
5151
import org.opensearch.search.aggregations.bucket.histogram.Histogram.Bucket;
52-
import org.opensearch.test.ParameterizedOpenSearchIntegTestCase;
52+
import org.opensearch.test.ParameterizedStaticSettingsOpenSearchIntegTestCase;
5353
import org.opensearch.test.hamcrest.OpenSearchAssertions;
5454

5555
import java.time.ZoneId;
@@ -69,7 +69,7 @@
6969
import static org.hamcrest.Matchers.equalTo;
7070
import static org.hamcrest.Matchers.greaterThan;
7171

72-
public class IndicesRequestCacheIT extends ParameterizedOpenSearchIntegTestCase {
72+
public class IndicesRequestCacheIT extends ParameterizedStaticSettingsOpenSearchIntegTestCase {
7373
public IndicesRequestCacheIT(Settings settings) {
7474
super(settings);
7575
}

‎server/src/internalClusterTest/java/org/opensearch/indices/memory/breaker/CircuitBreakerServiceIT.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
import org.opensearch.indices.breaker.HierarchyCircuitBreakerService;
6363
import org.opensearch.search.sort.SortOrder;
6464
import org.opensearch.test.OpenSearchIntegTestCase.ClusterScope;
65-
import org.opensearch.test.ParameterizedOpenSearchIntegTestCase;
65+
import org.opensearch.test.ParameterizedStaticSettingsOpenSearchIntegTestCase;
6666
import org.junit.After;
6767
import org.junit.Before;
6868

@@ -94,9 +94,9 @@
9494
* Integration tests for InternalCircuitBreakerService
9595
*/
9696
@ClusterScope(scope = TEST, numClientNodes = 0, maxNumDataNodes = 1)
97-
public class CircuitBreakerServiceIT extends ParameterizedOpenSearchIntegTestCase {
98-
public CircuitBreakerServiceIT(Settings dynamicSettings) {
99-
super(dynamicSettings);
97+
public class CircuitBreakerServiceIT extends ParameterizedStaticSettingsOpenSearchIntegTestCase {
98+
public CircuitBreakerServiceIT(Settings staticSettings) {
99+
super(staticSettings);
100100
}
101101

102102
@ParametersFactory

0 commit comments

Comments
 (0)