From 4efa7f55f33e5f7fd8cedc6593b2357a38075ec8 Mon Sep 17 00:00:00 2001 From: Michael Vorburger Date: Thu, 18 Jan 2018 03:15:23 +0100 Subject: [PATCH] DataBrokerTestModule getBindingToNormalizedNodeCodec() & Co. need these exposed for a new standalone component style test I'm on Change-Id: I5efd3a6e507d46d035067a561aaca7c2f80f51e6 Signed-off-by: Michael Vorburger --- .../binding/test/DataBrokerTestModule.java | 29 +++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/test/DataBrokerTestModule.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/test/DataBrokerTestModule.java index 990d75a917..fd95a50145 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/test/DataBrokerTestModule.java +++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/test/DataBrokerTestModule.java @@ -8,6 +8,11 @@ package org.opendaylight.controller.md.sal.binding.test; import org.opendaylight.controller.md.sal.binding.api.DataBroker; +import org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCodec; +import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker; +import org.opendaylight.controller.md.sal.dom.broker.impl.DOMNotificationRouter; +import org.opendaylight.controller.sal.core.api.model.SchemaService; +import org.opendaylight.yangtools.yang.model.api.SchemaContextProvider; public class DataBrokerTestModule { @@ -16,6 +21,7 @@ public class DataBrokerTestModule { } private final boolean useMTDataTreeChangeListenerExecutor; + private ConstantSchemaAbstractDataBrokerTest dataBrokerTest; public DataBrokerTestModule(boolean useMTDataTreeChangeListenerExecutor) { this.useMTDataTreeChangeListenerExecutor = useMTDataTreeChangeListenerExecutor; @@ -30,12 +36,31 @@ public class DataBrokerTestModule { // into this DataBrokerTestModule, and make AbstractDataBrokerTest // use it, instead of the way around it currently is (the opposite); // this is just for historical reasons... and works for now. - ConstantSchemaAbstractDataBrokerTest dataBrokerTest - = new ConstantSchemaAbstractDataBrokerTest(useMTDataTreeChangeListenerExecutor); + dataBrokerTest = new ConstantSchemaAbstractDataBrokerTest(useMTDataTreeChangeListenerExecutor); dataBrokerTest.setup(); return dataBrokerTest.getDataBroker(); } catch (Exception e) { throw new RuntimeException(e); } } + + public DOMDataBroker getDOMDataBroker() { + return dataBrokerTest.getDomBroker(); + } + + public BindingToNormalizedNodeCodec getBindingToNormalizedNodeCodec() { + return dataBrokerTest.getDataBrokerTestCustomizer().getBindingToNormalized(); + } + + public DOMNotificationRouter getDOMNotificationRouter() { + return dataBrokerTest.getDataBrokerTestCustomizer().getDomNotificationRouter(); + } + + public SchemaService getSchemaService() { + return dataBrokerTest.getDataBrokerTestCustomizer().getSchemaService(); + } + + public SchemaContextProvider getSchemaContextProvider() { + return (SchemaContextProvider) dataBrokerTest.getDataBrokerTestCustomizer().getSchemaService(); + } } -- 2.36.6