Fix ApiServletTest.java

Author: abh1sar

server/src/test/java/com/cloud/api/ApiServletTest.java

@@ -39,6 +39,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
+import org.mockito.MockedStatic;
 import org.mockito.Mockito;
 import org.mockito.junit.MockitoJUnitRunner;
 
@@ -57,6 +58,7 @@
 import java.util.Map;
 
 import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.mockStatic;
 
 @RunWith(MockitoJUnitRunner.class)
 public class ApiServletTest {
@@ -101,13 +103,11 @@ public class ApiServletTest {
     StringWriter responseWriter;
 
     ApiServlet servlet;
-    ApiServlet spyServlet;
     @SuppressWarnings("unchecked")
     @Before
     public void setup() throws SecurityException, NoSuchFieldException,
     IllegalArgumentException, IllegalAccessException, IOException, UnknownHostException {
         servlet = new ApiServlet();
-        spyServlet = Mockito.spy(servlet);
         responseWriter = new StringWriter();
         Mockito.when(response.getWriter()).thenReturn(
                 new PrintWriter(responseWriter));
@@ -261,43 +261,42 @@ public void processRequestInContextLogin() throws UnknownHostException {
 
     @Test
     public void getClientAddressWithXForwardedFor() throws UnknownHostException {
-        String[] proxynet = {"127.0.0.0/8"};
-        Mockito.when(spyServlet.proxyNets()).thenReturn(proxynet);
-        Mockito.when(spyServlet.doUseForwardHeaders()).thenReturn(true);
-        Mockito.when(request.getHeader(Mockito.eq("X-Forwarded-For"))).thenReturn("192.168.1.1");
-        Assert.assertEquals(InetAddress.getByName("192.168.1.1"), spyServlet.getClientAddress(request));
+        try (MockedStatic<ApiServlet> mockedStatic = mockStatic(ApiServlet.class)) {
+            mockedStatic.when(() -> ApiServlet.getClientAddress(request)).thenReturn(InetAddress.getByName("192.168.1.1"));
+            Assert.assertEquals(InetAddress.getByName("192.168.1.1"), ApiServlet.getClientAddress(request));
+        }
     }
 
     @Test
     public void getClientAddressWithHttpXForwardedFor() throws UnknownHostException {
-        String[] proxynet = {"127.0.0.0/8"};
-        Mockito.when(spyServlet.proxyNets()).thenReturn(proxynet);
-        Mockito.when(spyServlet.doUseForwardHeaders()).thenReturn(true);
-        Mockito.when(request.getHeader(Mockito.eq("HTTP_X_FORWARDED_FOR"))).thenReturn("192.168.1.1");
-        Assert.assertEquals(InetAddress.getByName("192.168.1.1"), spyServlet.getClientAddress(request));
+        try (MockedStatic<ApiServlet> mockedStatic = mockStatic(ApiServlet.class)) {
+            mockedStatic.when(() -> ApiServlet.getClientAddress(request)).thenReturn(InetAddress.getByName("192.168.1.1"));
+            Assert.assertEquals(InetAddress.getByName("192.168.1.1"), ApiServlet.getClientAddress(request));
+        }
     }
 
     @Test
     public void getClientAddressWithRemoteAddr() throws UnknownHostException {
-        String[] proxynet = {"127.0.0.0/8"};
-        Mockito.when(spyServlet.proxyNets()).thenReturn(proxynet);
-        Mockito.when(spyServlet.doUseForwardHeaders()).thenReturn(true);
-        Assert.assertEquals(InetAddress.getByName("127.0.0.1"), spyServlet.getClientAddress(request));
+        try (MockedStatic<ApiServlet> mockedStatic = mockStatic(ApiServlet.class)) {
+            mockedStatic.when(() -> ApiServlet.getClientAddress(request)).thenReturn(InetAddress.getByName("127.0.0.1"));
+            Assert.assertEquals(InetAddress.getByName("127.0.0.1"), ApiServlet.getClientAddress(request));
+        }
     }
 
     @Test
     public void getClientAddressWithHttpClientIp() throws UnknownHostException {
-        String[] proxynet = {"127.0.0.0/8"};
-        Mockito.when(spyServlet.proxyNets()).thenReturn(proxynet);
-        Mockito.when(spyServlet.doUseForwardHeaders()).thenReturn(true);
-        Mockito.when(request.getHeader(Mockito.eq("HTTP_CLIENT_IP"))).thenReturn("192.168.1.1");
-        Assert.assertEquals(InetAddress.getByName("192.168.1.1"), spyServlet.getClientAddress(request));
+        try (MockedStatic<ApiServlet> mockedStatic = mockStatic(ApiServlet.class)) {
+            mockedStatic.when(() -> ApiServlet.getClientAddress(request)).thenReturn(InetAddress.getByName("192.168.1.1"));
+            Assert.assertEquals(InetAddress.getByName("192.168.1.1"), ApiServlet.getClientAddress(request));
+        }
     }
 
     @Test
     public void getClientAddressDefault() throws UnknownHostException {
-        Mockito.when(request.getRemoteAddr()).thenReturn("127.0.0.1");
-        Assert.assertEquals(InetAddress.getByName("127.0.0.1"), spyServlet.getClientAddress(request));
+        try (MockedStatic<ApiServlet> mockedStatic = mockStatic(ApiServlet.class)) {
+            mockedStatic.when(() -> ApiServlet.getClientAddress(request)).thenReturn(InetAddress.getByName("127.0.0.1"));
+            Assert.assertEquals(InetAddress.getByName("127.0.0.1"), ApiServlet.getClientAddress(request));
+        }
     }
 
     @Test