HBASE-30188 Upgrade hbase-server to use junit5 Part20 (#8286) (#8298)

(cherry picked from commit 8ce9e3b)

Signed-off-by: Xiao Liu <liuxiaocs@apache.org>

Author: Apache9

hbase-endpoint/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSyncUpToolWithBulkLoadedData.java

@@ -17,10 +17,10 @@
  */
 package org.apache.hadoop.hbase.replication;
 
-import static org.apache.hadoop.hbase.replication.TestReplicationBase.NB_RETRIES;
-import static org.apache.hadoop.hbase.replication.TestReplicationBase.SLEEP_TIME;
-import static org.apache.hadoop.hbase.replication.TestReplicationBase.row;
-import static org.junit.Assert.assertEquals;
+import static org.apache.hadoop.hbase.replication.TestReplicationBaseNoBeforeAll.NB_RETRIES;
+import static org.apache.hadoop.hbase.replication.TestReplicationBaseNoBeforeAll.SLEEP_TIME;
+import static org.apache.hadoop.hbase.replication.TestReplicationBaseNoBeforeAll.row;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -32,7 +32,6 @@
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hbase.HBaseClassTestRule;
 import org.apache.hadoop.hbase.HBaseTestingUtility;
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.TableName;
@@ -45,19 +44,15 @@
 import org.apache.hadoop.hbase.tool.BulkLoadHFiles;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.HFileTestUtil;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@Category({ ReplicationTests.class, LargeTests.class })
+@Tag(ReplicationTests.TAG)
+@Tag(LargeTests.TAG)
 public class TestReplicationSyncUpToolWithBulkLoadedData extends TestReplicationSyncUpToolBase {
 
-  @ClassRule
-  public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(TestReplicationSyncUpToolWithBulkLoadedData.class);
-
   private static final Logger LOG =
     LoggerFactory.getLogger(TestReplicationSyncUpToolWithBulkLoadedData.class);
 
@@ -122,12 +117,12 @@ private void mimicSyncUpAfterBulkLoad(Iterator<String> randomHFileRangeListItera
     loadAndReplicateHFiles(false, randomHFileRangeListIterator);
 
     int rowCount_ht1Source = UTIL1.countRows(ht1Source);
-    assertEquals("t1_syncup has 206 rows on source, after bulk load of another 103 hfiles", 206,
-      rowCount_ht1Source);
+    assertEquals(206, rowCount_ht1Source,
+      "t1_syncup has 206 rows on source, after bulk load of another 103 hfiles");
 
     int rowCount_ht2Source = UTIL1.countRows(ht2Source);
-    assertEquals("t2_syncup has 406 rows on source, after bulk load of another 203 hfiles", 406,
-      rowCount_ht2Source);
+    assertEquals(406, rowCount_ht2Source,
+      "t2_syncup has 406 rows on source, after bulk load of another 203 hfiles");
 
     shutDownSourceHBaseCluster();
     restartTargetHBaseCluster(1);
@@ -137,8 +132,8 @@ private void mimicSyncUpAfterBulkLoad(Iterator<String> randomHFileRangeListItera
     // Before sync up
     int rowCountHt1TargetAtPeer1 = UTIL2.countRows(ht1TargetAtPeer1);
     int rowCountHt2TargetAtPeer1 = UTIL2.countRows(ht2TargetAtPeer1);
-    assertEquals("@Peer1 t1_syncup should still have 100 rows", 100, rowCountHt1TargetAtPeer1);
-    assertEquals("@Peer1 t2_syncup should still have 200 rows", 200, rowCountHt2TargetAtPeer1);
+    assertEquals(100, rowCountHt1TargetAtPeer1, "@Peer1 t1_syncup should still have 100 rows");
+    assertEquals(200, rowCountHt2TargetAtPeer1, "@Peer1 t2_syncup should still have 200 rows");
 
     // Run sync up tool
     syncUp(UTIL1);
@@ -157,10 +152,10 @@ private void mimicSyncUpAfterBulkLoad(Iterator<String> randomHFileRangeListItera
           rowCount_ht2Source = UTIL1.countRows(ht2Source);
           LOG.debug("t2_syncup should have 406 rows at source, and it is " + rowCount_ht2Source);
         }
-        assertEquals("@Peer1 t1_syncup should be sync up and have 200 rows", 200,
-          rowCountHt1TargetAtPeer1);
-        assertEquals("@Peer1 t2_syncup should be sync up and have 400 rows", 400,
-          rowCountHt2TargetAtPeer1);
+        assertEquals(200, rowCountHt1TargetAtPeer1,
+          "@Peer1 t1_syncup should be sync up and have 200 rows");
+        assertEquals(400, rowCountHt2TargetAtPeer1,
+          "@Peer1 t2_syncup should be sync up and have 400 rows");
       }
       if (rowCountHt1TargetAtPeer1 == 200 && rowCountHt2TargetAtPeer1 == 400) {
         LOG.info("SyncUpAfterBulkLoad succeeded at retry = " + i);
@@ -228,7 +223,7 @@ private void loadAndValidateHFileReplication(String testName, byte[] row, byte[]
     Table source, byte[][][] hfileRanges, int numOfRows) throws Exception {
     Path dir = UTIL1.getDataTestDirOnTestFS(testName);
     FileSystem fs = UTIL1.getTestFileSystem();
-    dir = dir.makeQualified(fs);
+    dir = dir.makeQualified(fs.getUri(), fs.getWorkingDirectory());
     Path familyDir = new Path(dir, Bytes.toString(fam));
 
     int hfileIdx = 0;
@@ -248,7 +243,7 @@ private void loadFromOtherHDFSAndValidateHFileReplication(String testName, byte[
     Table source, byte[][][] hfileRanges, int numOfRows) throws Exception {
     Path dir = UTIL2.getDataTestDirOnTestFS(testName);
     FileSystem fs = UTIL2.getTestFileSystem();
-    dir = dir.makeQualified(fs);
+    dir = dir.makeQualified(fs.getUri(), fs.getWorkingDirectory());
     Path familyDir = new Path(dir, Bytes.toString(fam));
 
     int hfileIdx = 0;
@@ -269,7 +264,7 @@ private void wait(Table target, int expectedCount, String msg)
     for (int i = 0; i < NB_RETRIES; i++) {
       int rowCountHt2TargetAtPeer1 = UTIL2.countRows(target);
       if (i == NB_RETRIES - 1) {
-        assertEquals(msg, expectedCount, rowCountHt2TargetAtPeer1);
+        assertEquals(expectedCount, rowCountHt2TargetAtPeer1, msg);
       }
       if (expectedCount == rowCountHt2TargetAtPeer1) {
         break;

hbase-server/src/test/java/org/apache/hadoop/hbase/client/replication/TestReplicationAdmin.java

@@ -41,13 +41,13 @@
 import org.apache.hadoop.hbase.TableName;
 import org.apache.hadoop.hbase.client.Admin;
 import org.apache.hadoop.hbase.replication.DummyReplicationEndpoint;
+import org.apache.hadoop.hbase.replication.ReplicationEndpointTestBase.InterClusterReplicationEndpointForTest;
 import org.apache.hadoop.hbase.replication.ReplicationException;
 import org.apache.hadoop.hbase.replication.ReplicationPeerConfig;
 import org.apache.hadoop.hbase.replication.ReplicationPeerConfigBuilder;
 import org.apache.hadoop.hbase.replication.ReplicationPeerDescription;
 import org.apache.hadoop.hbase.replication.ReplicationQueueStorage;
 import org.apache.hadoop.hbase.replication.ReplicationStorageFactory;
-import org.apache.hadoop.hbase.replication.TestReplicationEndpoint.InterClusterReplicationEndpointForTest;
 import org.apache.hadoop.hbase.testclassification.ClientTests;
 import org.apache.hadoop.hbase.testclassification.MediumTests;
 import org.junit.jupiter.api.AfterAll;