From e890776fe04697a32a71ac6a4a5dada9bc549d80 Mon Sep 17 00:00:00 2001 From: Duo Zhang Date: Fri, 20 Sep 2019 14:35:56 +0800 Subject: [PATCH] HBASE-22941 Addendum fix NPE in UT --- .../java/org/apache/hadoop/hbase/TestSplitMerge.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSplitMerge.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSplitMerge.java index 0aa329784e..04389bb668 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSplitMerge.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSplitMerge.java @@ -109,7 +109,6 @@ public class TestSplitMerge { @Test public void testMergeRegionOrder() throws Exception { - int regionCount= 20; TableName tableName = TableName.valueOf("MergeRegionOrder"); @@ -143,14 +142,13 @@ public class TestSplitMerge { RegionInfo mergedRegion = mergedRegions.get(0); List mergeParentRegions = MetaTableAccessor.getMergeRegions(UTIL.getConnection(), - mergedRegion.getEncodedNameAsBytes()); + mergedRegion.getRegionName()); assertEquals(mergeParentRegions.size(), regionCount); - for (int c = 0; c < regionCount-1; c++) { - assertTrue(Bytes.compareTo( - mergeParentRegions.get(c).getStartKey(), - mergeParentRegions.get(c+1).getStartKey()) < 0); + for (int c = 0; c < regionCount - 1; c++) { + assertTrue(Bytes.compareTo(mergeParentRegions.get(c).getStartKey(), + mergeParentRegions.get(c + 1).getStartKey()) < 0); } } } -- 2.17.1