(servicecomb-java-chassis) branch master updated: Migrate tracing module to junit5 (#4112)

[sh...@apache.org]

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 60668877d Migrate tracing module to junit5 (#4112)
60668877d is described below

commit 60668877da835e6eadd851227c671043a0e23c51
Author: pengxiangrui127 <67...@users.noreply.github.com>
AuthorDate: Sat Dec 9 21:23:24 2023 +0800

    Migrate tracing module to junit5 (#4112)
---
 .../apache/servicecomb/tracing/zipkin/ZipkinSpanAspectTest.java  | 9 +++------
 .../servicecomb/tracing/zipkin/ZipkinTracingAdviserTest.java     | 6 +++---
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/tracing/tracing-zipkin/src/test/java/org/apache/servicecomb/tracing/zipkin/ZipkinSpanAspectTest.java b/tracing/tracing-zipkin/src/test/java/org/apache/servicecomb/tracing/zipkin/ZipkinSpanAspectTest.java
index acccdc3fb..19970909b 100644
--- a/tracing/tracing-zipkin/src/test/java/org/apache/servicecomb/tracing/zipkin/ZipkinSpanAspectTest.java
+++ b/tracing/tracing-zipkin/src/test/java/org/apache/servicecomb/tracing/zipkin/ZipkinSpanAspectTest.java
@@ -34,14 +34,12 @@ import org.apache.servicecomb.tracing.zipkin.app.ZipkinSpanTestApplication;
 import org.apache.servicecomb.tracing.zipkin.app.ZipkinSpanTestApplication.CustomSpanTask;
 import org.apache.servicecomb.tracing.zipkin.app.ZipkinSpanTestApplication.SomeSlowTask;
 import org.hamcrest.MatcherAssert;
-import org.junit.After;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.test.context.junit4.SpringRunner;
 
 import brave.Tracing;
 import brave.propagation.StrictScopeDecorator;
@@ -49,7 +47,6 @@ import brave.propagation.ThreadLocalCurrentTraceContext;
 import zipkin2.Span;
 import zipkin2.reporter.brave.ZipkinSpanHandler;
 
-@RunWith(SpringRunner.class)
 @SpringBootTest(classes = {ZipkinSpanTestApplication.class, TracingConfig.class})
 public class ZipkinSpanAspectTest {
   private Queue<Span> spans;
@@ -83,7 +80,7 @@ public class ZipkinSpanAspectTest {
   public ZipkinSpanAspectTest() {
   }
 
-  @After
+  @AfterEach
   public void tearDown() throws Exception {
     tracing.close();
   }
diff --git a/tracing/tracing-zipkin/src/test/java/org/apache/servicecomb/tracing/zipkin/ZipkinTracingAdviserTest.java b/tracing/tracing-zipkin/src/test/java/org/apache/servicecomb/tracing/zipkin/ZipkinTracingAdviserTest.java
index 5b68f7324..60df34100 100644
--- a/tracing/tracing-zipkin/src/test/java/org/apache/servicecomb/tracing/zipkin/ZipkinTracingAdviserTest.java
+++ b/tracing/tracing-zipkin/src/test/java/org/apache/servicecomb/tracing/zipkin/ZipkinTracingAdviserTest.java
@@ -39,8 +39,6 @@ import java.util.stream.Collectors;
 
 import org.apache.servicecomb.tracing.zipkin.ZipkinTracingAdviser.ThrowableSupplier;
 import org.hamcrest.MatcherAssert;
-import org.junit.After;
-import org.junit.Test;
 
 import brave.Span;
 import brave.Tracer.SpanInScope;
@@ -48,7 +46,9 @@ import brave.Tracing;
 import brave.propagation.StrictScopeDecorator;
 import brave.propagation.ThreadLocalCurrentTraceContext;
 
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import zipkin2.reporter.brave.ZipkinSpanHandler;
 
@@ -76,7 +76,7 @@ public class ZipkinTracingAdviserTest {
 
   private final ZipkinTracingAdviser tracingAdviser = new ZipkinTracingAdviser(tracing.tracer());
 
-  @After
+  @AfterEach
   public void tearDown() throws Exception {
     tracing.close();
   }