fix test and address checkstyle warning

apache · Mar 1, 2022 · 81f38a7 · 81f38a7
1 parent 229197e
commit 81f38a7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 20 deletions.
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/codec/CodecPerformance.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/codec/CodecPerformance.java
@@ -18,7 +18,6 @@
 package org.apache.hadoop.hbase.codec;
 
 import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.io.ByteArrayInputStream;
@@ -31,10 +30,6 @@
 import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.CellScanner;
 import org.apache.hadoop.hbase.KeyValue;
-import org.apache.hadoop.hbase.codec.CellCodec;
-import org.apache.hadoop.hbase.codec.Codec;
-import org.apache.hadoop.hbase.codec.KeyValueCodec;
-import org.apache.hadoop.hbase.codec.MessageCodec;
 import org.apache.hadoop.hbase.io.CellOutputStream;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;

diff --git a/...rver/src/test/java/org/apache/hadoop/hbase/regionserver/TestMergesSplitsAddToTracker.java b/...rver/src/test/java/org/apache/hadoop/hbase/regionserver/TestMergesSplitsAddToTracker.java
@@ -18,15 +18,18 @@
 package org.apache.hadoop.hbase.regionserver;
 
 import static org.apache.hadoop.hbase.regionserver.storefiletracker.StoreFileTrackerFactory.TRACKER_IMPL;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.everyItem;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.hasProperty;
+import static org.hamcrest.Matchers.not;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
-import org.apache.commons.lang3.mutable.MutableBoolean;
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.FileUtil;
@@ -222,21 +225,12 @@ private Pair<StoreFileInfo,String> copyFileInTheStoreDir(HRegion region) throws
     return new Pair<>(fileInfo, copyName);
   }
 
-  private void validateDaughterRegionsFiles(HRegion region, String orignalFileName,
+  private void validateDaughterRegionsFiles(HRegion region, String originalFileName,
       String untrackedFile) throws IOException {
     //verify there's no link for the untracked, copied file in first region
     List<StoreFileInfo> infos = region.getRegionFileSystem().getStoreFiles("info");
-    final MutableBoolean foundLink = new MutableBoolean(false);
-    infos.stream().forEach(i -> {
-      assertTrue(i.getActiveFileName().contains(orignalFileName));
-      if(i.getActiveFileName().contains(untrackedFile)){
-        fail();
-      }
-      if(i.getActiveFileName().contains(orignalFileName)){
-        foundLink.setTrue();
-      }
-    });
-    assertTrue(foundLink.booleanValue());
+    assertThat(infos, everyItem(hasProperty("activeFileName", not(containsString(untrackedFile)))));
+    assertThat(infos, hasItem(hasProperty("activeFileName", containsString(originalFileName))));
   }
 
   private void verifyFilesAreTracked(Path regionDir, FileSystem fs) throws Exception {