Refactor AbstractDataBrokerTestCustomizer

[mdsal.git] / binding / mdsal-binding-dom-adapter / src / test / java / org / opendaylight / mdsal / binding / dom / adapter / test / util / BindingTestContext.java

diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/util/BindingTestContext.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/util/BindingTestContext.java
index c0c0085dd5d183069c8170ed54dbdb8ee205e1f2..dd06d7e63ff56d9d1def584ac178c3c5f837ce67 100644 (file)
--- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/util/BindingTestContext.java
+++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/util/BindingTestContext.java
@@ -48,8 +48,6 @@ import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 
 @Beta
 public class BindingTestContext implements AutoCloseable {
-    private MockAdapterContext codec;
-
     private final ListeningExecutorService executor;
 
     private final boolean startWithSchema;
@@ -84,7 +82,7 @@ public class BindingTestContext implements AutoCloseable {
     }
 
     public AdapterContext getCodec() {
-        return codec;
+        return mockSchemaService;
     }
 
     protected BindingTestContext(final ListeningExecutorService executor, final boolean startWithSchema) {
@@ -98,7 +96,7 @@ public class BindingTestContext implements AutoCloseable {
     public void startNewDataBroker() {
         checkState(executor != null, "Executor needs to be set");
         checkState(newDOMDataBroker != null, "DOM Data Broker must be set");
-        dataBroker = new BindingDOMDataBrokerAdapter(codec, newDOMDataBroker);
+        dataBroker = new BindingDOMDataBrokerAdapter(mockSchemaService, newDOMDataBroker);
     }
 
     public void startNewDomDataBroker() {
@@ -125,9 +123,9 @@ public class BindingTestContext implements AutoCloseable {
     public void startBindingBroker() {
         checkState(executor != null, "Executor needs to be set");
 
-        baConsumerRpc = new BindingDOMRpcServiceAdapter(codec, getDomRpcInvoker());
-        baProviderRpc = new BindingDOMRpcProviderServiceAdapter(codec, getDomRpcRegistry());
-        final MountPointService mountService = new BindingDOMMountPointServiceAdapter(codec, biMountImpl);
+        baConsumerRpc = new BindingDOMRpcServiceAdapter(mockSchemaService, getDomRpcInvoker());
+        baProviderRpc = new BindingDOMRpcProviderServiceAdapter(mockSchemaService, getDomRpcRegistry());
+        final MountPointService mountService = new BindingDOMMountPointServiceAdapter(mockSchemaService, biMountImpl);
     }
 
     public void startForwarding() {
@@ -135,12 +133,11 @@ public class BindingTestContext implements AutoCloseable {
     }
 
     public void startBindingToDomMappingService() {
-        codec = new MockAdapterContext();
-        mockSchemaService.registerSchemaContextListener(codec);
+        // No-op, really
     }
 
     private void updateYangSchema(final Set<YangModuleInfo> moduleInfos) {
-        mockSchemaService.changeSchema(BindingRuntimeHelpers.createEffectiveModel(moduleInfos));
+        mockSchemaService.changeSchema(BindingRuntimeHelpers.createRuntimeContext(moduleInfos));
     }
 
     public EffectiveModelContext getContext() {
@@ -181,8 +178,8 @@ public class BindingTestContext implements AutoCloseable {
         final DOMNotificationRouter router = DOMNotificationRouter.create(16);
         domPublishService = router;
         domListenService = router;
-        publishService = new BindingDOMNotificationPublishServiceAdapter(codec, domPublishService);
-        listenService = new BindingDOMNotificationServiceAdapter(codec, domListenService);
+        publishService = new BindingDOMNotificationPublishServiceAdapter(mockSchemaService, domPublishService);
+        listenService = new BindingDOMNotificationServiceAdapter(mockSchemaService, domListenService);
 
     }