Reuse FileUtils in tests

apache · Jul 19, 2023 · 75da8c2 · 75da8c2
1 parent 17d4535
commit 75da8c2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/test/java/org/apache/commons/net/tftp/TFTPServerMain.java b/src/test/java/org/apache/commons/net/tftp/TFTPServerMain.java
@@ -23,6 +23,8 @@
 import java.util.Map;
 import java.util.Random;
 
+import org.apache.commons.io.FileUtils;
+
 /**
  * Main class for TFTPServer. This allows CLI use of the server.
  *
@@ -37,7 +39,7 @@ public static void main(final String[] args) throws Exception {
         int port = 6901;
         int argc;
         final Map<String, String> opts = new HashMap<>();
-        opts.put("-p", System.getProperty("java.io.tmpdir"));
+        opts.put("-p", FileUtils.getTempDirectoryPath());
         // Parse options
         for (argc = 0; argc < args.length; argc++) {
             final String arg = args[argc];

diff --git a/src/test/java/org/apache/commons/net/tftp/TFTPServerPathTest.java b/src/test/java/org/apache/commons/net/tftp/TFTPServerPathTest.java
@@ -25,6 +25,7 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.net.tftp.TFTPServer.ServerMode;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -38,7 +39,7 @@ public class TFTPServerPathTest {
 
     private static final int SERVER_PORT = 6901;
     String filePrefix = "tftp-";
-    File serverDirectory = new File(System.getProperty("java.io.tmpdir"));
+    File serverDirectory = FileUtils.getTempDirectory();
 
     private File file;
     private File out;

diff --git a/src/test/java/org/apache/commons/net/tftp/TFTPTest.java b/src/test/java/org/apache/commons/net/tftp/TFTPTest.java
@@ -25,6 +25,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.net.tftp.TFTPServer.ServerMode;
 
 import junit.framework.TestCase;
@@ -35,7 +36,7 @@
 public class TFTPTest extends TestCase {
     private static final int SERVER_PORT = 6902;
     private static TFTPServer tftpS;
-    private static final File SERVER_DIR = new File(System.getProperty("java.io.tmpdir"));
+    private static final File SERVER_DIR = FileUtils.getTempDirectory();
     private static final String FILE_PREFIX = "tftp-";
     private static final File[] FILES = new File[8];