HBASE-30067 Upgrade hbase-server to use junit5 Part10#8046
Open
liuxiaocs7 wants to merge 3 commits intoapache:masterfrom
Open
HBASE-30067 Upgrade hbase-server to use junit5 Part10#8046liuxiaocs7 wants to merge 3 commits intoapache:masterfrom
liuxiaocs7 wants to merge 3 commits intoapache:masterfrom
Conversation
Member
liuxiaocs7
commented
Apr 9, 2026
liuxiaocs7
commented
- see: HBASE-30067
There was a problem hiding this comment.
Pull request overview
Migrates a set of hbase-server tests (snapshot, mob, ipc) from JUnit4 to JUnit5 as part of HBASE-30067.
Changes:
- Replaces JUnit4 annotations/assertions/rules (
@BeforeClass,@Category,@Rule,Assert.*, parameterized runner) with JUnit Jupiter equivalents (@BeforeAll,@Tag,TestInfo,Assertions.*,@TestTemplate+@HBaseParameterizedTestTemplate). - Updates several tests to generate per-test names via
TestInfoinstead of JUnit4TestName/TableNameTestRule. - Adjusts parameterized tests to use HBase’s JUnit5 template provider and
Stream<Arguments>parameter sources.
Reviewed changes
Copilot reviewed 60 out of 60 changed files in this pull request and generated 5 comments.
Show a summary per file
| File | Description |
|---|---|
| hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestSnapshotWhenChoreCleaning.java | JUnit5 migration for snapshot-cleaner concurrency test. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestSnapshotStoreFileSize.java | JUnit5 migration for snapshot storefile size validation. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestSnapshotManifest.java | JUnit5 migration for snapshot manifest unit tests. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestSnapshotDescriptionUtils.java | JUnit5 migration for snapshot description utils tests. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestSnapshotClientRetries.java | JUnit5 migration; replaces expected-exception with assertThrows and uses TestInfo for table naming. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestRestoreSnapshotHelper.java | JUnit5 migration for restore/clone snapshot helper tests. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestRestoreFlushSnapshotFromClient.java | JUnit5 migration for restore-from-client integration tests. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestRegionSnapshotTask.java | JUnit5 migration for region snapshot task integration test. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestMobRestoreSnapshotHelper.java | JUnit5 migration for MOB restore snapshot helper subclass. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestMobRestoreFlushSnapshotFromClient.java | JUnit5 migration for MOB restore/clone-from-client tests. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestMobFlushSnapshotFromClient.java | JUnit5 migration for MOB flush snapshot client tests. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.java | JUnit5 migration for base flush snapshot-from-client test suite. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestConcurrentFlushSnapshotFromClient.java | JUnit5 migration for concurrent snapshot client tests. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/SnapshotTestingUtils.java | JUnit5 assertion API updates for snapshot test helper utilities. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/MobSnapshotTestingUtils.java | JUnit5 assertion API updates for MOB snapshot helpers. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestRSMobFileCleanerChore.java | JUnit5 migration for RS mob cleaner chore tests. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobWithByteBuffAllocator.java | JUnit5 migration for MOB ByteBuff allocator test. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobUtils.java | JUnit5 migration; changes helper signature to accept method-name string. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobStoreScanner.java | JUnit5 migration; replaces TestName rule with TestInfo. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobStoreCompaction.java | Converts JUnit4 parameterized to JUnit5 template provider + Jupiter assertions. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobFileName.java | JUnit5 migration for mob filename unit test. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobFileLink.java | JUnit5 migration; uses TestInfo instead of TestName. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobFileCleanupUtil.java | JUnit5 migration for MOB file cleanup util tests. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobFileCache.java | JUnit5 migration for MOB file cache tests. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobFile.java | JUnit5 migration; uses TestInfo for case naming. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobDataBlockEncoding.java | JUnit5 migration for MOB data block encoding test. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobCompactionWithException.java | JUnit5 migration; replaces TestName with TestInfo for unique naming. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobCompactionWithDefaults.java | Converts JUnit4 parameterized to JUnit5 template provider; updates naming + assertions. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobCompactionRegularRegionBatchMode.java | JUnit5 migration; parameterized template usage and lifecycle updates. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobCompactionOptRegionBatchMode.java | JUnit5 migration; parameterized template usage and lifecycle updates. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobCompactionOptMode.java | JUnit5 migration; parameterized template usage and tag updates. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestExpiredMobFileCleanerChore.java | JUnit5 migration for master-side expired MOB file cleaner chore tests. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestExpiredMobFileCleaner.java | JUnit5 migration for expired MOB file cleaner tool tests. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestDefaultMobStoreFlusher.java | Converts JUnit4 parameterized to JUnit5 template provider; updates assertions and naming. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestCachedMobFile.java | JUnit5 migration; replaces TestName + Assert with Jupiter equivalents. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/mob/MobTestUtil.java | JUnit5 assertion API updates for MOB test utility methods. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestSimpleRpcServer.java | JUnit5 migration; uses TestInfo for per-test TableName. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestSimpleRpcScheduler.java | JUnit5 migration; replaces TestName and updates assertions. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestServerCall.java | JUnit5 migration; assertion argument order and message updates. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestSecurityRpcSentBytesMetrics.java | JUnit5 migration for secure RPC metrics test setup/teardown. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestSecureSimpleRpcServer.java | JUnit5 migration for secure simple RPC server test class. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestSecureNettyRpcServer.java | Converts to JUnit5 template provider + Jupiter lifecycle; integrates Kerberos setup. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestRWQueueRpcExecutor.java | JUnit5 migration; replaces TestName and updates assertions/messages. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestRpcSkipInitialSaslHandshake.java | JUnit5 migration for SASL-handshake skipping behavior test. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestRpcServerTraceLogging.java | JUnit5 migration for trace logging configuration test. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestRpcServerSlowConnectionSetup.java | Converts JUnit4 parameterized to JUnit5 template provider for rpc server impl variants. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestRpcMetrics.java | JUnit5 migration for rpc metrics unit tests. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestRpcHandlerException.java | Converts JUnit4 parameterized to JUnit5 template provider for handler exception tests. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestRpcConnectionHeader.java | JUnit5 migration; removes JUnit4 rules/classrule usage. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestRpcClientLeaks.java | JUnit5 migration; uses TestInfo for per-test table names. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestProtoBufRpc.java | Converts JUnit4 parameterized + expected-exception to JUnit5 template + assertThrows. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestNettyRpcServer.java | Converts JUnit4 parameterized to JUnit5 template provider; per-invocation allocator variants. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestNettyIPCCloseConnection.java | JUnit5 migration for netty channel close behavior test. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestNettyChannelWritability.java | JUnit5 migration; switches assertions to Jupiter. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestMultipleServerPrincipalsIPC.java | Converts JUnit4 parameterized to JUnit5 template provider for rpc server/client combinations. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestMasterFifoRpcScheduler.java | JUnit5 migration for master FIFO rpc scheduler tests. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestHBaseClient.java | JUnit5 migration; uses Jupiter assertions. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestFifoRpcScheduler.java | JUnit5 migration for FIFO rpc scheduler unit tests. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestCallRunner.java | JUnit5 migration; switches OpenTelemetry testing from JUnit4 rule to JUnit5 extension. |
| hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestBufferChain.java | JUnit5 migration for BufferChain unit tests. |
Comments suppressed due to low confidence (1)
hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestSnapshotWhenChoreCleaning.java:62
- The logger is initialized with TestSnapshotClientRetries.class, which is unrelated to this test class and will mislabel log output. Please use TestSnapshotWhenChoreCleaning.class (or getClass() for non-static) when creating the logger.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+149
to
+153
| TEST_UTIL.getAdmin().snapshot("snapshotName_prev", TABLE_NAME); | ||
| Assert.assertEquals(Lists.newArrayList(cleaner.getDeletableFiles(files)).size(), 0); | ||
| assertEquals(Lists.newArrayList(cleaner.getDeletableFiles(files)).size(), 0); | ||
| TEST_UTIL.getAdmin().deleteSnapshot("snapshotName_prev"); | ||
| cleaner.getFileCacheForTesting().triggerCacheRefreshForTesting(); | ||
| Assert.assertEquals(Lists.newArrayList(cleaner.getDeletableFiles(files)).size(), 100); | ||
| assertEquals(Lists.newArrayList(cleaner.getDeletableFiles(files)).size(), 100); |
There was a problem hiding this comment.
JUnit Jupiter's assertEquals expects (expected, actual). These assertions currently pass the computed size as the expected value and the constant as the actual value, which makes failures harder to interpret. Swap the arguments so the constant is expected and the computed size is actual.
Comment on lines
393
to
395
| assertTrue(HFileLink.isHFileLink(linkFile), linkFile + " should be a HFileLink"); | ||
| assertTrue(StoreFileInfo.isReference(refFile), refFile + " should be a Referene"); | ||
| assertEquals(sourceHtd.getTableName(), HFileLink.getReferencedTableName(linkFile)); |
There was a problem hiding this comment.
Typo in assertion message: "Referene" should be "Reference".
Comment on lines
36
to
41
| * TestSnapshotFromClient. This is worth refactoring this because there will be a few more flavors | ||
| * of snapshots that need to run these tests. | ||
| */ | ||
| @Category({ ClientTests.class, MediumTests.class }) | ||
| @Tag(ClientTests.TAG) | ||
| public class TestMobFlushSnapshotFromClient extends TestFlushSnapshotFromClient { | ||
|
|
There was a problem hiding this comment.
Comment on lines
34
to
38
| * TestRestoreSnapshotFromClient. This is worth refactoring this because there will be a few more | ||
| * flavors of snapshots that need to run these tests. | ||
| */ | ||
| @Category({ ClientTests.class, LargeTests.class }) | ||
| @Tag(ClientTests.TAG) | ||
| public class TestMobRestoreFlushSnapshotFromClient extends TestRestoreFlushSnapshotFromClient { |
There was a problem hiding this comment.
Comment on lines
26
to
30
| import org.slf4j.LoggerFactory; | ||
|
|
||
| @Category({ ClientTests.class, MediumTests.class }) | ||
| @Tag(ClientTests.TAG) | ||
| public class TestConcurrentFlushSnapshotFromClient extends TestFlushSnapshotFromClient { | ||
| private static final Logger LOG = LoggerFactory.getLogger(TestFlushSnapshotFromClient.class); |
There was a problem hiding this comment.
Apache9
approved these changes
Apr 9, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.