Migrate to assertj (open-telemetry#4512)

* migrate from junit/jupiter assertions to assertj in a few remaining places. * reorder
LWogan · Jun 2, 2022 · 83bfb84 · 83bfb84
1 parent f10959c
commit 83bfb84
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 56 deletions.
diff --git a/context/src/test/java/io/opentelemetry/context/propagation/MultiTextMapPropagatorTest.java b/context/src/test/java/io/opentelemetry/context/propagation/MultiTextMapPropagatorTest.java
@@ -6,7 +6,7 @@
 package io.opentelemetry.context.propagation;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -51,9 +51,8 @@ public String get(Map<String, String> carrier, String key) {
 
   @Test
   void addPropagator_null() {
-    assertThrows(
-        NullPointerException.class,
-        () -> new MultiTextMapPropagator((List<TextMapPropagator>) null));
+    assertThatThrownBy(() -> new MultiTextMapPropagator((List<TextMapPropagator>) null))
+        .isInstanceOf(NullPointerException.class);
   }
 
   @Test
@@ -82,7 +81,7 @@ void fields_readOnly() {
     when(propagator2.fields()).thenReturn(Arrays.asList("buggy", "bumpers"));
     TextMapPropagator prop = new MultiTextMapPropagator(propagator1, propagator2);
     Collection<String> fields = prop.fields();
-    assertThrows(UnsupportedOperationException.class, () -> fields.add("hi"));
+    assertThatThrownBy(() -> fields.add("hi")).isInstanceOf(UnsupportedOperationException.class);
   }
 
   @Test

diff --git a/...ers/jaeger/src/test/java/io/opentelemetry/exporter/jaeger/JaegerGrpcSpanExporterTest.java b/...ers/jaeger/src/test/java/io/opentelemetry/exporter/jaeger/JaegerGrpcSpanExporterTest.java
@@ -8,7 +8,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.jupiter.api.Assertions.fail;
+import static org.assertj.core.api.Assertions.fail;
 
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.linecorp.armeria.server.ServerBuilder;

diff --git a/...pagators/src/test/java/io/opentelemetry/extension/trace/propagation/B3PropagatorTest.java b/...pagators/src/test/java/io/opentelemetry/extension/trace/propagation/B3PropagatorTest.java
@@ -7,7 +7,6 @@
 
 import static io.opentelemetry.extension.trace.propagation.B3Propagator.DEBUG_CONTEXT_KEY;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import io.opentelemetry.api.internal.StringUtils;
 import io.opentelemetry.api.trace.Span;
@@ -644,7 +643,7 @@ void extract_DebugContext_SingleHeader() {
         .isEqualTo(
             SpanContext.createFromRemoteParent(
                 TRACE_ID, SPAN_ID, TraceFlags.getSampled(), TraceState.getDefault()));
-    assertTrue(context.get(DEBUG_CONTEXT_KEY));
+    assertThat(context.get(DEBUG_CONTEXT_KEY)).isTrue();
   }
 
   @Test
@@ -659,7 +658,7 @@ void extract_DebugContext_MultipleHeaders() {
         .isEqualTo(
             SpanContext.createFromRemoteParent(
                 TRACE_ID, SPAN_ID, TraceFlags.getSampled(), TraceState.getDefault()));
-    assertTrue(context.get(DEBUG_CONTEXT_KEY));
+    assertThat(context.get(DEBUG_CONTEXT_KEY)).isTrue();
   }
 
   @Test
@@ -675,7 +674,7 @@ void extract_DebugContext_SampledFalseDebugTrue_MultipleHeaders() {
         .isEqualTo(
             SpanContext.createFromRemoteParent(
                 TRACE_ID, SPAN_ID, TraceFlags.getSampled(), TraceState.getDefault()));
-    assertTrue(context.get(DEBUG_CONTEXT_KEY));
+    assertThat(context.get(DEBUG_CONTEXT_KEY)).isTrue();
   }
 
   @Test
@@ -691,7 +690,7 @@ void extract_DebugContext_SampledTrueDebugTrue_MultipleHeaders() {
         .isEqualTo(
             SpanContext.createFromRemoteParent(
                 TRACE_ID, SPAN_ID, TraceFlags.getSampled(), TraceState.getDefault()));
-    assertTrue(context.get(DEBUG_CONTEXT_KEY));
+    assertThat(context.get(DEBUG_CONTEXT_KEY)).isTrue();
   }
 
   @Test

diff --git a/...xtensions/autoconfigure/src/test/java/io/opentelemetry/sdk/autoconfigure/SpiUtilTest.java b/...xtensions/autoconfigure/src/test/java/io/opentelemetry/sdk/autoconfigure/SpiUtilTest.java
@@ -5,10 +5,8 @@
 
 package io.opentelemetry.sdk.autoconfigure;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
@@ -39,8 +37,8 @@ public void canRetrieveByName() {
             SpiUtilTest.class.getClassLoader(),
             mockFinder);
 
-    assertNotNull(spiProvider.getByName(SpiExampleProviderImplementation.NAME));
-    assertNull(spiProvider.getByName("invalid-provider"));
+    assertThat(spiProvider.getByName(SpiExampleProviderImplementation.NAME)).isNotNull();
+    assertThat(spiProvider.getByName("invalid-provider")).isNull();
   }
 
   @Test
@@ -82,7 +80,7 @@ public void onlyInstantiatesOnce() {
 
     SpiExample first = spiProvider.getByName(SpiExampleProviderImplementation.NAME);
     SpiExample second = spiProvider.getByName(SpiExampleProviderImplementation.NAME);
-    assertEquals(first, second);
+    assertThat(second).isEqualTo(first);
   }
 
   @Test
@@ -104,10 +102,9 @@ public void failureToInitializeThrows() {
             SpiUtilTest.class.getClassLoader(),
             mockFinder);
 
-    assertThrows(
-        RuntimeException.class,
-        () -> spiProvider.getByName("init-failure-example"),
-        exceptionMessage);
+    assertThatThrownBy(() -> spiProvider.getByName("init-failure-example"))
+        .withFailMessage(exceptionMessage)
+        .isInstanceOf(RuntimeException.class);
   }
 
   private interface SpiExampleProvider {

diff --git a/...ons/jfr-events/src/test/java/io/opentelemetry/sdk/extension/jfr/JfrSpanProcessorTest.java b/...ons/jfr-events/src/test/java/io/opentelemetry/sdk/extension/jfr/JfrSpanProcessorTest.java
@@ -5,7 +5,7 @@
 
 package io.opentelemetry.sdk.extension.jfr;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
 
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.Tracer;
@@ -69,15 +69,14 @@ public void basicSpan() throws IOException {
       }
 
       List<RecordedEvent> events = RecordingFile.readAllEvents(output);
-      assertEquals(1, events.size());
-      events.stream()
-          .forEach(
-              e -> {
-                assertEquals(span.getSpanContext().getTraceId(), e.getValue("traceId"));
-                assertEquals(span.getSpanContext().getSpanId(), e.getValue("spanId"));
-                assertEquals(OPERATION_NAME, e.getValue("operationName"));
-              });
-
+      assertThat(events).hasSize(1);
+      assertThat(events)
+          .extracting(e -> e.getValue("traceId"))
+          .isEqualTo(span.getSpanContext().getTraceId());
+      assertThat(events)
+          .extracting(e -> e.getValue("spanId"))
+          .isEqualTo(span.getSpanContext().getSpanId());
+      assertThat(events).extracting(e -> e.getValue("operationName")).isEqualTo(OPERATION_NAME);
     } finally {
       Files.delete(output);
     }
