[servicecomb-java-chassis] branch master updated: [SCB-2475] migrate edge-core module to junit5 (#3319)

[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 e76c120d3 [SCB-2475] migrate edge-core module to junit5 (#3319)
e76c120d3 is described below

commit e76c120d31952d2a8d369f7cb4283859f1122b8c
Author: TingTing Wang <1922919...@qq.com>
AuthorDate: Mon Sep 5 17:55:09 2022 +0800

    [SCB-2475] migrate edge-core module to junit5 (#3319)
---
 .../servicecomb/edge/core/TestAbstractEdgeDispatcher.java      |  2 +-
 .../servicecomb/edge/core/TestDefaultEdgeDispatcher.java       | 10 +++++-----
 .../org/apache/servicecomb/edge/core/TestEdgeBootListener.java | 10 +++++-----
 .../servicecomb/edge/core/TestURLMappedEdgeDispatcher.java     | 10 +++++-----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git 
a/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestAbstractEdgeDispatcher.java
 
b/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestAbstractEdgeDispatcher.java
index 06275aa2f..bbeceff22 100644
--- 
a/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestAbstractEdgeDispatcher.java
+++ 
b/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestAbstractEdgeDispatcher.java
@@ -19,11 +19,11 @@ package org.apache.servicecomb.edge.core;
 
 import 
org.apache.servicecomb.foundation.test.scaffolding.exception.RuntimeExceptionWithoutStackTrace;
 import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
-import org.junit.Test;
 
 import io.vertx.core.http.HttpServerResponse;
 import io.vertx.ext.web.Router;
 import io.vertx.ext.web.RoutingContext;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 public class TestAbstractEdgeDispatcher {
diff --git 
a/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestDefaultEdgeDispatcher.java
 
b/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestDefaultEdgeDispatcher.java
index ff1aa62ad..664815d98 100644
--- 
a/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestDefaultEdgeDispatcher.java
+++ 
b/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestDefaultEdgeDispatcher.java
@@ -25,25 +25,25 @@ import io.vertx.core.Vertx;
 import io.vertx.core.buffer.Buffer;
 import io.vertx.ext.web.RequestBody;
 import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
 
 import io.vertx.core.http.HttpServerRequest;
 import io.vertx.ext.web.Route;
 import io.vertx.ext.web.Router;
 import io.vertx.ext.web.RoutingContext;
+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.MockedStatic;
 import org.mockito.Mockito;
 
 public class TestDefaultEdgeDispatcher {
-  @Before
+  @BeforeEach
   public void setUp() {
 
   }
 
-  @After
+  @AfterEach
   public void tearDown() {
     ArchaiusUtils.resetConfig();
   }
diff --git 
a/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestEdgeBootListener.java
 
b/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestEdgeBootListener.java
index 185897e6b..b9341c600 100644
--- 
a/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestEdgeBootListener.java
+++ 
b/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestEdgeBootListener.java
@@ -21,24 +21,24 @@ import org.apache.servicecomb.core.BootListener.BootEvent;
 import org.apache.servicecomb.core.BootListener.EventType;
 import org.apache.servicecomb.core.executor.ExecutorManager;
 import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
 
 import com.netflix.config.DynamicPropertyFactory;
+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 TestEdgeBootListener {
   EdgeBootListener listener = new EdgeBootListener();
 
   BootEvent bootEvent = new BootEvent();
 
-  @Before
+  @BeforeEach
   public void setup() {
     ArchaiusUtils.resetConfig();
   }
 
-  @After
+  @AfterEach
   public void teardown() {
     ArchaiusUtils.resetConfig();
     System.clearProperty(ExecutorManager.KEY_EXECUTORS_DEFAULT);
diff --git 
a/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestURLMappedEdgeDispatcher.java
 
b/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestURLMappedEdgeDispatcher.java
index c68f83efc..78057915f 100644
--- 
a/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestURLMappedEdgeDispatcher.java
+++ 
b/edge/edge-core/src/test/java/org/apache/servicecomb/edge/core/TestURLMappedEdgeDispatcher.java
@@ -25,22 +25,22 @@ import io.vertx.core.buffer.Buffer;
 import io.vertx.ext.web.RequestBody;
 import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
 import org.apache.servicecomb.transport.rest.vertx.RestBodyHandler;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
 
 import io.vertx.core.http.HttpServerRequest;
 import io.vertx.ext.web.RoutingContext;
+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.MockedStatic;
 import org.mockito.Mockito;
 
 public class TestURLMappedEdgeDispatcher {
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
   }
 
-  @After
+  @AfterEach
   public void tearDown() {
     ArchaiusUtils.resetConfig();
   }