refactor: migrates from JUnit 4 to JUnit 5 (Jupiter)

activemq-client/src/test/java/zipkin2/reporter/activemq/ITActiveMQSender.java

@@ -38,7 +38,7 @@
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @Timeout(60)
-public class ITActiveMQSender {
+class ITActiveMQSender {
   @RegisterExtension ActiveMQExtension activemq = new ActiveMQExtension();
 
   @Test void checkPasses() {

amqp-client/src/test/java/zipkin2/reporter/amqp/RabbitMQSenderTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 The OpenZipkin Authors
+ * Copyright 2016-2023 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -13,7 +13,7 @@
  */
 package zipkin2.reporter.amqp;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import zipkin2.CheckResult;
 import zipkin2.reporter.AsyncReporter;
 import zipkin2.reporter.ClosedSenderException;
@@ -24,19 +24,19 @@
 import static zipkin2.TestObjects.CLIENT_SPAN;
 import static zipkin2.reporter.amqp.ITRabbitMQSender.send;
 
-public class RabbitMQSenderTest {
+class RabbitMQSenderTest {
   // We can be pretty certain RabbitMQ isn't running on localhost port 80
   RabbitMQSender sender = RabbitMQSender.newBuilder()
       .connectionTimeout(100).addresses("localhost:80").build();
 
-  @Test public void checkFalseWhenRabbitMQIsDown() {
+  @Test void checkFalseWhenRabbitMQIsDown() {
     CheckResult check = sender.check();
     assertThat(check.ok()).isFalse();
     assertThat(check.error())
         .isInstanceOf(RuntimeException.class);
   }
 
-  @Test public void illegalToSendWhenClosed() throws Exception {
+  @Test void illegalToSendWhenClosed() throws Exception {
     sender.close();
 
     assertThatThrownBy(() -> send(sender, CLIENT_SPAN, CLIENT_SPAN))
@@ -49,7 +49,7 @@ public class RabbitMQSenderTest {
    * tools, care should be taken to ensure the toString() output is a reasonable length and does not
    * contain sensitive information.
    */
-  @Test public void toStringContainsOnlySummaryInformation() {
+  @Test void toStringContainsOnlySummaryInformation() {
     assertThat(sender).hasToString(
         "RabbitMQSender{addresses=[localhost:80], queue=zipkin}"
     );

benchmarks/pom.xml

@@ -120,11 +120,6 @@
        https://github.com/charithe/kafka-junit -->
       <version>4.2.10</version>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>${junit.version}</version>
-    </dependency>
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>

brave/src/test/java/zipkin2/reporter/brave/BasicUsageTest_Async.java

@@ -15,13 +15,12 @@
 
 import java.util.List;
 import java.util.concurrent.TimeUnit;
-import org.junit.Rule;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import zipkin2.Span;
 import zipkin2.junit5.ZipkinExtension;
 import zipkin2.reporter.okhttp3.OkHttpSender;
 
-public class BasicUsageTest_Async extends BasicUsageTest<AsyncZipkinSpanHandler> {
+class BasicUsageTest_Async extends BasicUsageTest<AsyncZipkinSpanHandler> {
   @RegisterExtension public ZipkinExtension zipkin = new ZipkinExtension();
 
   OkHttpSender sender = OkHttpSender.create(zipkin.httpUrl() + "/api/v2/spans");

brave/src/test/java/zipkin2/reporter/brave/BasicUsageTest_Converting.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 The OpenZipkin Authors
+ * Copyright 2016-2023 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -16,7 +16,7 @@
 import java.util.List;
 import zipkin2.Span;
 
-public class BasicUsageTest_Converting extends BasicUsageTest<ZipkinSpanHandler> {
+class BasicUsageTest_Converting extends BasicUsageTest<ZipkinSpanHandler> {
   @Override ZipkinSpanHandler zipkinSpanHandler(List<Span> spans) {
     return (ZipkinSpanHandler) ZipkinSpanHandler.create(spans::add);
   }

brave/src/test/java/zipkin2/reporter/brave/ConvertingSpanReporterTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 The OpenZipkin Authors
+ * Copyright 2016-2023 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -18,8 +18,8 @@
 import brave.propagation.TraceContext;
 import java.util.ArrayList;
 import java.util.Objects;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import zipkin2.Annotation;
 import zipkin2.Endpoint;
 import zipkin2.Span;
@@ -32,7 +32,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.entry;
 
-public class ConvertingSpanReporterTest {
+class ConvertingSpanReporterTest {
   static class ListSpanReporter extends ArrayList<Span> implements Reporter<Span> {
     @Override public void report(Span span) {
       add(span);
@@ -44,15 +44,15 @@ static class ListSpanReporter extends ArrayList<Span> implements Reporter<Span>
   TraceContext context = TraceContext.newBuilder().traceId(1).spanId(2).sampled(true).build();
   MutableSpan defaultSpan;
 
-  @Before public void init() {
+  @BeforeEach void init() {
     defaultSpan = new MutableSpan(context, null);
     defaultSpan.localServiceName("Aa");
     defaultSpan.localIp("1.2.3.4");
     defaultSpan.localPort(80);
     spanReporter = new ConvertingSpanReporter(spans, Tags.ERROR);
   }
 
-  @Test public void generateKindMap() {
+  @Test void generateKindMap() {
     assertThat(ConvertingSpanReporter.generateKindMap()).containsExactly(
         entry(CLIENT, Span.Kind.CLIENT),
         entry(SERVER, Span.Kind.SERVER),
@@ -61,7 +61,7 @@ static class ListSpanReporter extends ArrayList<Span> implements Reporter<Span>
     );
   }
 
-  @Test public void equalsAndHashCode() {
+  @Test void equalsAndHashCode() {
     assertThat(spanReporter)
         .hasSameHashCodeAs(spans)
         .isEqualTo(new ConvertingSpanReporter(spans, Tags.ERROR));
@@ -74,7 +74,7 @@ static class ListSpanReporter extends ArrayList<Span> implements Reporter<Span>
         .isNotEqualTo(otherReporter.hashCode());
   }
 
-  @Test public void convertsSampledSpan() {
+  @Test void convertsSampledSpan() {
     MutableSpan span = new MutableSpan(context, null);
     spanReporter.report(span);
 
@@ -86,7 +86,7 @@ static class ListSpanReporter extends ArrayList<Span> implements Reporter<Span>
     );
   }
 
-  @Test public void convertsDebugSpan() {
+  @Test void convertsDebugSpan() {
     TraceContext context = TraceContext.newBuilder().traceId(1).spanId(2).debug(true).build();
     MutableSpan span = new MutableSpan(context, null);
     spanReporter.report(span);
@@ -100,7 +100,7 @@ static class ListSpanReporter extends ArrayList<Span> implements Reporter<Span>
     );
   }
 
-  @Test public void minimumDurationIsOne() {
+  @Test void minimumDurationIsOne() {
     MutableSpan span = new MutableSpan(context, null);
 
     span.startTimestamp(1L);
@@ -110,7 +110,7 @@ static class ListSpanReporter extends ArrayList<Span> implements Reporter<Span>
     assertThat(spans.get(0).duration()).isEqualTo(1L);
   }
 
-  @Test public void replacesTag() {
+  @Test void replacesTag() {
     MutableSpan span = new MutableSpan(context, null);
 
     span.tag("1", "1");
@@ -130,7 +130,7 @@ static class ListSpanReporter extends ArrayList<Span> implements Reporter<Span>
 
   Throwable ERROR = new RuntimeException();
 
-  @Test public void backfillsErrorTag() {
+  @Test void backfillsErrorTag() {
     MutableSpan span = new MutableSpan(context, null);
 
     span.error(ERROR);
@@ -141,7 +141,7 @@ static class ListSpanReporter extends ArrayList<Span> implements Reporter<Span>
         .containsOnly(entry("error", "RuntimeException"));
   }
 
-  @Test public void doesntOverwriteErrorTag() {
+  @Test void doesntOverwriteErrorTag() {
     MutableSpan span = new MutableSpan(context, null);
 
     span.error(ERROR);
@@ -153,7 +153,7 @@ static class ListSpanReporter extends ArrayList<Span> implements Reporter<Span>
         .containsOnly(entry("error", ""));
   }
 
-  @Test public void addsAnnotations() {
+  @Test void addsAnnotations() {
     MutableSpan span = new MutableSpan(context, null);
 
     span.startTimestamp(1L);
@@ -166,19 +166,19 @@ static class ListSpanReporter extends ArrayList<Span> implements Reporter<Span>
         .containsOnly(Annotation.create(2L, "foo"));
   }
 
-  @Test public void finished_client() {
+  @Test void finished_client() {
     finish(brave.Span.Kind.CLIENT, Span.Kind.CLIENT);
   }
 
-  @Test public void finished_server() {
+  @Test void finished_server() {
     finish(brave.Span.Kind.SERVER, Span.Kind.SERVER);
   }
 
-  @Test public void finished_producer() {
+  @Test void finished_producer() {
     finish(brave.Span.Kind.PRODUCER, Span.Kind.PRODUCER);
   }
 
-  @Test public void finished_consumer() {
+  @Test void finished_consumer() {
     finish(brave.Span.Kind.CONSUMER, Span.Kind.CONSUMER);
   }
 
@@ -197,19 +197,19 @@ void finish(brave.Span.Kind braveKind, Span.Kind span2Kind) {
     assertThat(zipkinSpan.kind()).isEqualTo(span2Kind);
   }
 
-  @Test public void flushed_client() {
+  @Test void flushed_client() {
     flush(brave.Span.Kind.CLIENT, Span.Kind.CLIENT);
   }
 
-  @Test public void flushed_server() {
+  @Test void flushed_server() {
     flush(brave.Span.Kind.SERVER, Span.Kind.SERVER);
   }
 
-  @Test public void flushed_producer() {
+  @Test void flushed_producer() {
     flush(brave.Span.Kind.PRODUCER, Span.Kind.PRODUCER);
   }
 
-  @Test public void flushed_consumer() {
+  @Test void flushed_consumer() {
     flush(brave.Span.Kind.CONSUMER, Span.Kind.CONSUMER);
   }
 
@@ -228,7 +228,7 @@ void flush(brave.Span.Kind braveKind, Span.Kind span2Kind) {
     assertThat(zipkinSpan.kind()).isEqualTo(span2Kind);
   }
 
-  @Test public void remoteEndpoint() {
+  @Test void remoteEndpoint() {
     MutableSpan span = new MutableSpan(context, null);
 
     Endpoint endpoint = Endpoint.newBuilder()
@@ -250,7 +250,7 @@ void flush(brave.Span.Kind braveKind, Span.Kind span2Kind) {
   }
 
   // This prevents the server startTimestamp from overwriting the client one on the collector
-  @Test public void writeTo_sharedStatus() {
+  @Test void writeTo_sharedStatus() {
     MutableSpan span = new MutableSpan(context, null);
 
     span.setShared();
@@ -264,7 +264,7 @@ void flush(brave.Span.Kind braveKind, Span.Kind span2Kind) {
         .isTrue();
   }
 
-  @Test public void flushUnstartedNeitherSetsTimestampNorDuration() {
+  @Test void flushUnstartedNeitherSetsTimestampNorDuration() {
     MutableSpan flushed = new MutableSpan(context, null);
     flushed.finishTimestamp(0L);
 

brave/src/test/java/zipkin2/reporter/brave/ZipkinSpanHandlerTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 The OpenZipkin Authors
+ * Copyright 2016-2023 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -19,15 +19,15 @@
 import brave.propagation.TraceContext;
 import java.util.ArrayList;
 import java.util.Objects;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import zipkin2.reporter.Reporter;
 
 import static brave.handler.SpanHandler.Cause.FINISHED;
 import static brave.handler.SpanHandler.Cause.FLUSHED;
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class ZipkinSpanHandlerTest {
+class ZipkinSpanHandlerTest {
   static class ListMutableSpanReporter extends ArrayList<MutableSpan>
       implements Reporter<MutableSpan> {
     @Override public void report(MutableSpan span) {
@@ -40,20 +40,20 @@ static class ListMutableSpanReporter extends ArrayList<MutableSpan>
   TraceContext context = TraceContext.newBuilder().traceId(1).spanId(2).sampled(true).build();
   MutableSpan defaultSpan;
 
-  @Before public void init() {
+  @BeforeEach void init() {
     defaultSpan = new MutableSpan();
     defaultSpan.localServiceName("Aa");
     defaultSpan.localIp("1.2.3.4");
     defaultSpan.localPort(80);
     handler = new ZipkinSpanHandler(spans, Tags.ERROR, false);
   }
 
-  @Test public void noopIsNoop() {
+  @Test void noopIsNoop() {
     assertThat(ZipkinSpanHandler.create(Reporter.NOOP))
         .isSameAs(SpanHandler.NOOP);
   }
 
-  @Test public void equalsAndHashCode() {
+  @Test void equalsAndHashCode() {
     assertThat(handler)
         .hasSameHashCodeAs(spans)
         .isEqualTo(new ZipkinSpanHandler(spans, Tags.ERROR, false));
@@ -66,41 +66,41 @@ static class ListMutableSpanReporter extends ArrayList<MutableSpan>
         .isNotEqualTo(otherHandler.hashCode());
   }
 
-  @Test public void reportsSampledSpan() {
+  @Test void reportsSampledSpan() {
     MutableSpan span = new MutableSpan(context, null);
     handler.end(context, span, FINISHED);
 
     assertThat(spans.get(0)).isSameAs(span);
   }
 
-  @Test public void reportsDebugSpan() {
+  @Test void reportsDebugSpan() {
     TraceContext context = TraceContext.newBuilder().traceId(1).spanId(2).debug(true).build();
     MutableSpan span = new MutableSpan(context, null);
     handler.end(context, span, FINISHED);
 
     assertThat(spans.get(0)).isSameAs(span);
   }
 
-  @Test public void reportsFlushedSpan() {
+  @Test void reportsFlushedSpan() {
     MutableSpan span = new MutableSpan(context, null);
     handler.end(context, span, FLUSHED);
 
     assertThat(spans.get(0)).isSameAs(span);
   }
 
-  @Test public void doesnNotHandleAbandoned() {
+  @Test void doesnNotHandleAbandoned() {
     assertThat(handler.handlesAbandoned()).isFalse();
   }
 
-  @Test public void doesntReportUnsampledSpan() {
+  @Test void doesntReportUnsampledSpan() {
     TraceContext context =
         TraceContext.newBuilder().traceId(1).spanId(2).sampled(false).sampledLocal(true).build();
     handler.end(context, new MutableSpan(context, null), FINISHED);
 
     assertThat(spans).isEmpty();
   }
 
-  @Test public void alwaysReportSpans_reportsUnsampledSpan() {
+  @Test void alwaysReportSpans_reportsUnsampledSpan() {
     handler = new ZipkinSpanHandler(spans, Tags.ERROR, true);
 
     TraceContext context =
@@ -110,7 +110,7 @@ static class ListMutableSpanReporter extends ArrayList<MutableSpan>
     assertThat(spans).isNotEmpty();
   }
 
-  @Test public void alwaysReportSpans_doesNotHandleAbandoned() {
+  @Test void alwaysReportSpans_doesNotHandleAbandoned() {
     handler = new ZipkinSpanHandler(spans, Tags.ERROR, true);
     assertThat(handler.handlesAbandoned()).isFalse();
   }