Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Migrate OSGI compendium reference
[controller.git]
/
opendaylight
/
md-sal
/
sal-binding-broker
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
md
/
sal
/
binding
/
test
/
AbstractBaseDataBrokerTest.java
diff --git
a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/test/AbstractBaseDataBrokerTest.java
b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/test/AbstractBaseDataBrokerTest.java
index 257ed9031c440d3e0047d587e5724621a04d3024..dc1d871ec6e3962dd16d07d7aad2a710897d35c1 100644
(file)
--- a/
opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/test/AbstractBaseDataBrokerTest.java
+++ b/
opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/test/AbstractBaseDataBrokerTest.java
@@
-15,6
+15,7
@@
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
import org.opendaylight.yangtools.yang.model.api.SchemaContext;
import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+@Deprecated
public abstract class AbstractBaseDataBrokerTest extends AbstractSchemaAwareTest {
private static final int ASSERT_COMMIT_DEFAULT_TIMEOUT = 5000;
public abstract class AbstractBaseDataBrokerTest extends AbstractSchemaAwareTest {
private static final int ASSERT_COMMIT_DEFAULT_TIMEOUT = 5000;
@@
-25,11
+26,18
@@
public abstract class AbstractBaseDataBrokerTest extends AbstractSchemaAwareTest
protected abstract AbstractDataBrokerTestCustomizer createDataBrokerTestCustomizer();
protected abstract AbstractDataBrokerTestCustomizer createDataBrokerTestCustomizer();
+ public AbstractDataBrokerTestCustomizer getDataBrokerTestCustomizer() {
+ if (testCustomizer == null) {
+ throw new IllegalStateException("testCustomizer not yet set by call to createDataBrokerTestCustomizer()");
+ }
+ return testCustomizer;
+ }
+
@Override
protected void setupWithSchema(final SchemaContext context) {
testCustomizer = createDataBrokerTestCustomizer();
dataBroker = testCustomizer.createDataBroker();
@Override
protected void setupWithSchema(final SchemaContext context) {
testCustomizer = createDataBrokerTestCustomizer();
dataBroker = testCustomizer.createDataBroker();
- domBroker = testCustomizer.
create
DOMDataBroker();
+ domBroker = testCustomizer.
get
DOMDataBroker();
testCustomizer.updateSchema(context);
}
testCustomizer.updateSchema(context);
}