@@ -109,16 +108,17 @@ public void basicSpanWithScope() throws IOException, InterruptedException {
       }
 
       List<RecordedEvent> events = RecordingFile.readAllEvents(output);
-      assertEquals(2, events.size());
-      events.stream()
-          .forEach(
-              e -> {
-                assertEquals(span.getSpanContext().getTraceId(), e.getValue("traceId"));
-                assertEquals(span.getSpanContext().getSpanId(), e.getValue("spanId"));
-                if ("Span".equals(e.getEventType().getLabel())) {
-                  assertEquals(OPERATION_NAME, e.getValue("operationName"));
-                }
-              });
+      assertThat(events).hasSize(2);
+      assertThat(events)
+          .extracting(e -> e.getValue("traceId"))
+          .isEqualTo(span.getSpanContext().getTraceId());
+      assertThat(events)
+          .extracting(e -> e.getValue("spanId"))
+          .isEqualTo(span.getSpanContext().getSpanId());
+      assertThat(events)
+          .filteredOn(e -> "Span".equals(e.getEventType().getLabel()))
+          .extracting(e -> e.getValue("operationName"))
+          .isEqualTo(OPERATION_NAME);
 
     } finally {
       Files.delete(output);

diff --git a/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/data/LogDataBuilderTest.java b/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/data/LogDataBuilderTest.java
@@ -5,8 +5,7 @@
 
 package io.opentelemetry.sdk.logs.data;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -33,22 +32,22 @@ void canSetClock() {
     LogDataBuilder builder = LogDataBuilder.create(resource, scopeInfo, clock);
 
     LogData result = builder.build();
-    assertEquals(12L, result.getEpochNanos());
+    assertThat(result.getEpochNanos()).isEqualTo(12L);
   }
 
   @Test
   void canSetSpanContext() {
     LogDataBuilder builder = LogDataBuilder.create(resource, scopeInfo);
     SpanContext spanContext = mock(SpanContext.class);
     LogData result = builder.setSpanContext(spanContext).build();
-    assertSame(spanContext, result.getSpanContext());
+    assertThat(result.getSpanContext()).isSameAs(spanContext);
   }
 
   @Test
   void setSpanContext_nullSafe() {
     LogDataBuilder builder = LogDataBuilder.create(resource, scopeInfo);
     LogData result = builder.setSpanContext(null).build();
-    assertSame(SpanContext.getInvalid(), result.getSpanContext());
+    assertThat(result.getSpanContext()).isSameAs(SpanContext.getInvalid());
   }
 
   @Test
@@ -65,6 +64,6 @@ void canSetSpanContextFromContext() {
     LogDataBuilder builder = LogDataBuilder.create(resource, scopeInfo);
 
     LogData result = builder.setContext(context).build();
-    assertSame(spanContext, result.getSpanContext());
+    assertThat(result.getSpanContext()).isSameAs(spanContext);
   }
 }
