From 036a3589cfc1a62eddb49dc9cf09b7949c313f9b Mon Sep 17 00:00:00 2001 From: Maros Marsalek Date: Wed, 13 Apr 2016 10:44:12 +0200 Subject: HONEYCOMB-9: Remove initial Honeycomb pipeline + Rewire global restconf to only serve VPP requests + Remove artificial Honeycomb mountpoint Change-Id: I90738123e46a9fb29db19ee09fd139b57cd8af10 Signed-off-by: Maros Marsalek --- .../params/xml/ns/yang/v3po/impl/rev141210/V3poModuleTest.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'v3po/impl/src/test/java/org/opendaylight/yang/gen') diff --git a/v3po/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/v3po/impl/rev141210/V3poModuleTest.java b/v3po/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/v3po/impl/rev141210/V3poModuleTest.java index 845e679d6..3d8e79641 100644 --- a/v3po/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/v3po/impl/rev141210/V3poModuleTest.java +++ b/v3po/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/v3po/impl/rev141210/V3poModuleTest.java @@ -17,11 +17,10 @@ package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.im import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import io.fd.honeycomb.v3po.impl.V3poProvider; import javax.management.ObjectName; import org.junit.Test; import org.opendaylight.controller.config.api.DependencyResolver; @@ -29,6 +28,8 @@ import org.opendaylight.controller.config.api.JmxAttribute; import org.opendaylight.controller.config.api.ModuleIdentifier; import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker; import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; +import org.opendaylight.controller.sal.core.api.Broker; +import org.opendaylight.controller.sal.core.api.Provider; import org.opendaylight.yangtools.binding.data.codec.api.BindingNormalizedNodeSerializer; public class V3poModuleTest { @@ -41,7 +42,6 @@ public class V3poModuleTest { module.customValidation(); } - @Test public void testCreateInstance() throws Exception { // configure mocks @@ -52,6 +52,7 @@ public class V3poModuleTest { final org.opendaylight.controller.sal.core.api.Broker domBroker = mock(org.opendaylight.controller.sal.core.api.Broker.class); when(dependencyResolver.resolveInstance(eq(org.opendaylight.controller.sal.core.api.Broker.class), any(ObjectName.class), any(JmxAttribute.class))) .thenReturn(domBroker); + doReturn(mock(Broker.ProviderSession.class)).when(domBroker).registerProvider(any(Provider.class)); when(dependencyResolver.resolveInstance(eq(BindingNormalizedNodeSerializer.class), any(ObjectName.class), any(JmxAttribute.class))) .thenReturn(mock(BindingNormalizedNodeSerializer.class)); when(dependencyResolver.resolveInstance(eq(DOMDataBroker.class), any(ObjectName.class), any(JmxAttribute.class))) @@ -63,9 +64,6 @@ public class V3poModuleTest { // getInstance calls resolveInstance to get the broker dependency and then calls createInstance AutoCloseable closeable = module.getInstance(); - // verify that the module registered the returned provider with the broker - verify(broker).registerProvider((V3poProvider)closeable); - // ensure no exceptions on close closeable.close(); } -- cgit 1.2.3-korg