[servicecomb-java-chassis] branch master updated: [SCB-2475] migrate transport-rest-client module to junit5 (#3091)

[li...@apache.org]

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 101aa44a5 [SCB-2475] migrate transport-rest-client module to junit5 (#3091)
101aa44a5 is described below

commit 101aa44a52a8646b60eaf004156d26ad375c1dc3
Author: TingTing Wang <19...@qq.com>
AuthorDate: Fri Jun 17 10:19:32 2022 +0800

    [SCB-2475] migrate transport-rest-client module to junit5 (#3091)
---
 .../transport/rest/client/TestRestTransportClient.java         | 10 +++++-----
 .../transport/rest/client/TestTransportClientConfig.java       | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/TestRestTransportClient.java b/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/TestRestTransportClient.java
index 638dc11b1..da01bfa51 100644
--- a/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/TestRestTransportClient.java
+++ b/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/TestRestTransportClient.java
@@ -21,10 +21,10 @@ import org.apache.servicecomb.common.rest.RestConst;
 import org.apache.servicecomb.core.Invocation;
 import org.apache.servicecomb.core.definition.OperationMeta;
 import org.apache.servicecomb.swagger.invocation.AsyncResponse;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+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 TestRestTransportClient {
@@ -38,12 +38,12 @@ public class TestRestTransportClient {
   OperationMeta operationMeta = Mockito.mock(OperationMeta.class);
 
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     instance = new RestTransportClient();
   }
 
-  @After
+  @AfterEach
   public void tearDown() throws Exception {
     instance = null;
   }
diff --git a/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/TestTransportClientConfig.java b/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/TestTransportClientConfig.java
index 27fa2b3d6..10f43c23c 100644
--- a/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/TestTransportClientConfig.java
+++ b/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/TestTransportClientConfig.java
@@ -18,19 +18,19 @@
 package org.apache.servicecomb.transport.rest.client;
 
 import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TestTransportClientConfig {
 
-  @Before
+  @BeforeEach
   public void before() {
     ArchaiusUtils.resetConfig();
   }
 
-  @After
+  @AfterEach
   public void after() {
     ArchaiusUtils.resetConfig();
   }