Skip to content

Commit 1bc289f

Browse files
authored
Replace setUp/tearDown overrides with @Before/@after in inference tests (elastic#155785)
Replace @OverRide setUp()/tearDown() methods in x-pack/plugin/inference tests with descriptively named @Before/@after methods, removing the now-redundant super.setUp()/super.tearDown() calls.
1 parent b292ac6 commit 1bc289f

27 files changed

Lines changed: 37 additions & 92 deletions

x-pack/plugin/inference/src/internalClusterTest/java/org/elasticsearch/search/ccs/KnnMixedFieldTypeCrossClusterSearchIT.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,7 @@ protected boolean reuseClusters() {
110110
}
111111

112112
@Before
113-
@Override
114-
public void setUp() throws Exception {
115-
super.setUp();
113+
public void configureClustersIfNeeded() throws Exception {
116114
if (clustersConfigured == false) {
117115
configureClusters();
118116
clustersConfigured = true;

x-pack/plugin/inference/src/internalClusterTest/java/org/elasticsearch/search/ccs/KnnVectorQueryBuilderCrossClusterSearchIT.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,7 @@ protected boolean reuseClusters() {
5555
}
5656

5757
@Before
58-
@Override
59-
public void setUp() throws Exception {
60-
super.setUp();
58+
public void configureClustersIfNeeded() throws Exception {
6159
if (clustersConfigured == false) {
6260
configureClusters();
6361
clustersConfigured = true;

x-pack/plugin/inference/src/internalClusterTest/java/org/elasticsearch/search/ccs/MatchQueryBuilderCrossClusterSearchIT.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,7 @@ protected boolean reuseClusters() {
4848
}
4949

5050
@Before
51-
@Override
52-
public void setUp() throws Exception {
53-
super.setUp();
51+
public void configureInferenceEndpoints() throws Exception {
5452
configureClusters();
5553
}
5654

x-pack/plugin/inference/src/internalClusterTest/java/org/elasticsearch/search/ccs/SemanticQueryBuilderCrossClusterSearchIT.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,7 @@ protected boolean reuseClusters() {
5050
}
5151

5252
@Before
53-
@Override
54-
public void setUp() throws Exception {
55-
super.setUp();
53+
public void configureClustersIfNeeded() throws Exception {
5654
if (clustersConfigured == false) {
5755
configureClusters();
5856
clustersConfigured = true;

x-pack/plugin/inference/src/internalClusterTest/java/org/elasticsearch/search/ccs/SparseVectorQueryBuilderCrossClusterSearchIT.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,7 @@ protected boolean reuseClusters() {
3737
}
3838

3939
@Before
40-
@Override
41-
public void setUp() throws Exception {
42-
super.setUp();
40+
public void configureClustersIfNeeded() throws Exception {
4341
if (clustersConfigured == false) {
4442
configureClusters();
4543
clustersConfigured = true;

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/BaseTransportInferenceActionTestCase.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,7 @@ public BaseTransportInferenceActionTestCase(TaskType taskType) {
8181
}
8282

8383
@Before
84-
public void setUp() throws Exception {
85-
super.setUp();
84+
public void initMocks() throws Exception {
8685
ActionFilters actionFilters = mock();
8786
threadPool = mock();
8887
when(threadPool.getThreadContext()).thenReturn(new ThreadContext(Settings.EMPTY));

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/TransportDeleteCCMConfigurationActionTests.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ public class TransportDeleteCCMConfigurationActionTests extends ESTestCase {
3737
private TransportDeleteCCMConfigurationAction action;
3838

3939
@Before
40-
public void setUp() throws Exception {
41-
super.setUp();
40+
public void createAction() throws Exception {
4241
var ccmFeature = mock(CCMFeature.class);
4342
when(ccmFeature.isCcmSupportedEnvironment()).thenReturn(true);
4443

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/TransportDeleteInferenceEndpointActionTests.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@ public class TransportDeleteInferenceEndpointActionTests extends ESTestCase {
5858
private InferenceServiceRegistry mockInferenceServiceRegistry;
5959

6060
@Before
61-
public void setUp() throws Exception {
62-
super.setUp();
61+
public void createAction() throws Exception {
6362
threadPool = createThreadPool(inferenceUtilityExecutors());
6463
mockModelRegistry = mock(ModelRegistry.class);
6564
mockInferenceServiceRegistry = mock(InferenceServiceRegistry.class);
@@ -75,8 +74,7 @@ public void setUp() throws Exception {
7574
}
7675

7776
@After
78-
public void tearDown() throws Exception {
79-
super.tearDown();
77+
public void shutdownThreadPool() throws Exception {
8078
terminate(threadPool);
8179
}
8280

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/TransportInferenceActionProxyTests.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@ public class TransportInferenceActionProxyTests extends ESTestCase {
5252
private ModelRegistry modelRegistry;
5353

5454
@Before
55-
public void setUp() throws Exception {
56-
super.setUp();
55+
public void createAction() throws Exception {
5756
client = mock(Client.class);
5857
threadPool = new TestThreadPool("test");
5958
when(client.threadPool()).thenReturn(threadPool);
@@ -63,8 +62,7 @@ public void setUp() throws Exception {
6362
}
6463

6564
@After
66-
public void tearDown() throws Exception {
67-
super.tearDown();
65+
public void shutdownThreadPool() throws Exception {
6866
terminate(threadPool);
6967
}
7068

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/TransportInternalDeleteEndpointsActionTests.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@ public class TransportInternalDeleteEndpointsActionTests extends ESTestCase {
4040
private ModelRegistry mockModelRegistry;
4141

4242
@Before
43-
public void setUp() throws Exception {
44-
super.setUp();
43+
public void createAction() throws Exception {
4544
threadPool = createThreadPool(inferenceUtilityExecutors());
4645
mockModelRegistry = mock(ModelRegistry.class);
4746
action = new TransportInternalDeleteEndpointsAction(
@@ -54,8 +53,7 @@ public void setUp() throws Exception {
5453
}
5554

5655
@After
57-
public void tearDown() throws Exception {
58-
super.tearDown();
56+
public void shutdownThreadPool() throws Exception {
5957
terminate(threadPool);
6058
}
6159

0 commit comments

Comments
 (0)