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

SP-122, BIS-81: extract enabled technologies from core-plugins folder

SVN: 25638
parent f319cdba
No related branches found
No related tags found
No related merge requests found
...@@ -43,6 +43,7 @@ import org.testng.annotations.BeforeSuite; ...@@ -43,6 +43,7 @@ import org.testng.annotations.BeforeSuite;
import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel; import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
import ch.systemsx.cisd.common.logging.BufferedAppender; import ch.systemsx.cisd.common.logging.BufferedAppender;
import ch.systemsx.cisd.common.shared.basic.utils.CommaSeparatedListBuilder;
import ch.systemsx.cisd.etlserver.ETLDaemon; import ch.systemsx.cisd.etlserver.ETLDaemon;
import ch.systemsx.cisd.openbis.datastoreserver.systemtests.RmiConversationTest.EchoServiceBean; import ch.systemsx.cisd.openbis.datastoreserver.systemtests.RmiConversationTest.EchoServiceBean;
import ch.systemsx.cisd.openbis.datastoreserver.systemtests.RmiConversationTest.EchoServiceExporter; import ch.systemsx.cisd.openbis.datastoreserver.systemtests.RmiConversationTest.EchoServiceExporter;
...@@ -56,6 +57,8 @@ import ch.systemsx.cisd.openbis.generic.shared.Constants; ...@@ -56,6 +57,8 @@ import ch.systemsx.cisd.openbis.generic.shared.Constants;
*/ */
public abstract class SystemTestCase extends AssertJUnit public abstract class SystemTestCase extends AssertJUnit
{ {
private static final String SOURCE_TEST_CORE_PLUGINS = "sourceTest/core-plugins";
public static final int SYSTEM_TEST_CASE_SERVER_PORT = 8888; public static final int SYSTEM_TEST_CASE_SERVER_PORT = 8888;
private static final String UNIT_TEST_WORKING_DIRECTORY = "unit-test-wd"; private static final String UNIT_TEST_WORKING_DIRECTORY = "unit-test-wd";
...@@ -173,7 +176,7 @@ public abstract class SystemTestCase extends AssertJUnit ...@@ -173,7 +176,7 @@ public abstract class SystemTestCase extends AssertJUnit
System.setProperty(OPENBIS_DSS_SYSTEM_PROPERTIES_PREFIX + "inputs", ""); System.setProperty(OPENBIS_DSS_SYSTEM_PROPERTIES_PREFIX + "inputs", "");
System.setProperty(OPENBIS_DSS_SYSTEM_PROPERTIES_PREFIX + "core-plugins-folder", System.setProperty(OPENBIS_DSS_SYSTEM_PROPERTIES_PREFIX + "core-plugins-folder",
"sourceTest/core-plugins"); SOURCE_TEST_CORE_PLUGINS);
System.setProperty(OPENBIS_DSS_SYSTEM_PROPERTIES_PREFIX System.setProperty(OPENBIS_DSS_SYSTEM_PROPERTIES_PREFIX
+ Constants.ENABLED_TECHNOLOGIES_KEY, getEnabledTechnologies()); + Constants.ENABLED_TECHNOLOGIES_KEY, getEnabledTechnologies());
System.setProperty(OPENBIS_DSS_SYSTEM_PROPERTIES_PREFIX + ROOT_DIR_KEY, System.setProperty(OPENBIS_DSS_SYSTEM_PROPERTIES_PREFIX + ROOT_DIR_KEY,
...@@ -187,9 +190,16 @@ public abstract class SystemTestCase extends AssertJUnit ...@@ -187,9 +190,16 @@ public abstract class SystemTestCase extends AssertJUnit
ETLDaemon.runForTesting(new String[0]); ETLDaemon.runForTesting(new String[0]);
} }
protected String getEnabledTechnologies() private String getEnabledTechnologies()
{ {
return "generic-test"; File corePluginsFolder = new File(SOURCE_TEST_CORE_PLUGINS);
String[] list = corePluginsFolder.list();
CommaSeparatedListBuilder builder = new CommaSeparatedListBuilder();
for (String technology : list)
{
builder.append(technology);
}
return builder.toString();
} }
/** /**
......
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