From c8b3373bbc9a309eec5b6e86d86148a7db20d552 Mon Sep 17 00:00:00 2001
From: Jan Bartel <janb@webtide.com>
Date: Mon, 1 Jul 2024 08:19:37 +0200
Subject: [PATCH] Issue #11957 Fix
 DefaultServletTest.testGetPrecompressedSuffixMapping (#11994)

---
 jetty-ee9/jetty-ee9-servlet/pom.xml           |  2 +-
 .../jetty/ee9/servlet/DefaultServletTest.java | 71 +++++++++++--------
 2 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/jetty-ee9/jetty-ee9-servlet/pom.xml b/jetty-ee9/jetty-ee9-servlet/pom.xml
index 6e0634c64f7..0d29dd650cb 100644
--- a/jetty-ee9/jetty-ee9-servlet/pom.xml
+++ b/jetty-ee9/jetty-ee9-servlet/pom.xml
@@ -73,7 +73,7 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <!-- Reuse Forks causes test failures -->
-          <reuseForks>false</reuseForks>
+          <reuseForks>true</reuseForks>
           <argLine>@{argLine} ${jetty.surefire.argLine}
             --add-modules org.eclipse.jetty.util.ajax
             --add-reads org.eclipse.jetty.ee9.servlet=org.eclipse.jetty.logging</argLine>
diff --git a/jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/DefaultServletTest.java b/jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/DefaultServletTest.java
index f6eb2bbb39e..3cfde90d623 100644
--- a/jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/DefaultServletTest.java
+++ b/jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/DefaultServletTest.java
@@ -26,6 +26,7 @@ import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -2569,44 +2570,52 @@ public class DefaultServletTest
     @Test
     public void testGetPrecompressedSuffixMapping() throws Exception
     {
-        Path docRoot = workDir.getEmptyPathDir().resolve("docroot");
-        FS.ensureDirExists(docRoot);
-
-        startServer((context) ->
+        final AtomicReference<ResourceFactory> oldFileResourceFactory = new AtomicReference<>();
+        try
         {
-            ResourceFactory.registerResourceFactory("file", new URLResourceFactory());
-            Resource resource = ResourceFactory.of(context).newResource(docRoot);
-            assertThat("Expecting URLResource", resource.getClass().getName(), endsWith("URLResource"));
-            context.setBaseResource(resource);
+            Path docRoot = workDir.getEmptyPathDir().resolve("docroot");
+            FS.ensureDirExists(docRoot);
 
-            ServletHolder defholder = context.addServlet(DefaultServlet.class, "*.js");
-            defholder.setInitParameter("cacheControl", "no-store");
-            defholder.setInitParameter("dirAllowed", "false");
-            defholder.setInitParameter("gzip", "false");
-            defholder.setInitParameter("precompressed", "gzip=.gz");
-        });
+            startServer((context) ->
+            {
+                oldFileResourceFactory.set(ResourceFactory.unregisterResourceFactory("file"));
+                ResourceFactory.registerResourceFactory("file", new URLResourceFactory());
+                Resource resource = ResourceFactory.of(context).newResource(docRoot);
+                assertThat("Expecting URLResource", resource.getClass().getName(), endsWith("URLResource"));
+                context.setBaseResource(resource);
 
+                ServletHolder defholder = context.addServlet(DefaultServlet.class, "*.js");
+                defholder.setInitParameter("cacheControl", "no-store");
+                defholder.setInitParameter("dirAllowed", "false");
+                defholder.setInitParameter("gzip", "false");
+                defholder.setInitParameter("precompressed", "gzip=.gz");
+            });
 
-        FS.ensureDirExists(docRoot.resolve("scripts"));
+            FS.ensureDirExists(docRoot.resolve("scripts"));
 
-        String scriptText = "This is a script";
-        Files.writeString(docRoot.resolve("scripts/script.js"), scriptText, UTF_8);
+            String scriptText = "This is a script";
+            Files.writeString(docRoot.resolve("scripts/script.js"), scriptText, UTF_8);
 
-        byte[] compressedBytes = compressGzip(scriptText);
-        Files.write(docRoot.resolve("scripts/script.js.gz"), compressedBytes);
+            byte[] compressedBytes = compressGzip(scriptText);
+            Files.write(docRoot.resolve("scripts/script.js.gz"), compressedBytes);
 
-        String rawResponse = connector.getResponse("""
-            GET /context/scripts/script.js HTTP/1.1
-            Host: test
-            Accept-Encoding: gzip
-            Connection: close
-            
-            """);
-        HttpTester.Response response = HttpTester.parseResponse(rawResponse);
-        assertThat(response.getStatus(), is(HttpStatus.OK_200));
-        assertThat("Suffix url-pattern mapping not used", response.get(HttpHeader.CACHE_CONTROL), is("no-store"));
-        String responseDecompressed = decompressGzip(response.getContentBytes());
-        assertThat(responseDecompressed, is("This is a script"));
+            String rawResponse = connector.getResponse("""
+                GET /context/scripts/script.js HTTP/1.1
+                Host: test
+                Accept-Encoding: gzip
+                Connection: close
+                            
+                """);
+            HttpTester.Response response = HttpTester.parseResponse(rawResponse);
+            assertThat(response.getStatus(), is(HttpStatus.OK_200));
+            assertThat("Suffix url-pattern mapping not used", response.get(HttpHeader.CACHE_CONTROL), is("no-store"));
+            String responseDecompressed = decompressGzip(response.getContentBytes());
+            assertThat(responseDecompressed, is("This is a script"));
+        }
+        finally
+        {
+            ResourceFactory.registerResourceFactory("file", oldFileResourceFactory.get());
+        }
     }
 
     @Test