fix powermock issue 56/128056/2
authorjinquanni <ni.jinquan@zte.com.cn>
Thu, 24 Mar 2022 06:31:04 +0000 (14:31 +0800)
committerjinquanni <ni.jinquan@zte.com.cn>
Thu, 24 Mar 2022 06:57:45 +0000 (14:57 +0800)
Issue-ID: MSB-654

Signed-off-by: jinquanni <ni.jinquan@zte.com.cn>
Change-Id: I3a15714617673250f8b36e0bd828740101769186

26 files changed:
apiroute/apiroute-service/pom.xml
apiroute/apiroute-service/src/test/java/org/onap/msb/apiroute/SyncDataManagerTest.java
apiroute/apiroute-service/src/test/java/org/onap/msb/apiroute/health/ApiRouteHealthCheckTest.java
apiroute/apiroute-service/src/test/java/org/onap/msb/apiroute/health/ConsulLinkHealthCheckTest.java
apiroute/apiroute-service/src/test/java/org/onap/msb/apiroute/health/OpenRestyHealthCheckTest.java
apiroute/apiroute-service/src/test/java/org/onap/msb/apiroute/health/RedisHealthCheckTest.java
apiroute/apiroute-service/src/test/java/org/onap/msb/apiroute/wrapper/ApiRouteServiceWrapperTest.java
apiroute/apiroute-service/src/test/java/org/onap/msb/apiroute/wrapper/CustomRouteServiceWrapperTest.java
apiroute/apiroute-service/src/test/java/org/onap/msb/apiroute/wrapper/InitRouteServiceWrapperTest.java
apiroute/apiroute-service/src/test/java/org/onap/msb/apiroute/wrapper/IuiRouteServiceWrapperTest.java
apiroute/apiroute-service/src/test/java/org/onap/msb/apiroute/wrapper/MicroServiceWrapperTest.java
apiroute/apiroute-service/src/test/java/org/onap/msb/apiroute/wrapper/consulextend/ConsulTest.java
apiroute/apiroute-service/src/test/java/org/onap/msb/apiroute/wrapper/consulextend/expose/CheckServiceDataEmptyAndAutoStopWatchFilterTest.java
apiroute/apiroute-service/src/test/java/org/onap/msb/apiroute/wrapper/consulextend/expose/WatchCatalogServicesTaskTest.java
apiroute/apiroute-service/src/test/java/org/onap/msb/apiroute/wrapper/consulextend/expose/WatchServiceHealthTaskTest.java
apiroute/apiroute-service/src/test/java/org/onap/msb/apiroute/wrapper/queue/QueueManagerTest.java
apiroute/apiroute-service/src/test/java/org/onap/msb/apiroute/wrapper/service/ApiRouteServiceTest.java
apiroute/apiroute-service/src/test/java/org/onap/msb/apiroute/wrapper/service/CustomRouteServiceTest.java
apiroute/apiroute-service/src/test/java/org/onap/msb/apiroute/wrapper/service/IuiRouteServiceTest.java
apiroute/apiroute-service/src/test/java/org/onap/msb/apiroute/wrapper/service/MicroServiceFullServiceTest.java
apiroute/apiroute-service/src/test/java/org/onap/msb/apiroute/wrapper/serviceListener/MicroServiceChangeListenerTest.java
apiroute/apiroute-service/src/test/java/org/onap/msb/apiroute/wrapper/util/ConfigUtilTest.java
apiroute/apiroute-service/src/test/java/org/onap/msb/apiroute/wrapper/util/MicroServiceUtilTest.java
apiroute/apiroute-service/src/test/java/org/onap/msb/apiroute/wrapper/util/RouteUtilTest.java
apiroute/apiroute-service/src/test/java/org/onap/msb/apiroute/wrapper/util/ServiceFilterTest.java
apiroute/pom.xml

index e277265..9072d3e 100644 (file)
 
 
        <dependencies>
+           <dependency>
+            <groupId>org.javassist</groupId>
+            <artifactId>javassist</artifactId>
+            <version>3.23.1-GA</version>
+        </dependency>
                <dependency>
                        <groupId>io.dropwizard</groupId>
                        <artifactId>dropwizard-core</artifactId>
