From 52b0de4ac77386a46f7ea4941a9a597ac9e6a54c Mon Sep 17 00:00:00 2001 From: felmer <felmer> Date: Tue, 13 Sep 2016 06:14:42 +0000 Subject: [PATCH] SSDM-3897: SetEnableTechnologiesVariableActionTest adapted SVN: 37058 --- ...tEnableTechnologiesVariableActionTest.java | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/installation/sourceTest/java/ch/systemsx/cisd/openbis/installer/izpack/SetEnableTechnologiesVariableActionTest.java b/installation/sourceTest/java/ch/systemsx/cisd/openbis/installer/izpack/SetEnableTechnologiesVariableActionTest.java index 0b882d53963..b2c476e7866 100644 --- a/installation/sourceTest/java/ch/systemsx/cisd/openbis/installer/izpack/SetEnableTechnologiesVariableActionTest.java +++ b/installation/sourceTest/java/ch/systemsx/cisd/openbis/installer/izpack/SetEnableTechnologiesVariableActionTest.java @@ -93,7 +93,7 @@ public class SetEnableTechnologiesVariableActionTest extends AbstractFileSystemT variables.setProperty(TECHNOLOGY_SCREENING, "true"); updateEnabledTechnologyProperties(variables, false); - assertEquals("[, enabled-modules = dropbox-monitor, dataset-uploader, screening]", + assertEquals("[, enabled-modules = dropbox-monitor, dataset-uploader, data-set-file-search, screening]", FileUtilities.loadToStringList(corePluginsProperties).toString()); } @@ -101,14 +101,15 @@ public class SetEnableTechnologiesVariableActionTest extends AbstractFileSystemT public void testUpdateInstallationWithOtherEnabledTechnologiesInAs() { FileUtilities.writeToFile(corePluginsProperties, "abc = 123\n" + ENABLED_TECHNOLOGIES_KEY - + "=dropbox-monitor, dataset-uploader, proteomics, my-tech"); + + "=dropbox-monitor, dataset-uploader, data-set-file-search, proteomics, my-tech"); Properties variables = new Properties(); variables.setProperty(TECHNOLOGY_PROTEOMICS, "true"); variables.setProperty(TECHNOLOGY_SCREENING, "false"); updateEnabledTechnologyProperties(variables, false); - assertEquals("[abc = 123, " + ENABLED_TECHNOLOGIES_KEY + "=dropbox-monitor, dataset-uploader, proteomics, my-tech]", + assertEquals("[abc = 123, " + ENABLED_TECHNOLOGIES_KEY + "=dropbox-monitor, dataset-uploader, " + + "data-set-file-search, proteomics, my-tech]", FileUtilities.loadToStringList(corePluginsProperties).toString()); } @@ -116,14 +117,15 @@ public class SetEnableTechnologiesVariableActionTest extends AbstractFileSystemT public void testUpdateUnchangedProperty() { FileUtilities.writeToFile(corePluginsProperties, "abc = 123\n" + ENABLED_TECHNOLOGIES_KEY - + "=dropbox-monitor, dataset-uploader, proteomics"); + + "=dropbox-monitor, dataset-uploader, data-set-file-search, proteomics"); Properties variables = new Properties(); variables.setProperty(TECHNOLOGY_PROTEOMICS, "true"); variables.setProperty(TECHNOLOGY_SCREENING, "false"); updateEnabledTechnologyProperties(variables, false); - assertEquals("[abc = 123, " + ENABLED_TECHNOLOGIES_KEY + "=dropbox-monitor, dataset-uploader, proteomics]", FileUtilities + assertEquals("[abc = 123, " + ENABLED_TECHNOLOGIES_KEY + "=dropbox-monitor, dataset-uploader, " + + "data-set-file-search, proteomics]", FileUtilities .loadToStringList(corePluginsProperties).toString()); } @@ -138,7 +140,8 @@ public class SetEnableTechnologiesVariableActionTest extends AbstractFileSystemT updateEnabledTechnologyProperties(variables, false); - assertEquals("[abc = 123, " + ENABLED_TECHNOLOGIES_KEY + " = dropbox-monitor, dataset-uploader, proteomics, screening, answer = 42]", + assertEquals("[abc = 123, " + ENABLED_TECHNOLOGIES_KEY + " = dropbox-monitor, dataset-uploader, " + + "data-set-file-search, proteomics, screening, answer = 42]", FileUtilities .loadToStringList(corePluginsProperties).toString()); } @@ -153,7 +156,8 @@ public class SetEnableTechnologiesVariableActionTest extends AbstractFileSystemT updateEnabledTechnologyProperties(variables, false); - assertEquals("[abc = 123, " + ENABLED_TECHNOLOGIES_KEY + " = dropbox-monitor, dataset-uploader, screening]", FileUtilities + assertEquals("[abc = 123, " + ENABLED_TECHNOLOGIES_KEY + " = dropbox-monitor, dataset-uploader, " + + "data-set-file-search, screening]", FileUtilities .loadToStringList(corePluginsProperties).toString()); } @@ -168,8 +172,9 @@ public class SetEnableTechnologiesVariableActionTest extends AbstractFileSystemT updateEnabledTechnologyProperties(variables, false); - assertEquals("[a = b, " + ENABLED_TECHNOLOGIES_KEY + " = dropbox-monitor, dataset-uploader, screening, " - + "gamma = alpha]", FileUtilities.loadToStringList(corePluginsProperties).toString()); + assertEquals("[a = b, " + ENABLED_TECHNOLOGIES_KEY + " = dropbox-monitor, dataset-uploader, " + + "data-set-file-search, screening, gamma = alpha]", + FileUtilities.loadToStringList(corePluginsProperties).toString()); } private AutomatedInstallData updateEnabledTechnologyProperties(Properties variables, -- GitLab