fixcomment

Author: 研发中心-郭飞-philipse

hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestRequestHedgingProxyProvider.java

@@ -37,7 +37,7 @@
 import org.apache.hadoop.ipc.StandbyException;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.test.GenericTestUtils;
-import org.apache.hadoop.test.LambdaTestUtils;
+`import org.apache.hadoop.test.LambdaTestUtils;`
 import org.apache.hadoop.util.Lists;
 import org.apache.hadoop.util.Time;
 import org.junit.Assert;

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSPermission.java

@@ -30,9 +30,9 @@
 import java.util.Map;
 import java.util.Random;
 
-import org.apache.hadoop.test.GenericTestUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.apache.hadoop.test.LambdaTestUtils;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.CommonConfigurationKeys;
 import org.apache.hadoop.fs.FSDataInputStream;
@@ -262,30 +262,13 @@ private void createAndCheckPermission(OpType op, Path name, short umask,
   }
 
   @Test
-  public void testFSNamesystemCheckAccess() throws Exception {
-    Path testValidDir = new Path("/test1");
-    Path testValidFile = new Path("/test1/file1");
+  public void testFSNamesystemCheckAccess(){
     Path testInvalidPath = new Path("/test2");
     fs = FileSystem.get(conf);
 
-    fs.mkdirs(testValidDir);
-    fs.create(testValidFile);
-
-    fs.access(testValidDir, FsAction.READ);
-    fs.access(testValidFile, FsAction.READ);
-
-    assertTrue(fs.exists(testValidDir));
-    assertTrue(fs.exists(testValidFile));
-
-    try {
-      fs.access(testInvalidPath, FsAction.READ);
-      fail("Failed to get expected FileNotFoundException");
-    } catch (FileNotFoundException e) {
-      GenericTestUtils.assertExceptionContains(
-              "Path not found: " + testInvalidPath, e);
-    } finally {
-      fs.delete(testValidDir, true);
-    }
+    LambdaTestUtils.intercept(FileNotFoundException.class,
+            "Path not found: " + testInvalidPath,
+            () -> fs.access(testInvalidPath, FsAction.READ));
   }
 
   /* Check if the permission of a file/directory is the same as the

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSNamesystem.java

@@ -26,7 +26,6 @@
 import static org.junit.Assert.*;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.URI;
@@ -35,7 +34,6 @@
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileUtil;
-import org.apache.hadoop.fs.permission.FsAction;
 import org.apache.hadoop.ha.HAServiceProtocol;
 import org.apache.hadoop.hdfs.DFSConfigKeys;
 import org.apache.hadoop.hdfs.DFSTestUtil;
@@ -48,7 +46,6 @@
 import org.apache.hadoop.hdfs.server.namenode.snapshot.Snapshot;
 import org.apache.hadoop.hdfs.server.namenode.top.TopAuditLogger;
 import org.apache.hadoop.hdfs.server.protocol.NamespaceInfo;
-import org.apache.hadoop.test.GenericTestUtils;
 import org.apache.hadoop.test.Whitebox;
 import org.junit.After;
 import org.junit.Test;
@@ -123,23 +120,6 @@ public void testStartupSafemode() throws IOException {
       + "isInSafeMode still returned false",  fsn.isInSafeMode());
   }
 
-  @Test
-  public void testCheckAccess() throws IOException {
-    Configuration conf = new Configuration();
-    FSImage fsImage = Mockito.mock(FSImage.class);
-    FSEditLog fsEditLog = Mockito.mock(FSEditLog.class);
-    Mockito.when(fsImage.getEditLog()).thenReturn(fsEditLog);
-    String src = "/test1";
-    FSNamesystem fsn = new FSNamesystem(conf, fsImage);
-    try {
-      fsn.checkAccess(src, FsAction.READ);
-      fail("Failed to get expected FileNotFoundException");
-    } catch (FileNotFoundException e) {
-      GenericTestUtils.assertExceptionContains(
-              "Path not found: " + src, e);
-    }
-  }
-
   @Test
   public void testReplQueuesActiveAfterStartupSafemode() throws IOException, InterruptedException{
     Configuration conf = new Configuration();