[servicecomb-java-chassis] branch master updated: [SCB-2475] migrate provider-rest-common module to junit5 (#3426)

[liubao]

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

liubao 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 6ced3714b [SCB-2475] migrate provider-rest-common module to junit5 
(#3426)
6ced3714b is described below

commit 6ced3714b447564fc0d2fc48109ab15a2bd2d680
Author: TingTing Wang <1922919...@qq.com>
AuthorDate: Sat Oct 29 10:27:32 2022 +0800

    [SCB-2475] migrate provider-rest-common module to junit5 (#3426)
---
 .../rest/common/TestInvocationToHttpServletRequest.java        | 10 +++++-----
 .../provider/rest/common/TestProducerHttpRequestArgMapper.java |  2 +-
 .../servicecomb/provider/rest/common/TestRestProducers.java    |  2 +-
 .../provider/rest/common/TestRestServiceProvider.java          |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

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 6e20e7ac1..cba3c660e 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
@@ -33,12 +33,12 @@ import org.apache.servicecomb.core.definition.OperationMeta;
 import 
org.apache.servicecomb.foundation.common.exceptions.ServiceCombException;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
 
 import io.vertx.core.net.SocketAddress;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 public class TestInvocationToHttpServletRequest {
@@ -56,7 +56,7 @@ public class TestInvocationToHttpServletRequest {
 
   HttpServletRequest request;
 
-  @Before
+  @BeforeEach
   public void setup() {
     handlerContext.put(Const.REMOTE_ADDRESS, socketAddress);
     args = new HashMap<>();
@@ -67,7 +67,7 @@ public class TestInvocationToHttpServletRequest {
     request = new InvocationToHttpServletRequest(invocation);
   }
 
-  @After
+  @AfterEach
   public void tearDown() {
 
   }
diff --git 
a/providers/provider-rest-common/src/test/java/org/apache/servicecomb/provider/rest/common/TestProducerHttpRequestArgMapper.java
 
b/providers/provider-rest-common/src/test/java/org/apache/servicecomb/provider/rest/common/TestProducerHttpRequestArgMapper.java
index da41b423b..f338850d6 100644
--- 
a/providers/provider-rest-common/src/test/java/org/apache/servicecomb/provider/rest/common/TestProducerHttpRequestArgMapper.java
+++ 
b/providers/provider-rest-common/src/test/java/org/apache/servicecomb/provider/rest/common/TestProducerHttpRequestArgMapper.java
@@ -26,9 +26,9 @@ import org.apache.servicecomb.common.rest.RestConst;
 import org.apache.servicecomb.common.rest.definition.RestOperationMeta;
 import org.apache.servicecomb.core.Invocation;
 import org.apache.servicecomb.core.definition.OperationMeta;
-import org.junit.Test;
 
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 public class TestProducerHttpRequestArgMapper {
diff --git 
a/providers/provider-rest-common/src/test/java/org/apache/servicecomb/provider/rest/common/TestRestProducers.java
 
b/providers/provider-rest-common/src/test/java/org/apache/servicecomb/provider/rest/common/TestRestProducers.java
index c53b94340..bf54f656e 100644
--- 
a/providers/provider-rest-common/src/test/java/org/apache/servicecomb/provider/rest/common/TestRestProducers.java
+++ 
b/providers/provider-rest-common/src/test/java/org/apache/servicecomb/provider/rest/common/TestRestProducers.java
@@ -18,8 +18,8 @@
 package org.apache.servicecomb.provider.rest.common;
 
 import org.apache.servicecomb.foundation.test.scaffolding.spring.SpringUtils;
-import org.junit.Test;
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 public class TestRestProducers {
   @RestSchema(schemaId = "test")
diff --git 
a/providers/provider-rest-common/src/test/java/org/apache/servicecomb/provider/rest/common/TestRestServiceProvider.java
 
b/providers/provider-rest-common/src/test/java/org/apache/servicecomb/provider/rest/common/TestRestServiceProvider.java
index 747c6fa70..e7713afdd 100644
--- 
a/providers/provider-rest-common/src/test/java/org/apache/servicecomb/provider/rest/common/TestRestServiceProvider.java
+++ 
b/providers/provider-rest-common/src/test/java/org/apache/servicecomb/provider/rest/common/TestRestServiceProvider.java
@@ -19,8 +19,8 @@ package org.apache.servicecomb.provider.rest.common;
 
 import org.apache.servicecomb.common.rest.RestConst;
 import org.apache.servicecomb.foundation.common.utils.BeanUtils;
-import org.junit.Test;
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;
 import org.springframework.context.ApplicationContext;