(hbase) branch master updated: HBASE-29968 Addendum adapted to the latest changes

[li...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

liuxiaocs pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/master by this push:
     new d462dba4b4a HBASE-29968 Addendum adapted to the latest changes
d462dba4b4a is described below

commit d462dba4b4ab99b13687a7202cfdcaf7a350026b
Author: liuxiaocs7 <li...@qq.com>
AuthorDate: Sun Mar 29 02:10:18 2026 +0800

    HBASE-29968 Addendum adapted to the latest changes
---
 .../mapreduce/TestTableSnapshotInputFormat.java    | 23 +++++++++++-----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableSnapshotInputFormat.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableSnapshotInputFormat.java
index 8f04d42c787..7a9f8d5dfb6 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableSnapshotInputFormat.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableSnapshotInputFormat.java
@@ -149,8 +149,8 @@ public class TestTableSnapshotInputFormat extends TableSnapshotInputFormatTestBa
 
   @Test
   public void testTableSnapshotRegionRecordReaderGetFilesRead() throws Exception {
-    final TableName tableName = TableName.valueOf(name.getMethodName());
-    String snapshotName = name.getMethodName() + "_snapshot";
+    final TableName tableName = TableName.valueOf(name);
+    String snapshotName = name + "_snapshot";
     try {
       // Setup: create table, load data, snapshot, and configure job with restore dir
       createTableAndSnapshot(UTIL, tableName, snapshotName, getStartRow(), getEndRow(), 1);
@@ -166,10 +166,10 @@ public class TestTableSnapshotInputFormat extends TableSnapshotInputFormatTestBa
       // Get splits (one per region) and extract delegate split for restore path and region info
       TableSnapshotInputFormat tsif = new TableSnapshotInputFormat();
       List<InputSplit> splits = tsif.getSplits(job);
-      Assert.assertEquals(1, splits.size());
+      assertEquals(1, splits.size());
 
       InputSplit split = splits.get(0);
-      Assert.assertTrue(split instanceof TableSnapshotRegionSplit);
+      assertTrue(split instanceof TableSnapshotRegionSplit);
       TableSnapshotRegionSplit snapshotRegionSplit = (TableSnapshotRegionSplit) split;
       TableSnapshotInputFormatImpl.InputSplit implSplit = snapshotRegionSplit.getDelegate();
 
@@ -196,8 +196,8 @@ public class TestTableSnapshotInputFormat extends TableSnapshotInputFormatTestBa
           }
         }
       }
-      Assert.assertFalse("Should have at least one store file after snapshot restore",
-        expectedFiles.isEmpty());
+      assertFalse(expectedFiles.isEmpty(),
+        "Should have at least one store file after snapshot restore");
 
       // Create record reader, initialize with split (opens underlying ClientSideRegionScanner)
       TaskAttemptContext taskAttemptContext = mock(TaskAttemptContext.class);
@@ -205,13 +205,13 @@ public class TestTableSnapshotInputFormat extends TableSnapshotInputFormatTestBa
 
       RecordReader<ImmutableBytesWritable, Result> rr =
         tsif.createRecordReader(split, taskAttemptContext);
-      Assert.assertTrue(rr instanceof TableSnapshotRegionRecordReader);
+      assertTrue(rr instanceof TableSnapshotRegionRecordReader);
       TableSnapshotRegionRecordReader recordReader = (TableSnapshotRegionRecordReader) rr;
       recordReader.initialize(split, taskAttemptContext);
 
       // Before close: getFilesRead() must be empty
       Set<Path> filesReadBeforeClose = recordReader.getFilesRead();
-      Assert.assertTrue("Should return empty set before closing", filesReadBeforeClose.isEmpty());
+      assertTrue(filesReadBeforeClose.isEmpty(), "Should return empty set before closing");
 
       // Read a few key-values; getFilesRead() must still be empty until close
       int count = 0;
@@ -220,8 +220,8 @@ public class TestTableSnapshotInputFormat extends TableSnapshotInputFormatTestBa
       }
 
       filesReadBeforeClose = recordReader.getFilesRead();
-      Assert.assertTrue("Should return empty set before closing even after reading",
-        filesReadBeforeClose.isEmpty());
+      assertTrue(filesReadBeforeClose.isEmpty(),
+        "Should return empty set before closing even after reading");
 
       // Close reader so underlying scanner reports files successfully read
       recordReader.close();
@@ -230,8 +230,7 @@ public class TestTableSnapshotInputFormat extends TableSnapshotInputFormatTestBa
       Set<String> filesReadAfterClose =
         recordReader.getFilesRead().stream().map(Path::getName).collect(Collectors.toSet());
 
-      Assert.assertEquals("Should contain all expected file paths", expectedFiles,
-        filesReadAfterClose);
+      assertEquals(expectedFiles, filesReadAfterClose, "Should contain all expected file paths");
     } finally {
       UTIL.getAdmin().deleteSnapshot(snapshotName);
       UTIL.deleteTable(tableName);