From 21f8e58e040f4564cc2df5e7bdc76a16e3f70e99 Mon Sep 17 00:00:00 2001
From: Lachlan Roberts <lachlan@webtide.com>
Date: Tue, 4 Jun 2024 13:47:02 +1000
Subject: [PATCH] Issue #11873 - fixes for getDefaultFavicon and
 getDefaultStyleSheet in Server

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
---
 .../java/org/eclipse/jetty/server/Server.java |  4 +-
 .../ServerDefaultResourcesTest.java           | 64 +++++++++++++++++++
 2 files changed, 66 insertions(+), 2 deletions(-)
 create mode 100644 jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/subpackage/ServerDefaultResourcesTest.java

diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
index 2372f6abe5ae..166c70b0952b 100644
--- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
+++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
@@ -793,7 +793,7 @@ public Server getServer()
      */
     public Resource getDefaultStyleSheet()
     {
-        return newResource("jetty-dir.css");
+        return newResource("/org/eclipse/jetty/server/jetty-dir.css");
     }
 
     /**
@@ -803,7 +803,7 @@ public Resource getDefaultStyleSheet()
      */
     public Resource getDefaultFavicon()
     {
-        return newResource("favicon.ico");
+        return newResource("/org/eclipse/jetty/server/favicon.ico");
     }
 
     /**
diff --git a/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/subpackage/ServerDefaultResourcesTest.java b/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/subpackage/ServerDefaultResourcesTest.java
new file mode 100644
index 000000000000..49ed00d8f292
--- /dev/null
+++ b/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/subpackage/ServerDefaultResourcesTest.java
@@ -0,0 +1,64 @@
+//
+// ========================================================================
+// Copyright (c) 1995 Mort Bay Consulting Pty Ltd and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
+//
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+// ========================================================================
+//
+
+package org.eclipse.jetty.server.subpackage;
+
+import java.util.stream.Stream;
+
+import org.eclipse.jetty.server.Server;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+public class ServerDefaultResourcesTest
+{
+    public static Stream<Arguments> arguments()
+    {
+        return Stream.of(
+            new Server(),
+            new Server(){}
+        ).map(Arguments::of);
+    }
+
+    @ParameterizedTest
+    @MethodSource("arguments")
+    public void testDefaultStyleSheet(Server server) throws Exception
+    {
+        try
+        {
+            server.start();
+            assertNotNull(server.getDefaultStyleSheet());
+        }
+        finally
+        {
+            server.stop();
+        }
+    }
+
+    @ParameterizedTest
+    @MethodSource("arguments")
+    public void testDefaultFavicon(Server server) throws Exception
+    {
+        try
+        {
+            server.start();
+            assertNotNull(server.getDefaultFavicon());
+        }
+        finally
+        {
+            server.stop();
+        }
+    }
+}