fix powerMock and mockito versions mismatch

this was causing failures in OLM PowerMgmtPowerMockTest Junit
and in OlmPowerServiceImplTest that is not completely fixed yet.

JIRA: TRNSPRTPCE-180
Change-Id: I0937f92c63a3999314dcb36ec0b02a65a46d5ff5
Signed-off-by: Ahmed Abbas <ahmad.helmy@orange.com>

diff --git a/olm/pom.xml b/olm/pom.xml
index f5ca9820852e8268385282a2ccb10da5745f5f67..18aa436e9143ceada9626ea6a77dcf3ed7b719a9 100644 (file)
--- a/olm/pom.xml
+++ b/olm/pom.xml
@@ -30,14 +30,28 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <version>${project.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>2.25.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-core</artifactId>
+      <version>2.0.2</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-api-mockito2</artifactId>
+      <version>2.0.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-module-junit4</artifactId>
+      <version>2.0.2</version>
       <scope>test</scope>
     </dependency>
 

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 345fcb6305aa51cd46919bf31bd32fcc6ed6baa6..7656d2a30e41559bd8a3813ade3a54be4785df43 100644 (file)
--- a/olm/src/test/java/org/opendaylight/transportpce/olm/power/PowerMgmtPowerMockTest.java
+++ b/olm/src/test/java/org/opendaylight/transportpce/olm/power/PowerMgmtPowerMockTest.java
@@ -15,7 +15,6 @@ import java.util.Map;
 import java.util.Optional;
 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;
@@ -117,7 +116,6 @@ public class PowerMgmtPowerMockTest extends AbstractTest {
                 this.deviceTransactionManager);
     }
 
-    @Ignore
     @Test
     public void testSetPowerMockingUtil() {
         PowerMockito.mockStatic(OlmUtils.class);
@@ -129,7 +127,6 @@ public class PowerMgmtPowerMockTest extends AbstractTest {
 
     }
 
-    @Ignore
     @Test
     public void testSetPowerMockingUtilNetwokType() throws OpenRoadmInterfaceException {
         PowerMockito.mockStatic(OlmUtils.class);
@@ -151,7 +148,6 @@ public class PowerMgmtPowerMockTest extends AbstractTest {
 
     }
 
-    @Ignore
     @Test
     public void testSetPowerMockingUtilNetwokTypeMoreThanOneNode() throws OpenRoadmInterfaceException {
         PowerMockito.mockStatic(OlmUtils.class);
@@ -173,7 +169,6 @@ public class PowerMgmtPowerMockTest extends AbstractTest {
 
     }
 
-    @Ignore
     @Test
     public void testSetPowerXpdrNodes() {
         PowerMockito.mockStatic(OlmUtils.class);
@@ -185,7 +180,6 @@ public class PowerMgmtPowerMockTest extends AbstractTest {
 
     }
 
-    @Ignore
     @Test
     public void testSetPowerRdmNodesReturnInterfaceEmpty() throws OpenRoadmInterfaceException {
         PowerMockito.mockStatic(OlmUtils.class);
@@ -200,7 +194,6 @@ public class PowerMgmtPowerMockTest extends AbstractTest {
         Assert.assertEquals(false, output);
     }
 
-    @Ignore
     @Test
     public void testSetPowerRdmNodesThrowsException() throws OpenRoadmInterfaceException {
         PowerMockito.mockStatic(OlmUtils.class);
@@ -215,7 +208,6 @@ public class PowerMgmtPowerMockTest extends AbstractTest {
         Assert.assertEquals(false, output);
     }
 
-    @Ignore
     @Test
     public void testSetPowerRdmNodesReturnInterface() throws OpenRoadmInterfaceException {
         PowerMockito.mockStatic(OlmUtils.class);