Skip to content
Snippets Groups Projects
Commit 2af32c54 authored by felmer's avatar felmer
Browse files

SP-182, Bis-109: tests in project installation fixed

SVN: 26648
parent c39fb954
No related branches found
No related tags found
No related merge requests found
...@@ -54,9 +54,9 @@ public class SetEnableTechnologiesVariableActionTest extends AbstractFileSystemT ...@@ -54,9 +54,9 @@ public class SetEnableTechnologiesVariableActionTest extends AbstractFileSystemT
{ {
corePluginsFolder = new File(workingDirectory, Utils.CORE_PLUGINS_PATH); corePluginsFolder = new File(workingDirectory, Utils.CORE_PLUGINS_PATH);
corePluginsFolder.mkdirs(); corePluginsFolder.mkdirs();
configFile = new File(workingDirectory, Utils.AS_PATH + Utils.SERVICE_PROPERTIES_PATH); configFile = new File(workingDirectory, Utils.AS_PATH + Utils.CORE_PLUGINS_PROPERTIES_PATH);
configFile.getParentFile().mkdirs(); configFile.getParentFile().mkdirs();
dssConfigFile = new File(workingDirectory, Utils.DSS_PATH + Utils.SERVICE_PROPERTIES_PATH); dssConfigFile = new File(workingDirectory, Utils.DSS_PATH + Utils.CORE_PLUGINS_PROPERTIES_PATH);
dssConfigFile.getParentFile().mkdirs(); dssConfigFile.getParentFile().mkdirs();
try try
{ {
...@@ -114,7 +114,7 @@ public class SetEnableTechnologiesVariableActionTest extends AbstractFileSystemT ...@@ -114,7 +114,7 @@ public class SetEnableTechnologiesVariableActionTest extends AbstractFileSystemT
{ {
assertEquals("targets/unit-test-wd/ch.systemsx.cisd.openbis.installer.izpack." assertEquals("targets/unit-test-wd/ch.systemsx.cisd.openbis.installer.izpack."
+ "SetEnableTechnologiesVariableActionTest/servers/openBIS-server/jetty/" + "SetEnableTechnologiesVariableActionTest/servers/openBIS-server/jetty/"
+ "etc/service.properties (No such file or directory)", ex.getMessage()); + "etc/core_plugins.properties (No such file or directory)", ex.getMessage());
} }
} }
......
...@@ -61,7 +61,7 @@ public class SetTechnologyCheckBoxesActionTest extends AssertJUnit ...@@ -61,7 +61,7 @@ public class SetTechnologyCheckBoxesActionTest extends AssertJUnit
{ {
Properties properties = new Properties(); Properties properties = new Properties();
properties.setProperty(SetTechnologyCheckBoxesAction.ENABLED_TECHNOLOGIES_KEY, "proteomics"); properties.setProperty(SetTechnologyCheckBoxesAction.ENABLED_TECHNOLOGIES_KEY, "proteomics");
saveProperties(properties, Utils.AS_PATH + Utils.SERVICE_PROPERTIES_PATH); saveProperties(properties, Utils.AS_PATH + Utils.CORE_PLUGINS_PROPERTIES_PATH);
SetTechnologyCheckBoxesAction action = new SetTechnologyCheckBoxesAction(); SetTechnologyCheckBoxesAction action = new SetTechnologyCheckBoxesAction();
assertEquals(true, action.isTechnologyEnabled(TEST_FOLDER, TECHNOLOGY_PROTEOMICS)); assertEquals(true, action.isTechnologyEnabled(TEST_FOLDER, TECHNOLOGY_PROTEOMICS));
......
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