You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by sh...@apache.org on 2022/06/16 12:02:24 UTC

[servicecomb-java-chassis] branch master updated: [SCB-2576] migrate swagger-invocation-jaxrs module to junit5 (#3084)

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 3cbe0110e [SCB-2576] migrate swagger-invocation-jaxrs module to junit5 (#3084)
3cbe0110e is described below

commit 3cbe0110e15a81b7d06c9c873dbc6b30a8816c20
Author: TingTing Wang <19...@qq.com>
AuthorDate: Thu Jun 16 20:02:16 2022 +0800

    [SCB-2576] migrate swagger-invocation-jaxrs module to junit5 (#3084)
---
 .../response/TestJaxrsConsumerResponseMapper.java  |  6 ++--
 .../response/TestJaxrsProducerResponseMapper.java  | 36 ++++++++--------------
 .../TestJaxrsProducerResponseMapperFactory.java    |  2 +-
 3 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/swagger/swagger-invocation/invocation-jaxrs/src/test/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/TestJaxrsConsumerResponseMapper.java b/swagger/swagger-invocation/invocation-jaxrs/src/test/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/TestJaxrsConsumerResponseMapper.java
index 5125d78af..1112cb8ab 100644
--- a/swagger/swagger-invocation/invocation-jaxrs/src/test/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/TestJaxrsConsumerResponseMapper.java
+++ b/swagger/swagger-invocation/invocation-jaxrs/src/test/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/TestJaxrsConsumerResponseMapper.java
@@ -26,12 +26,12 @@ import org.apache.servicecomb.swagger.engine.SwaggerEnvironment;
 import org.apache.servicecomb.swagger.generator.SwaggerGenerator;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.junit.Before;
-import org.junit.Test;
 
 import io.swagger.annotations.ApiResponse;
 import io.swagger.models.Swagger;
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TestJaxrsConsumerResponseMapper {
   @Path("/")
@@ -51,7 +51,7 @@ public class TestJaxrsConsumerResponseMapper {
   org.apache.servicecomb.swagger.invocation.Response response = org.apache.servicecomb.swagger.invocation.Response
       .ok(result);
 
-  @Before
+  @BeforeEach
   public void setup() {
     Swagger swagger = SwaggerGenerator.generate(ConsumerResponseForTest.class);
     swaggerConsumer = environment.createConsumer(ConsumerResponseForTest.class, swagger);
diff --git a/swagger/swagger-invocation/invocation-jaxrs/src/test/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/TestJaxrsProducerResponseMapper.java b/swagger/swagger-invocation/invocation-jaxrs/src/test/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/TestJaxrsProducerResponseMapper.java
index 5b647eae6..3f7dcb72b 100644
--- a/swagger/swagger-invocation/invocation-jaxrs/src/test/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/TestJaxrsProducerResponseMapper.java
+++ b/swagger/swagger-invocation/invocation-jaxrs/src/test/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/TestJaxrsProducerResponseMapper.java
@@ -23,28 +23,21 @@ import javax.ws.rs.core.Response.Status;
 import org.apache.servicecomb.swagger.invocation.Response;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.junit.Test;
 
-import mockit.Expectations;
-import mockit.Mocked;
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
 
 public class TestJaxrsProducerResponseMapper {
   JaxrsProducerResponseMapper mapper = new JaxrsProducerResponseMapper();
 
-  @Mocked
-  javax.ws.rs.core.Response jaxrsResponse;
-
   @Test
   public void mapResponse_withoutHeaders() {
-    new Expectations() {
-      {
-        jaxrsResponse.getStatusInfo();
-        result = Status.OK;
-        jaxrsResponse.getEntity();
-        result = "result";
-      }
-    };
+    javax.ws.rs.core.Response jaxrsResponse = Mockito.mock(javax.ws.rs.core.Response.class);
+    Mockito.when(jaxrsResponse.getStatusInfo()).thenReturn(Status.OK);
+    Mockito.when(jaxrsResponse.getEntity()).thenReturn("result");
+    Mockito.when(jaxrsResponse.getHeaders()).thenReturn(new MultivaluedHashMap<>());
+
     Response response = mapper.mapResponse(null, jaxrsResponse);
     Assertions.assertEquals(Status.OK, response.getStatus());
     Assertions.assertEquals("result", response.getResult());
@@ -53,19 +46,14 @@ public class TestJaxrsProducerResponseMapper {
 
   @Test
   public void mapResponse_withHeaders() {
+    javax.ws.rs.core.Response jaxrsResponse = Mockito.mock(javax.ws.rs.core.Response.class);
+    Mockito.when(jaxrsResponse.getStatusInfo()).thenReturn(Status.OK);
+    Mockito.when(jaxrsResponse.getEntity()).thenReturn("result");
+
     MultivaluedMap<String, Object> headers = new MultivaluedHashMap<>();
     headers.add("h", "v");
+    Mockito.when(jaxrsResponse.getHeaders()).thenReturn(headers);
 
-    new Expectations() {
-      {
-        jaxrsResponse.getStatusInfo();
-        result = Status.OK;
-        jaxrsResponse.getEntity();
-        result = "result";
-        jaxrsResponse.getHeaders();
-        result = headers;
-      }
-    };
     Response response = mapper.mapResponse(null, jaxrsResponse);
     Assertions.assertEquals(Status.OK, response.getStatus());
     Assertions.assertEquals("result", response.getResult());
diff --git a/swagger/swagger-invocation/invocation-jaxrs/src/test/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/TestJaxrsProducerResponseMapperFactory.java b/swagger/swagger-invocation/invocation-jaxrs/src/test/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/TestJaxrsProducerResponseMapperFactory.java
index 304cc3963..8a1acf913 100644
--- a/swagger/swagger-invocation/invocation-jaxrs/src/test/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/TestJaxrsProducerResponseMapperFactory.java
+++ b/swagger/swagger-invocation/invocation-jaxrs/src/test/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/TestJaxrsProducerResponseMapperFactory.java
@@ -20,8 +20,8 @@ import javax.ws.rs.core.Response;
 
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.junit.Test;
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 public class TestJaxrsProducerResponseMapperFactory {
   JaxrsProducerResponseMapperFactory factory = new JaxrsProducerResponseMapperFactory();