HBASE-30039 Upgrade hbase-server to use junit5 Part3 (#7999)

Signed-off-by: Duo Zhang <zhangduo@apache.org>

Author: liuxiaocs7

hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/SpaceQuotaHelperForTests.java

@@ -17,9 +17,9 @@
  */
 package org.apache.hadoop.hbase.quotas;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -65,7 +65,6 @@
 import org.apache.hadoop.hbase.util.Pair;
 import org.apache.hadoop.util.StringUtils;
 import org.apache.yetus.audience.InterfaceAudience;
-import org.junit.rules.TestName;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -84,11 +83,11 @@ public class SpaceQuotaHelperForTests {
   public static final long ONE_GIGABYTE = ONE_MEGABYTE * ONE_KILOBYTE;
 
   private final HBaseTestingUtility testUtil;
-  private final TestName testName;
+  private final String testName;
   private final AtomicLong counter;
   private static final int NUM_RETRIES = 10;
 
-  public SpaceQuotaHelperForTests(HBaseTestingUtility testUtil, TestName testName,
+  public SpaceQuotaHelperForTests(HBaseTestingUtility testUtil, String testName,
     AtomicLong counter) {
     this.testUtil = Objects.requireNonNull(testUtil);
     this.testName = Objects.requireNonNull(testName);
@@ -232,12 +231,13 @@ void verifyViolation(SpaceViolationPolicy policyToViolate, TableName tn, Mutatio
         assertTrue(
           msg.contains("TableNotEnabledException") || msg.contains(policyToViolate.name()));
       } else {
-        assertTrue("Expected exception message to contain the word '" + policyToViolate.name()
-          + "', but was " + msg, msg.contains(policyToViolate.name()));
+        assertTrue(msg.contains(policyToViolate.name()),
+          "Expected exception message to contain the word '" + policyToViolate.name()
+            + "', but was " + msg);
       }
     }
-    assertTrue("Expected to see an exception writing data to a table exceeding its quota",
-      sawError);
+    assertTrue(sawError,
+      "Expected to see an exception writing data to a table exceeding its quota");
   }
 
   /**
@@ -277,7 +277,7 @@ void verifyNoViolation(TableName tn, Mutation m) throws Exception {
         scanner.close();
       }
     }
-    assertTrue("Expected to succeed in writing data to a table not having quota ", sawSuccess);
+    assertTrue(sawSuccess, "Expected to succeed in writing data to a table not having quota ");
   }
 
   /**
@@ -290,8 +290,8 @@ void verifyTableUsageSnapshotForSpaceQuotaExist(TableName tn) throws Exception {
       ResultScanner rs = quotaTable.getScanner(s);
       sawUsageSnapshot = (rs.next() != null);
     }
-    assertTrue("Expected to succeed in getting table usage snapshots for space quota",
-      sawUsageSnapshot);
+    assertTrue(sawUsageSnapshot,
+      "Expected to succeed in getting table usage snapshots for space quota");
   }
 
   /**
@@ -336,7 +336,7 @@ ClientServiceCallable<Void> generateFileToLoad(TableName tn, int numFiles, int n
     Connection conn = testUtil.getConnection();
     FileSystem fs = testUtil.getTestFileSystem();
     Configuration conf = testUtil.getConfiguration();
-    Path baseDir = new Path(fs.getHomeDirectory(), testName.getMethodName() + "_files");
+    Path baseDir = new Path(fs.getHomeDirectory(), testName + "_files");
     fs.mkdirs(baseDir);
     final List<Pair<byte[], String>> famPaths = new ArrayList<Pair<byte[], String>>();
     for (int i = 1; i <= numFiles; i++) {
@@ -365,44 +365,6 @@ public Void rpcCall() throws Exception {
     };
   }
 
-  /**
-   * Bulk-loads a number of files with a number of rows to the given table.
-   */
-  // ClientServiceCallable<Boolean> generateFileToLoad(
-  // TableName tn, int numFiles, int numRowsPerFile) throws Exception {
-  // Connection conn = testUtil.getConnection();
-  // FileSystem fs = testUtil.getTestFileSystem();
-  // Configuration conf = testUtil.getConfiguration();
-  // Path baseDir = new Path(fs.getHomeDirectory(), testName.getMethodName() + "_files");
-  // fs.mkdirs(baseDir);
-  // final List<Pair<byte[], String>> famPaths = new ArrayList<>();
-  // for (int i = 1; i <= numFiles; i++) {
-  // Path hfile = new Path(baseDir, "file" + i);
-  // TestHRegionServerBulkLoad.createHFile(
-  // fs, hfile, Bytes.toBytes(SpaceQuotaHelperForTests.F1), Bytes.toBytes("my"),
-  // Bytes.toBytes("file"), numRowsPerFile);
-  // famPaths.add(new Pair<>(Bytes.toBytes(SpaceQuotaHelperForTests.F1), hfile.toString()));
-  // }
-  //
-  // // bulk load HFiles
-  // Table table = conn.getTable(tn);
-  // final String bulkToken = new SecureBulkLoadClient(conf, table).prepareBulkLoad(conn);
-  // return new ClientServiceCallable<Boolean>(
-  // conn, tn, Bytes.toBytes("row"), new RpcControllerFactory(conf).newController(),
-  // HConstants.PRIORITY_UNSET) {
-  // @Override
-  // public Boolean rpcCall() throws Exception {
-  // SecureBulkLoadClient secureClient = null;
-  // byte[] regionName = getLocation().getRegion().getRegionName();
-  // try (Table table = conn.getTable(getTableName())) {
-  // secureClient = new SecureBulkLoadClient(conf, table);
-  // return secureClient.secureBulkLoadHFiles(getStub(), famPaths, regionName,
-  // true, null, bulkToken);
-  // }
-  // }
-  // };
-  // }
-
   /**
    * Removes the space quota from the given namespace
    */
@@ -466,14 +428,14 @@ QuotaSettings getTableSpaceQuota(Connection conn, TableName tn) throws IOExcepti
   /**
    * Waits 30seconds for the HBase quota table to exist.
    */
-  public void waitForQuotaTable(Connection conn) throws IOException {
+  void waitForQuotaTable(Connection conn) throws IOException {
     waitForQuotaTable(conn, 30_000);
   }
 
   /**
    * Waits {@code timeout} milliseconds for the HBase quota table to exist.
    */
-  public void waitForQuotaTable(Connection conn, long timeout) throws IOException {
+  void waitForQuotaTable(Connection conn, long timeout) throws IOException {
     testUtil.waitFor(timeout, 1000, new Predicate<IOException>() {
       @Override
       public boolean evaluate() throws IOException {
@@ -598,7 +560,7 @@ TableName getNextTableName() {
   }
 
   TableName getNextTableName(String namespace) {
-    return TableName.valueOf(namespace, testName.getMethodName() + counter.getAndIncrement());
+    return TableName.valueOf(namespace, testName + counter.getAndIncrement());
   }
 
   TableName createTable() throws Exception {
@@ -647,8 +609,7 @@ TableName createTableWithRegions(Admin admin, String namespace, int numRegions,
 
   TableName createTableInNamespace(NamespaceDescriptor nd) throws Exception {
     final Admin admin = testUtil.getAdmin();
-    final TableName tn =
-      TableName.valueOf(nd.getName(), testName.getMethodName() + counter.getAndIncrement());
+    final TableName tn = TableName.valueOf(nd.getName(), testName + counter.getAndIncrement());
 
     // Delete the old table
     if (admin.tableExists(tn)) {
@@ -658,7 +619,7 @@ TableName createTableInNamespace(NamespaceDescriptor nd) throws Exception {
 
     // Create the table
     TableDescriptor tableDesc = TableDescriptorBuilder.newBuilder(tn)
-      .addColumnFamily(ColumnFamilyDescriptorBuilder.of(F1)).build();
+      .setColumnFamily(ColumnFamilyDescriptorBuilder.of(F1)).build();
 
     admin.createTable(tableDesc);
     return tn;

hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestActivePolicyEnforcement.java

@@ -17,42 +17,36 @@
  */
 package org.apache.hadoop.hbase.quotas;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
 
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
-import org.apache.hadoop.hbase.HBaseClassTestRule;
 import org.apache.hadoop.hbase.TableName;
 import org.apache.hadoop.hbase.quotas.SpaceQuotaSnapshot.SpaceQuotaStatus;
 import org.apache.hadoop.hbase.quotas.policies.DefaultViolationPolicyEnforcement;
 import org.apache.hadoop.hbase.quotas.policies.MissingSnapshotViolationPolicyEnforcement;
 import org.apache.hadoop.hbase.quotas.policies.NoWritesViolationPolicyEnforcement;
 import org.apache.hadoop.hbase.regionserver.RegionServerServices;
 import org.apache.hadoop.hbase.testclassification.SmallTests;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test class for {@link ActivePolicyEnforcement}.
  */
-@Category(SmallTests.class)
+@Tag(SmallTests.TAG)
 public class TestActivePolicyEnforcement {
 
-  @ClassRule
-  public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(TestActivePolicyEnforcement.class);
-
   private RegionServerServices rss;
 
-  @Before
+  @BeforeEach
   public void setup() {
     rss = mock(RegionServerServices.class);
   }
@@ -73,8 +67,9 @@ public void testNoPolicyReturnsNoopEnforcement() {
     SpaceViolationPolicyEnforcement enforcement =
       ape.getPolicyEnforcement(TableName.valueOf("nonexistent"));
     assertNotNull(enforcement);
-    assertTrue("Expected an instance of MissingSnapshotViolationPolicyEnforcement, but got "
-      + enforcement.getClass(), enforcement instanceof MissingSnapshotViolationPolicyEnforcement);
+    assertTrue(enforcement instanceof MissingSnapshotViolationPolicyEnforcement,
+      "Expected an instance of MissingSnapshotViolationPolicyEnforcement, but got "
+        + enforcement.getClass());
   }
 
   @Test
@@ -84,7 +79,7 @@ public void testNoBulkLoadChecksOnNoSnapshot() {
         Collections.<TableName, SpaceQuotaSnapshot> emptyMap(), mock(RegionServerServices.class));
     SpaceViolationPolicyEnforcement enforcement =
       ape.getPolicyEnforcement(TableName.valueOf("nonexistent"));
-    assertFalse("Should not check bulkloads", enforcement.shouldCheckBulkLoads());
+    assertFalse(enforcement.shouldCheckBulkLoads(), "Should not check bulkloads");
   }
 
   @Test
@@ -109,10 +104,10 @@ public void testNonViolatingQuotaCachesPolicyEnforcment() {
     final ActivePolicyEnforcement ape =
       new ActivePolicyEnforcement(Collections.emptyMap(), snapshots, rss);
     SpaceViolationPolicyEnforcement policyEnforcement = ape.getPolicyEnforcement(tableName);
-    assertTrue("Found the wrong class: " + policyEnforcement.getClass(),
-      policyEnforcement instanceof DefaultViolationPolicyEnforcement);
+    assertTrue(policyEnforcement instanceof DefaultViolationPolicyEnforcement,
+      "Found the wrong class: " + policyEnforcement.getClass());
     SpaceViolationPolicyEnforcement copy = ape.getPolicyEnforcement(tableName);
-    assertTrue("Expected the instance to be cached", policyEnforcement == copy);
+    assertTrue(policyEnforcement == copy, "Expected the instance to be cached");
     Entry<TableName, SpaceViolationPolicyEnforcement> entry =
       ape.getLocallyCachedPolicies().entrySet().iterator().next();
     assertTrue(policyEnforcement == entry.getValue());

hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestAtomicReadQuota.java

@@ -22,7 +22,6 @@
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
-import org.apache.hadoop.hbase.HBaseClassTestRule;
 import org.apache.hadoop.hbase.HBaseTestingUtility;
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.TableName;
@@ -40,34 +39,31 @@
 import org.apache.hadoop.hbase.testclassification.RegionServerTests;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@Category({ RegionServerTests.class, MediumTests.class })
+@Tag(RegionServerTests.TAG)
+@Tag(MediumTests.TAG)
 public class TestAtomicReadQuota {
-  @ClassRule
-  public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(TestAtomicReadQuota.class);
   private static final Logger LOG = LoggerFactory.getLogger(TestAtomicReadQuota.class);
   private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
   private static final TableName TABLE_NAME = TableName.valueOf(UUID.randomUUID().toString());
   private static final byte[] FAMILY = Bytes.toBytes("cf");
   private static final byte[] QUALIFIER = Bytes.toBytes("q");
 
-  @AfterClass
+  @AfterAll
   public static void tearDown() throws Exception {
     ThrottleQuotaTestUtil.clearQuotaCache(TEST_UTIL);
     EnvironmentEdgeManager.reset();
     TEST_UTIL.deleteTable(TABLE_NAME);
     TEST_UTIL.shutdownMiniCluster();
   }
 
-  @BeforeClass
+  @BeforeAll
   public static void setUpBeforeClass() throws Exception {
     TEST_UTIL.getConfiguration().setInt("hbase.client.pause", 1);
     TEST_UTIL.getConfiguration().setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 1);

hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestBlockBytesScannedQuota.java

@@ -23,11 +23,10 @@
 import static org.apache.hadoop.hbase.quotas.ThrottleQuotaTestUtil.doScans;
 import static org.apache.hadoop.hbase.quotas.ThrottleQuotaTestUtil.triggerUserCacheRefresh;
 import static org.apache.hadoop.hbase.quotas.ThrottleQuotaTestUtil.waitMinuteQuota;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.concurrent.Callable;
 import java.util.concurrent.TimeUnit;
-import org.apache.hadoop.hbase.HBaseClassTestRule;
 import org.apache.hadoop.hbase.HBaseTestingUtility;
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.TableName;
@@ -38,20 +37,17 @@
 import org.apache.hadoop.hbase.testclassification.RegionServerTests;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@Category({ RegionServerTests.class, LargeTests.class })
+@Tag(RegionServerTests.TAG)
+@Tag(LargeTests.TAG)
 public class TestBlockBytesScannedQuota {
-  @ClassRule
-  public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(TestBlockBytesScannedQuota.class);
 
   private final static Logger LOG = LoggerFactory.getLogger(TestBlockBytesScannedQuota.class);
 
@@ -63,7 +59,7 @@ public class TestBlockBytesScannedQuota {
   private static final TableName TABLE_NAME = TableName.valueOf("BlockBytesScannedQuotaTest");
   private static final long MAX_SCANNER_RESULT_SIZE = 100 * 1024 * 1024;
 
-  @BeforeClass
+  @BeforeAll
   public static void setUpBeforeClass() throws Exception {
     // client should fail fast
     TEST_UTIL.getConfiguration().setInt("hbase.client.pause", 10);
@@ -86,14 +82,14 @@ public static void setUpBeforeClass() throws Exception {
     TEST_UTIL.waitTableAvailable(TABLE_NAME);
   }
 
-  @AfterClass
+  @AfterAll
   public static void tearDownAfterClass() throws Exception {
     EnvironmentEdgeManager.reset();
     TEST_UTIL.deleteTable(TABLE_NAME);
     TEST_UTIL.shutdownMiniCluster();
   }
 
-  @After
+  @AfterEach
   public void tearDown() throws Exception {
     ThrottleQuotaTestUtil.clearQuotaCache(TEST_UTIL);
   }