Repository: deltaspike Updated Branches: refs/heads/master 41a333ffd -> d4fe6f076
DELTASPIKE-785 minor cleanup Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/d4fe6f07 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/d4fe6f07 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/d4fe6f07 Branch: refs/heads/master Commit: d4fe6f076c69fbe5198a30d4fe34460897453176 Parents: 41a333f Author: gpetracek <gpetra...@apache.org> Authored: Thu Nov 20 13:45:28 2014 +0100 Committer: gpetracek <gpetra...@apache.org> Committed: Thu Nov 20 13:45:28 2014 +0100 ---------------------------------------------------------------------- .../testcontrol/api/junit/CdiTestSuiteRunner.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/d4fe6f07/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestSuiteRunner.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestSuiteRunner.java b/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestSuiteRunner.java index 7f442a0..92dd6c2 100644 --- a/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestSuiteRunner.java +++ b/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestSuiteRunner.java @@ -40,10 +40,15 @@ import java.util.logging.Logger; public class CdiTestSuiteRunner extends Suite { /** - * The configuration switch to define the configuration properties file. + * Configuration key to define a custom configuration properties file-name. + * e.g.: + * deltaspike.testcontrol.test-container.config-file_name=META-INF/dsTestContainerBootConfig.properties */ - public static final String TEST_RUNNER_CONFIG_KEY = "deltaspike.testcontrol.boot_config"; - private static final String TEST_RUNNER_DEFAULT_CONFIG_NAME = "META-INF/apache-deltaspike_test-container"; + private static final String CUSTOM_TEST_CONTAINER_CONFIG_FILE_NAME_KEY = + "deltaspike.testcontrol.test-container.config-file_name"; + + private static final String DEFAULT_TEST_CONTAINER_CONFIG_FILE_NAME = + "META-INF/apache-deltaspike_test-container"; private static final boolean STOP_CONTAINER; @@ -196,7 +201,7 @@ public class CdiTestSuiteRunner extends Suite public static Properties getTestContainerConfig() { String cdiTestRunnerConfig = ConfigResolver.getProjectStageAwarePropertyValue( - TEST_RUNNER_CONFIG_KEY, TEST_RUNNER_DEFAULT_CONFIG_NAME); + CUSTOM_TEST_CONTAINER_CONFIG_FILE_NAME_KEY, DEFAULT_TEST_CONTAINER_CONFIG_FILE_NAME); return PropertyLoader.getProperties(cdiTestRunnerConfig); } }
