Skip to content

Commit 380b093

Browse files
committed
Fix compilation errors.
Change-Id: I1929c7d55a423d82fe1b9efbbb31c0da6cd1ed26
1 parent 06211e7 commit 380b093

1 file changed

Lines changed: 4 additions & 8 deletions

File tree

hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/TestSCMStateMachine.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import static org.junit.jupiter.api.Assertions.assertTrue;
2121
import static org.mockito.Mockito.mock;
22-
import static org.mockito.Mockito.mockStatic;
2322
import static org.mockito.Mockito.when;
2423

2524
import org.apache.hadoop.hdds.scm.container.placement.metrics.SCMMetrics;
@@ -28,7 +27,6 @@
2827
import org.apache.ratis.proto.RaftProtos;
2928
import org.apache.ratis.server.protocol.TermIndex;
3029
import org.junit.jupiter.api.Test;
31-
import org.mockito.MockedStatic;
3230

3331
/**
3432
* Test SCMStateMachine events recording.
@@ -39,17 +37,15 @@ public class TestSCMStateMachine {
3937
public void testRatisEventsRecording() throws Exception {
4038
StorageContainerManager scm = mock(StorageContainerManager.class);
4139
SCMMetrics metrics = SCMMetrics.create();
40+
when(scm.getMetrics()).thenReturn(metrics);
41+
4242
SCMHADBTransactionBuffer buffer = mock(SCMHADBTransactionBuffer.class);
4343
when(buffer.getLatestTrxInfo()).thenReturn(TransactionInfo.valueOf(TermIndex.valueOf(0, 0)));
4444

4545
SCMStateMachine stateMachine = new SCMStateMachine(scm, buffer);
4646

47-
try (MockedStatic<StorageContainerManager> scmStaticMock = mockStatic(StorageContainerManager.class)) {
48-
scmStaticMock.when(StorageContainerManager::getMetrics).thenReturn(metrics);
49-
50-
stateMachine.notifyConfigurationChanged(1, 1, RaftProtos.RaftConfigurationProto.getDefaultInstance());
51-
assertTrue(metrics.getRatisEvents().contains("New peers [] added at term index"));
52-
}
47+
stateMachine.notifyConfigurationChanged(1, 1, RaftProtos.RaftConfigurationProto.getDefaultInstance());
48+
assertTrue(metrics.getRatisEvents().contains("Configuration changed at term index"));
5349

5450
metrics.unRegister();
5551
}

0 commit comments

Comments
 (0)