HDDS-9998. Add static import for assertions and mocks in remaining ozone modules

hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestVulnerableUnhealthyReplicasHandler.java

@@ -35,7 +35,6 @@
 import org.apache.hadoop.hdds.scm.node.states.NodeNotFoundException;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
 
 import java.util.Collections;
 import java.util.HashSet;
@@ -190,7 +189,7 @@ public void testReturnsTrueForQuasiClosedContainerWithVulnerableReplicaWhenAllRe
     ContainerReplica unhealthy =
         createContainerReplica(container.containerID(), 0, DECOMMISSIONING, State.UNHEALTHY, sequenceId);
     replicas.add(unhealthy);
-    Mockito.when(replicationManager.getNodeStatus(Mockito.any(DatanodeDetails.class)))
+    when(replicationManager.getNodeStatus(any(DatanodeDetails.class)))
         .thenAnswer(invocation -> {
           DatanodeDetails dn = invocation.getArgument(0);
           if (dn.equals(unhealthy.getDatanodeDetails())) {

hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDatanodeAdminMonitor.java

@@ -41,7 +41,6 @@
 import org.apache.hadoop.security.authentication.client.AuthenticationException;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
 
 import java.io.IOException;
 import java.util.Collections;
@@ -406,7 +405,7 @@ public void testDecommissionWaitsForUnhealthyReplicaWithUniqueOriginToReplicateN
     replicas.add(unhealthy);
     nodeManager.setContainers(dn1, ImmutableSet.of(containerID));
 
-    Mockito.when(repManager.getContainerReplicaCount(Mockito.eq(containerID)))
+    when(repManager.getContainerReplicaCount(eq(containerID)))
         .thenReturn(new RatisContainerReplicaCount(container, replicas,
             Collections.emptyList(), 2, false));
     DatanodeAdminMonitorTestUtil.mockCheckContainerState(repManager, true);
@@ -430,7 +429,7 @@ public void testDecommissionWaitsForUnhealthyReplicaWithUniqueOriginToReplicateN
         .setDatanodeDetails(MockDatanodeDetails.randomDatanodeDetails())
         .build();
     replicas.add(copyOfUnhealthyOnNewNode);
-    Mockito.when(repManager.getContainerReplicaCount(Mockito.eq(containerID)))
+    when(repManager.getContainerReplicaCount(eq(containerID)))
         .thenReturn(new RatisContainerReplicaCount(container, replicas,
             Collections.emptyList(), 2, false));
     DatanodeAdminMonitorTestUtil.mockCheckContainerState(repManager, false);

hadoop-ozone/insight/src/test/java/org/apache/hadoop/ozone/insight/TestBaseInsightPoint.java

@@ -17,12 +17,14 @@
  */
 package org.apache.hadoop.ozone.insight;
 
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import java.util.Map;
 
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 /**
  * Test common insight point utility methods.
  */
@@ -42,29 +44,29 @@ public String getDescription() {
     Map<String, String> filters = new HashMap<>();
     filters.put("datanode", "123");
 
-    Assertions.assertTrue(insightPoint
+    assertTrue(insightPoint
         .filterLog(filters, "This a log specific to [datanode=123]"));
 
-    Assertions.assertFalse(insightPoint
+    assertFalse(insightPoint
         .filterLog(filters, "This a log specific to [datanode=234]"));
 
     //with empty filters
-    Assertions.assertTrue(insightPoint
+    assertTrue(insightPoint
         .filterLog(new HashMap<>(), "This a log specific to [datanode=234]"));
 
     //with multiple filters
     filters.clear();
     filters.put("datanode", "123");
     filters.put("pipeline", "abcd");
 
-    Assertions.assertFalse(insightPoint
+    assertFalse(insightPoint
         .filterLog(filters, "This a log specific to [datanode=123]"));
 
-    Assertions.assertTrue(insightPoint
+    assertTrue(insightPoint
         .filterLog(filters,
             "This a log specific to [datanode=123] [pipeline=abcd]"));
 
-    Assertions.assertFalse(insightPoint
+    assertFalse(insightPoint
         .filterLog(filters,
             "This a log specific to [datanode=456] [pipeline=abcd]"));
 

hadoop-ozone/insight/src/test/java/org/apache/hadoop/ozone/insight/TestConfigurationSubCommand.java

@@ -27,11 +27,12 @@
 import org.apache.hadoop.hdds.conf.ConfigTag;
 import org.apache.hadoop.hdds.conf.OzoneConfiguration;
 
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 /**
  * Test insight report which prints out configs.
  */
@@ -60,12 +61,12 @@ public void testPrintConfig() throws UnsupportedEncodingException {
     subCommand.printConfig(CustomConfig.class, conf);
 
     final String output = out.toString(StandardCharsets.UTF_8.name());
-    Assertions.assertTrue(output.contains(">>> ozone.scm.client.address"));
-    Assertions.assertTrue(output.contains("default: localhost"));
-    Assertions.assertTrue(output.contains("current: omclient"));
-    Assertions.assertTrue(output.contains(">>> ozone.scm.client.secure"));
-    Assertions.assertTrue(output.contains("default: true"));
-    Assertions.assertTrue(output.contains("current: true"));
+    assertThat(output).contains(">>> ozone.scm.client.address");
+    assertThat(output).contains("default: localhost");
+    assertThat(output).contains("current: omclient");
+    assertThat(output).contains(">>> ozone.scm.client.secure");
+    assertThat(output).contains("default: true");
+    assertThat(output).contains("current: true");
   }
 
   /**

hadoop-ozone/insight/src/test/java/org/apache/hadoop/ozone/insight/TestLogSubcommand.java

@@ -17,9 +17,10 @@
  */
 package org.apache.hadoop.ozone.insight;
 
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 /**
  * Testing utility methods of the log subcommand test.
  */
@@ -36,6 +37,6 @@ public void filterLog() {
             + "storageLocation: \"/tmp/hadoop-neo/dfs/data\"\\n  capacity: "
             + "250438021120\\n  scmUsed: 16384\\n  remaining: 212041244672\\n  "
             + "storageType: DISK\\n  failed: false\\n}\\n</json>");
-    Assertions.assertEquals(10, result.split("\n").length);
+    assertEquals(10, result.split("\n").length);
   }
 }

hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/TestECContainerRecovery.java

@@ -52,7 +52,6 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -72,6 +71,8 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_RECOVERING_CONTAINER_TIMEOUT;
 import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_RECOVERING_CONTAINER_TIMEOUT_DEFAULT;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.doAnswer;
 
 /**
  * Tests the EC recovery and over replication processing.
@@ -308,7 +309,7 @@ public void testECContainerRecoveryWithTimedOutRecovery() throws Exception {
               .mockFieldReflection(handler,
                       "coordinator");
 
-      Mockito.doAnswer(invocation -> {
+      doAnswer(invocation -> {
         GenericTestUtils.waitFor(() ->
             dn.getDatanodeStateMachine()
                 .getContainer()
@@ -320,8 +321,8 @@ public void testECContainerRecoveryWithTimedOutRecovery() throws Exception {
         reconstructedDN.set(dn);
         invocation.callRealMethod();
         return null;
-      }).when(coordinator).reconstructECBlockGroup(Mockito.any(), Mockito.any(),
-              Mockito.any(), Mockito.any());
+      }).when(coordinator).reconstructECBlockGroup(any(), any(),
+              any(), any());
     }
 
     // Shutting down DN triggers close pipeline and close container.