update

Author: liuxiaocs7

hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapred/TestTableSnapshotInputFormat.java

@@ -46,6 +46,7 @@
 import org.apache.hadoop.mapred.Reporter;
 import org.apache.hadoop.mapred.RunningJob;
 import org.apache.hadoop.mapred.lib.NullOutputFormat;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
@@ -60,6 +61,13 @@ public class TestTableSnapshotInputFormat extends TableSnapshotInputFormatTestBa
   private static final String COLUMNS =
     Bytes.toString(FAMILIES[0]) + " " + Bytes.toString(FAMILIES[1]);
 
+  private String methodName;
+
+  @BeforeEach
+  public void beforeEach(TestInfo testInfo) {
+    methodName = testInfo.getTestMethod().get().getName();
+  }
+
   @Override
   protected byte[] getStartRow() {
     return aaa;
@@ -99,8 +107,8 @@ public void close() {
   }
 
   @Test
-  public void testInitTableSnapshotMapperJobConfig(TestInfo testInfo) throws Exception {
-    final TableName tableName = TableName.valueOf(testInfo.getTestMethod().get().getName());
+  public void testInitTableSnapshotMapperJobConfig() throws Exception {
+    final TableName tableName = TableName.valueOf(methodName);
     String snapshotName = "foo";
 
     try {
@@ -160,7 +168,7 @@ public void testRestoreSnapshotDoesNotCreateBackRefLinksInit(TableName tableName
   @Override
   protected void testWithMockedMapReduce(HBaseTestingUtil util, String snapshotName, int numRegions,
     int numSplitsPerRegion, int expectedNumSplits, boolean setLocalityEnabledTo) throws Exception {
-    final TableName tableName = TableName.valueOf("testWithMockedMapReduce");
+    final TableName tableName = TableName.valueOf(methodName);
     try {
       createTableAndSnapshot(util, tableName, snapshotName, getStartRow(), getEndRow(), numRegions);
 

hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsvParser.java

@@ -203,19 +203,8 @@ public void testTsvParserInvalidTimestamp() throws BadTsvLineException {
     assertEquals(1, parser.getTimestampKeyColumnIndex());
     byte[] line = Bytes.toBytes("rowkey\ttimestamp\tval_a");
     ParsedLine parsed = parser.parse(line, line.length);
-    assertEquals(-1, parsed.getTimestamp(-1));
-    // The original test expected BadTsvLineException, but the code above doesn't seem to trigger it explicitly
-    // unless parsed.getTimestamp(-1) throws it or checkParsing does.
-    // However, looking at the original code:
-    // @Test(expected = BadTsvLineException.class)
-    // public void testTsvParserInvalidTimestamp() ...
-    // So it MUST throw.
-    // Let's wrap the part that is expected to throw.
-    // It seems getTimestamp() or checkParsing() might throw if timestamp is invalid string?
-    // "timestamp" string cannot be parsed as long. So getTimestamp will throw NumberFormatException?
-    // Wait, TsvParser likely throws BadTsvLineException on bad timestamp format.
-    // Let's assume parsed.getTimestamp(-1) throws it.
     assertThrows(BadTsvLineException.class, () -> parsed.getTimestamp(-1));
+    checkParsing(parsed, Splitter.on("\t").split(Bytes.toString(line)));
   }
 
   @Test