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 377d6a674f HDDS-9421. Reduce the duplicate create Container/Context
code for test code (#5429)
377d6a674f is described below
commit 377d6a674f76805d6ed4df640a87159757ed3398
Author: XiChen <[email protected]>
AuthorDate: Tue Oct 17 18:57:18 2023 +0800
HDDS-9421. Reduce the duplicate create Container/Context code for test code
(#5429)
---
.../ozone/container/common/ContainerTestUtils.java | 12 ++++--
.../container/common/impl/TestHddsDispatcher.java | 22 ++--------
.../container/common/interfaces/TestHandler.java | 9 ++--
.../TestCloseContainerCommandHandler.java | 13 ++----
.../TestCreatePipelineCommandHandler.java | 18 +++-----
.../TestDeleteBlocksCommandHandler.java | 11 -----
.../container/keyvalue/TestKeyValueHandler.java | 10 ++---
.../container/ozoneimpl/TestOzoneContainer.java | 48 +++-------------------
.../ozone/container/common/TestEndPoint.java | 36 ++++++----------
.../container/metrics/TestContainerMetrics.java | 11 ++---
.../container/ozoneimpl/TestOzoneContainer.java | 23 +++--------
.../ozoneimpl/TestOzoneContainerWithTLS.java | 24 +++--------
.../ozoneimpl/TestSecureOzoneContainer.java | 20 ++-------
.../container/server/TestContainerServer.java | 12 ++----
.../server/TestSecureContainerServer.java | 9 +---
15 files changed, 69 insertions(+), 209 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 061e20b9b9..08476300c9 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
@@ -116,14 +116,20 @@ public final class ContainerTestUtils {
public static OzoneContainer getOzoneContainer(
DatanodeDetails datanodeDetails, OzoneConfiguration conf)
throws IOException {
- DatanodeStateMachine stateMachine =
- Mockito.mock(DatanodeStateMachine.class);
+ StateContext context = getMockContext(datanodeDetails, conf);
+ return new OzoneContainer(datanodeDetails, conf, context);
+ }
+
+ public static StateContext getMockContext(DatanodeDetails datanodeDetails,
+ OzoneConfiguration conf) {
+ DatanodeStateMachine stateMachine = Mockito.mock(
+ DatanodeStateMachine.class);
Mockito.when(stateMachine.getReconfigurationHandler())
.thenReturn(new ReconfigurationHandler("DN", conf, op -> { }));
StateContext context = Mockito.mock(StateContext.class);
Mockito.when(stateMachine.getDatanodeDetails()).thenReturn(datanodeDetails);
Mockito.when(context.getParent()).thenReturn(stateMachine);
- return new OzoneContainer(datanodeDetails, conf, context);
+ return context;
}
public static DatanodeDetails createDatanodeDetails() {
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestHddsDispatcher.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestHddsDispatcher.java
index 55e255c355..fde9d46917 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestHddsDispatcher.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestHddsDispatcher.java
@@ -45,11 +45,11 @@ import org.apache.hadoop.ozone.OzoneConfigKeys;
import org.apache.hadoop.ozone.common.Checksum;
import org.apache.hadoop.ozone.common.utils.BufferUtils;
import org.apache.hadoop.ozone.container.ContainerTestHelper;
+import org.apache.hadoop.ozone.container.common.ContainerTestUtils;
import org.apache.hadoop.ozone.container.common.helpers.ContainerMetrics;
import org.apache.hadoop.ozone.container.common.interfaces.Container;
import org.apache.hadoop.ozone.container.common.interfaces.Handler;
import org.apache.hadoop.ozone.container.common.report.IncrementalReportSender;
-import
org.apache.hadoop.ozone.container.common.statemachine.DatanodeStateMachine;
import org.apache.hadoop.ozone.container.common.statemachine.StateContext;
import
org.apache.hadoop.ozone.container.common.transport.server.ratis.DispatcherContext;
import
org.apache.hadoop.ozone.container.common.volume.RoundRobinVolumeChoosingPolicy;
@@ -123,12 +123,7 @@ public class TestHddsDispatcher {
try {
UUID scmId = UUID.randomUUID();
ContainerSet containerSet = new ContainerSet(1000);
-
- DatanodeStateMachine stateMachine = Mockito.mock(
- DatanodeStateMachine.class);
- StateContext context = Mockito.mock(StateContext.class);
- Mockito.when(stateMachine.getDatanodeDetails()).thenReturn(dd);
- Mockito.when(context.getParent()).thenReturn(stateMachine);
+ StateContext context = ContainerTestUtils.getMockContext(dd, conf);
KeyValueContainerData containerData = new KeyValueContainerData(1L,
layout,
(long) StorageUnit.GB.toBytes(1), UUID.randomUUID().toString(),
@@ -195,12 +190,7 @@ public class TestHddsDispatcher {
try {
UUID scmId = UUID.randomUUID();
ContainerSet containerSet = new ContainerSet(1000);
-
- DatanodeStateMachine stateMachine = Mockito.mock(
- DatanodeStateMachine.class);
- StateContext context = Mockito.mock(StateContext.class);
- Mockito.when(stateMachine.getDatanodeDetails()).thenReturn(dd);
- Mockito.when(context.getParent()).thenReturn(stateMachine);
+ StateContext context = ContainerTestUtils.getMockContext(dd, conf);
// create a 50 byte container
KeyValueContainerData containerData = new KeyValueContainerData(1L,
layout,
@@ -466,11 +456,7 @@ public class TestHddsDispatcher {
throw new RuntimeException(e);
}
});
- DatanodeStateMachine stateMachine = Mockito.mock(
- DatanodeStateMachine.class);
- StateContext context = Mockito.mock(StateContext.class);
- Mockito.when(stateMachine.getDatanodeDetails()).thenReturn(dd);
- Mockito.when(context.getParent()).thenReturn(stateMachine);
+ StateContext context = ContainerTestUtils.getMockContext(dd, conf);
ContainerMetrics metrics = ContainerMetrics.create(conf);
Map<ContainerType, Handler> handlers = Maps.newHashMap();
for (ContainerType containerType : ContainerType.values()) {
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/interfaces/TestHandler.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/interfaces/TestHandler.java
index e4e280d9cf..30ce8f27fd 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/interfaces/TestHandler.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/interfaces/TestHandler.java
@@ -23,11 +23,11 @@ import java.util.Map;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos;
+import org.apache.hadoop.ozone.container.common.ContainerTestUtils;
import org.apache.hadoop.ozone.container.common.helpers.ContainerMetrics;
import org.apache.hadoop.ozone.container.common.impl.ContainerSet;
import org.apache.hadoop.ozone.container.common.impl.HddsDispatcher;
import org.apache.hadoop.ozone.container.common.impl.TestHddsDispatcher;
-import
org.apache.hadoop.ozone.container.common.statemachine.DatanodeStateMachine;
import org.apache.hadoop.ozone.container.common.statemachine.StateContext;
import org.apache.hadoop.ozone.container.common.volume.MutableVolumeSet;
import org.apache.hadoop.ozone.container.common.volume.VolumeSet;
@@ -62,11 +62,8 @@ public class TestHandler {
this.containerSet = Mockito.mock(ContainerSet.class);
this.volumeSet = Mockito.mock(MutableVolumeSet.class);
DatanodeDetails datanodeDetails = Mockito.mock(DatanodeDetails.class);
- DatanodeStateMachine stateMachine = Mockito.mock(
- DatanodeStateMachine.class);
- StateContext context = Mockito.mock(StateContext.class);
-
Mockito.when(stateMachine.getDatanodeDetails()).thenReturn(datanodeDetails);
- Mockito.when(context.getParent()).thenReturn(stateMachine);
+ StateContext context = ContainerTestUtils.getMockContext(
+ datanodeDetails, conf);
ContainerMetrics metrics = ContainerMetrics.create(conf);
Map<ContainerProtos.ContainerType, Handler> handlers = Maps.newHashMap();
for (ContainerProtos.ContainerType containerType :
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCloseContainerCommandHandler.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCloseContainerCommandHandler.java
index e6267550be..d70c7af0d3 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCloseContainerCommandHandler.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCloseContainerCommandHandler.java
@@ -21,12 +21,11 @@ import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos;
import org.apache.hadoop.hdds.scm.pipeline.PipelineID;
+import org.apache.hadoop.ozone.container.common.ContainerTestUtils;
import org.apache.hadoop.ozone.container.common.impl.ContainerLayoutVersion;
import org.apache.hadoop.ozone.container.common.impl.ContainerSet;
import org.apache.hadoop.ozone.container.common.interfaces.Container;
import org.apache.hadoop.ozone.container.common.interfaces.Handler;
-import org.apache.hadoop.ozone.container.common.statemachine
- .DatanodeStateMachine;
import org.apache.hadoop.ozone.container.common.statemachine.StateContext;
import
org.apache.hadoop.ozone.container.common.transport.server.XceiverServerSpi;
import org.apache.hadoop.ozone.container.keyvalue.ContainerLayoutTestInfo;
@@ -86,19 +85,15 @@ public class TestCloseContainerCommandHandler {
@Before
public void before() throws Exception {
- context = mock(StateContext.class);
- DatanodeStateMachine dnStateMachine = mock(DatanodeStateMachine.class);
- when(dnStateMachine.getDatanodeDetails())
- .thenReturn(randomDatanodeDetails());
- when(context.getParent()).thenReturn(dnStateMachine);
-
+ OzoneConfiguration conf = new OzoneConfiguration();
+ context = ContainerTestUtils.getMockContext(randomDatanodeDetails(), conf);
pipelineID = PipelineID.randomId();
KeyValueContainerData data = new KeyValueContainerData(CONTAINER_ID,
layout, GB,
pipelineID.getId().toString(), null);
- container = new KeyValueContainer(data, new OzoneConfiguration());
+ container = new KeyValueContainer(data, conf);
containerSet = new ContainerSet(1000);
containerSet.addContainer(container);
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 681d63d92b..5296818ef0 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
@@ -24,7 +24,7 @@ import org.apache.hadoop.hdds.protocol.MockDatanodeDetails;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
import
org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.CreatePipelineCommandProto;
import org.apache.hadoop.hdds.scm.pipeline.PipelineID;
-import
org.apache.hadoop.ozone.container.common.statemachine.DatanodeStateMachine;
+import org.apache.hadoop.ozone.container.common.ContainerTestUtils;
import
org.apache.hadoop.ozone.container.common.statemachine.SCMConnectionManager;
import org.apache.hadoop.ozone.container.common.statemachine.StateContext;
import
org.apache.hadoop.ozone.container.common.transport.server.XceiverServerSpi;
@@ -61,11 +61,12 @@ public class TestCreatePipelineCommandHandler {
private SCMConnectionManager connectionManager;
private RaftClient raftClient;
private GroupManagementApi raftClientGroupManager;
+ private OzoneConfiguration conf;
@Before
public void setup() throws Exception {
+ conf = new OzoneConfiguration();
ozoneContainer = Mockito.mock(OzoneContainer.class);
- stateContext = Mockito.mock(StateContext.class);
connectionManager = Mockito.mock(SCMConnectionManager.class);
raftClient = Mockito.mock(RaftClient.class);
raftClientGroupManager = Mockito.mock(GroupManagementApi.class);
@@ -82,12 +83,9 @@ public class TestCreatePipelineCommandHandler {
final SCMCommand<CreatePipelineCommandProto> command =
new CreatePipelineCommand(pipelineID, HddsProtos.ReplicationType.RATIS,
HddsProtos.ReplicationFactor.THREE, datanodes);
+ stateContext = ContainerTestUtils.getMockContext(datanodes.get(0), conf);
final XceiverServerSpi writeChanel = Mockito.mock(XceiverServerSpi.class);
- final DatanodeStateMachine dnsm = Mockito.mock(DatanodeStateMachine.class);
-
- Mockito.when(stateContext.getParent()).thenReturn(dnsm);
- Mockito.when(dnsm.getDatanodeDetails()).thenReturn(datanodes.get(0));
Mockito.when(ozoneContainer.getWriteChannel()).thenReturn(writeChanel);
Mockito.when(writeChanel.isExist(pipelineID.getProtobuf()))
.thenReturn(false);
@@ -117,17 +115,13 @@ public class TestCreatePipelineCommandHandler {
HddsProtos.ReplicationFactor.THREE, datanodes);
final XceiverServerSpi writeChanel = Mockito.mock(XceiverServerSpi.class);
- final DatanodeStateMachine dnsm = Mockito.mock(DatanodeStateMachine.class);
-
- Mockito.when(stateContext.getParent()).thenReturn(dnsm);
- Mockito.when(dnsm.getDatanodeDetails()).thenReturn(datanodes.get(0));
+ stateContext = ContainerTestUtils.getMockContext(datanodes.get(0), conf);
Mockito.when(ozoneContainer.getWriteChannel()).thenReturn(writeChanel);
Mockito.when(writeChanel.isExist(pipelineID.getProtobuf()))
.thenReturn(true);
final CreatePipelineCommandHandler commandHandler =
- new CreatePipelineCommandHandler(new OzoneConfiguration(),
- MoreExecutors.directExecutor());
+ new CreatePipelineCommandHandler(conf, MoreExecutors.directExecutor());
commandHandler.handle(command, ozoneContainer, stateContext,
connectionManager);
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestDeleteBlocksCommandHandler.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestDeleteBlocksCommandHandler.java
index f560591ee1..a33341b1f9 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestDeleteBlocksCommandHandler.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestDeleteBlocksCommandHandler.java
@@ -24,8 +24,6 @@ import
org.apache.hadoop.ozone.container.common.impl.ContainerLayoutVersion;
import org.apache.hadoop.ozone.container.common.impl.ContainerSet;
import org.apache.hadoop.ozone.container.common.interfaces.Container;
import
org.apache.hadoop.ozone.container.common.statemachine.DatanodeConfiguration;
-import
org.apache.hadoop.ozone.container.common.statemachine.DatanodeStateMachine;
-import org.apache.hadoop.ozone.container.common.statemachine.StateContext;
import org.apache.hadoop.ozone.container.common.volume.HddsVolume;
import org.apache.hadoop.ozone.container.keyvalue.ContainerTestVersionInfo;
import org.apache.hadoop.ozone.container.keyvalue.KeyValueContainer;
@@ -59,7 +57,6 @@ import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Future;
-import static
org.apache.hadoop.hdds.protocol.MockDatanodeDetails.randomDatanodeDetails;
import static
org.apache.hadoop.ozone.container.common.statemachine.commandhandler.DeleteBlocksCommandHandler.DeleteBlockTransactionExecutionResult;
import static org.apache.hadoop.ozone.OzoneConsts.SCHEMA_V1;
import static org.apache.hadoop.ozone.OzoneConsts.SCHEMA_V2;
@@ -67,7 +64,6 @@ import static org.apache.hadoop.ozone.OzoneConsts.SCHEMA_V3;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.when;
@@ -82,7 +78,6 @@ public class TestDeleteBlocksCommandHandler {
public TestRule testTimeout = new JUnit5AwareTimeout(Timeout.seconds(300));
private OzoneConfiguration conf;
- private StateContext context;
private ContainerLayoutVersion layout;
private OzoneContainer ozoneContainer;
private ContainerSet containerSet;
@@ -106,14 +101,8 @@ public class TestDeleteBlocksCommandHandler {
@Before
public void setup() throws Exception {
conf = new OzoneConfiguration();
- context = mock(StateContext.class);
layout = ContainerLayoutVersion.FILE_PER_BLOCK;
ozoneContainer = Mockito.mock(OzoneContainer.class);
- DatanodeStateMachine dnsm = Mockito.mock(DatanodeStateMachine.class);
- when(dnsm.getDatanodeDetails())
- .thenReturn(randomDatanodeDetails());
- Mockito.when(context.getParent()).thenReturn(dnsm);
-
containerSet = new ContainerSet(1000);
volume1 = Mockito.mock(HddsVolume.class);
Mockito.when(volume1.getStorageID()).thenReturn("uuid-1");
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueHandler.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueHandler.java
index 4dc6a76f74..e484c3334e 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueHandler.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueHandler.java
@@ -38,13 +38,13 @@ import
org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.ContainerC
import
org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.ContainerType;
import
org.apache.hadoop.hdds.scm.container.common.helpers.StorageContainerException;
import org.apache.hadoop.hdds.security.token.TokenVerifier;
+import org.apache.hadoop.ozone.container.common.ContainerTestUtils;
import org.apache.hadoop.ozone.container.common.helpers.ContainerMetrics;
import org.apache.hadoop.ozone.container.common.impl.ContainerLayoutVersion;
import org.apache.hadoop.ozone.container.common.impl.ContainerSet;
import org.apache.hadoop.ozone.container.common.impl.HddsDispatcher;
import org.apache.hadoop.ozone.container.common.interfaces.Container;
import org.apache.hadoop.ozone.container.common.interfaces.Handler;
-import
org.apache.hadoop.ozone.container.common.statemachine.DatanodeStateMachine;
import org.apache.hadoop.ozone.container.common.statemachine.StateContext;
import
org.apache.hadoop.ozone.container.common.transport.server.ratis.DispatcherContext;
import org.apache.hadoop.ozone.container.common.utils.StorageVolumeUtil;
@@ -278,12 +278,8 @@ public class TestKeyValueHandler {
interval[0] = 2;
ContainerMetrics metrics = new ContainerMetrics(interval);
DatanodeDetails datanodeDetails = Mockito.mock(DatanodeDetails.class);
- DatanodeStateMachine stateMachine = Mockito.mock(
- DatanodeStateMachine.class);
- StateContext context = Mockito.mock(StateContext.class);
- Mockito.when(stateMachine.getDatanodeDetails())
- .thenReturn(datanodeDetails);
- Mockito.when(context.getParent()).thenReturn(stateMachine);
+ StateContext context = ContainerTestUtils.getMockContext(
+ datanodeDetails, conf);
KeyValueHandler keyValueHandler = new KeyValueHandler(conf,
context.getParent().getDatanodeDetails().getUuidString(), cset,
volumeSet, metrics, c -> {
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java
index 8d9b30d2ff..1384530ff7 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java
@@ -24,7 +24,6 @@ import org.apache.hadoop.conf.StorageUnit;
import org.apache.hadoop.hdds.HddsConfigKeys;
import org.apache.hadoop.hdds.client.BlockID;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
-import org.apache.hadoop.hdds.conf.ReconfigurationHandler;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos;
import org.apache.hadoop.hdds.scm.ScmConfigKeys;
@@ -37,8 +36,6 @@ import
org.apache.hadoop.ozone.container.common.helpers.ChunkInfo;
import org.apache.hadoop.ozone.container.common.impl.ContainerLayoutVersion;
import org.apache.hadoop.ozone.container.common.impl.ContainerSet;
import org.apache.hadoop.ozone.container.common.interfaces.DBHandle;
-import
org.apache.hadoop.ozone.container.common.statemachine.DatanodeStateMachine;
-import org.apache.hadoop.ozone.container.common.statemachine.StateContext;
import org.apache.hadoop.ozone.container.common.utils.StorageVolumeUtil;
import org.apache.hadoop.ozone.container.common.volume.HddsVolume;
import
org.apache.hadoop.ozone.container.common.volume.RoundRobinVolumeChoosingPolicy;
@@ -56,7 +53,6 @@ import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
-import org.mockito.Mockito;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -169,19 +165,8 @@ public class TestOzoneContainer {
Long.valueOf(volCommitBytes + freeBytes));
}
BlockUtils.shutdownCache(conf);
-
- DatanodeStateMachine stateMachine = Mockito.mock(
- DatanodeStateMachine.class);
- Mockito.when(stateMachine.getReconfigurationHandler())
- .thenReturn(new ReconfigurationHandler("DN", conf, op -> { }));
- StateContext context = Mockito.mock(StateContext.class);
-
Mockito.when(stateMachine.getDatanodeDetails()).thenReturn(datanodeDetails);
- Mockito.when(context.getParent()).thenReturn(stateMachine);
- // When OzoneContainer is started, the containers from disk should be
- // loaded into the containerSet.
- // Also expected to initialize committed space for each volume.
- OzoneContainer ozoneContainer = new
- OzoneContainer(datanodeDetails, conf, context);
+ OzoneContainer ozoneContainer = ContainerTestUtils
+ .getOzoneContainer(datanodeDetails, conf);
ContainerSet containerset = ozoneContainer.getContainerSet();
assertEquals(numTestContainers, containerset.containerCount());
@@ -206,19 +191,8 @@ public class TestOzoneContainer {
conf.set(OzoneConfigKeys.HDDS_DATANODE_CONTAINER_DB_DIR,
dbDirString.toString());
ContainerTestUtils.enableSchemaV3(conf);
-
- DatanodeStateMachine stateMachine = Mockito.mock(
- DatanodeStateMachine.class);
- Mockito.when(stateMachine.getReconfigurationHandler())
- .thenReturn(new ReconfigurationHandler("DN", conf, op -> { }));
- StateContext context = Mockito.mock(StateContext.class);
-
Mockito.when(stateMachine.getDatanodeDetails()).thenReturn(datanodeDetails);
- Mockito.when(context.getParent()).thenReturn(stateMachine);
- // When OzoneContainer is started, the containers from disk should be
- // loaded into the containerSet.
- // Also expected to initialize committed space for each volume.
- OzoneContainer ozoneContainer = new
- OzoneContainer(datanodeDetails, conf, context);
+ OzoneContainer ozoneContainer = ContainerTestUtils
+ .getOzoneContainer(datanodeDetails, conf);
Assert.assertEquals(volumeSet.getVolumesList().size(),
ozoneContainer.getNodeReport().getStorageReportList().size());
Assert.assertEquals(3,
@@ -230,18 +204,8 @@ public class TestOzoneContainer {
@Test
public void testBuildNodeReportWithDefaultRatisLogDir() throws Exception {
- DatanodeStateMachine stateMachine = Mockito.mock(
- DatanodeStateMachine.class);
- Mockito.when(stateMachine.getReconfigurationHandler())
- .thenReturn(new ReconfigurationHandler("DN", conf, op -> { }));
- StateContext context = Mockito.mock(StateContext.class);
-
Mockito.when(stateMachine.getDatanodeDetails()).thenReturn(datanodeDetails);
- Mockito.when(context.getParent()).thenReturn(stateMachine);
- // When OzoneContainer is started, the containers from disk should be
- // loaded into the containerSet.
- // Also expected to initialize committed space for each volume.
- OzoneContainer ozoneContainer = new
- OzoneContainer(datanodeDetails, conf, context);
+ OzoneContainer ozoneContainer = ContainerTestUtils
+ .getOzoneContainer(datanodeDetails, conf);
Assert.assertEquals(volumeSet.getVolumesList().size(),
ozoneContainer.getNodeReport().getStorageReportList().size());
Assert.assertEquals(1,
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/common/TestEndPoint.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/common/TestEndPoint.java
index b5dca06fc9..c202b46ca2 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/common/TestEndPoint.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/common/TestEndPoint.java
@@ -26,7 +26,6 @@ import java.util.Map;
import java.util.UUID;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
-import org.apache.hadoop.hdds.conf.ReconfigurationHandler;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
import
org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.CloseContainerCommandProto;
@@ -151,8 +150,8 @@ public class TestEndPoint {
true);
ozoneConf.setBoolean(
OzoneConfigKeys.DFS_CONTAINER_RATIS_DATASTREAM_RANDOM_PORT, true);
- OzoneContainer ozoneContainer = new OzoneContainer(
- dnDetails, ozoneConf, getContext(dnDetails));
+ OzoneContainer ozoneContainer = new OzoneContainer(dnDetails,
+ ozoneConf, ContainerTestUtils.getMockContext(dnDetails, ozoneConf));
rpcEndPoint.setState(EndpointStateMachine.EndPointStates.GETVERSION);
VersionEndpointTask versionTask = new VersionEndpointTask(rpcEndPoint,
ozoneConf, ozoneContainer);
@@ -226,8 +225,8 @@ public class TestEndPoint {
serverAddress, 1000)) {
GenericTestUtils.LogCapturer logCapturer = GenericTestUtils.LogCapturer
.captureLogs(VersionEndpointTask.LOG);
- OzoneContainer ozoneContainer = new OzoneContainer(
- dnDetails, ozoneConf, getContext(dnDetails));
+ OzoneContainer ozoneContainer = new OzoneContainer(dnDetails, ozoneConf,
+ ContainerTestUtils.getMockContext(dnDetails, ozoneConf));
rpcEndPoint.setState(EndpointStateMachine.EndPointStates.GETVERSION);
VersionEndpointTask versionTask = new VersionEndpointTask(rpcEndPoint,
ozoneConf, ozoneContainer);
@@ -273,8 +272,8 @@ public class TestEndPoint {
true);
try (EndpointStateMachine rpcEndPoint = createEndpoint(ozoneConf,
serverAddress, 1000)) {
- OzoneContainer ozoneContainer = new OzoneContainer(
- dnDetails, ozoneConf, getContext(dnDetails));
+ OzoneContainer ozoneContainer = new OzoneContainer(dnDetails, ozoneConf,
+ ContainerTestUtils.getMockContext(dnDetails, ozoneConf));
rpcEndPoint.setState(EndpointStateMachine.EndPointStates.GETVERSION);
VersionEndpointTask versionTask = new VersionEndpointTask(rpcEndPoint,
ozoneConf, ozoneContainer);
@@ -302,8 +301,8 @@ public class TestEndPoint {
nonExistentServerAddress, 1000)) {
rpcEndPoint.setState(EndpointStateMachine.EndPointStates.GETVERSION);
DatanodeDetails datanodeDetails = randomDatanodeDetails();
- OzoneContainer ozoneContainer = new OzoneContainer(
- datanodeDetails, conf, getContext(datanodeDetails));
+ OzoneContainer ozoneContainer = new OzoneContainer(datanodeDetails,
+ conf, ContainerTestUtils.getMockContext(datanodeDetails, ozoneConf));
VersionEndpointTask versionTask = new VersionEndpointTask(rpcEndPoint,
conf, ozoneContainer);
EndpointStateMachine.EndPointStates newState = versionTask.call();
@@ -330,8 +329,8 @@ public class TestEndPoint {
serverAddress, (int) rpcTimeout)) {
rpcEndPoint.setState(EndpointStateMachine.EndPointStates.GETVERSION);
DatanodeDetails datanodeDetails = randomDatanodeDetails();
- OzoneContainer ozoneContainer = new OzoneContainer(
- datanodeDetails, conf, getContext(datanodeDetails));
+ OzoneContainer ozoneContainer = new OzoneContainer(datanodeDetails, conf,
+ ContainerTestUtils.getMockContext(datanodeDetails, ozoneConf));
VersionEndpointTask versionTask = new VersionEndpointTask(rpcEndPoint,
conf, ozoneContainer);
@@ -616,21 +615,10 @@ public class TestEndPoint {
Assertions.assertTrue(end - start <= rpcTimeout + tolerance + 6000);
}
- private StateContext getContext(DatanodeDetails datanodeDetails) {
- DatanodeStateMachine stateMachine = Mockito.mock(
- DatanodeStateMachine.class);
- Mockito.when(stateMachine.getReconfigurationHandler())
- .thenReturn(new ReconfigurationHandler("DN", ozoneConf, op -> { }));
- StateContext context = Mockito.mock(StateContext.class);
-
Mockito.when(stateMachine.getDatanodeDetails()).thenReturn(datanodeDetails);
- Mockito.when(context.getParent()).thenReturn(stateMachine);
- return context;
- }
-
private OzoneContainer createVolume(OzoneConfiguration conf)
throws IOException {
- OzoneContainer ozoneContainer = new OzoneContainer(
- dnDetails, conf, getContext(dnDetails));
+ OzoneContainer ozoneContainer = new OzoneContainer(dnDetails, conf,
+ ContainerTestUtils.getMockContext(dnDetails, ozoneConf));
String clusterId = scmServerImpl.getClusterId();
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/metrics/TestContainerMetrics.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/metrics/TestContainerMetrics.java
index e8163e9a07..dd733fa6f8 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/metrics/TestContainerMetrics.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/metrics/TestContainerMetrics.java
@@ -36,11 +36,11 @@ import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
import org.apache.hadoop.metrics2.MetricsRecordBuilder;
import org.apache.hadoop.ozone.OzoneConfigKeys;
import org.apache.hadoop.ozone.container.ContainerTestHelper;
+import org.apache.hadoop.ozone.container.common.ContainerTestUtils;
import org.apache.hadoop.ozone.container.common.helpers.ContainerMetrics;
import org.apache.hadoop.ozone.container.common.impl.ContainerSet;
import org.apache.hadoop.ozone.container.common.impl.HddsDispatcher;
import org.apache.hadoop.ozone.container.common.interfaces.Handler;
-import
org.apache.hadoop.ozone.container.common.statemachine.DatanodeStateMachine;
import org.apache.hadoop.ozone.container.common.statemachine.StateContext;
import
org.apache.hadoop.ozone.container.common.transport.server.XceiverServerGrpc;
import org.apache.hadoop.ozone.container.common.utils.StorageVolumeUtil;
@@ -61,7 +61,6 @@ import org.junit.Test;
import org.junit.rules.TestRule;
import org.junit.rules.Timeout;
import org.apache.ozone.test.JUnit5AwareTimeout;
-import org.mockito.Mockito;
/**
* Test for metrics published by storage containers.
@@ -99,12 +98,8 @@ public class TestContainerMetrics {
datanodeDetails.getUuidString(), conf,
null, StorageVolume.VolumeType.DATA_VOLUME, null);
ContainerSet containerSet = new ContainerSet(1000);
- DatanodeStateMachine stateMachine = Mockito.mock(
- DatanodeStateMachine.class);
- StateContext context = Mockito.mock(StateContext.class);
- Mockito.when(stateMachine.getDatanodeDetails())
- .thenReturn(datanodeDetails);
- Mockito.when(context.getParent()).thenReturn(stateMachine);
+ StateContext context = ContainerTestUtils.getMockContext(
+ datanodeDetails, conf);
ContainerMetrics metrics = ContainerMetrics.create(conf);
Map<ContainerProtos.ContainerType, Handler> handlers = Maps.newHashMap();
for (ContainerProtos.ContainerType containerType :
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java
index db7416dcfa..4eb57003df 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java
@@ -19,7 +19,6 @@
package org.apache.hadoop.ozone.container.ozoneimpl;
import org.apache.hadoop.hdds.client.BlockID;
-import org.apache.hadoop.hdds.conf.ReconfigurationHandler;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos;
import org.apache.hadoop.hdds.scm.pipeline.MockPipeline;
@@ -30,15 +29,13 @@ import
org.apache.hadoop.ozone.container.ContainerTestHelper;
import org.apache.hadoop.hdds.scm.XceiverClientGrpc;
import org.apache.hadoop.hdds.scm.XceiverClientSpi;
import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
-import
org.apache.hadoop.ozone.container.common.statemachine.DatanodeStateMachine;
-import org.apache.hadoop.ozone.container.common.statemachine.StateContext;
+import org.apache.hadoop.ozone.container.common.ContainerTestUtils;
import org.junit.Assert;
import org.junit.Rule;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
import org.junit.jupiter.migrationsupport.rules.EnableRuleMigrationSupport;
import org.junit.rules.TemporaryFolder;
-import org.mockito.Mockito;
import java.util.HashMap;
import java.util.LinkedList;
@@ -77,13 +74,8 @@ public class TestOzoneContainer {
.getPort(DatanodeDetails.Port.Name.STANDALONE).getValue());
DatanodeDetails datanodeDetails = randomDatanodeDetails();
- StateContext context = Mockito.mock(StateContext.class);
- DatanodeStateMachine dsm = Mockito.mock(DatanodeStateMachine.class);
- Mockito.when(dsm.getReconfigurationHandler())
- .thenReturn(new ReconfigurationHandler("DN", conf, op -> { }));
- Mockito.when(dsm.getDatanodeDetails()).thenReturn(datanodeDetails);
- Mockito.when(context.getParent()).thenReturn(dsm);
- container = new OzoneContainer(datanodeDetails, conf, context);
+ container = ContainerTestUtils
+ .getOzoneContainer(datanodeDetails, conf);
//Set clusterId and manually start ozone container.
container.start(UUID.randomUUID().toString());
@@ -112,13 +104,8 @@ public class TestOzoneContainer {
.getPort(DatanodeDetails.Port.Name.STANDALONE).getValue());
DatanodeDetails datanodeDetails = randomDatanodeDetails();
- StateContext context = Mockito.mock(StateContext.class);
- DatanodeStateMachine dsm = Mockito.mock(DatanodeStateMachine.class);
- Mockito.when(dsm.getReconfigurationHandler())
- .thenReturn(new ReconfigurationHandler("DN", conf, op -> { }));
- Mockito.when(dsm.getDatanodeDetails()).thenReturn(datanodeDetails);
- Mockito.when(context.getParent()).thenReturn(dsm);
- container = new OzoneContainer(datanodeDetails, conf, context);
+ container = ContainerTestUtils
+ .getOzoneContainer(datanodeDetails, conf);
String clusterId = UUID.randomUUID().toString();
container.start(clusterId);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainerWithTLS.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainerWithTLS.java
index 5c6fe2a37e..828f6c2964 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainerWithTLS.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainerWithTLS.java
@@ -20,7 +20,6 @@ package org.apache.hadoop.ozone.container.ozoneimpl;
import org.apache.hadoop.fs.FileUtil;
import org.apache.hadoop.hdds.HddsConfigKeys;
-import org.apache.hadoop.hdds.conf.ReconfigurationHandler;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.protocol.MockDatanodeDetails;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos;
@@ -39,8 +38,7 @@ import org.apache.hadoop.ozone.container.ContainerTestHelper;
import org.apache.hadoop.hdds.scm.XceiverClientGrpc;
import org.apache.hadoop.hdds.scm.XceiverClientSpi;
import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
-import
org.apache.hadoop.ozone.container.common.statemachine.DatanodeStateMachine;
-import org.apache.hadoop.ozone.container.common.statemachine.StateContext;
+import org.apache.hadoop.ozone.container.common.ContainerTestUtils;
import org.apache.hadoop.ozone.container.replication.SimpleContainerDownloader;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.token.Token;
@@ -55,7 +53,6 @@ import org.junit.rules.Timeout;
import org.apache.ozone.test.JUnit5AwareTimeout;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
-import org.mockito.Mockito;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -189,8 +186,8 @@ public class TestOzoneContainerWithTLS {
conf.setBoolean(
OzoneConfigKeys.DFS_CONTAINER_IPC_RANDOM_PORT, false);
- container = new OzoneContainer(dn, conf, getContext(dn), caClient,
- secretKeyClient);
+ container = new OzoneContainer(dn, conf, ContainerTestUtils
+ .getMockContext(dn, conf), caClient, secretKeyClient);
//Set scmId and manually start ozone container.
container.start(UUID.randomUUID().toString());
@@ -229,8 +226,8 @@ public class TestOzoneContainerWithTLS {
OzoneContainer container = null;
try {
- container = new OzoneContainer(dn, conf, getContext(dn), caClient,
- secretKeyClient);
+ container = new OzoneContainer(dn, conf, ContainerTestUtils
+ .getMockContext(dn, conf), caClient, secretKeyClient);
// Set scmId and manually start ozone container.
container.start(UUID.randomUUID().toString());
@@ -374,15 +371,4 @@ public class TestOzoneContainerWithTLS {
Assert.assertNotNull(response);
Assert.assertTrue(response.getResult() == ContainerProtos.Result.SUCCESS);
}
-
- private StateContext getContext(DatanodeDetails datanodeDetails) {
- DatanodeStateMachine stateMachine = Mockito.mock(
- DatanodeStateMachine.class);
- StateContext context = Mockito.mock(StateContext.class);
- Mockito.when(stateMachine.getReconfigurationHandler())
- .thenReturn(new ReconfigurationHandler("DN", conf, op -> { }));
-
Mockito.when(stateMachine.getDatanodeDetails()).thenReturn(datanodeDetails);
- Mockito.when(context.getParent()).thenReturn(stateMachine);
- return context;
- }
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestSecureOzoneContainer.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestSecureOzoneContainer.java
index 2bf0dd5e10..b3f87dc7b1 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestSecureOzoneContainer.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestSecureOzoneContainer.java
@@ -20,7 +20,6 @@ package org.apache.hadoop.ozone.container.ozoneimpl;
import org.apache.hadoop.hdds.HddsConfigKeys;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
-import org.apache.hadoop.hdds.conf.ReconfigurationHandler;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.protocol.MockDatanodeDetails;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos;
@@ -39,8 +38,7 @@ import
org.apache.hadoop.hdds.security.x509.certificate.client.CertificateClient
import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
import org.apache.hadoop.ozone.OzoneConfigKeys;
import org.apache.hadoop.ozone.client.SecretKeyTestClient;
-import
org.apache.hadoop.ozone.container.common.statemachine.DatanodeStateMachine;
-import org.apache.hadoop.ozone.container.common.statemachine.StateContext;
+import org.apache.hadoop.ozone.container.common.ContainerTestUtils;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.token.Token;
import org.apache.ozone.test.GenericTestUtils;
@@ -54,7 +52,6 @@ import org.junit.rules.Timeout;
import org.apache.ozone.test.JUnit5AwareTimeout;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
-import org.mockito.Mockito;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -152,8 +149,8 @@ public class TestSecureOzoneContainer {
conf.setBoolean(OzoneConfigKeys.DFS_CONTAINER_IPC_RANDOM_PORT, false);
DatanodeDetails dn = MockDatanodeDetails.randomDatanodeDetails();
- container = new OzoneContainer(dn, conf, getContext(dn), caClient,
- secretKeyClient);
+ container = new OzoneContainer(dn, conf, ContainerTestUtils
+ .getMockContext(dn, conf), caClient, secretKeyClient);
//Set scmId and manually start ozone container.
container.start(UUID.randomUUID().toString());
@@ -203,17 +200,6 @@ public class TestSecureOzoneContainer {
}
}
- private StateContext getContext(DatanodeDetails datanodeDetails) {
- DatanodeStateMachine stateMachine = Mockito.mock(
- DatanodeStateMachine.class);
- Mockito.when(stateMachine.getReconfigurationHandler())
- .thenReturn(new ReconfigurationHandler("DN", conf, op -> { }));
- StateContext context = Mockito.mock(StateContext.class);
-
Mockito.when(stateMachine.getDatanodeDetails()).thenReturn(datanodeDetails);
- Mockito.when(context.getParent()).thenReturn(stateMachine);
- return context;
- }
-
private void assertState(boolean condition) {
assertTrue(condition, this::testCase);
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/server/TestContainerServer.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/server/TestContainerServer.java
index 7896011790..ccc62ddeab 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/server/TestContainerServer.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/server/TestContainerServer.java
@@ -44,12 +44,12 @@ import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
import org.apache.hadoop.ozone.OzoneConfigKeys;
import org.apache.hadoop.ozone.RatisTestHelper;
import org.apache.hadoop.ozone.container.ContainerTestHelper;
+import org.apache.hadoop.ozone.container.common.ContainerTestUtils;
import org.apache.hadoop.ozone.container.common.helpers.ContainerMetrics;
import org.apache.hadoop.ozone.container.common.impl.ContainerSet;
import org.apache.hadoop.ozone.container.common.impl.HddsDispatcher;
import org.apache.hadoop.ozone.container.common.interfaces.ContainerDispatcher;
import org.apache.hadoop.ozone.container.common.interfaces.Handler;
-import
org.apache.hadoop.ozone.container.common.statemachine.DatanodeStateMachine;
import org.apache.hadoop.ozone.container.common.statemachine.StateContext;
import
org.apache.hadoop.ozone.container.common.transport.server.XceiverServerGrpc;
import
org.apache.hadoop.ozone.container.common.transport.server.XceiverServerSpi;
@@ -73,7 +73,7 @@ import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.apache.ozone.test.tag.Slow;
import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
+
import static org.mockito.Mockito.mock;
/**
@@ -200,12 +200,8 @@ public class TestContainerServer {
ContainerMetrics metrics = ContainerMetrics.create(conf);
Map<ContainerProtos.ContainerType, Handler> handlers = Maps.newHashMap();
DatanodeDetails datanodeDetails = randomDatanodeDetails();
- DatanodeStateMachine stateMachine = Mockito.mock(
- DatanodeStateMachine.class);
- StateContext context = Mockito.mock(StateContext.class);
- Mockito.when(stateMachine.getDatanodeDetails())
- .thenReturn(datanodeDetails);
- Mockito.when(context.getParent()).thenReturn(stateMachine);
+ StateContext context = ContainerTestUtils.getMockContext(
+ datanodeDetails, conf);
for (ContainerProtos.ContainerType containerType :
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/server/TestSecureContainerServer.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/server/TestSecureContainerServer.java
index 0ab142f8f9..00d044398b 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/server/TestSecureContainerServer.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/server/TestSecureContainerServer.java
@@ -55,12 +55,12 @@ import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
import org.apache.hadoop.ozone.OzoneConfigKeys;
import org.apache.hadoop.ozone.RatisTestHelper;
import org.apache.hadoop.ozone.client.SecretKeyTestClient;
+import org.apache.hadoop.ozone.container.common.ContainerTestUtils;
import org.apache.hadoop.ozone.container.common.helpers.ContainerMetrics;
import org.apache.hadoop.ozone.container.common.impl.ContainerSet;
import org.apache.hadoop.ozone.container.common.impl.HddsDispatcher;
import org.apache.hadoop.ozone.container.common.interfaces.ContainerDispatcher;
import org.apache.hadoop.ozone.container.common.interfaces.Handler;
-import
org.apache.hadoop.ozone.container.common.statemachine.DatanodeStateMachine;
import org.apache.hadoop.ozone.container.common.statemachine.StateContext;
import
org.apache.hadoop.ozone.container.common.transport.server.XceiverServerGrpc;
import
org.apache.hadoop.ozone.container.common.transport.server.XceiverServerSpi;
@@ -111,7 +111,6 @@ import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.mockito.Mockito;
/**
* Test Container servers when security is enabled.
@@ -177,11 +176,7 @@ public class TestSecureContainerServer {
conf.set(OZONE_METADATA_DIRS, TEST_DIR);
VolumeSet volumeSet = new MutableVolumeSet(dd.getUuidString(), conf, null,
StorageVolume.VolumeType.DATA_VOLUME, null);
- DatanodeStateMachine stateMachine = Mockito.mock(
- DatanodeStateMachine.class);
- StateContext context = Mockito.mock(StateContext.class);
- Mockito.when(stateMachine.getDatanodeDetails()).thenReturn(dd);
- Mockito.when(context.getParent()).thenReturn(stateMachine);
+ StateContext context = ContainerTestUtils.getMockContext(dd, conf);
ContainerMetrics metrics = ContainerMetrics.create(conf);
Map<ContainerProtos.ContainerType, Handler> handlers = Maps.newHashMap();
for (ContainerProtos.ContainerType containerType :
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