diff --git a/.../opentelemetry/sdk/metrics/internal/aggregator/DoubleExponentialHistogramBucketsTest.java b/.../opentelemetry/sdk/metrics/internal/aggregator/DoubleExponentialHistogramBucketsTest.java
@@ -7,8 +7,6 @@
 
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 import io.opentelemetry.sdk.metrics.internal.state.ExponentialCounterFactory;
 import io.opentelemetry.sdk.testing.assertj.MetricAssertions;
@@ -79,18 +77,18 @@ void testEqualsAndHashCode(ExponentialBucketStrategy buckets) {
     DoubleExponentialHistogramBuckets b = buckets.newBuckets();
 
     assertThat(a).isNotNull();
-    assertEquals(a, b);
-    assertEquals(b, a);
+    assertThat(b).isEqualTo(a);
+    assertThat(a).isEqualTo(b);
     assertThat(a).hasSameHashCodeAs(b);
 
     a.record(1);
-    assertNotEquals(a, b);
-    assertNotEquals(b, a);
+    assertThat(a).isNotEqualTo(b);
+    assertThat(b).isNotEqualTo(a);
     assertThat(a).doesNotHaveSameHashCodeAs(b);
 
     b.record(1);
-    assertEquals(a, b);
-    assertEquals(b, a);
+    assertThat(b).isEqualTo(a);
+    assertThat(a).isEqualTo(b);
     assertThat(a).hasSameHashCodeAs(b);
 
     // Now we start to play with altering offset, but having same effective counts.