From 83bfb84d14f6537e5398d64ac0f1f744712bce45 Mon Sep 17 00:00:00 2001 From: jason plumb <75337021+breedx-splk@users.noreply.github.com> Date: Thu, 2 Jun 2022 13:38:46 -0700 Subject: [PATCH] Migrate to assertj (#4512) * migrate from junit/jupiter assertions to assertj in a few remaining places. * reorder --- .../MultiTextMapPropagatorTest.java | 9 ++--- .../jaeger/JaegerGrpcSpanExporterTest.java | 2 +- .../trace/propagation/B3PropagatorTest.java | 9 ++--- .../sdk/autoconfigure/SpiUtilTest.java | 19 ++++----- .../extension/jfr/JfrSpanProcessorTest.java | 40 +++++++++---------- .../sdk/logs/data/LogDataBuilderTest.java | 11 +++-- ...DoubleExponentialHistogramBucketsTest.java | 14 +++---- 7 files changed, 48 insertions(+), 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 index 66e80bc95c..fccd1581c7 100644 --- 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 @@ class MultiTextMapPropagatorTest { @Test void addPropagator_null() { - assertThrows( - NullPointerException.class, - () -> new MultiTextMapPropagator((List) null)); + assertThatThrownBy(() -> new MultiTextMapPropagator((List) null)) + .isInstanceOf(NullPointerException.class); } @Test @@ -82,7 +81,7 @@ class MultiTextMapPropagatorTest { when(propagator2.fields()).thenReturn(Arrays.asList("buggy", "bumpers")); TextMapPropagator prop = new MultiTextMapPropagator(propagator1, propagator2); Collection fields = prop.fields(); - assertThrows(UnsupportedOperationException.class, () -> fields.add("hi")); + assertThatThrownBy(() -> fields.add("hi")).isInstanceOf(UnsupportedOperationException.class); } @Test diff --git a/exporters/jaeger/src/test/java/io/opentelemetry/exporter/jaeger/JaegerGrpcSpanExporterTest.java b/exporters/jaeger/src/test/java/io/opentelemetry/exporter/jaeger/JaegerGrpcSpanExporterTest.java index b6a232a5d0..46d7b4cbb7 100644 --- a/exporters/jaeger/src/test/java/io/opentelemetry/exporter/jaeger/JaegerGrpcSpanExporterTest.java +++ b/exporters/jaeger/src/test/java/io/opentelemetry/exporter/jaeger/JaegerGrpcSpanExporterTest.java @@ -8,7 +8,7 @@ package io.opentelemetry.exporter.jaeger; 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/extensions/trace-propagators/src/test/java/io/opentelemetry/extension/trace/propagation/B3PropagatorTest.java b/extensions/trace-propagators/src/test/java/io/opentelemetry/extension/trace/propagation/B3PropagatorTest.java index 90437c7284..6c71cb2cc6 100644 --- a/extensions/trace-propagators/src/test/java/io/opentelemetry/extension/trace/propagation/B3PropagatorTest.java +++ b/extensions/trace-propagators/src/test/java/io/opentelemetry/extension/trace/propagation/B3PropagatorTest.java @@ -7,7 +7,6 @@ package io.opentelemetry.extension.trace.propagation; 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 @@ class B3PropagatorTest { .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 @@ class B3PropagatorTest { .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 @@ class B3PropagatorTest { .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 @@ class B3PropagatorTest { .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/sdk-extensions/autoconfigure/src/test/java/io/opentelemetry/sdk/autoconfigure/SpiUtilTest.java b/sdk-extensions/autoconfigure/src/test/java/io/opentelemetry/sdk/autoconfigure/SpiUtilTest.java index 6bad1a5641..821a40cc0b 100644 --- a/sdk-extensions/autoconfigure/src/test/java/io/opentelemetry/sdk/autoconfigure/SpiUtilTest.java +++ b/sdk-extensions/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 class SpiUtilTest { 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 class SpiUtilTest { 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 class SpiUtilTest { 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/sdk-extensions/jfr-events/src/test/java/io/opentelemetry/sdk/extension/jfr/JfrSpanProcessorTest.java b/sdk-extensions/jfr-events/src/test/java/io/opentelemetry/sdk/extension/jfr/JfrSpanProcessorTest.java index 530d297725..49902d59f1 100644 --- a/sdk-extensions/jfr-events/src/test/java/io/opentelemetry/sdk/extension/jfr/JfrSpanProcessorTest.java +++ b/sdk-extensions/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 @@ class JfrSpanProcessorTest { } List 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 @@ class JfrSpanProcessorTest { } List 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 index 1d71f3b608..c055f5e0b3 100644 --- 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,7 +32,7 @@ class LogDataBuilderTest { LogDataBuilder builder = LogDataBuilder.create(resource, scopeInfo, clock); LogData result = builder.build(); - assertEquals(12L, result.getEpochNanos()); + assertThat(result.getEpochNanos()).isEqualTo(12L); } @Test @@ -41,14 +40,14 @@ class LogDataBuilderTest { 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 @@ class LogDataBuilderTest { LogDataBuilder builder = LogDataBuilder.create(resource, scopeInfo); LogData result = builder.setContext(context).build(); - assertSame(spanContext, result.getSpanContext()); + assertThat(result.getSpanContext()).isSameAs(spanContext); } } diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/internal/aggregator/DoubleExponentialHistogramBucketsTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/internal/aggregator/DoubleExponentialHistogramBucketsTest.java index 108af2d95f..b93f5a555b 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/internal/aggregator/DoubleExponentialHistogramBucketsTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/internal/aggregator/DoubleExponentialHistogramBucketsTest.java @@ -7,8 +7,6 @@ package io.opentelemetry.sdk.metrics.internal.aggregator; 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 @@ class DoubleExponentialHistogramBucketsTest { 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.