Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #5492 - Updating jetty-start property test expectations 

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
This commit is contained in:
Joakim Erdfelt 2021-02-15 14:25:09 -06:00
parent 1b15c1e4a3
commit 7ed68d0681
No known key found for this signature in database
GPG Key ID: 2D0E1FB8FE4B68B4
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
View File

@ -1507,9 +1507,9 @@ public class StartArgs
properties.setProperty("java.version.platform", Integer.toString(ver.getPlatform()), source);
// features built into java.
// TODO: Remove in Jetty 10+
// In Jetty 10+ these will always be true, but still need to stick around for users that
// want to move between Jetty 9.4.x and 10.0.x+
properties.setProperty("runtime.feature.alpn", Boolean.toString(isMethodAvailable(javax.net.ssl.SSLParameters.class, "getApplicationProtocols", null)), source);
// TODO: Remove in Jetty 10+
properties.setProperty("runtime.feature.jpms", Boolean.toString(isClassAvailable("java.lang.ModuleLayer")), source);
// @deprecated - below will be removed in Jetty 10.x

1
jetty-start/src/test/java/org/eclipse/jetty/start/ConfigurationAssert.java
View File

@ -143,6 +143,7 @@ public class ConfigurationAssert
"jetty.base.uri".equals(name) ||
"user.dir".equals(name) ||
prop.source.equals(Props.ORIGIN_SYSPROP) ||
name.startsWith("runtime.feature.") ||
name.startsWith("java."))
{
// strip these out from assertion, to make assertions easier.

7
jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java
View File

@ -225,8 +225,11 @@ public class MainTest
{
Path distPath = MavenTestingUtils.getTestResourceDir("dist-home").toPath().toRealPath();
Path homePath = MavenTestingUtils.getTargetTestingPath().resolve("dist home with spaces");
IO.copy(distPath.toFile(), homePath.toFile());
Files.createFile(homePath.resolve("lib/a library.jar"));
if (!Files.exists(homePath))
{
IO.copy(distPath.toFile(), homePath.toFile());
Files.createFile(homePath.resolve("lib/a library.jar"));
}
List<String> cmdLineArgs = new ArrayList<>();
cmdLineArgs.add("user.dir=" + homePath);