From: guillaume.lambert Date: Mon, 26 Aug 2019 13:46:04 +0000 (+0200) Subject: remove some olm Junit X-Git-Tag: 0.4.0~7 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F95%2F83995%2F2;hp=3c0bb0501a44b03b2c30ba841fa66b8b0500f49e;p=transportpce.git remove some olm Junit to ease Databroker migration Signed-off-by: guillaume.lambert Change-Id: I39fd0893bd82c0bda4ded7474f6c3eec1dbdc292 --- diff --git a/olm/src/test/java/org/opendaylight/transportpce/olm/OlmProviderTest.java b/olm/src/test/java/org/opendaylight/transportpce/olm/OlmProviderTest.java deleted file mode 100644 index c2f3ecc6c..000000000 --- a/olm/src/test/java/org/opendaylight/transportpce/olm/OlmProviderTest.java +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Copyright © 2018 Orange Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - - -package org.opendaylight.transportpce.olm; - -import org.junit.Before; -import org.junit.Test; -import org.mockito.Mockito; -import org.opendaylight.controller.md.sal.binding.api.MountPoint; -import org.opendaylight.controller.md.sal.binding.api.MountPointService; -import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; -import org.opendaylight.transportpce.common.StringConstants; -import org.opendaylight.transportpce.common.crossconnect.CrossConnect; -import org.opendaylight.transportpce.common.crossconnect.CrossConnectImpl; -import org.opendaylight.transportpce.common.crossconnect.CrossConnectImpl121; -import org.opendaylight.transportpce.common.crossconnect.CrossConnectImpl221; -import org.opendaylight.transportpce.common.device.DeviceTransactionManager; -import org.opendaylight.transportpce.common.device.DeviceTransactionManagerImpl; -import org.opendaylight.transportpce.common.mapping.MappingUtils; -import org.opendaylight.transportpce.common.mapping.PortMapping; -import org.opendaylight.transportpce.common.mapping.PortMappingImpl; -import org.opendaylight.transportpce.common.mapping.PortMappingVersion121; -import org.opendaylight.transportpce.common.mapping.PortMappingVersion221; -import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces; -import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfacesImpl; -import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfacesImpl121; -import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfacesImpl221; -import org.opendaylight.transportpce.olm.power.PowerMgmt; -import org.opendaylight.transportpce.olm.power.PowerMgmtImpl; -import org.opendaylight.transportpce.olm.service.OlmPowerService; -import org.opendaylight.transportpce.olm.service.OlmPowerServiceImpl; -import org.opendaylight.transportpce.olm.stub.MountPointServiceStub; -import org.opendaylight.transportpce.olm.stub.MountPointStub; -import org.opendaylight.transportpce.olm.stub.RpcProviderRegistryStub; -import org.opendaylight.transportpce.olm.stub.RpcProviderRegistryStub2; -import org.opendaylight.transportpce.test.AbstractTest; - -public class OlmProviderTest extends AbstractTest { - - private MountPoint mountPoint; - private MountPointService mountPointService; - private DeviceTransactionManager deviceTransactionManager; - private CrossConnect crossConnect; - private OpenRoadmInterfaces openRoadmInterfaces; - private PortMapping portMapping; - private PowerMgmt powerMgmt; - private OlmPowerService olmPowerService; - private RpcProviderRegistry rpcProviderRegistry; - private OlmProvider olmProvider; - private CrossConnectImpl121 crossConnectImpl121; - private CrossConnectImpl221 crossConnectImpl22; - private MappingUtils mappingUtils; - private OpenRoadmInterfacesImpl121 openRoadmInterfacesImpl121; - private OpenRoadmInterfacesImpl221 openRoadmInterfacesImpl22; - private PortMappingVersion221 portMappingVersion22; - private PortMappingVersion121 portMappingVersion121; - - @Before - public void setUp() { - this.mountPoint = new MountPointStub(this.getDataBroker()); - this.mountPointService = new MountPointServiceStub(mountPoint); - this.mappingUtils = Mockito.spy(MappingUtils.class); - Mockito.doReturn(StringConstants.OPENROADM_DEVICE_VERSION_1_2_1).when(mappingUtils) - .getOpenRoadmVersion(Mockito.anyString()); - this.deviceTransactionManager = new DeviceTransactionManagerImpl(mountPointService, 3000); - this.crossConnectImpl121 = new CrossConnectImpl121(deviceTransactionManager); - this.crossConnectImpl22 = new CrossConnectImpl221(deviceTransactionManager); - this.crossConnect = new CrossConnectImpl(deviceTransactionManager, this.mappingUtils, this.crossConnectImpl121, - this.crossConnectImpl22); - this.openRoadmInterfacesImpl121 = new OpenRoadmInterfacesImpl121(deviceTransactionManager); - this.openRoadmInterfacesImpl22 = new OpenRoadmInterfacesImpl221(deviceTransactionManager); - this.openRoadmInterfaces = new OpenRoadmInterfacesImpl((this.deviceTransactionManager), - this.mappingUtils,this.openRoadmInterfacesImpl121,this.openRoadmInterfacesImpl22); - this.portMappingVersion22 = - new PortMappingVersion221(getDataBroker(), deviceTransactionManager, this.openRoadmInterfaces); - this.portMappingVersion121 = - new PortMappingVersion121(getDataBroker(), deviceTransactionManager, this.openRoadmInterfaces); - this.portMapping = new PortMappingImpl(getDataBroker(), this.portMappingVersion22, - this.portMappingVersion121); - this.portMapping = Mockito.spy(this.portMapping); - this.powerMgmt = new PowerMgmtImpl(this.getDataBroker(), this.openRoadmInterfaces, this.crossConnect, - this.deviceTransactionManager); - this.olmPowerService = new OlmPowerServiceImpl(this.getDataBroker(), this.powerMgmt, - this.deviceTransactionManager, this.portMapping, this.mappingUtils, this.openRoadmInterfaces); - this.rpcProviderRegistry = new RpcProviderRegistryStub(); - this.olmProvider = new OlmProvider(this.rpcProviderRegistry, this.olmPowerService); - - } - - @Test - public void testInitAndClose() { - this.olmProvider.init(); - this.olmProvider.close(); - } - - @Test - public void testClose2() { - this.rpcProviderRegistry = new RpcProviderRegistryStub2(); - this.olmProvider = new OlmProvider(this.rpcProviderRegistry, this.olmPowerService); - this.olmProvider.init(); - this.olmProvider.close(); - } - -} diff --git a/olm/src/test/java/org/opendaylight/transportpce/olm/stub/CompositeRoutedRpcRegistrationStub.java b/olm/src/test/java/org/opendaylight/transportpce/olm/stub/CompositeRoutedRpcRegistrationStub.java deleted file mode 100644 index 69a979086..000000000 --- a/olm/src/test/java/org/opendaylight/transportpce/olm/stub/CompositeRoutedRpcRegistrationStub.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright © 2018 Orange Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - - -package org.opendaylight.transportpce.olm.stub; - -import java.util.HashMap; -import java.util.Map; -import javax.annotation.Nonnull; -import org.opendaylight.controller.md.sal.binding.impl.BindingDOMRpcProviderServiceAdapter; -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; -import org.opendaylight.yangtools.concepts.ObjectRegistration; -import org.opendaylight.yangtools.yang.binding.BaseIdentity; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.opendaylight.yangtools.yang.binding.RpcService; - -public class CompositeRoutedRpcRegistrationStub implements - BindingAwareBroker.RoutedRpcRegistration { - private final Class type; - private final T instance; - private final BindingDOMRpcProviderServiceAdapter adapter; - private final Map, ObjectRegistration> registrations = new HashMap(2); - - CompositeRoutedRpcRegistrationStub(final Class type, final T impl, - final BindingDOMRpcProviderServiceAdapter providerAdapter) { - this.type = type; - this.instance = impl; - this.adapter = providerAdapter; - } - - @Override public void registerInstance(Class context, InstanceIdentifier myinstance) { - - } - - @Override public void unregisterInstance(Class context, InstanceIdentifier myinstance) { - - } - - @Override public void registerPath(Class context, InstanceIdentifier path) { - - } - - @Override public void unregisterPath(Class context, InstanceIdentifier path) { - - } - - @Override public Class getServiceType() { - return null; - } - - @Override public void close() { - - } - - @Nonnull - @Override public T getInstance() { - return null; - } -} diff --git a/olm/src/test/java/org/opendaylight/transportpce/olm/stub/RpcProviderRegistryStub.java b/olm/src/test/java/org/opendaylight/transportpce/olm/stub/RpcProviderRegistryStub.java deleted file mode 100644 index 41e942d8d..000000000 --- a/olm/src/test/java/org/opendaylight/transportpce/olm/stub/RpcProviderRegistryStub.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright © 2018 Orange Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -package org.opendaylight.transportpce.olm.stub; - -import org.opendaylight.controller.md.sal.common.api.routing.RouteChangeListener; -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; -import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; -import org.opendaylight.controller.sal.binding.api.rpc.RpcContextIdentifier; -import org.opendaylight.yangtools.concepts.ListenerRegistration; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.opendaylight.yangtools.yang.binding.RpcService; - -public class RpcProviderRegistryStub implements RpcProviderRegistry { - @Override public BindingAwareBroker.RpcRegistration addRpcImplementation( - Class serviceInterface, T implementation) throws IllegalStateException { - return new CompositeRoutedRpcRegistrationStub(serviceInterface, implementation, null); - } - - @Override public BindingAwareBroker.RoutedRpcRegistration addRoutedRpcImplementation( - Class serviceInterface, T implementation) throws IllegalStateException { - return null; - } - - @Override public >> ListenerRegistration registerRouteChangeListener(L listener) { - return null; - } - - @Override public T getRpcService(Class serviceInterface) { - return null; - } -} diff --git a/olm/src/test/java/org/opendaylight/transportpce/olm/stub/RpcProviderRegistryStub2.java b/olm/src/test/java/org/opendaylight/transportpce/olm/stub/RpcProviderRegistryStub2.java deleted file mode 100644 index a4a7e6062..000000000 --- a/olm/src/test/java/org/opendaylight/transportpce/olm/stub/RpcProviderRegistryStub2.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright © 2018 Orange Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -package org.opendaylight.transportpce.olm.stub; - -import org.opendaylight.controller.md.sal.common.api.routing.RouteChangeListener; -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; -import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; -import org.opendaylight.controller.sal.binding.api.rpc.RpcContextIdentifier; -import org.opendaylight.yangtools.concepts.ListenerRegistration; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.opendaylight.yangtools.yang.binding.RpcService; - -public class RpcProviderRegistryStub2 implements RpcProviderRegistry { - @Override public BindingAwareBroker.RpcRegistration addRpcImplementation( - Class serviceInterface, T implementation) throws IllegalStateException { - return null; - } - - @Override public BindingAwareBroker.RoutedRpcRegistration addRoutedRpcImplementation( - Class serviceInterface, T implementation) throws IllegalStateException { - return null; - } - - @Override public >> ListenerRegistration registerRouteChangeListener(L listener) { - return null; - } - - @Override public T getRpcService(Class serviceInterface) { - return null; - } -}