package org.opendaylight.controller.config.it.base;
import static org.ops4j.pax.exam.CoreOptions.maven;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.when;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.features;
*/
private static final String KARAF_DISTRO_TYPE = "zip";
private static final String KARAF_DISTRO_ARTIFACTID = "opendaylight-karaf-empty";
- private static final String KARAF_DISTRO_GROUPID = "org.opendaylight.controller";
+ private static final String KARAF_DISTRO_GROUPID = "org.opendaylight.odlparent";
/*
* Property names to override defaults for karaf distro artifactId, groupId, version, and type
return null;
}
- public String logConfiguration(Class<?> klazz) {
+ public String logConfiguration(final Class<?> klazz) {
return "log4j.logger." + klazz.getPackage().getName();
}
try (InputStream abstractConfigTestBaseInputStream = Thread.currentThread().getContextClassLoader()
.getResourceAsStream(PROPERTIES_FILENAME)) {
abstractConfigTestBaseProps.load(abstractConfigTestBaseInputStream);
- } catch (IOException e) {
+ } catch (final IOException e) {
LOG.error("Unable to load {} to determine the Karaf version", PROPERTIES_FILENAME, e);
}
version = abstractConfigTestBaseProps.getProperty(KARAF_DISTRO_VERSION_PROP);
.useDeployFolder(false),
when(Boolean.getBoolean(KEEP_UNPACK_DIRECTORY_PROP)).useOptions(keepRuntimeFolder()),
features(getFeatureRepo(), getFeatureName()),
+ mavenBundle("org.apache.aries.quiesce", "org.apache.aries.quiesce.api", "1.0.0"),
getLoggingOption(),
mvnLocalRepoOption(),
editConfigurationFilePut(ETC_ORG_OPS4J_PAX_LOGGING_CFG, "log4j.rootLogger", "INFO, stdout, osgi:*")};
LOG.info("Module: {} Instance: {} ObjectName: {}.",
moduleName,instanceName,objectName);
break;
- } catch (Exception e) {
+ } catch (final Exception e) {
if(i<MODULE_TIMEOUT_MILLIS) {
Thread.sleep(1);
continue;
public TestRule watcher = new TestWatcher() {
@Override
- protected void starting(Description description) {
+ protected void starting(final Description description) {
LOG.info("TestWatcher: Starting test: {}", description.getDisplayName());
}
@Override
- protected void finished(Description description) {
+ protected void finished(final Description description) {
LOG.info("TestWatcher: Finished test: {}", description.getDisplayName());
}
@Override
- protected void succeeded(Description description) {
+ protected void succeeded(final Description description) {
LOG.info("TestWatcher: Test succeeded: {}", description.getDisplayName());
}
@Override
- protected void failed(Throwable ex, Description description) {
+ protected void failed(final Throwable ex, final Description description) {
LOG.info("TestWatcher: Test failed: {}", description.getDisplayName(), ex);
}
@Override
- protected void skipped(AssumptionViolatedException ex, Description description) {
+ protected void skipped(final AssumptionViolatedException ex, final Description description) {
LOG.info("TestWatcher: Test skipped: {} ", description.getDisplayName(), ex);
}
};