From ad25c71ed327f7b42bbd6faab270ef2de38a4c95 Mon Sep 17 00:00:00 2001
From: liuxiaocs7 <liuxiao2103@qq.com>
Date: Sat, 28 Feb 2026 01:36:40 +0800
Subject: [PATCH] HBASE-29937 Upgrade hbase-metrics-api to use junit5

---
 hbase-metrics-api/pom.xml                      |  5 -----
 .../metrics/TestMetricRegistriesLoader.java    | 18 ++++++------------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/hbase-metrics-api/pom.xml b/hbase-metrics-api/pom.xml
index 5c6e65f66fc7..c1a5af10d414 100644
--- a/hbase-metrics-api/pom.xml
+++ b/hbase-metrics-api/pom.xml
@@ -88,11 +88,6 @@
       <artifactId>junit-jupiter-params</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
diff --git a/hbase-metrics-api/src/test/java/org/apache/hadoop/hbase/metrics/TestMetricRegistriesLoader.java b/hbase-metrics-api/src/test/java/org/apache/hadoop/hbase/metrics/TestMetricRegistriesLoader.java
index b9df823e7565..83cdcbb2fca6 100644
--- a/hbase-metrics-api/src/test/java/org/apache/hadoop/hbase/metrics/TestMetricRegistriesLoader.java
+++ b/hbase-metrics-api/src/test/java/org/apache/hadoop/hbase/metrics/TestMetricRegistriesLoader.java
@@ -17,30 +17,24 @@
  */
 package org.apache.hadoop.hbase.metrics;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.mockito.Mockito.mock;
 
-import org.apache.hadoop.hbase.HBaseClassTestRule;
 import org.apache.hadoop.hbase.testclassification.SmallTests;
-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.apache.hbase.thirdparty.com.google.common.collect.Lists;
 
 /**
  * Test class for {@link MetricRegistriesLoader}.
  */
-@Category(SmallTests.class)
+@Tag(SmallTests.TAG)
 public class TestMetricRegistriesLoader {
 
-  @ClassRule
-  public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(TestMetricRegistriesLoader.class);
-
   @Test
-  public void testLoadSinleInstance() {
+  public void testLoadSingleInstance() {
     MetricRegistries loader = mock(MetricRegistries.class);
     MetricRegistries instance = MetricRegistriesLoader.load(Lists.newArrayList(loader));
     assertEquals(loader, instance);