Issue #5492 - Updating jetty-start property test expectations

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
jetty · Feb 15, 2021 · 7ed68d0 · 7ed68d0
1 parent 1b15c1e
commit 7ed68d0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java b/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
@@ -1507,9 +1507,9 @@ public void setProperty(String key, String value, String source)
                 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

diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/ConfigurationAssert.java b/jetty-start/src/test/java/org/eclipse/jetty/start/ConfigurationAssert.java
@@ -143,6 +143,7 @@ public static void assertConfiguration(BaseHome baseHome, StartArgs args, String
                 "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.

diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java b/jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java
@@ -225,8 +225,11 @@ public void testJettyHomeWithSpaces() throws Exception
     {
         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);