update 2: fix build/test errors in 4.19

Author: weizhouapache

server/src/test/java/com/cloud/network/vpc/NetworkACLServiceImplTest.java

@@ -622,8 +622,8 @@ public void validateProtocolTestProtocolIsStringValid() {
 
     @Test(expected = InvalidParameterValueException.class)
     public void validateProtocolTestProtocolNotIcmpWithIcmpConfigurations() {
-        Mockito.when(networkAclItemVoMock.getIcmpCode()).thenReturn(1);
-        Mockito.when(networkAclItemVoMock.getIcmpType()).thenReturn(1);
+        Mockito.when(networkAclItemVoMock.getIcmpCode()).thenReturn(2);
+        Mockito.when(networkAclItemVoMock.getIcmpType()).thenReturn(3);
 
         Mockito.when(networkAclItemVoMock.getProtocol()).thenReturn("tcp");
         networkAclServiceImpl.validateProtocol(networkAclItemVoMock);
@@ -647,8 +647,8 @@ public void validateProtocolTestProtocolNotIcmpWithSourcePorts() {
 
     @Test
     public void validateProtocolTestProtocolIcmpWithIcmpConfigurations() {
-        Mockito.when(networkAclItemVoMock.getIcmpCode()).thenReturn(1);
-        Mockito.when(networkAclItemVoMock.getIcmpType()).thenReturn(1);
+        Mockito.when(networkAclItemVoMock.getIcmpCode()).thenReturn(2);
+        Mockito.when(networkAclItemVoMock.getIcmpType()).thenReturn(3);
 
         Mockito.when(networkAclItemVoMock.getSourcePortStart()).thenReturn(null);
         Mockito.when(networkAclItemVoMock.getSourcePortEnd()).thenReturn(null);

utils/src/test/java/com/cloud/utils/net/NetUtilsTest.java

@@ -855,7 +855,6 @@ private void validateIcmpTypeAndCodeInternal(Integer icmpType, Integer icmpCode,
     }
 
     @Test
-    @PrepareForTest(NetUtils.class)
     public void validateIcmpTypeAndCodes() {
         validateIcmpTypeAndCodeInternal(-1, -1, true);
         validateIcmpTypeAndCodeInternal(3, 2, true);

utils/src/test/java/com/cloud/utils/net/NetworkProtocolsTest.java

@@ -23,10 +23,10 @@
 import org.junit.Test;
 
 import org.junit.runner.RunWith;
-import org.powermock.modules.junit4.PowerMockRunner;
+import org.mockito.runners.MockitoJUnitRunner;
 
 
-@RunWith(PowerMockRunner.class)
+@RunWith(MockitoJUnitRunner.class)
 public class NetworkProtocolsTest {
 
     @Test