Skip to content
Snippets Groups Projects
Commit 457d9641 authored by anttil's avatar anttil
Browse files

SSDM-2824: Fix installer tests

SVN: 38206
parent 68e6f524
No related branches found
No related tags found
No related merge requests found
...@@ -177,7 +177,8 @@ public class ExecuteSetupScriptsActionTest extends AbstractFileSystemTestCase ...@@ -177,7 +177,8 @@ public class ExecuteSetupScriptsActionTest extends AbstractFileSystemTestCase
Properties properties = loadProperties(dssServicePropertiesFile); Properties properties = loadProperties(dssServicePropertiesFile);
assertEquals("my-<store>", properties.getProperty(Utils.DSS_KEYSTORE_PASSWORD_KEY)); assertEquals("my-<store>", properties.getProperty(Utils.DSS_KEYSTORE_PASSWORD_KEY));
assertEquals("my-<key>", properties.getProperty(Utils.DSS_KEYSTORE_KEY_PASSWORD_KEY)); assertEquals("my-<key>", properties.getProperty(Utils.DSS_KEYSTORE_KEY_PASSWORD_KEY));
assertEquals("[jetty.keystore.password=my-<store>, jetty.keymanager.password=my-<key>, jetty.truststore.password=my-<store>]", assertEquals(
"[jetty.sslContext.keyStorePassword=my-<store>, jetty.sslContext.keyManagerPassword=my-<key>, jetty.sslContext.trustStorePassword=my-<store>]",
loadFilteredAndTrimmedJettyXMLFile().toString()); loadFilteredAndTrimmedJettyXMLFile().toString());
} }
...@@ -187,7 +188,7 @@ public class ExecuteSetupScriptsActionTest extends AbstractFileSystemTestCase ...@@ -187,7 +188,7 @@ public class ExecuteSetupScriptsActionTest extends AbstractFileSystemTestCase
List<String> result = new ArrayList<String>(); List<String> result = new ArrayList<String>();
for (String line : lines) for (String line : lines)
{ {
if (line.indexOf("password=") > 0) if (line.indexOf("Password=") > 0)
{ {
result.add(line.trim()); result.add(line.trim());
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment