[java-idp-integration-tests] 05/08: Quote special characters in paths on Windows.

[Tom Zeller]

This is an automated email from the git hooks/post-receive script.

tzeller pushed a commit to branch master
in repository java-idp-integration-tests.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-integration-tests.git;a=commit;h=32785b44bcac3e10d9da1cc61d0111532dc91288

commit 32785b44bcac3e10d9da1cc61d0111532dc91288
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Tue Jul 26 13:40:44 2016 -0500

    Quote special characters in paths on Windows.
---
 src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java | 5 +++--
 src/test/java/net/shibboleth/idp/test/TomcatServerProcess.java | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java b/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java
index 2540d88..de8b33b 100644
--- a/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java
+++ b/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java
@@ -32,6 +32,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.SortedSet;
+import java.util.regex.Matcher;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -417,7 +418,7 @@ public abstract class BaseIntegrationTest
             final Path pathToSetenvBat = pathToTomcatBase.resolve(Paths.get("bin", "setenv.bat"));
             Assert.assertTrue(pathToSetenvBat.toAbsolutePath().toFile().exists(), "Path to setenv.bat not found");
             final String oldTextSetenvSh = "-Didp.home=/opt/shibboleth-idp";
-            final String newTextSetenvSh = "-Didp.home=" + pathToIdPHome.toAbsolutePath().toString();
+            final String newTextSetenvSh = "-Didp.home=" + Matcher.quoteReplacement(pathToIdPHome.toAbsolutePath().toString());
             replaceFile(pathToSetenvSh, oldTextSetenvSh, newTextSetenvSh);
             replaceFile(pathToSetenvBat, oldTextSetenvSh, newTextSetenvSh);
 
@@ -613,7 +614,7 @@ public abstract class BaseIntegrationTest
         logUnencryptedSAML();
 
         // Add logging when starting the server.
-        serverCommands.add("-Dlogback.configurationFile=" + pathToIdPHome.resolve(pathToLogbackXML).toAbsolutePath());
+        serverCommands.add("-Dlogback.configurationFile=" + pathToIdPHome.resolve(pathToLogbackXML).toAbsolutePath().toString());
     }
 
     /**
diff --git a/src/test/java/net/shibboleth/idp/test/TomcatServerProcess.java b/src/test/java/net/shibboleth/idp/test/TomcatServerProcess.java
index e58d8bc..d35cf57 100644
--- a/src/test/java/net/shibboleth/idp/test/TomcatServerProcess.java
+++ b/src/test/java/net/shibboleth/idp/test/TomcatServerProcess.java
@@ -22,6 +22,7 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Iterator;
 import java.util.SortedSet;
+import java.util.regex.Matcher;
 
 import javax.annotation.Nonnull;
 
@@ -55,7 +56,7 @@ public class TomcatServerProcess extends AbstractServerProcess {
         for (final String serverCommand : getAdditionalCommands()) {
             if (serverCommand.startsWith("-D")) {
                 try {
-                    BaseIntegrationTest.replaceFile(pathToSetenvSh, "\"$", " " + serverCommand + "\"");
+                    BaseIntegrationTest.replaceFile(pathToSetenvSh, "\"$", " " + Matcher.quoteReplacement(serverCommand) + "\"");
                 } catch (IOException e) {
                     log.error("Unable to replace file", e);
                     throw new ComponentInitializationException(e);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.