From a738204e8add24ee147ac81e22229bf6f6be95ad Mon Sep 17 00:00:00 2001
From: Vishesh <vishesh92@gmail.com>
Date: Fri, 28 Jul 2023 16:54:25 +0530
Subject: [PATCH] Remove powermock from nicira nvp (#7789)

---
 .../network/nicira/NiciraRestClient.java      |  2 +-
 .../network/nicira/NiciraRestClientTest.java  | 26 ++++++++-----------
 .../org.mockito.plugins.MockMaker             |  1 +
 3 files changed, 13 insertions(+), 16 deletions(-)
 create mode 100644 plugins/network-elements/nicira-nvp/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker

diff --git a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/nicira/NiciraRestClient.java b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/nicira/NiciraRestClient.java
index 73d08a0f1cb..a98480b11b3 100644
--- a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/nicira/NiciraRestClient.java
+++ b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/nicira/NiciraRestClient.java
@@ -76,7 +76,7 @@ public class NiciraRestClient extends BasicRestClient {
         return execute(request, 0);
     }
 
-    private CloseableHttpResponse execute(final HttpUriRequest request, final int previousStatusCode) throws CloudstackRESTException {
+    CloseableHttpResponse execute(final HttpUriRequest request, final int previousStatusCode) throws CloudstackRESTException {
         if (counter.hasReachedExecutionLimit()) {
             throw new CloudstackRESTException("Reached max executions limit of " + executionLimit);
         }
diff --git a/plugins/network-elements/nicira-nvp/src/test/java/com/cloud/network/nicira/NiciraRestClientTest.java b/plugins/network-elements/nicira-nvp/src/test/java/com/cloud/network/nicira/NiciraRestClientTest.java
index d23c4dcb5de..75b751c8ae1 100644
--- a/plugins/network-elements/nicira-nvp/src/test/java/com/cloud/network/nicira/NiciraRestClientTest.java
+++ b/plugins/network-elements/nicira-nvp/src/test/java/com/cloud/network/nicira/NiciraRestClientTest.java
@@ -26,11 +26,11 @@ import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.sameInstance;
 import static org.junit.Assert.fail;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static org.powermock.api.mockito.PowerMockito.spy;
-import static org.powermock.api.mockito.PowerMockito.verifyPrivate;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -47,18 +47,14 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import com.cloud.utils.rest.CloudstackRESTException;
 import com.cloud.utils.rest.HttpMethods;
 import com.cloud.utils.rest.HttpRequestMatcher;
 import com.cloud.utils.rest.HttpUriRequestBuilder;
 
-@RunWith(PowerMockRunner.class)
-@PrepareForTest(NiciraRestClient.class)
-@PowerMockIgnore({"javax.xml.*", "org.w3c.dom.*", "org.apache.xerces.*", "org.apache.log4j.*"})
+@RunWith(MockitoJUnitRunner.class)
 public class NiciraRestClientTest {
 
     private static final int HTTPS_PORT = 443;
@@ -120,7 +116,7 @@ public class NiciraRestClientTest {
 
         assertThat(response, notNullValue());
         assertThat(response, sameInstance(mockResponse));
-        verifyPrivate(client).invoke("execute", request, 0);
+        verify(client).execute(request, 0);
     }
 
     @Test
@@ -139,9 +135,9 @@ public class NiciraRestClientTest {
 
         assertThat(response, notNullValue());
         assertThat(response, sameInstance(mockResponse));
-        verifyPrivate(client).invoke("execute", HttpRequestMatcher.eq(request), eq(0));
-        verifyPrivate(client).invoke("execute", HttpRequestMatcher.eq(loginRequest), eq(401));
-        verifyPrivate(client).invoke("execute", HttpRequestMatcher.eq(request), eq(200));
+        verify(client).execute((HttpUriRequest)HttpRequestMatcher.eq(request), eq(0));
+        verify(client).execute((HttpUriRequest)HttpRequestMatcher.eq(request), eq(200));
+        verify(client).execute((HttpUriRequest)HttpRequestMatcher.eq(loginRequest), eq(401));
     }
 
     @Test
@@ -168,8 +164,8 @@ public class NiciraRestClientTest {
             fail("Expected CloudstackRESTException exception");
         } catch (final CloudstackRESTException e) {
             assertThat(e.getMessage(), not(isEmptyOrNullString()));
-            verifyPrivate(client).invoke("execute", HttpRequestMatcher.eq(request), eq(0));
-            verifyPrivate(client).invoke("execute", HttpRequestMatcher.eq(loginRequest), eq(401));
+            verify(client).execute((HttpUriRequest)HttpRequestMatcher.eq(request), eq(0));
+            verify(client).execute((HttpUriRequest)HttpRequestMatcher.eq(loginRequest), eq(401));
         }
     }
 
diff --git a/plugins/network-elements/nicira-nvp/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/plugins/network-elements/nicira-nvp/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
new file mode 100644
index 00000000000..1f0955d450f
--- /dev/null
+++ b/plugins/network-elements/nicira-nvp/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
@@ -0,0 +1 @@
+mock-maker-inline