diff options
author | Valerij Fredriksen <valerijf@verizonmedia.com> | 2020-04-24 10:37:03 +0200 |
---|---|---|
committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2020-04-24 10:37:03 +0200 |
commit | e83700c6f617f5fbcb78be9f7a1289523aee987d (patch) | |
tree | a5bee7baf4f9500352a0a27505a5d518dfdc3230 /node-admin | |
parent | 720b053342ac50480633281c5b70e949e2410d2d (diff) |
Use JimFS instead
Diffstat (limited to 'node-admin')
-rw-r--r-- | node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileFinderTest.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileFinderTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileFinderTest.java index 197077159d1..8fff2141252 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileFinderTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileFinderTest.java @@ -2,15 +2,15 @@ package com.yahoo.vespa.hosted.node.admin.task.util.file; import com.yahoo.vespa.hosted.node.admin.component.TaskContext; +import com.yahoo.vespa.test.file.TestFileSystem; import org.junit.Before; -import org.junit.Rule; import org.junit.Test; import org.junit.experimental.runners.Enclosed; -import org.junit.rules.TemporaryFolder; import org.junit.runner.RunWith; import java.io.IOException; import java.io.UncheckedIOException; +import java.nio.file.FileSystem; import java.nio.file.Files; import java.nio.file.NoSuchFileException; import java.nio.file.Path; @@ -40,8 +40,8 @@ import static org.mockito.Mockito.when; public class FileFinderTest { public static class GeneralLogicTests { - @Rule - public TemporaryFolder folder = new TemporaryFolder(); + + private final FileSystem fileSystem = TestFileSystem.create(); @Test public void all_files_non_recursive() { @@ -111,6 +111,7 @@ public class FileFinderTest { @Before public void setup() throws IOException { Path root = testRoot(); + Files.createDirectories(root); Files.createFile(root.resolve("file-1.json")); Files.createFile(root.resolve("test.json")); @@ -127,7 +128,7 @@ public class FileFinderTest { } private Path testRoot() { - return folder.getRoot().toPath(); + return fileSystem.getPath("/file-finder"); } private void assertFileHelper(FileFinder fileFinder, Set<String> expectedList, Set<String> expectedContentsAfterDelete) { |