index 91ee211..095abc3 100644 (file)
@@ -28,7 +28,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({Http.class})
-@PowerMockIgnore({"javax.net.ssl.*"})
+@PowerMockIgnore({"javax.net.ssl.*", "jdk.internal.reflect.*"})
 public class SyncDataManagerTest {
 
     @SuppressWarnings("unchecked")
index a8223eb..8f19137 100644 (file)
@@ -24,9 +24,11 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.codahale.metrics.health.HealthCheck.Result;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({HttpClientUtil.class})
+@PowerMockIgnore("jdk.internal.reflect.*")
 public class ApiRouteHealthCheckTest {
     private static final Logger LOGGER = LoggerFactory.getLogger(ApiRouteHealthCheckTest.class);
 
index 2b1bc4f..50fd1ff 100644 (file)
@@ -22,11 +22,14 @@ import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
+import org.onap.msb.apiroute.health.ConsulLinkHealthCheck;
 
 import com.codahale.metrics.health.HealthCheck.Result;
 
 @RunWith(PowerMockRunner.class)
-@PrepareForTest({HttpClientUtil.class, ConsulLinkHealthCheck.class})
+@PrepareForTest({HttpClientUtil.class})
+@PowerMockIgnore("jdk.internal.reflect.*")
 public class ConsulLinkHealthCheckTest {
     private static final Logger LOGGER = LoggerFactory.getLogger(ConsulLinkHealthCheckTest.class);
 
index 2a22e5a..620adf7 100644 (file)
@@ -22,11 +22,15 @@ import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
+import org.onap.msb.apiroute.health.OpenRestyHealthCheck;
+
 
 import com.codahale.metrics.health.HealthCheck.Result;
 
 @RunWith(PowerMockRunner.class)
-@PrepareForTest({HttpClientUtil.class, OpenRestyHealthCheck.class})
+@PrepareForTest({HttpClientUtil.class})
+@PowerMockIgnore("jdk.internal.reflect.*")
 public class OpenRestyHealthCheckTest {
     private static final Logger LOGGER = LoggerFactory.getLogger(OpenRestyHealthCheckTest.class);
 
index 16b874e..95964af 100644 (file)
@@ -25,6 +25,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+
 import com.codahale.metrics.health.HealthCheck.Result;
 import com.fiftyonred.mock_jedis.MockJedisPool;
 
@@ -33,7 +34,7 @@ import redis.clients.jedis.JedisPoolConfig;
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({JedisUtil.class, RedisAccessWrapper.class})
-@PowerMockIgnore({"javax.management.*"})
+@PowerMockIgnore({"javax.management.*", "jdk.internal.reflect.*"})
 public class RedisHealthCheckTest {
     private static final Logger LOGGER = LoggerFactory.getLogger(RedisHealthCheckTest.class);
 
index 4f3176b..739143f 100644 (file)
@@ -47,7 +47,7 @@ import redis.clients.jedis.JedisPoolConfig;
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({JedisUtil.class, RouteUtil.class, RedisAccessWrapper.class})
-@PowerMockIgnore({"javax.management.*"})
+@PowerMockIgnore({"javax.management.*","jdk.internal.reflect.*"})
 public class ApiRouteServiceWrapperTest {
     private static ApiRouteServiceWrapper apiRouteServiceWrapper;
     private static Comparator<ApiRouteInfo> apiRouteComparator = null;
index d72c57c..ddc13f5 100644 (file)
@@ -44,7 +44,7 @@ import redis.clients.jedis.JedisPoolConfig;
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({JedisUtil.class, RouteUtil.class, RedisAccessWrapper.class})
-@PowerMockIgnore({"javax.management.*"})
+@PowerMockIgnore({"javax.management.*", "jdk.internal.reflect.*"})
 public class CustomRouteServiceWrapperTest {
 
     private static CustomRouteServiceWrapper customRouteServiceWrapper;
index e7b0e4c..086896c 100644 (file)
@@ -50,7 +50,7 @@ import redis.clients.jedis.JedisPoolConfig;
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({JedisUtil.class, RedisAccessWrapper.class, ConfigUtil.class, Http.class,
                 InitRouteServiceWrapper.class})
-@PowerMockIgnore({"javax.management.*", "javax.net.ssl.*"})
+@PowerMockIgnore({"javax.management.*", "javax.net.ssl.*", "jdk.internal.reflect.*"})
 public class InitRouteServiceWrapperTest {
     private static InitRouteServiceWrapper initRouteServiceWrapper;
     private static Consul consul;
index 8a5ceca..4da70f1 100644 (file)
@@ -45,7 +45,7 @@ import redis.clients.jedis.JedisPoolConfig;
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({JedisUtil.class, RouteUtil.class, RedisAccessWrapper.class})
-@PowerMockIgnore({"javax.management.*"})
+@PowerMockIgnore({"javax.management.*", "jdk.internal.reflect.*"})
 public class IuiRouteServiceWrapperTest {
     private static IuiRouteServiceWrapper iuiRouteServiceWrapper;
     private static Comparator<IuiRouteInfo> iuiRouteComparator = null;
index 516c5ed..9a34066 100644 (file)
@@ -45,7 +45,7 @@ import redis.clients.jedis.JedisPoolConfig;
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({JedisUtil.class, RedisAccessWrapper.class})
-@PowerMockIgnore({"javax.management.*"})
+@PowerMockIgnore({"javax.management.*", "jdk.internal.reflect.*"})
 public class MicroServiceWrapperTest {
     private static MicroServiceWrapper microServiceWrapper;
     private static Comparator<MicroServiceFullInfo> microServiceComparator = null;
index 71e6a84..bfda2a9 100644 (file)
@@ -40,7 +40,7 @@ import com.orbitz.consul.option.QueryOptions;
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({Http.class})
-@PowerMockIgnore({"javax.net.ssl.*"})
+@PowerMockIgnore({"javax.net.ssl.*", "jdk.internal.reflect.*"})
 public class ConsulTest {
     private static Consul consul10081;
     private static Consul consul8500;
index c0cf337..fff27a9 100644 (file)
@@ -26,7 +26,7 @@ import org.onap.msb.apiroute.wrapper.consulextend.model.health.ImmutableServiceH
 import org.onap.msb.apiroute.wrapper.consulextend.model.health.Service;
 import org.onap.msb.apiroute.wrapper.consulextend.model.health.ServiceHealth;
 import org.onap.msb.apiroute.wrapper.util.RouteUtil;
-
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import com.orbitz.consul.model.ConsulResponse;
 import com.orbitz.consul.model.health.ImmutableNode;
 
index 548639e..000bf29 100644 (file)
@@ -44,7 +44,7 @@ import com.orbitz.consul.option.QueryOptions;
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({Http.class})
-@PowerMockIgnore({"javax.net.ssl.*"})
+@PowerMockIgnore({"javax.net.ssl.*", "jdk.internal.reflect.*"})
 public class WatchCatalogServicesTaskTest {
     private static final Logger LOGGER = LoggerFactory.getLogger(WatchCatalogServicesTaskTest.class);
 
index 641c4c7..db1620e 100644 (file)
@@ -48,7 +48,7 @@ import com.orbitz.consul.option.QueryOptions;
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({Http.class})
-@PowerMockIgnore({"javax.net.ssl.*"})
+@PowerMockIgnore({"javax.net.ssl.*", "jdk.internal.reflect.*"})
 public class WatchServiceHealthTaskTest {
     private static final Logger LOGGER = LoggerFactory.getLogger(WatchServiceHealthTaskTest.class);
 
index 931c09d..aedda1e 100644 (file)
@@ -54,7 +54,7 @@ import com.orbitz.consul.model.health.ImmutableNode;
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({JedisUtil.class, RouteUtil.class, RedisAccessWrapper.class})
-@PowerMockIgnore({"javax.management.*"})
+@PowerMockIgnore({"javax.management.*", "jdk.internal.reflect.*"})
 public class QueueManagerTest {
     private static QueueManager queueManager;
 
index 76ad8f8..568593e 100644 (file)
@@ -44,7 +44,7 @@ import redis.clients.jedis.JedisPoolConfig;
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({JedisUtil.class, RedisAccessWrapper.class})
-@PowerMockIgnore({"javax.management.*"})
+@PowerMockIgnore({"javax.management.*", "jdk.internal.reflect.*"})
 public class ApiRouteServiceTest {
     private static ApiRouteService apiRouteService = null;
     private static Comparator<ApiRouteInfo> apiRouteComparator = null;
index 1e11c78..efae160 100644 (file)
@@ -44,7 +44,7 @@ import redis.clients.jedis.JedisPoolConfig;
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({JedisUtil.class, RedisAccessWrapper.class})
-@PowerMockIgnore({"javax.management.*"})
+@PowerMockIgnore({"javax.management.*", "jdk.internal.reflect.*"})
 public class CustomRouteServiceTest {
     private static CustomRouteService customRouteService = null;
     private static Comparator<CustomRouteInfo> customRouteComparator = null;
index 213c3d6..6286658 100644 (file)
@@ -44,7 +44,7 @@ import redis.clients.jedis.JedisPoolConfig;
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({JedisUtil.class, RedisAccessWrapper.class})
-@PowerMockIgnore({"javax.management.*"})
+@PowerMockIgnore({"javax.management.*", "jdk.internal.reflect.*"})
 public class IuiRouteServiceTest {
     private static IuiRouteService iuiRouteService = null;
     private static Comparator<IuiRouteInfo> iuiRouteComparator = null;
index 6e7200d..dab7e61 100644 (file)
@@ -49,7 +49,7 @@ import redis.clients.jedis.JedisPoolConfig;
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({JedisUtil.class, RedisAccessWrapper.class})
-@PowerMockIgnore({"javax.management.*"})
+@PowerMockIgnore({"javax.management.*", "jdk.internal.reflect.*"})
 public class MicroServiceFullServiceTest {
     private static MicroServiceFullService microServiceFullService = null;
     private static Comparator<MicroServiceFullInfo> serviceComparator = null;
index 10c50f4..b7068eb 100644 (file)
@@ -53,7 +53,7 @@ import redis.clients.jedis.JedisPoolConfig;
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({JedisUtil.class, ConfigUtil.class, HttpClientUtil.class, RedisAccessWrapper.class,})
-@PowerMockIgnore({"javax.management.*"})
+@PowerMockIgnore({"javax.management.*", "jdk.internal.reflect.*"})
 public class MicroServiceChangeListenerTest {
     private static RouteNotify routeInstance;
     private static ApiRouteServiceWrapper apiRouteServiceWrapper;
index 51a06df..72c3cc4 100644 (file)
@@ -25,9 +25,11 @@ import org.onap.msb.apiroute.api.DiscoverInfo;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({ConfigUtil.class})
+@PowerMockIgnore("jdk.internal.reflect.*")
 public class ConfigUtilTest {
 
     @Test
index 2b622a4..8b13531 100644 (file)
@@ -21,9 +21,11 @@ import org.junit.runner.RunWith;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({HttpServletRequest.class})
+@PowerMockIgnore("jdk.internal.reflect.*")
 public class MicroServiceUtilTest {
 
     @Test
index 4fb59a1..b2b096b 100644 (file)
@@ -27,9 +27,11 @@ import org.onap.msb.apiroute.api.exception.UnprocessableEntityException;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({ConfigUtil.class})
+@PowerMockIgnore("jdk.internal.reflect.*")
 public class RouteUtilTest {
 
     @Test
index 5759014..1f14b18 100644 (file)
@@ -34,11 +34,12 @@ import org.onap.msb.apiroute.wrapper.util.ServiceFilter;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
-
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import com.orbitz.consul.model.health.ImmutableNode;
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({ConfigUtil.class})
+@PowerMockIgnore("jdk.internal.reflect.*")
 public class ServiceFilterTest {
 
 
index 104e375..9acb7a4 100644 (file)
@@ -60,7 +60,7 @@
                <swagger.version>1.5.8</swagger.version>
 
                <jedis.version>2.7.3</jedis.version>
-               <lombok.version>1.16.16</lombok.version>
+               <lombok.version>1.16.22</lombok.version>
                <junit.version>4.11</junit.version>
                <powermock.version>1.6.6</powermock.version>
                <consul-client.version>0.13.8</consul-client.version>