This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 6d8407fbc8 HDDS-9495. Migrate TestCreatePipelineCommandHandler to
JUnit5 (#5607)
6d8407fbc8 is described below
commit 6d8407fbc877563a5b6c70619d329ae6e6276f0c
Author: Galsza <[email protected]>
AuthorDate: Wed Nov 15 16:36:03 2023 +0100
HDDS-9495. Migrate TestCreatePipelineCommandHandler to JUnit5 (#5607)
---
.../ozone/container/common/ContainerTestUtils.java | 2 +-
.../TestCreatePipelineCommandHandler.java | 18 +++++++-----------
2 files changed, 8 insertions(+), 12 deletions(-)
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/ContainerTestUtils.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/ContainerTestUtils.java
index 092b7a84aa..71773c41a2 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/ContainerTestUtils.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/ContainerTestUtils.java
@@ -124,7 +124,7 @@ public final class ContainerTestUtils {
OzoneConfiguration conf) {
DatanodeStateMachine stateMachine = Mockito.mock(
DatanodeStateMachine.class);
- Mockito.when(stateMachine.getReconfigurationHandler())
+ Mockito.lenient().when(stateMachine.getReconfigurationHandler())
.thenReturn(new ReconfigurationHandler("DN", conf, op -> { }));
StateContext context = Mockito.mock(StateContext.class);
Mockito.when(stateMachine.getDatanodeDetails()).thenReturn(datanodeDetails);
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCreatePipelineCommandHandler.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCreatePipelineCommandHandler.java
index 5296818ef0..dfe94cd175 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCreatePipelineCommandHandler.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCreatePipelineCommandHandler.java
@@ -35,13 +35,11 @@ import org.apache.ratis.client.RaftClient;
import org.apache.ratis.client.api.GroupManagementApi;
import org.apache.ratis.protocol.RaftGroup;
import org.apache.ratis.protocol.RaftPeerId;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mockito;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import java.io.IOException;
import java.util.ArrayList;
@@ -52,8 +50,7 @@ import java.util.List;
/**
* Test cases to verify CreatePipelineCommandHandler.
*/
-@RunWith(PowerMockRunner.class)
-@PrepareForTest(RaftClient.class)
+@ExtendWith(MockitoExtension.class)
public class TestCreatePipelineCommandHandler {
private OzoneContainer ozoneContainer;
@@ -63,16 +60,15 @@ public class TestCreatePipelineCommandHandler {
private GroupManagementApi raftClientGroupManager;
private OzoneConfiguration conf;
- @Before
+ @BeforeEach
public void setup() throws Exception {
conf = new OzoneConfiguration();
ozoneContainer = Mockito.mock(OzoneContainer.class);
connectionManager = Mockito.mock(SCMConnectionManager.class);
raftClient = Mockito.mock(RaftClient.class);
raftClientGroupManager = Mockito.mock(GroupManagementApi.class);
- Mockito.when(raftClient.getGroupManagementApi(
+ Mockito.lenient().when(raftClient.getGroupManagementApi(
Mockito.any(RaftPeerId.class))).thenReturn(raftClientGroupManager);
- PowerMockito.mockStatic(RaftClient.class);
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
