This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new a0a4bb8e3f1 HBASE-29876 Upgrade hbase-shell to use junit5 (#7729)
a0a4bb8e3f1 is described below
commit a0a4bb8e3f1b0096ce66eb02fc79d8c67c9c3816
Author: Liu Xiao <[email protected]>
AuthorDate: Thu Feb 12 23:39:29 2026 +0800
HBASE-29876 Upgrade hbase-shell to use junit5 (#7729)
Signed-off-by: Duo Zhang <[email protected]>
Signed-off-by: Dávid Paksy <[email protected]>
---
hbase-shell/pom.xml | 5 -----
.../apache/hadoop/hbase/client/AbstractTestShell.java | 10 +++++-----
.../org/apache/hadoop/hbase/client/RubyShellTest.java | 2 +-
.../org/apache/hadoop/hbase/client/TestAdminShell.java | 15 +++++----------
.../hadoop/hbase/client/TestListTablesShell.java | 10 +++-------
.../apache/hadoop/hbase/client/TestQuotasShell.java | 10 +++-------
.../apache/hadoop/hbase/client/TestRSGroupShell.java | 15 +++++----------
.../hadoop/hbase/client/TestReplicationShell.java | 10 +++-------
.../java/org/apache/hadoop/hbase/client/TestShell.java | 9 +++------
.../apache/hadoop/hbase/client/TestShellNoCluster.java | 18 +++++++-----------
.../org/apache/hadoop/hbase/client/TestTableShell.java | 10 +++-------
11 files changed, 38 insertions(+), 76 deletions(-)
diff --git a/hbase-shell/pom.xml b/hbase-shell/pom.xml
index 25ec73039df..24be8d71128 100644
--- a/hbase-shell/pom.xml
+++ b/hbase-shell/pom.xml
@@ -94,11 +94,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-shell/src/test/java/org/apache/hadoop/hbase/client/AbstractTestShell.java
b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/AbstractTestShell.java
index e98eecc100b..bf523ccd734 100644
---
a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/AbstractTestShell.java
+++
b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/AbstractTestShell.java
@@ -20,9 +20,9 @@ package org.apache.hadoop.hbase.client;
import java.io.IOException;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.jruby.embed.ScriptingContainer;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public abstract class AbstractTestShell implements RubyShellTest {
protected final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
@@ -43,7 +43,7 @@ public abstract class AbstractTestShell implements
RubyShellTest {
return "**/*_test.rb";
}
- @Before
+ @BeforeEach
public void setUp() throws Exception {
RubyShellTest.setUpConfig(this);
@@ -55,7 +55,7 @@ public abstract class AbstractTestShell implements
RubyShellTest {
RubyShellTest.doTestSetup(this);
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
TEST_UTIL.shutdownMiniCluster();
}
diff --git
a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/RubyShellTest.java
b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/RubyShellTest.java
index 770acb66a9d..8a108a6e874 100644
---
a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/RubyShellTest.java
+++
b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/RubyShellTest.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public interface RubyShellTest {
- static Logger LOG = LoggerFactory.getLogger(RubyShellTest.class);
+ Logger LOG = LoggerFactory.getLogger(RubyShellTest.class);
HBaseTestingUtility getTEST_UTIL();
diff --git
a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestAdminShell.java
b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestAdminShell.java
index 8e644b348c6..1db7d1d2b20 100644
---
a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestAdminShell.java
+++
b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestAdminShell.java
@@ -19,24 +19,19 @@ package org.apache.hadoop.hbase.client;
import java.util.Collections;
import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.fs.ErasureCodingUtils;
import org.apache.hadoop.hbase.testclassification.ClientTests;
import org.apache.hadoop.hbase.testclassification.LargeTests;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@Category({ ClientTests.class, LargeTests.class })
+@Tag(ClientTests.TAG)
+@Tag(LargeTests.TAG)
public class TestAdminShell extends AbstractTestShell {
private static final Logger LOG =
LoggerFactory.getLogger(TestAdminShell.class);
- @ClassRule
- public static final HBaseClassTestRule CLASS_RULE =
- HBaseClassTestRule.forClass(TestAdminShell.class);
-
@Override
public String getIncludeList() {
return "admin_test.rb";
@@ -45,7 +40,7 @@ public class TestAdminShell extends AbstractTestShell {
protected boolean erasureCodingSupported = false;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
RubyShellTest.setUpConfig(this);
diff --git
a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestListTablesShell.java
b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestListTablesShell.java
index ffd80f91a38..66fc8dca6e9 100644
---
a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestListTablesShell.java
+++
b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestListTablesShell.java
@@ -17,17 +17,13 @@
*/
package org.apache.hadoop.hbase.client;
-import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.testclassification.ClientTests;
import org.apache.hadoop.hbase.testclassification.LargeTests;
-import org.junit.ClassRule;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.Tag;
-@Category({ ClientTests.class, LargeTests.class })
+@Tag(ClientTests.TAG)
+@Tag(LargeTests.TAG)
public class TestListTablesShell extends AbstractTestShell {
- @ClassRule
- public static final HBaseClassTestRule CLASS_RULE =
- HBaseClassTestRule.forClass(TestListTablesShell.class);
@Override
public String getIncludeList() {
diff --git
a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestQuotasShell.java
b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestQuotasShell.java
index 1550478d0a7..27cd72cac76 100644
---
a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestQuotasShell.java
+++
b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestQuotasShell.java
@@ -17,17 +17,13 @@
*/
package org.apache.hadoop.hbase.client;
-import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.testclassification.ClientTests;
import org.apache.hadoop.hbase.testclassification.LargeTests;
-import org.junit.ClassRule;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.Tag;
-@Category({ ClientTests.class, LargeTests.class })
+@Tag(ClientTests.TAG)
+@Tag(LargeTests.TAG)
public class TestQuotasShell extends AbstractTestShell {
- @ClassRule
- public static final HBaseClassTestRule CLASS_RULE =
- HBaseClassTestRule.forClass(TestQuotasShell.class);
@Override
public String getIncludeList() {
diff --git
a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestRSGroupShell.java
b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestRSGroupShell.java
index 38b9b2dd002..4fccd2e6540 100644
---
a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestRSGroupShell.java
+++
b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestRSGroupShell.java
@@ -17,26 +17,21 @@
*/
package org.apache.hadoop.hbase.client;
-import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;
import org.apache.hadoop.hbase.rsgroup.RSGroupAdminEndpoint;
import org.apache.hadoop.hbase.rsgroup.RSGroupBasedLoadBalancer;
import org.apache.hadoop.hbase.testclassification.ClientTests;
import org.apache.hadoop.hbase.testclassification.LargeTests;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
-@Category({ ClientTests.class, LargeTests.class })
+@Tag(ClientTests.TAG)
+@Tag(LargeTests.TAG)
public class TestRSGroupShell extends AbstractTestShell {
- @ClassRule
- public static final HBaseClassTestRule CLASS_RULE =
- HBaseClassTestRule.forClass(TestRSGroupShell.class);
-
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
RubyShellTest.setUpConfig(this);
diff --git
a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestReplicationShell.java
b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestReplicationShell.java
index 5bf0b3a6328..b3ad8db28d8 100644
---
a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestReplicationShell.java
+++
b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestReplicationShell.java
@@ -17,17 +17,13 @@
*/
package org.apache.hadoop.hbase.client;
-import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.testclassification.ClientTests;
import org.apache.hadoop.hbase.testclassification.LargeTests;
-import org.junit.ClassRule;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.Tag;
-@Category({ ClientTests.class, LargeTests.class })
+@Tag(ClientTests.TAG)
+@Tag(LargeTests.TAG)
public class TestReplicationShell extends AbstractTestShell {
- @ClassRule
- public static final HBaseClassTestRule CLASS_RULE =
- HBaseClassTestRule.forClass(TestReplicationShell.class);
@Override
public String getIncludeList() {
diff --git
a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestShell.java
b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestShell.java
index 28b1fb59ef0..75da373bec0 100644
--- a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestShell.java
+++ b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestShell.java
@@ -17,16 +17,13 @@
*/
package org.apache.hadoop.hbase.client;
-import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.testclassification.ClientTests;
import org.apache.hadoop.hbase.testclassification.LargeTests;
-import org.junit.ClassRule;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.Tag;
-@Category({ ClientTests.class, LargeTests.class })
+@Tag(ClientTests.TAG)
+@Tag(LargeTests.TAG)
public class TestShell extends AbstractTestShell {
- @ClassRule
- public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestShell.class);
@Override
public String getSuitePattern() {
diff --git
a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestShellNoCluster.java
b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestShellNoCluster.java
index 0071b24103b..0b11c299cde 100644
---
a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestShellNoCluster.java
+++
b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestShellNoCluster.java
@@ -17,22 +17,18 @@
*/
package org.apache.hadoop.hbase.client;
-import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.testclassification.ClientTests;
import org.apache.hadoop.hbase.testclassification.MediumTests;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
-@Category({ ClientTests.class, MediumTests.class })
+@Tag(ClientTests.TAG)
+@Tag(MediumTests.TAG)
public class TestShellNoCluster extends AbstractTestShell {
- @ClassRule
- public static final HBaseClassTestRule CLASS_RULE =
- HBaseClassTestRule.forClass(TestShellNoCluster.class);
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
RubyShellTest.setUpConfig(this);
@@ -44,7 +40,7 @@ public class TestShellNoCluster extends AbstractTestShell {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
// no cluster
}
diff --git
a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestTableShell.java
b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestTableShell.java
index cae60ea8445..97641e8ee5a 100644
---
a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestTableShell.java
+++
b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestTableShell.java
@@ -17,17 +17,13 @@
*/
package org.apache.hadoop.hbase.client;
-import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.testclassification.ClientTests;
import org.apache.hadoop.hbase.testclassification.LargeTests;
-import org.junit.ClassRule;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.Tag;
-@Category({ ClientTests.class, LargeTests.class })
+@Tag(ClientTests.TAG)
+@Tag(LargeTests.TAG)
public class TestTableShell extends AbstractTestShell {
- @ClassRule
- public static final HBaseClassTestRule CLASS_RULE =
- HBaseClassTestRule.forClass(TestTableShell.class);
@Override
public String getIncludeList() {
