Skip to content

Use assertj consistently everywhere #2252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 12, 2025
Merged

Use assertj consistently everywhere #2252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/IntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@
package io.opentelemetry.contrib.disk.buffering;

import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

Expand Down Expand Up @@ -168,20 +166,20 @@ void verifyLogRecordsIntegration() throws IOException {
private <T> void assertExporter(FromDiskExporterImpl<T> exporter, Supplier<Integer> finishedItems)
throws IOException {
// Verify no data has been received in the original exporter until this point.
assertEquals(0, finishedItems.get());
assertThat(finishedItems.get()).isEqualTo(0);

// Go to the future when we can read the stored items.
fastForwardTimeByMillis(storageConfig.getMinFileAgeForReadMillis());

// Read and send stored data.
assertTrue(exporter.exportStoredBatch(1, TimeUnit.SECONDS));
assertThat(exporter.exportStoredBatch(1, TimeUnit.SECONDS)).isTrue();

// Now the data must have been delegated to the original exporter.
assertEquals(1, finishedItems.get());
assertThat(finishedItems.get()).isEqualTo(1);

// Bonus: Try to read again, no more data should be available.
assertFalse(exporter.exportStoredBatch(1, TimeUnit.SECONDS));
assertEquals(1, finishedItems.get());
assertThat(exporter.exportStoredBatch(1, TimeUnit.SECONDS)).isFalse();
assertThat(finishedItems.get()).isEqualTo(1);
}

@SuppressWarnings("DirectInvocationOnMock")
Expand Down
12 changes: 5 additions & 7 deletions ...ib/disk/buffering/internal/serialization/deserializers/LogRecordDataDeserializerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

package io.opentelemetry.contrib.disk.buffering.internal.serialization.deserializers;

import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
Copy link
Member

@zeitlinger zeitlinger Sep 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think assertThatCode is more readable: https://javadoc.io/static/org.assertj/assertj-core/3.25.2/org/assertj/core/api/Assertions.html#assertThatCode(org.assertj.core.api.ThrowableAssert.ThrowingCallable)

Copy link
Member Author

@trask trask Sep 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice, I'll follow-up and try that out everywhere

Copy link
Member Author

@trask trask Oct 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@zeitlinger I finally gave this a try, and I wish the API looked like:

assertThatCode(boomCode).throwsInstanceOf(Exception.class)

which reads nicely, vs

assertThatCode(boomCode).isInstanceOf(Exception.class)

which reads oddly to me


import io.opentelemetry.api.common.Value;
import io.opentelemetry.api.logs.Severity;
Expand Down Expand Up @@ -39,16 +39,14 @@ void verifyDeserialization() {

@Test
void whenDecodingMalformedMessage_wrapIntoDeserializationException() {
assertThrows(
DeserializationException.class,
() -> getDeserializer().deserialize(TestData.makeMalformedSignalBinary()));
assertThatThrownBy(() -> getDeserializer().deserialize(TestData.makeMalformedSignalBinary()))
.isInstanceOf(DeserializationException.class);
}

@Test
void whenDecodingTooShortMessage_wrapIntoDeserializationException() {
assertThrows(
DeserializationException.class,
() -> getDeserializer().deserialize(TestData.makeTooShortSignalBinary()));
assertThatThrownBy(() -> getDeserializer().deserialize(TestData.makeTooShortSignalBinary()))
.isInstanceOf(DeserializationException.class);
}

@Override
Expand Down
12 changes: 5 additions & 7 deletions ...ntrib/disk/buffering/internal/serialization/deserializers/MetricDataDeserializerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

package io.opentelemetry.contrib.disk.buffering.internal.serialization.deserializers;

import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

import io.opentelemetry.contrib.disk.buffering.internal.serialization.serializers.SignalSerializer;
import io.opentelemetry.contrib.disk.buffering.testutils.BaseSignalSerializerTest;
Expand All @@ -17,16 +17,14 @@ class MetricDataDeserializerTest extends BaseSignalSerializerTest<MetricData> {

@Test
void whenDecodingMalformedMessage_wrapIntoDeserializationException() {
assertThrows(
DeserializationException.class,
() -> getDeserializer().deserialize(TestData.makeMalformedSignalBinary()));
assertThatThrownBy(() -> getDeserializer().deserialize(TestData.makeMalformedSignalBinary()))
.isInstanceOf(DeserializationException.class);
}

@Test
void whenDecodingTooShortMessage_wrapIntoDeserializationException() {
assertThrows(
DeserializationException.class,
() -> getDeserializer().deserialize(TestData.makeTooShortSignalBinary()));
assertThatThrownBy(() -> getDeserializer().deserialize(TestData.makeTooShortSignalBinary()))
.isInstanceOf(DeserializationException.class);
}

@Override
Expand Down
12 changes: 5 additions & 7 deletions ...contrib/disk/buffering/internal/serialization/deserializers/SpanDataDeserializerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

package io.opentelemetry.contrib.disk.buffering.internal.serialization.deserializers;

import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

import io.opentelemetry.api.trace.SpanKind;
import io.opentelemetry.contrib.disk.buffering.internal.serialization.mapping.spans.models.SpanDataImpl;
Expand Down Expand Up @@ -44,16 +44,14 @@ void verifyDeserialization() {

@Test
void whenDecodingMalformedMessage_wrapIntoDeserializationException() {
assertThrows(
DeserializationException.class,
() -> getDeserializer().deserialize(TestData.makeMalformedSignalBinary()));
assertThatThrownBy(() -> getDeserializer().deserialize(TestData.makeMalformedSignalBinary()))
.isInstanceOf(DeserializationException.class);
}

@Test
void whenDecodingTooShortMessage_wrapIntoDeserializationException() {
assertThrows(
DeserializationException.class,
() -> getDeserializer().deserialize(TestData.makeTooShortSignalBinary()));
assertThatThrownBy(() -> getDeserializer().deserialize(TestData.makeTooShortSignalBinary()))
.isInstanceOf(DeserializationException.class);
}

@Override
Expand Down
6 changes: 3 additions & 3 deletions ...ry/contrib/disk/buffering/internal/serialization/mapping/common/AttributesMapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

package io.opentelemetry.contrib.disk.buffering.internal.serialization.mapping.common;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.assertj.core.api.Assertions.assertThat;

import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.api.common.Attributes;
Expand All @@ -28,7 +28,7 @@ void verifyMapping() {

List<KeyValue> proto = mapToProto(attributes);

assertEquals(attributes, mapFromProto(proto));
assertThat(mapFromProto(proto)).isEqualTo(attributes);
}

@Test
Expand All @@ -45,7 +45,7 @@ void verifyArrayMapping() {

List<KeyValue> serialized = mapToProto(attributes);

assertEquals(attributes, mapFromProto(serialized));
assertThat(mapFromProto(serialized)).isEqualTo(attributes);
}

private static List<KeyValue> mapToProto(Attributes attributes) {
Expand Down
5 changes: 3 additions & 2 deletions ...etry/contrib/disk/buffering/internal/serialization/mapping/common/ResourceMapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

package io.opentelemetry.contrib.disk.buffering.internal.serialization.mapping.common;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.assertj.core.api.Assertions.assertThat;

import io.opentelemetry.contrib.disk.buffering.testutils.TestData;
import io.opentelemetry.proto.resource.v1.Resource;
Expand All @@ -17,7 +17,8 @@ class ResourceMapperTest {
void verifyMapping() {
Resource proto = mapToProto(TestData.RESOURCE_FULL);

assertEquals(TestData.RESOURCE_FULL, mapToSdk(proto, TestData.RESOURCE_FULL.getSchemaUrl()));
assertThat(mapToSdk(proto, TestData.RESOURCE_FULL.getSchemaUrl()))
.isEqualTo(TestData.RESOURCE_FULL);
}

private static Resource mapToProto(io.opentelemetry.sdk.resources.Resource sdkResource) {
Expand Down
7 changes: 3 additions & 4 deletions ...y/contrib/disk/buffering/internal/serialization/mapping/logs/LogRecordDataMapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

package io.opentelemetry.contrib.disk.buffering.internal.serialization.mapping.logs;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.assertj.core.api.Assertions.assertThat;

import io.opentelemetry.api.common.Value;
import io.opentelemetry.api.logs.Severity;
Expand Down Expand Up @@ -38,9 +38,8 @@ class LogRecordDataMapperTest {
void verifyMapping() {
LogRecord proto = mapToProto(LOG_RECORD);

assertEquals(
LOG_RECORD,
mapToSdk(proto, LOG_RECORD.getResource(), LOG_RECORD.getInstrumentationScopeInfo()));
assertThat(mapToSdk(proto, LOG_RECORD.getResource(), LOG_RECORD.getInstrumentationScopeInfo()))
.isEqualTo(LOG_RECORD);
}

private static LogRecord mapToProto(LogRecordData data) {
Expand Down
39 changes: 19 additions & 20 deletions ...y/contrib/disk/buffering/internal/serialization/mapping/logs/ProtoLogsDataMapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
package io.opentelemetry.contrib.disk.buffering.internal.serialization.mapping.logs;

import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;

import io.opentelemetry.api.common.Value;
import io.opentelemetry.api.logs.Severity;
Expand Down Expand Up @@ -107,9 +106,9 @@ void verifyConversionDataStructure() {
ExportLogsServiceRequest result = mapToProto(signals);

List<ResourceLogs> resourceLogsList = result.resource_logs;
assertEquals(1, resourceLogsList.size());
assertEquals(1, resourceLogsList.get(0).scope_logs.size());
assertEquals(1, resourceLogsList.get(0).scope_logs.get(0).log_records.size());
assertThat(resourceLogsList).hasSize(1);
assertThat(resourceLogsList.get(0).scope_logs).hasSize(1);
assertThat(resourceLogsList.get(0).scope_logs.get(0).log_records).hasSize(1);

assertThat(mapFromProto(result)).containsExactlyInAnyOrderElementsOf(signals);
}
Expand All @@ -121,15 +120,15 @@ void verifyMultipleLogsWithSameResourceAndScope() {
ExportLogsServiceRequest proto = mapToProto(signals);

List<ResourceLogs> resourceLogsList = proto.resource_logs;
assertEquals(1, resourceLogsList.size());
assertThat(resourceLogsList).hasSize(1);
List<ScopeLogs> scopeLogsList = resourceLogsList.get(0).scope_logs;
assertEquals(1, scopeLogsList.size());
assertThat(scopeLogsList).hasSize(1);
List<LogRecord> logRecords = scopeLogsList.get(0).log_records;
assertEquals(2, logRecords.size());
assertEquals("Log body", logRecords.get(0).body.string_value);
assertEquals("Other log body", logRecords.get(1).body.string_value);
assertThat(logRecords).hasSize(2);
assertThat(logRecords.get(0).body.string_value).isEqualTo("Log body");
assertThat(logRecords.get(1).body.string_value).isEqualTo("Other log body");

assertEquals(2, mapFromProto(proto).size());
assertThat(mapFromProto(proto)).hasSize(2);

assertThat(mapFromProto(proto)).containsExactlyInAnyOrderElementsOf(signals);
}
Expand All @@ -142,15 +141,15 @@ void verifyMultipleLogsWithSameResourceDifferentScope() {
ExportLogsServiceRequest proto = mapToProto(signals);

List<ResourceLogs> resourceLogsList = proto.resource_logs;
assertEquals(1, resourceLogsList.size());
assertThat(resourceLogsList).hasSize(1);
List<ScopeLogs> scopeLogsList = resourceLogsList.get(0).scope_logs;
assertEquals(2, scopeLogsList.size());
assertThat(scopeLogsList).hasSize(2);
ScopeLogs firstScope = scopeLogsList.get(0);
ScopeLogs secondScope = scopeLogsList.get(1);
List<LogRecord> firstScopeLogs = firstScope.log_records;
List<LogRecord> secondScopeLogs = secondScope.log_records;
assertEquals(1, firstScopeLogs.size());
assertEquals(1, secondScopeLogs.size());
assertThat(firstScopeLogs).hasSize(1);
assertThat(secondScopeLogs).hasSize(1);

assertThat(mapFromProto(proto)).containsExactlyInAnyOrderElementsOf(signals);
}
Expand All @@ -162,19 +161,19 @@ void verifyMultipleLogsWithDifferentResource() {
ExportLogsServiceRequest proto = mapToProto(signals);

List<ResourceLogs> resourceLogsList = proto.resource_logs;
assertEquals(2, resourceLogsList.size());
assertThat(resourceLogsList).hasSize(2);
ResourceLogs firstResourceLogs = resourceLogsList.get(0);
ResourceLogs secondResourceLogs = resourceLogsList.get(1);
List<ScopeLogs> firstScopeLogsList = firstResourceLogs.scope_logs;
List<ScopeLogs> secondScopeLogsList = secondResourceLogs.scope_logs;
assertEquals(1, firstScopeLogsList.size());
assertEquals(1, secondScopeLogsList.size());
assertThat(firstScopeLogsList).hasSize(1);
assertThat(secondScopeLogsList).hasSize(1);
ScopeLogs firstScope = firstScopeLogsList.get(0);
ScopeLogs secondScope = secondScopeLogsList.get(0);
List<LogRecord> firstScopeLogs = firstScope.log_records;
List<LogRecord> secondScopeLogs = secondScope.log_records;
assertEquals(1, firstScopeLogs.size());
assertEquals(1, secondScopeLogs.size());
assertThat(firstScopeLogs).hasSize(1);
assertThat(secondScopeLogs).hasSize(1);

assertThat(mapFromProto(proto)).containsExactlyInAnyOrderElementsOf(signals);
}
Expand All @@ -188,7 +187,7 @@ void verifyLogWithEventName() {
List<ResourceLogs> resourceLogsList = result.resource_logs;
LogRecord firstLog = resourceLogsList.get(0).scope_logs.get(0).log_records.get(0);

assertEquals("test.event.name", firstLog.event_name);
assertThat(firstLog.event_name).isEqualTo("test.event.name");
assertThat(mapFromProto(result)).containsExactlyInAnyOrderElementsOf(signals);
}

Expand Down
8 changes: 4 additions & 4 deletions ...y/contrib/disk/buffering/internal/serialization/mapping/metrics/MetricDataMapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import static io.opentelemetry.contrib.disk.buffering.testutils.TestData.makeLongGauge;
import static io.opentelemetry.contrib.disk.buffering.testutils.TestData.makeLongPointData;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;

import io.opentelemetry.api.trace.SpanContext;
import io.opentelemetry.api.trace.TraceFlags;
Expand Down Expand Up @@ -121,9 +120,10 @@ void verifySummaryMapping() {

Metric proto = mapToProto(summaryMetric);

assertEquals(
summaryMetric,
mapToSdk(proto, summaryMetric.getResource(), summaryMetric.getInstrumentationScopeInfo()));
assertThat(
mapToSdk(
proto, summaryMetric.getResource(), summaryMetric.getInstrumentationScopeInfo()))
.isEqualTo(summaryMetric);
}

@Test
Expand Down
31 changes: 15 additions & 16 deletions ...rib/disk/buffering/internal/serialization/mapping/metrics/ProtoMetricsDataMapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
package io.opentelemetry.contrib.disk.buffering.internal.serialization.mapping.metrics;

import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;

import io.opentelemetry.api.trace.TraceFlags;
import io.opentelemetry.contrib.disk.buffering.testutils.TestData;
Expand All @@ -33,9 +32,9 @@ void verifyConversionDataStructure() {
ExportMetricsServiceRequest proto = mapToProto(signals);

List<ResourceMetrics> resourceMetrics = proto.resource_metrics;
assertEquals(1, resourceMetrics.size());
assertEquals(1, resourceMetrics.get(0).scope_metrics.size());
assertEquals(1, resourceMetrics.get(0).scope_metrics.get(0).metrics.size());
assertThat(resourceMetrics).hasSize(1);
assertThat(resourceMetrics.get(0).scope_metrics).hasSize(1);
assertThat(resourceMetrics.get(0).scope_metrics.get(0).metrics).hasSize(1);

assertThat(mapFromProto(proto)).containsExactlyInAnyOrderElementsOf(expectedSignals);
}
Expand All @@ -52,11 +51,11 @@ void verifyMultipleMetricsWithSameResourceAndScope() {
ExportMetricsServiceRequest proto = mapToProto(signals);

List<ResourceMetrics> resourceMetrics = proto.resource_metrics;
assertEquals(1, resourceMetrics.size());
assertThat(resourceMetrics).hasSize(1);
List<ScopeMetrics> scopeMetrics = resourceMetrics.get(0).scope_metrics;
assertEquals(1, scopeMetrics.size());
assertThat(scopeMetrics).hasSize(1);
List<Metric> metrics = scopeMetrics.get(0).metrics;
assertEquals(2, metrics.size());
assertThat(metrics).hasSize(2);

List<MetricData> result = mapFromProto(proto);

Expand All @@ -81,15 +80,15 @@ void verifyMultipleMetricsWithSameResourceDifferentScope() {
ExportMetricsServiceRequest proto = mapToProto(signals);

List<ResourceMetrics> resourceMetrics = proto.resource_metrics;
assertEquals(1, resourceMetrics.size());
assertThat(resourceMetrics).hasSize(1);
List<ScopeMetrics> scopeMetrics = resourceMetrics.get(0).scope_metrics;
assertEquals(2, scopeMetrics.size());
assertThat(scopeMetrics).hasSize(2);
ScopeMetrics firstScope = scopeMetrics.get(0);
ScopeMetrics secondScope = scopeMetrics.get(1);
List<Metric> firstScopeMetrics = firstScope.metrics;
List<Metric> secondScopeMetrics = secondScope.metrics;
assertEquals(1, firstScopeMetrics.size());
assertEquals(1, secondScopeMetrics.size());
assertThat(firstScopeMetrics).hasSize(1);
assertThat(secondScopeMetrics).hasSize(1);

assertThat(mapFromProto(proto)).containsExactlyInAnyOrderElementsOf(expectedSignals);
}
Expand All @@ -116,19 +115,19 @@ void verifyMultipleMetricsWithDifferentResource() {
ExportMetricsServiceRequest proto = mapToProto(signals);

List<ResourceMetrics> resourceMetrics = proto.resource_metrics;
assertEquals(2, resourceMetrics.size());
assertThat(resourceMetrics).hasSize(2);
ResourceMetrics firstResourceMetrics = resourceMetrics.get(0);
ResourceMetrics secondResourceMetrics = resourceMetrics.get(1);
List<ScopeMetrics> firstScopeMetrics = firstResourceMetrics.scope_metrics;
List<ScopeMetrics> secondScopeMetrics = secondResourceMetrics.scope_metrics;
assertEquals(1, firstScopeMetrics.size());
assertEquals(1, secondScopeMetrics.size());
assertThat(firstScopeMetrics).hasSize(1);
assertThat(secondScopeMetrics).hasSize(1);
ScopeMetrics firstScope = firstScopeMetrics.get(0);
ScopeMetrics secondScope = secondScopeMetrics.get(0);
List<Metric> firstMetrics = firstScope.metrics;
List<Metric> secondMetrics = secondScope.metrics;
assertEquals(1, firstMetrics.size());
assertEquals(1, secondMetrics.size());
assertThat(firstMetrics).hasSize(1);
assertThat(secondMetrics).hasSize(1);

assertThat(mapFromProto(proto)).containsExactlyInAnyOrderElementsOf(expectedSignals);
}
Expand Down
Loading
Loading