Reuse TestLFS from TestTrash

Thanks Konstantin for the suggestion!
apache · Oct 13, 2021 · 207c4f2 · 207c4f2
1 parent e747b47
commit 207c4f2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 30 deletions.
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestTrash.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestTrash.java
@@ -794,7 +794,7 @@ public void tearDown() throws IOException {
     }
   }
 
-  static class TestLFS extends LocalFileSystem {
+  public static class TestLFS extends LocalFileSystem {
     private URI uriName = null;
     Path home;
     TestLFS() {

diff --git a/...mmon-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFsTrash.java b/...mmon-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFsTrash.java
@@ -36,40 +36,15 @@ public class TestViewFsTrash {
   FileSystem fsTarget;  // the target file system - the mount will point here
   FileSystem fsView;
   Configuration conf;
-  private static FileSystemTestHelper fileSystemTestHelper = new FileSystemTestHelper();
-
-  static class TestLFS extends LocalFileSystem {
-    Path home;
-    TestLFS() throws IOException {
-      this(new Path(fileSystemTestHelper.getTestRootDir()));
-    }
-    TestLFS(Path home) throws IOException {
-
-      super(new RawLocalFileSystem() {
-        @Override
-        protected Path getInitialWorkingDirectory() {
-          return makeQualified(home);
-        }
-
-        @Override
-        public Path getHomeDirectory() {
-          return makeQualified(home);
-        }
-      });
-      this.home = home;
-    }
-    @Override
-    public Path getHomeDirectory() {
-      return home;
-    }
-  }
+  private FileSystemTestHelper fileSystemTestHelper;
 
   @Before
   public void setUp() throws Exception {
     Configuration targetFSConf = new Configuration();
-    targetFSConf.setClass("fs.file.impl", TestViewFsTrash.TestLFS.class, FileSystem.class);
+    targetFSConf.setClass("fs.file.impl", TestTrash.TestLFS.class, FileSystem.class);
 
     fsTarget = FileSystem.getLocal(targetFSConf);
+    fileSystemTestHelper = new FileSystemTestHelper(fsTarget.getHomeDirectory().toUri().getPath());
 
     conf = ViewFileSystemTestSetup.createConfig();
     fsView = ViewFileSystemTestSetup.setupForViewFileSystem(conf, fileSystemTestHelper, fsTarget);
@@ -79,7 +54,7 @@ public void setUp() throws Exception {
      * Need to set the fs.file.impl to TestViewFsTrash.TestLFS. Otherwise, it will load
      * LocalFileSystem implementation which uses System.getProperty("user.home") for homeDirectory.
      */
-    conf.setClass("fs.file.impl", TestViewFsTrash.TestLFS.class, FileSystem.class);
+    conf.setClass("fs.file.impl", TestTrash.TestLFS.class, FileSystem.class);
 
   }