From c59d11dbcee9714bf7739ff12c3f7455a388f369 Mon Sep 17 00:00:00 2001 From: Kevin Wang Date: Wed, 30 Mar 2016 16:24:00 -0700 Subject: [PATCH] Make config-it-base capable of accepting additional options from derived classes. Change-Id: I654224bf9c927e0b393f92036f759b487a8075ad Signed-off-by: Kevin Wang --- .../config/it/base/AbstractConfigTestBase.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/opendaylight/config/config-it-base/src/main/java/org/opendaylight/controller/config/it/base/AbstractConfigTestBase.java b/opendaylight/config/config-it-base/src/main/java/org/opendaylight/controller/config/it/base/AbstractConfigTestBase.java index 05bcfbc043..d7c42f58a9 100644 --- a/opendaylight/config/config-it-base/src/main/java/org/opendaylight/controller/config/it/base/AbstractConfigTestBase.java +++ b/opendaylight/config/config-it-base/src/main/java/org/opendaylight/controller/config/it/base/AbstractConfigTestBase.java @@ -32,6 +32,7 @@ import org.opendaylight.controller.config.api.ConfigRegistry; import org.opendaylight.controller.config.util.ConfigRegistryJMXClient; import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; +import org.ops4j.pax.exam.OptionUtils; import org.ops4j.pax.exam.karaf.options.KarafDistributionOption; import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel; import org.ops4j.pax.exam.options.MavenArtifactUrlReference; @@ -92,6 +93,15 @@ public abstract class AbstractConfigTestBase { return option; } + /** + * Override this method to provide more options to config + * + * @return An array of additional config options + */ + protected Option[] getAdditionalOptions() { + return null; + } + public String logConfiguration(Class klazz) { return "log4j.logger." + klazz.getPackage().getName(); } @@ -141,7 +151,7 @@ public abstract class AbstractConfigTestBase { getLoggingOption(), mvnLocalRepoOption(), editConfigurationFilePut(ETC_ORG_OPS4J_PAX_LOGGING_CFG, "log4j.rootLogger", "INFO, stdout, osgi:*")}; - return options; + return OptionUtils.combine(options, getAdditionalOptions()); } @Before -- 2.36.6