From 6fdf10c92288db88259bb192716ccfa95dda796b Mon Sep 17 00:00:00 2001 From: Gilles Thouenon Date: Thu, 3 Mar 2022 13:48:23 +0100 Subject: [PATCH] Remove usage of deprecated initMocks method Replace deprecated initMocks method used in JUnit tests by openMocks method. JIRA: TRNSPRTPCE-627 Signed-off-by: Gilles Thouenon Change-Id: I117bfce864472d92e41f191af602561acc7a8d72 --- .../olm/service/OlmPowerServiceImplSpanLossBaseTest.java | 2 +- .../transportpce/olm/service/OlmPowerServiceImplTest.java | 2 +- .../opendaylight/transportpce/pce/PcePathDescriptionTests.java | 2 +- .../opendaylight/transportpce/pce/graph/PceGraphEdgeTest.java | 2 +- .../org/opendaylight/transportpce/pce/graph/PceGraphTest.java | 2 +- .../transportpce/pce/networkanalyzer/PceLinkTest.java | 2 +- .../transportpce/pce/networkanalyzer/PceOpticalNodeTest.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/olm/src/test/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImplSpanLossBaseTest.java b/olm/src/test/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImplSpanLossBaseTest.java index 79816bf2f..68db7160c 100644 --- a/olm/src/test/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImplSpanLossBaseTest.java +++ b/olm/src/test/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImplSpanLossBaseTest.java @@ -85,7 +85,7 @@ public class OlmPowerServiceImplSpanLossBaseTest extends AbstractTest { this.olmPowerService = new OlmPowerServiceImpl(getDataBroker(), this.powerMgmt, this.deviceTransactionManager, this.portMapping, this.mappingUtils, this.openRoadmInterfaces); this.dataBroker = getDataBroker(); - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); Mockito.doReturn(StringConstants.OPENROADM_DEVICE_VERSION_2_2_1).when(this.mappingUtils) .getOpenRoadmVersion(Mockito.anyString()); diff --git a/olm/src/test/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImplTest.java b/olm/src/test/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImplTest.java index 0bca3731f..879359200 100644 --- a/olm/src/test/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImplTest.java +++ b/olm/src/test/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImplTest.java @@ -137,7 +137,7 @@ public class OlmPowerServiceImplTest extends AbstractTest { this.olmPowerServiceMock = new OlmPowerServiceImpl(this.dataBroker, this.powerMgmtMock, this.deviceTransactionManager, this.portMapping, this.mappingUtils, this.openRoadmInterfaces); this.olmPowerServiceMock = Mockito.mock(OlmPowerServiceImpl.class); - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); } @Test diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/PcePathDescriptionTests.java b/pce/src/test/java/org/opendaylight/transportpce/pce/PcePathDescriptionTests.java index ebb322038..06a76ee71 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/PcePathDescriptionTests.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/PcePathDescriptionTests.java @@ -50,7 +50,7 @@ public class PcePathDescriptionTests extends AbstractTest { @Before public void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); // Build Link link = NodeUtils.createRoadmToRoadm("OpenROADM-3-2-DEG1", "OpenROADM-3-1-DEG1", diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/graph/PceGraphEdgeTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/graph/PceGraphEdgeTest.java index ef8bfbb27..f40dd2909 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/graph/PceGraphEdgeTest.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/graph/PceGraphEdgeTest.java @@ -37,7 +37,7 @@ public class PceGraphEdgeTest { @Before public void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); // Build Link link = NodeUtils.createRoadmToRoadm("OpenROADM-3-2-DEG1", "OpenROADM-3-1-DEG1", diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/graph/PceGraphTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/graph/PceGraphTest.java index 5ccd1d9ce..a743d5cfa 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/graph/PceGraphTest.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/graph/PceGraphTest.java @@ -55,7 +55,7 @@ public class PceGraphTest { @Before public void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); // Build Link link = NodeUtils.createRoadmToRoadm("OpenROADM-3-2-DEG1", "OpenROADM-3-1-DEG1", diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLinkTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLinkTest.java index c2ff8ac86..1dbb641f6 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLinkTest.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLinkTest.java @@ -68,7 +68,7 @@ public class PceLinkTest extends AbstractTest { @Before public void setup() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); } @Test diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNodeTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNodeTest.java index 0b01a1b7c..a1341acd0 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNodeTest.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNodeTest.java @@ -78,7 +78,7 @@ public class PceOpticalNodeTest extends AbstractTest { NodeBuilder node1Builder = getNodeBuilder(geSupportingNodes(), OpenroadmTpType.SRGTXRXPP); node = node1Builder.setNodeId(new NodeId("test")).build(); availableBitSet.set(0,8); - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); } @Test -- 2.36.6