import static org.ops4j.pax.exam.CoreOptions.maven;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.features;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
import javax.management.InstanceNotFoundException;
import org.junit.Rule;
+import org.junit.internal.AssumptionViolatedException;
import org.junit.rules.TestRule;
import org.junit.rules.TestWatcher;
import org.junit.runner.Description;
import org.slf4j.LoggerFactory;
public abstract class AbstractConfigTestBase {
-
private static final Logger LOG = LoggerFactory.getLogger(AbstractConfigTestBase.class);
- public static final String ORG_OPS4J_PAX_LOGGING_CFG = "etc/org.ops4j.pax.logging.cfg";
- public static final String CUSTOM_PROPERTIES = "etc/custom.properties";
- private static final String SERVER_IPADDRESS = "ovsdbserver.ipaddress";
- private static final String SERVER_PORT = "ovsdbserver.port";
- private static final String CONNECTION_TYPE = "ovsdbserver.connection";
- private static final String CONNECTION_TYPE_ACTIVE = "active";
- private static final String CONNECTION_TYPE_PASSIVE = "passive";
- private static final String DEFAULT_SERVER_IPADDRESS = "127.0.0.1";
- private static final String DEFAULT_SERVER_PORT = "6640";
/*
* Wait up to 10s for our configured module to come up
*/
private static final int MODULE_TIMEOUT = 10000;
+ private static int configTimes = 0;
public abstract String getModuleName();
public Option[] getLoggingOptions() {
Option[] options = new Option[] {
- editConfigurationFilePut(ORG_OPS4J_PAX_LOGGING_CFG,
+ editConfigurationFilePut(SouthboundITConstants.ORG_OPS4J_PAX_LOGGING_CFG,
logConfiguration(AbstractConfigTestBase.class),
- LogLevel.INFO.name()),
- editConfigurationFilePut(ORG_OPS4J_PAX_LOGGING_CFG,
- "log4j.logger.org.opendaylight.ovsdb.southbound-impl",
- LogLevel.DEBUG.name())
+ LogLevel.INFO.name())
};
return options;
}
return "log4j.logger." + klazz.getPackage().getName();
}
+ public Option[] getFeaturesOptions() {
+ return new Option[]{};
+ }
+
public Option[] getPropertiesOptions() {
- return null;
+ return new Option[]{};
}
public MavenArtifactUrlReference getKarafDistro() {
- MavenArtifactUrlReference karafUrl = maven()
- .groupId("org.opendaylight.controller")
- .artifactId("opendaylight-karaf-empty")
- .version("1.5.0-SNAPSHOT")
+ MavenArtifactUrlReference karafUrl;
+ karafUrl = maven()
+ // karaf-empty is busted
+ //.groupId("org.opendaylight.controller")
+ //.artifactId("opendaylight-karaf-empty")
+ //.version("1.5.0-SNAPSHOT")
+ .groupId("org.opendaylight.ovsdb")
+ .artifactId("southbound-karaf")
+ .version("1.1.0-SNAPSHOT")
.type("zip");
return karafUrl;
}
@Configuration
public Option[] config() {
+ LOG.info("Calling config, configTimes: {}", configTimes);
+ configTimes++;
Option[] options = new Option[] {
- // KarafDistributionOption.debugConfiguration("5005", true),
+ //KarafDistributionOption.debugConfiguration("5005", true),
karafDistributionConfiguration()
.frameworkUrl(getKarafDistro())
.unpackDirectory(new File("target/exam"))
.useDeployFolder(false),
keepRuntimeFolder(),
- features(getFeatureRepo() , getFeatureName()),
+ //features(getFeatureRepo() , getFeatureName())
};
+ options = ObjectArrays.concat(options, getFeaturesOptions(), Option.class);
options = ObjectArrays.concat(options, getLoggingOptions(), Option.class);
options = ObjectArrays.concat(options, getPropertiesOptions(), Option.class);
return options;
configRegistryClient.lookupConfigBean(getModuleName(), getInstanceName());
Thread.sleep(1);
} catch (InstanceNotFoundException e) {
- if (timer < MODULE_TIMEOUT) {
- continue;
- } else {
+ if (timer >= MODULE_TIMEOUT) {
throw e;
}
} catch (InterruptedException e) {
public TestRule watcher = new TestWatcher() {
@Override
protected void starting(Description description) {
- LOG.info("TestWatcher: Starting test: {}",
- description.getDisplayName());
+ LOG.info("TestWatcher: Starting test:\n{}", description.getDisplayName());
}
@Override
protected void finished(Description description) {
- LOG.info("TestWatcher: Finished test: {}", description.getDisplayName());
+ LOG.info("TestWatcher: Finished test:\n{}", description.getDisplayName());
+ }
+
+ @Override
+ protected void succeeded(Description description) {
+ LOG.info("TestWatcher: Test succeeded:\n{}", description.getDisplayName());
+ }
+
+ @Override
+ protected void failed(Throwable ex, Description description) {
+ LOG.info("TestWatcher: Test failed:\n{} ", description.getDisplayName(), ex);
+ }
+
+ @Override
+ protected void skipped(AssumptionViolatedException ex, Description description) {
+ LOG.info("TestWatcher: Test skipped:\n{} ", description.getDisplayName(), ex);
}
};
}