X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=olm%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Folm%2Fpower%2FPowerMgmtPowerMockTest.java;h=0a8d34d9911a6da4e46b955c78244df9004244c9;hb=refs%2Fchanges%2F46%2F100646%2F27;hp=bbce9663bce7f8bbef43d00e3418b42f9c448012;hpb=a2c0845af51f68102d9f32df83cdfa93fbf9bb35;p=transportpce.git diff --git a/olm/src/test/java/org/opendaylight/transportpce/olm/power/PowerMgmtPowerMockTest.java b/olm/src/test/java/org/opendaylight/transportpce/olm/power/PowerMgmtPowerMockTest.java index bbce9663b..0a8d34d99 100644 --- a/olm/src/test/java/org/opendaylight/transportpce/olm/power/PowerMgmtPowerMockTest.java +++ b/olm/src/test/java/org/opendaylight/transportpce/olm/power/PowerMgmtPowerMockTest.java @@ -8,7 +8,6 @@ package org.opendaylight.transportpce.olm.power; -import java.math.BigDecimal; import java.util.HashMap; import java.util.Map; import java.util.Optional; @@ -16,7 +15,6 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -import org.junit.runner.RunWith; import org.mockito.ArgumentMatchers; import org.mockito.Mockito; import org.opendaylight.mdsal.binding.api.MountPoint; @@ -48,15 +46,13 @@ import org.opendaylight.transportpce.olm.util.OlmPowerServiceRpcImplUtil; import org.opendaylight.transportpce.olm.util.OlmUtils; import org.opendaylight.transportpce.test.AbstractTest; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.ServicePowerSetupInput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.Network; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.OpenroadmNodeVersion; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.mapping.Mapping; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.mapping.MappingBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.mapping.MappingKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.network.Nodes; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.network.NodesBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.network.NodesKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.network.nodes.NodeInfoBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.OpenroadmNodeVersion; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.mapping.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.mapping.MappingBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.mapping.MappingKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.network.Nodes; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.network.NodesBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.network.nodes.NodeInfoBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.OpticalControlMode; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.RatioDB; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.interfaces.grp.InterfaceBuilder; @@ -64,16 +60,9 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.device.types.rev191129.No import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces.rev161014.Interface1Builder; import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces.rev161014.ots.container.Ots; import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces.rev161014.ots.container.OtsBuilder; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.powermock.api.mockito.PowerMockito; -import org.powermock.core.classloader.annotations.PowerMockIgnore; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; +import org.opendaylight.yangtools.yang.common.Decimal64; @Ignore -@RunWith(PowerMockRunner.class) -@PrepareForTest({OlmUtils.class,PowerMgmtVersion121.class}) -@PowerMockIgnore("org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.openroadm.device.container.*") public class PowerMgmtPowerMockTest extends AbstractTest { private MountPoint mountPoint; @@ -128,8 +117,8 @@ public class PowerMgmtPowerMockTest extends AbstractTest { @Test public void testSetPowerMockingUtil() { - PowerMockito.mockStatic(OlmUtils.class); - PowerMockito.when(OlmUtils.getNode(Mockito.anyString(), ArgumentMatchers.eq(getDataBroker()))) + Mockito.mockStatic(OlmUtils.class); + Mockito.when(OlmUtils.getNode(Mockito.anyString(), ArgumentMatchers.eq(getDataBroker()))) .thenReturn(Optional.of(getXpdrNodesFromNodesBuilderDeg())); ServicePowerSetupInput input = OlmPowerServiceRpcImplUtil.getServicePowerSetupInput2(); boolean output = this.powerMgmt.setPower(input); @@ -139,17 +128,17 @@ public class PowerMgmtPowerMockTest extends AbstractTest { @Test public void testSetPowerMockingUtilNetwokType() throws OpenRoadmInterfaceException { - PowerMockito.mockStatic(OlmUtils.class); - PowerMockito.mockStatic(PowerMgmtVersion121.class); - PowerMockito.when(OlmUtils.getNode(Mockito.anyString(), ArgumentMatchers.eq(getDataBroker()))) + Mockito.mockStatic(OlmUtils.class); + Mockito.mockStatic(PowerMgmtVersion121.class); + Mockito.when(OlmUtils.getNode(Mockito.anyString(), ArgumentMatchers.eq(getDataBroker()))) .thenReturn(Optional.of(getXpdrNodesFromNodesBuilderNetwork())); Map txPowerRangeMap = new HashMap<>(); - PowerMockito.when(PowerMgmtVersion121.getXponderPowerRange( + Mockito.when(PowerMgmtVersion121.getXponderPowerRange( Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), ArgumentMatchers.eq(deviceTransactionManager))) .thenReturn(txPowerRangeMap); ServicePowerSetupInput input = OlmPowerServiceRpcImplUtil.getServicePowerSetupInput2(); - OpenRoadmInterfacesImpl121 openRoadmInterfacesImpl121Spy = PowerMockito.mock(OpenRoadmInterfacesImpl121.class); + OpenRoadmInterfacesImpl121 openRoadmInterfacesImpl121Spy = Mockito.mock(OpenRoadmInterfacesImpl121.class); Mockito.when(openRoadmInterfacesImpl121Spy.getInterface(Mockito.anyString(), Mockito.anyString())) .thenReturn(Optional.empty()); PowerMgmtImpl powerMgmtImpl = getNewPowerMgmt(openRoadmInterfacesImpl121Spy,this.crossConnect); @@ -160,17 +149,17 @@ public class PowerMgmtPowerMockTest extends AbstractTest { @Test public void testSetPowerMockingUtilNetwokTypeMoreThanOneNode() throws OpenRoadmInterfaceException { - PowerMockito.mockStatic(OlmUtils.class); - PowerMockito.mockStatic(PowerMgmtVersion121.class); - PowerMockito.when(OlmUtils.getNode(Mockito.anyString(), ArgumentMatchers.eq(getDataBroker()))) + Mockito.mockStatic(OlmUtils.class); + Mockito.mockStatic(PowerMgmtVersion121.class); + Mockito.when(OlmUtils.getNode(Mockito.anyString(), ArgumentMatchers.eq(getDataBroker()))) .thenReturn(Optional.of(getXpdrNodesFromNodesBuilderNetwork())); Map txPowerRangeMap = new HashMap<>(); - PowerMockito.when(PowerMgmtVersion121 + Mockito.when(PowerMgmtVersion121 .getXponderPowerRange(Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), ArgumentMatchers.eq(deviceTransactionManager))) .thenReturn(txPowerRangeMap); ServicePowerSetupInput input = OlmPowerServiceRpcImplUtil.getServicePowerSetupInput2(); - OpenRoadmInterfacesImpl121 openRoadmInterfacesImpl121Spy = PowerMockito.mock(OpenRoadmInterfacesImpl121.class); + OpenRoadmInterfacesImpl121 openRoadmInterfacesImpl121Spy = Mockito.mock(OpenRoadmInterfacesImpl121.class); Mockito.when(openRoadmInterfacesImpl121Spy.getInterface(Mockito.anyString(), Mockito.anyString())) .thenReturn(Optional.empty()); PowerMgmtImpl powerMgmtImpl = getNewPowerMgmt(openRoadmInterfacesImpl121Spy,this.crossConnect); @@ -181,8 +170,8 @@ public class PowerMgmtPowerMockTest extends AbstractTest { @Test public void testSetPowerXpdrNodes() { - PowerMockito.mockStatic(OlmUtils.class); - PowerMockito.when(OlmUtils.getNode(Mockito.anyString(), ArgumentMatchers.eq(getDataBroker()))) + Mockito.mockStatic(OlmUtils.class); + Mockito.when(OlmUtils.getNode(Mockito.anyString(), ArgumentMatchers.eq(getDataBroker()))) .thenReturn(Optional.of(getXpdrNodesFromNodesBuilderDeg())); ServicePowerSetupInput input = OlmPowerServiceRpcImplUtil.getServicePowerSetupInput3(); boolean output = this.powerMgmt.setPower(input); @@ -192,11 +181,11 @@ public class PowerMgmtPowerMockTest extends AbstractTest { @Test public void testSetPowerRdmNodesReturnInterfaceEmpty() throws OpenRoadmInterfaceException { - PowerMockito.mockStatic(OlmUtils.class); + Mockito.mockStatic(OlmUtils.class); Mockito.when(OlmUtils.getNode(Mockito.anyString(), ArgumentMatchers.eq(getDataBroker()))) .thenReturn(Optional.of(getRdmNodesFromNodesBuilder())); ServicePowerSetupInput input = OlmPowerServiceRpcImplUtil.getServicePowerSetupInput3(); - OpenRoadmInterfacesImpl121 openRoadmInterfacesImpl121Spy = PowerMockito.mock(OpenRoadmInterfacesImpl121.class); + OpenRoadmInterfacesImpl121 openRoadmInterfacesImpl121Spy = Mockito.mock(OpenRoadmInterfacesImpl121.class); Mockito.when(openRoadmInterfacesImpl121Spy.getInterface(Mockito.anyString(), Mockito.anyString())) .thenReturn(Optional.empty()); PowerMgmtImpl powerMgmtImpl = getNewPowerMgmt(openRoadmInterfacesImpl121Spy,this.crossConnect); @@ -206,11 +195,11 @@ public class PowerMgmtPowerMockTest extends AbstractTest { @Test public void testSetPowerRdmNodesThrowsException() throws OpenRoadmInterfaceException { - PowerMockito.mockStatic(OlmUtils.class); + Mockito.mockStatic(OlmUtils.class); Mockito.when(OlmUtils.getNode(Mockito.anyString(), ArgumentMatchers.eq(getDataBroker()))) .thenReturn(Optional.of(getRdmNodesFromNodesBuilder())); ServicePowerSetupInput input = OlmPowerServiceRpcImplUtil.getServicePowerSetupInput3(); - OpenRoadmInterfacesImpl121 openRoadmInterfacesImpl121Spy = PowerMockito.mock(OpenRoadmInterfacesImpl121.class); + OpenRoadmInterfacesImpl121 openRoadmInterfacesImpl121Spy = Mockito.mock(OpenRoadmInterfacesImpl121.class); Mockito.when(openRoadmInterfacesImpl121Spy.getInterface(Mockito.anyString(), Mockito.anyString())) .thenThrow(new OpenRoadmInterfaceException("error thrown by unit tests ")); PowerMgmtImpl powerMgmtImpl = getNewPowerMgmt(openRoadmInterfacesImpl121Spy,this.crossConnect); @@ -220,13 +209,13 @@ public class PowerMgmtPowerMockTest extends AbstractTest { @Test public void testSetPowerRdmNodesReturnInterface() throws OpenRoadmInterfaceException { - PowerMockito.mockStatic(OlmUtils.class); + Mockito.mockStatic(OlmUtils.class); Mockito.when(OlmUtils.getNode(Mockito.anyString(), ArgumentMatchers.eq(getDataBroker()))) .thenReturn(Optional.of(getRdmNodesFromNodesBuilder())); ServicePowerSetupInput input = OlmPowerServiceRpcImplUtil.getServicePowerSetupInput3(); - OpenRoadmInterfacesImpl121 openRoadmInterfacesImpl121Spy = PowerMockito.mock(OpenRoadmInterfacesImpl121.class); + OpenRoadmInterfacesImpl121 openRoadmInterfacesImpl121Spy = Mockito.mock(OpenRoadmInterfacesImpl121.class); - Ots ots = new OtsBuilder().setSpanLossTransmit(new RatioDB(new BigDecimal(23))).build(); + Ots ots = new OtsBuilder().setSpanLossTransmit(new RatioDB(Decimal64.valueOf("23"))).build(); Interface1Builder intf1Builder = new Interface1Builder(); Mockito.when(openRoadmInterfacesImpl121Spy.getInterface(Mockito.anyString(), Mockito.anyString())).thenReturn( Optional.of(new InterfaceBuilder().addAugmentation(intf1Builder.setOts(ots).build()) @@ -245,7 +234,7 @@ public class PowerMgmtPowerMockTest extends AbstractTest { OpenRoadmInterfacesImpl openRoadmInterfacesSpy = new OpenRoadmInterfacesImpl((this.deviceTransactionManager), this.mappingUtils, openRoadmInterfacesImpl121Spy, this.openRoadmInterfacesImpl22, this.openRoadmInterfacesImpl710); - openRoadmInterfacesSpy = PowerMockito.spy(openRoadmInterfacesSpy); + openRoadmInterfacesSpy = Mockito.spy(openRoadmInterfacesSpy); return new PowerMgmtImpl(getDataBroker(), openRoadmInterfacesSpy, crossConnectMock, this.deviceTransactionManager); } @@ -282,33 +271,24 @@ public class PowerMgmtPowerMockTest extends AbstractTest { } private MappingBuilder getMappingBuilderDeg() { - MappingBuilder mappingBuilder = new MappingBuilder(); - mappingBuilder.withKey(new MappingKey("deg")); - mappingBuilder.setLogicalConnectionPoint("logicalConnPoint"); - mappingBuilder.setSupportingOts("OTS"); - mappingBuilder.setSupportingCircuitPackName("2/0"); - mappingBuilder.setSupportingOms("OMS"); - mappingBuilder.setSupportingPort("8080"); - mappingBuilder.setSupportingCircuitPackName("circuit1"); - InstanceIdentifier portMappingIID = - InstanceIdentifier.builder(Network.class).child(Nodes.class, new NodesKey("node 1")) - .child(Mapping.class, new MappingKey("deg")).build(); - return mappingBuilder; + return new MappingBuilder() + .withKey(new MappingKey("deg")) + .setLogicalConnectionPoint("logicalConnPoint") + .setSupportingOts("OTS") + .setSupportingCircuitPackName("2/0") + .setSupportingOms("OMS") + .setSupportingPort("8080") + .setSupportingCircuitPackName("circuit1"); } private MappingBuilder getMappingBuilderNetWork() { - MappingBuilder mappingBuilder = new MappingBuilder(); - mappingBuilder.withKey(new MappingKey("network")); - mappingBuilder.setLogicalConnectionPoint("logicalConnPoint"); - mappingBuilder.setSupportingOts("OTS"); - mappingBuilder.setSupportingCircuitPackName("2/0"); - mappingBuilder.setSupportingOms("OMS"); - mappingBuilder.setSupportingPort("8080"); - mappingBuilder.setSupportingCircuitPackName("circuit1"); - InstanceIdentifier portMappingIID = - InstanceIdentifier.builder(Network.class).child(Nodes.class, new NodesKey("node 1")) - .child(Mapping.class, new MappingKey("network")).build(); - return mappingBuilder; + return new MappingBuilder() + .withKey(new MappingKey("network")) + .setLogicalConnectionPoint("logicalConnPoint") + .setSupportingOts("OTS") + .setSupportingCircuitPackName("2/0") + .setSupportingOms("OMS") + .setSupportingPort("8080") + .setSupportingCircuitPackName("circuit1"); } - }