From 457d964140372f469ccc52cd8f3fe204686dc60e Mon Sep 17 00:00:00 2001
From: anttil <anttil>
Date: Mon, 22 May 2017 12:22:55 +0000
Subject: [PATCH] SSDM-2824: Fix installer tests
SVN: 38206
---
.../installer/izpack/ExecuteSetupScriptsActionTest.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/installation/sourceTest/java/ch/systemsx/cisd/openbis/installer/izpack/ExecuteSetupScriptsActionTest.java b/installation/sourceTest/java/ch/systemsx/cisd/openbis/installer/izpack/ExecuteSetupScriptsActionTest.java
index 7d7269de57a..648ec9fcd76 100644
--- a/installation/sourceTest/java/ch/systemsx/cisd/openbis/installer/izpack/ExecuteSetupScriptsActionTest.java
+++ b/installation/sourceTest/java/ch/systemsx/cisd/openbis/installer/izpack/ExecuteSetupScriptsActionTest.java
@@ -177,7 +177,8 @@ public class ExecuteSetupScriptsActionTest extends AbstractFileSystemTestCase
Properties properties = loadProperties(dssServicePropertiesFile);
assertEquals("my-<store>", properties.getProperty(Utils.DSS_KEYSTORE_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());
}
@@ -187,7 +188,7 @@ public class ExecuteSetupScriptsActionTest extends AbstractFileSystemTestCase
List<String> result = new ArrayList<String>();
for (String line : lines)
{
- if (line.indexOf("password=") > 0)
+ if (line.indexOf("Password=") > 0)
{
result.add(line.trim());
}
--
GitLab