From a9c0c213fe4701d3d471120b4e091c75a282312b Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Mon, 11 Jun 2012 10:00:32 +0000
Subject: [PATCH] SP-122, BIS-81: extract enabled technologies from
core-plugins folder
SVN: 25638
---
.../systemtests/SystemTestCase.java | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/SystemTestCase.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/SystemTestCase.java
index 625a7ea4ef8..42892058f14 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/SystemTestCase.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/SystemTestCase.java
@@ -43,6 +43,7 @@ import org.testng.annotations.BeforeSuite;
import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
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.openbis.datastoreserver.systemtests.RmiConversationTest.EchoServiceBean;
import ch.systemsx.cisd.openbis.datastoreserver.systemtests.RmiConversationTest.EchoServiceExporter;
@@ -56,6 +57,8 @@ import ch.systemsx.cisd.openbis.generic.shared.Constants;
*/
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;
private static final String UNIT_TEST_WORKING_DIRECTORY = "unit-test-wd";
@@ -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 + "core-plugins-folder",
- "sourceTest/core-plugins");
+ SOURCE_TEST_CORE_PLUGINS);
System.setProperty(OPENBIS_DSS_SYSTEM_PROPERTIES_PREFIX
+ Constants.ENABLED_TECHNOLOGIES_KEY, getEnabledTechnologies());
System.setProperty(OPENBIS_DSS_SYSTEM_PROPERTIES_PREFIX + ROOT_DIR_KEY,
@@ -187,9 +190,16 @@ public abstract class SystemTestCase extends AssertJUnit
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();
}
/**
--
GitLab