Backporting StaticFileGen fixes

jetty · Feb 5, 2024 · a1c44cf · a1c44cf
1 parent cd07145
commit a1c44cf
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/embedded/file-server/src/test/java/examples/ResourceHandlerFromFileSystemTest.java b/embedded/file-server/src/test/java/examples/ResourceHandlerFromFileSystemTest.java
@@ -18,7 +18,6 @@
 
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.toolchain.test.FS;
-import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
 import org.eclipse.jetty.util.component.LifeCycle;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -41,7 +40,7 @@ public class ResourceHandlerFromFileSystemTest
     @BeforeEach
     public void startServer() throws Exception
     {
-        Path resourcesRoot = MavenTestingUtils.getTargetTestingPath(ResourceHandlerFromFileSystemTest.class.getSimpleName());
+        Path resourcesRoot = StaticFileGen.tempDir("static-huge");
         FS.ensureDirExists(resourcesRoot);
 
         exampleSha = StaticFileGen.generate(resourcesRoot.resolve("example.png"), exampleSize);

diff --git a/embedded/file-server/src/test/java/examples/ServletFileServerMultipleLocationsTest.java b/embedded/file-server/src/test/java/examples/ServletFileServerMultipleLocationsTest.java
@@ -19,7 +19,6 @@
 
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.toolchain.test.FS;
-import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
 import org.eclipse.jetty.util.component.LifeCycle;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -42,7 +41,7 @@ public class ServletFileServerMultipleLocationsTest
     @BeforeEach
     public void startServer() throws Exception
     {
-        Path resourcesRoot = MavenTestingUtils.getTargetTestingPath(ServletFileServerMultipleLocations.class.getSimpleName());
+        Path resourcesRoot = StaticFileGen.tempDir("static-huge");
         FS.ensureDirExists(resourcesRoot);
 
         exampleSha = StaticFileGen.generate(resourcesRoot.resolve("example.png"), exampleSize);

diff --git a/embedded/file-server/src/test/java/examples/StaticFileGen.java b/embedded/file-server/src/test/java/examples/StaticFileGen.java
@@ -19,12 +19,14 @@
 import java.nio.channels.SeekableByteChannel;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
 import java.security.DigestOutputStream;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
 
+import org.eclipse.jetty.toolchain.test.FS;
 import org.eclipse.jetty.toolchain.test.Hex;
 import org.eclipse.jetty.toolchain.test.Sha1Sum;
 import org.eclipse.jetty.util.IO;
@@ -81,6 +83,13 @@ public static String generate(Path staticFile, long size) throws IOException, No
         return Sha1Sum.calculate(staticFile);
     }
 
+    public static Path tempDir(String directoryName)
+    {
+        Path tempDir = Paths.get(System.getProperty("java.io.tmpdir"), directoryName);
+        FS.ensureDirExists(tempDir);
+        return tempDir;
+    }
+
     public static void verify(InputStream inputStream, long expectedSize, String expectedSha1) throws NoSuchAlgorithmException, IOException
     {
         MessageDigest digest = MessageDigest.getInstance("SHA1");