-
Notifications
You must be signed in to change notification settings - Fork 1.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Issue #11873 - Server resources are not found if the server is subclassed in a different package #11874
Merged
lachlan-roberts
merged 1 commit into
jetty-12.0.x
from
jetty-12.0.x-11873-ServerResources
Jun 4, 2024
Merged
Issue #11873 - Server resources are not found if the server is subclassed in a different package #11874
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
64 changes: 64 additions & 0 deletions
64
...-server/src/test/java/org/eclipse/jetty/server/subpackage/ServerDefaultResourcesTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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(); | ||
} | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think this tests what you think it tests.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@joakime this test fails before fix and now passes.
The idea is that it is trying to load
jetty-dir.css
, and it doesgetClass().getResource(name)
, internally this appends the package name as the resource does not start with/
, and because the server is subclassed with the{}
it is looking for/org/eclipse/jetty/server/subpackage/jetty-dir.css
which does not exist.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So the second argument is an anonymous subclass. got it.