[servicecomb-java-chassis] branch master updated: [SCB-2570] Bump jmockit from version from 1.30 to 1.31 (#3072)

[sh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

shoothzj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git


The following commit(s) were added to refs/heads/master by this push:
     new 8e33a7e6b [SCB-2570] Bump jmockit from version from 1.30 to 1.31 (#3072)
8e33a7e6b is described below

commit 8e33a7e6beab7bee8dec4ea2907492f5eef9a2bb
Author: LeKe <95...@users.noreply.github.com>
AuthorDate: Tue Jun 14 09:01:21 2022 +0800

    [SCB-2570] Bump jmockit from version from 1.30 to 1.31 (#3072)
---
 dependencies/default/pom.xml                          |  2 +-
 .../common/TestInvocationToHttpServletRequest.java    | 19 ++++++++-----------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/dependencies/default/pom.xml b/dependencies/default/pom.xml
index 03500993e..1013fa6b8 100644
--- a/dependencies/default/pom.xml
+++ b/dependencies/default/pom.xml
@@ -65,7 +65,7 @@
     <javax-resource.version>1.5</javax-resource.version>
     <jakarta.ws.rs.version>2.1.6</jakarta.ws.rs.version>
     <jersey.version>2.35</jersey.version>
-    <jmockit.version>1.30</jmockit.version>
+    <jmockit.version>1.31</jmockit.version>
     <junit.version>4.13.2</junit.version>
     <junit5.version>5.8.2</junit5.version>
     <log4j.version>1.2.17</log4j.version>
diff --git a/providers/provider-rest-common/src/test/java/org/apache/servicecomb/provider/rest/common/TestInvocationToHttpServletRequest.java b/providers/provider-rest-common/src/test/java/org/apache/servicecomb/provider/rest/common/TestInvocationToHttpServletRequest.java
index f94a0ef76..b6b395315 100644
--- a/providers/provider-rest-common/src/test/java/org/apache/servicecomb/provider/rest/common/TestInvocationToHttpServletRequest.java
+++ b/providers/provider-rest-common/src/test/java/org/apache/servicecomb/provider/rest/common/TestInvocationToHttpServletRequest.java
@@ -41,6 +41,7 @@ import io.vertx.core.net.SocketAddress;
 import mockit.Expectations;
 import mockit.Mocked;
 import org.junit.jupiter.api.Assertions;
+import org.mockito.Mockito;
 
 public class TestInvocationToHttpServletRequest {
   @Mocked
@@ -300,18 +301,14 @@ public class TestInvocationToHttpServletRequest {
   }
 
   @Test
-  public void testGetRemoteAddressEmpty(@Mocked Invocation invocation) throws Exception {
+  public void testGetRemoteAddressEmpty() throws Exception {
+    Invocation invocation = Mockito.mock(Invocation.class);
+
+    OperationMeta operationMeta = Mockito.mock(OperationMeta.class);
+    Mockito.when(operationMeta.getExtData(RestConst.SWAGGER_REST_OPERATION)).thenReturn(swaggerOperation);
+    Mockito.when(invocation.getOperationMeta()).thenReturn(operationMeta);
     handlerContext.remove(Const.REMOTE_ADDRESS);
-    new Expectations() {
-      {
-        invocation.getOperationMeta();
-        result = operationMeta;
-        operationMeta.getExtData(RestConst.SWAGGER_REST_OPERATION);
-        result = swaggerOperation;
-        invocation.getHandlerContext();
-        result = handlerContext;
-      }
-    };
+    Mockito.when(invocation.getHandlerContext()).thenReturn(handlerContext);
     InvocationToHttpServletRequest request = new InvocationToHttpServletRequest(invocation);
     String addr = request.getRemoteAddr();
     String host = request.getRemoteHost();