From 2af32c54d60f7f7d77765e8428c4e947e2954ee4 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Mon, 17 Sep 2012 14:48:20 +0000
Subject: [PATCH] SP-182, Bis-109: tests in project installation fixed
SVN: 26648
---
.../izpack/SetEnableTechnologiesVariableActionTest.java | 6 +++---
.../installer/izpack/SetTechnologyCheckBoxesActionTest.java | 2 +-
2 files changed, 4 insertions(+), 4 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 9c7bc8f010d..cbac5ef6148 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
@@ -54,9 +54,9 @@ public class SetEnableTechnologiesVariableActionTest extends AbstractFileSystemT
{
corePluginsFolder = new File(workingDirectory, Utils.CORE_PLUGINS_PATH);
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();
- 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();
try
{
@@ -114,7 +114,7 @@ public class SetEnableTechnologiesVariableActionTest extends AbstractFileSystemT
{
assertEquals("targets/unit-test-wd/ch.systemsx.cisd.openbis.installer.izpack."
+ "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());
}
}
diff --git a/installation/sourceTest/java/ch/systemsx/cisd/openbis/installer/izpack/SetTechnologyCheckBoxesActionTest.java b/installation/sourceTest/java/ch/systemsx/cisd/openbis/installer/izpack/SetTechnologyCheckBoxesActionTest.java
index e8a2b0584b9..6d2305e3e71 100644
--- a/installation/sourceTest/java/ch/systemsx/cisd/openbis/installer/izpack/SetTechnologyCheckBoxesActionTest.java
+++ b/installation/sourceTest/java/ch/systemsx/cisd/openbis/installer/izpack/SetTechnologyCheckBoxesActionTest.java
@@ -61,7 +61,7 @@ public class SetTechnologyCheckBoxesActionTest extends AssertJUnit
{
Properties properties = new Properties();
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();
assertEquals(true, action.isTechnologyEnabled(TEST_FOLDER, TECHNOLOGY_PROTEOMICS));
--
GitLab