fix

Author: liuxiaocs7

hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormat.java

@@ -32,7 +32,6 @@
 import java.util.Map;
 import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.CompareOperator;
-import org.apache.hadoop.hbase.HBaseClassTestRule;
 import org.apache.hadoop.hbase.HBaseConfiguration;
 import org.apache.hadoop.hbase.HBaseTestingUtil;
 import org.apache.hadoop.hbase.NotServingRegionException;
@@ -74,9 +73,6 @@
 @Tag(LargeTests.TAG)
 public class TestTableInputFormat {
 
-  public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(TestTableInputFormat.class);
-
   private static final Logger LOG = LoggerFactory.getLogger(TestTableInputFormat.class);
 
   private final static HBaseTestingUtil UTIL = new HBaseTestingUtil();

hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestWALPlayer.java

@@ -39,7 +39,6 @@
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.CellUtil;
-import org.apache.hadoop.hbase.HBaseClassTestRule;
 import org.apache.hadoop.hbase.HBaseTestingUtil;
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.KeyValue;
@@ -83,9 +82,6 @@
 @Tag(LargeTests.TAG)
 public class TestWALPlayer {
 
-  public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(TestWALPlayer.class);
-
   private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
   private static SingleProcessHBaseCluster cluster;
   private static Path rootDir;

hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/replication/TestVerifyReplicationRecompareRunnable.java

@@ -19,6 +19,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.when;
 
 import java.io.IOException;
@@ -77,7 +78,7 @@ public void setUp() {
     for (VerifyReplication.Verifier.Counters counter : VerifyReplication.Verifier.Counters
       .values()) {
       Counter emptyCounter = new GenericCounter(counter.name(), counter.name());
-      when(context.getCounter(counter)).thenReturn(emptyCounter);
+      lenient().when(context.getCounter(counter)).thenReturn(emptyCounter);
     }
   }
 
@@ -131,7 +132,7 @@ public void itRecomparesBadRow() throws IOException {
   @Test
   public void itHandlesExceptionOnRecompare() throws IOException {
     when(sourceTable.get(any(Get.class))).thenThrow(new IOException("Error!"));
-    when(replicatedTable.get(any(Get.class))).thenReturn(genResult(5));
+    lenient().when(replicatedTable.get(any(Get.class))).thenReturn(genResult(5));
 
     VerifyReplicationRecompareRunnable runnable = new VerifyReplicationRecompareRunnable(context,
       genResult(5), null, VerifyReplication.Verifier.Counters.ONLY_IN_SOURCE_TABLE_ROWS, "",