From 13ecb41108a26e0d125e1f0cbeb6f587055a08fd Mon Sep 17 00:00:00 2001
From: lovehzj <1922919664@qq.com>
Date: Sun, 4 Sep 2022 23:02:38 +0800
Subject: [PATCH] [SCB-2475] migrate edge-core module to junit5

---
 .../edge/core/TestAbstractEdgeDispatcher.java          |  2 +-
 .../edge/core/TestDefaultEdgeDispatcher.java           | 10 +++++-----
 .../servicecomb/edge/core/TestEdgeBootListener.java    | 10 +++++-----
 .../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 06275aa2f1b..bbeceff2292 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 @@
 
 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 ff1aa62ad18..664815d98ed 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.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 185897e6b60..b9341c600c5 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.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 c68f83efc40..78057915fcc 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.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();
   }