diff --git a/installation/source/java/ch/systemsx/cisd/openbis/installer/izpack/SetDisableTechnologiesVariableAction.java b/installation/source/java/ch/systemsx/cisd/openbis/installer/izpack/SetDisableTechnologiesVariableAction.java index 18a88524e812f79888c30c7a7ea2e480553a0dbe..5e7360da80f8a9c6d6afa4887b846ff9b33b10f2 100644 --- a/installation/source/java/ch/systemsx/cisd/openbis/installer/izpack/SetDisableTechnologiesVariableAction.java +++ b/installation/source/java/ch/systemsx/cisd/openbis/installer/izpack/SetDisableTechnologiesVariableAction.java @@ -101,8 +101,8 @@ public class SetDisableTechnologiesVariableAction implements PanelAction { appendEntryToConfigFile(configFile, propertiesEntry); } + updateDisabledDssPluginsProperty(data, installDir); } - updateDisabledDssPluginsProperty(data, installDir); } private void updateDisabledDssPluginsProperty(AutomatedInstallData data, File installDir) diff --git a/installation/sourceTest/java/ch/systemsx/cisd/openbis/installer/izpack/SetDisableTechnologiesVariableActionTest.java b/installation/sourceTest/java/ch/systemsx/cisd/openbis/installer/izpack/SetDisableTechnologiesVariableActionTest.java index f1a3827c8a252e9517da0971cfd64cf29494c130..b9513a14869ad4b666d8b218792574d333653802 100644 --- a/installation/sourceTest/java/ch/systemsx/cisd/openbis/installer/izpack/SetDisableTechnologiesVariableActionTest.java +++ b/installation/sourceTest/java/ch/systemsx/cisd/openbis/installer/izpack/SetDisableTechnologiesVariableActionTest.java @@ -94,8 +94,6 @@ public class SetDisableTechnologiesVariableActionTest extends AbstractFileSystem AutomatedInstallData data = updateDisabledTechnologyProperties(variables, true); assertEquals("proteomics, screening", data.getVariable(DISABLED_TECHNOLOGIES_VARNAME)); - assertEquals("[" + DISABLED_CORE_PLUGINS_KEY + " = proteomics, screening]", FileUtilities - .loadToStringList(dssConfigFile).toString()); } @Test @@ -168,13 +166,14 @@ public class SetDisableTechnologiesVariableActionTest extends AbstractFileSystem @Test public void testUpdateDisabledPluginsForSwitchedTechnologies() { + FileUtilities.writeToFile(configFile, "abc = 123"); FileUtilities.writeToFile(dssConfigFile, "a = b\n" + DISABLED_CORE_PLUGINS_KEY + "= screening, proteomics:a:b\n" + "gamma = alpha"); Properties variables = new Properties(); variables.setProperty(TECHNOLOGY_PROTEOMICS, "false"); variables.setProperty(TECHNOLOGY_SCREENING, "true"); - updateDisabledTechnologyProperties(variables, true); + updateDisabledTechnologyProperties(variables, false); assertEquals("[a = b, " + DISABLED_CORE_PLUGINS_KEY + " = proteomics:a:b, proteomics, " + "gamma = alpha]", FileUtilities.loadToStringList(dssConfigFile).toString()); @@ -183,16 +182,14 @@ public class SetDisableTechnologiesVariableActionTest extends AbstractFileSystem @Test public void testUpdateDisabledPluginsForSameTechnology() { + FileUtilities.writeToFile(configFile, "abc = 123"); FileUtilities.writeToFile(dssConfigFile, "a = b\n" + DISABLED_CORE_PLUGINS_KEY + "= proteomics, proteomics:a:b\n" + "gamma = alpha"); Properties variables = new Properties(); variables.setProperty(TECHNOLOGY_PROTEOMICS, "false"); variables.setProperty(TECHNOLOGY_SCREENING, "true"); - updateDisabledTechnologyProperties(variables, true); - - assertEquals("[a = b, " + DISABLED_CORE_PLUGINS_KEY + " = proteomics, proteomics:a:b, " - + "gamma = alpha]", FileUtilities.loadToStringList(dssConfigFile).toString()); + updateDisabledTechnologyProperties(variables, false); } private AutomatedInstallData updateDisabledTechnologyProperties(Properties variables,