Skip to content

Commit 901e64b

Browse files
trasktrask
authored
Use assertj consistently everywhere (open-telemetry#2252)
1 parent 095a4db commit 901e64b

16 files changed

+185
-204
lines changed

‎disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/IntegrationTest.java‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
package io.opentelemetry.contrib.disk.buffering;
77

88
import static java.util.concurrent.TimeUnit.MILLISECONDS;
9-
import static org.junit.jupiter.api.Assertions.assertEquals;
10-
import static org.junit.jupiter.api.Assertions.assertFalse;
11-
import static org.junit.jupiter.api.Assertions.assertTrue;
9+
import static org.assertj.core.api.Assertions.assertThat;
1210
import static org.mockito.Mockito.mock;
1311
import static org.mockito.Mockito.when;
1412

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

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

176174
// Read and send stored data.
177-
assertTrue(exporter.exportStoredBatch(1, TimeUnit.SECONDS));
175+
assertThat(exporter.exportStoredBatch(1, TimeUnit.SECONDS)).isTrue();
178176

179177
// Now the data must have been delegated to the original exporter.
180-
assertEquals(1, finishedItems.get());
178+
assertThat(finishedItems.get()).isEqualTo(1);
181179

182180
// Bonus: Try to read again, no more data should be available.
183-
assertFalse(exporter.exportStoredBatch(1, TimeUnit.SECONDS));
184-
assertEquals(1, finishedItems.get());
181+
assertThat(exporter.exportStoredBatch(1, TimeUnit.SECONDS)).isFalse();
182+
assertThat(finishedItems.get()).isEqualTo(1);
185183
}
186184

187185
@SuppressWarnings("DirectInvocationOnMock")

‎disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/deserializers/LogRecordDataDeserializerTest.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

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

8-
import static org.junit.jupiter.api.Assertions.assertThrows;
8+
import static org.assertj.core.api.Assertions.assertThatThrownBy;
99

1010
import io.opentelemetry.api.common.Value;
1111
import io.opentelemetry.api.logs.Severity;
@@ -39,16 +39,14 @@ void verifyDeserialization() {
3939

4040
@Test
4141
void whenDecodingMalformedMessage_wrapIntoDeserializationException() {
42-
assertThrows(
43-
DeserializationException.class,
44-
() -> getDeserializer().deserialize(TestData.makeMalformedSignalBinary()));
42+
assertThatThrownBy(() -> getDeserializer().deserialize(TestData.makeMalformedSignalBinary()))
43+
.isInstanceOf(DeserializationException.class);
4544
}
4645

4746
@Test
4847
void whenDecodingTooShortMessage_wrapIntoDeserializationException() {
49-
assertThrows(
50-
DeserializationException.class,
51-
() -> getDeserializer().deserialize(TestData.makeTooShortSignalBinary()));
48+
assertThatThrownBy(() -> getDeserializer().deserialize(TestData.makeTooShortSignalBinary()))
49+
.isInstanceOf(DeserializationException.class);
5250
}
5351

5452
@Override

‎disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/deserializers/MetricDataDeserializerTest.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

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

8-
import static org.junit.jupiter.api.Assertions.assertThrows;
8+
import static org.assertj.core.api.Assertions.assertThatThrownBy;
99

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

1818
@Test
1919
void whenDecodingMalformedMessage_wrapIntoDeserializationException() {
20-
assertThrows(
21-
DeserializationException.class,
22-
() -> getDeserializer().deserialize(TestData.makeMalformedSignalBinary()));
20+
assertThatThrownBy(() -> getDeserializer().deserialize(TestData.makeMalformedSignalBinary()))
21+
.isInstanceOf(DeserializationException.class);
2322
}
2423

2524
@Test
2625
void whenDecodingTooShortMessage_wrapIntoDeserializationException() {
27-
assertThrows(
28-
DeserializationException.class,
29-
() -> getDeserializer().deserialize(TestData.makeTooShortSignalBinary()));
26+
assertThatThrownBy(() -> getDeserializer().deserialize(TestData.makeTooShortSignalBinary()))
27+
.isInstanceOf(DeserializationException.class);
3028
}
3129

3230
@Override

‎disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/deserializers/SpanDataDeserializerTest.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

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

8-
import static org.junit.jupiter.api.Assertions.assertThrows;
8+
import static org.assertj.core.api.Assertions.assertThatThrownBy;
99

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

4545
@Test
4646
void whenDecodingMalformedMessage_wrapIntoDeserializationException() {
47-
assertThrows(
48-
DeserializationException.class,
49-
() -> getDeserializer().deserialize(TestData.makeMalformedSignalBinary()));
47+
assertThatThrownBy(() -> getDeserializer().deserialize(TestData.makeMalformedSignalBinary()))
48+
.isInstanceOf(DeserializationException.class);
5049
}
5150

5251
@Test
5352
void whenDecodingTooShortMessage_wrapIntoDeserializationException() {
54-
assertThrows(
55-
DeserializationException.class,
56-
() -> getDeserializer().deserialize(TestData.makeTooShortSignalBinary()));
53+
assertThatThrownBy(() -> getDeserializer().deserialize(TestData.makeTooShortSignalBinary()))
54+
.isInstanceOf(DeserializationException.class);
5755
}
5856

5957
@Override

‎disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/mapping/common/AttributesMapperTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

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

8-
import static org.junit.jupiter.api.Assertions.assertEquals;
8+
import static org.assertj.core.api.Assertions.assertThat;
99

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

2929
List<KeyValue> proto = mapToProto(attributes);
3030

31-
assertEquals(attributes, mapFromProto(proto));
31+
assertThat(mapFromProto(proto)).isEqualTo(attributes);
3232
}
3333

3434
@Test
@@ -45,7 +45,7 @@ void verifyArrayMapping() {
4545

4646
List<KeyValue> serialized = mapToProto(attributes);
4747

48-
assertEquals(attributes, mapFromProto(serialized));
48+
assertThat(mapFromProto(serialized)).isEqualTo(attributes);
4949
}
5050

5151
private static List<KeyValue> mapToProto(Attributes attributes) {

‎disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/mapping/common/ResourceMapperTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

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

8-
import static org.junit.jupiter.api.Assertions.assertEquals;
8+
import static org.assertj.core.api.Assertions.assertThat;
99

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

20-
assertEquals(TestData.RESOURCE_FULL, mapToSdk(proto, TestData.RESOURCE_FULL.getSchemaUrl()));
20+
assertThat(mapToSdk(proto, TestData.RESOURCE_FULL.getSchemaUrl()))
21+
.isEqualTo(TestData.RESOURCE_FULL);
2122
}
2223

2324
private static Resource mapToProto(io.opentelemetry.sdk.resources.Resource sdkResource) {

‎disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/mapping/logs/LogRecordDataMapperTest.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

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

8-
import static org.junit.jupiter.api.Assertions.assertEquals;
8+
import static org.assertj.core.api.Assertions.assertThat;
99

1010
import io.opentelemetry.api.common.Value;
1111
import io.opentelemetry.api.logs.Severity;
@@ -38,9 +38,8 @@ class LogRecordDataMapperTest {
3838
void verifyMapping() {
3939
LogRecord proto = mapToProto(LOG_RECORD);
4040

41-
assertEquals(
42-
LOG_RECORD,
43-
mapToSdk(proto, LOG_RECORD.getResource(), LOG_RECORD.getInstrumentationScopeInfo()));
41+
assertThat(mapToSdk(proto, LOG_RECORD.getResource(), LOG_RECORD.getInstrumentationScopeInfo()))
42+
.isEqualTo(LOG_RECORD);
4443
}
4544

4645
private static LogRecord mapToProto(LogRecordData data) {

‎disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/mapping/logs/ProtoLogsDataMapperTest.java‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
package io.opentelemetry.contrib.disk.buffering.internal.serialization.mapping.logs;
77

88
import static org.assertj.core.api.Assertions.assertThat;
9-
import static org.junit.jupiter.api.Assertions.assertEquals;
109

1110
import io.opentelemetry.api.common.Value;
1211
import io.opentelemetry.api.logs.Severity;
@@ -107,9 +106,9 @@ void verifyConversionDataStructure() {
107106
ExportLogsServiceRequest result = mapToProto(signals);
108107

109108
List<ResourceLogs> resourceLogsList = result.resource_logs;
110-
assertEquals(1, resourceLogsList.size());
111-
assertEquals(1, resourceLogsList.get(0).scope_logs.size());
112-
assertEquals(1, resourceLogsList.get(0).scope_logs.get(0).log_records.size());
109+
assertThat(resourceLogsList).hasSize(1);
110+
assertThat(resourceLogsList.get(0).scope_logs).hasSize(1);
111+
assertThat(resourceLogsList.get(0).scope_logs.get(0).log_records).hasSize(1);
113112

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

123122
List<ResourceLogs> resourceLogsList = proto.resource_logs;
124-
assertEquals(1, resourceLogsList.size());
123+
assertThat(resourceLogsList).hasSize(1);
125124
List<ScopeLogs> scopeLogsList = resourceLogsList.get(0).scope_logs;
126-
assertEquals(1, scopeLogsList.size());
125+
assertThat(scopeLogsList).hasSize(1);
127126
List<LogRecord> logRecords = scopeLogsList.get(0).log_records;
128-
assertEquals(2, logRecords.size());
129-
assertEquals("Log body", logRecords.get(0).body.string_value);
130-
assertEquals("Other log body", logRecords.get(1).body.string_value);
127+
assertThat(logRecords).hasSize(2);
128+
assertThat(logRecords.get(0).body.string_value).isEqualTo("Log body");
129+
assertThat(logRecords.get(1).body.string_value).isEqualTo("Other log body");
131130

132-
assertEquals(2, mapFromProto(proto).size());
131+
assertThat(mapFromProto(proto)).hasSize(2);
133132

134133
assertThat(mapFromProto(proto)).containsExactlyInAnyOrderElementsOf(signals);
135134
}
@@ -142,15 +141,15 @@ void verifyMultipleLogsWithSameResourceDifferentScope() {
142141
ExportLogsServiceRequest proto = mapToProto(signals);
143142

144143
List<ResourceLogs> resourceLogsList = proto.resource_logs;
145-
assertEquals(1, resourceLogsList.size());
144+
assertThat(resourceLogsList).hasSize(1);
146145
List<ScopeLogs> scopeLogsList = resourceLogsList.get(0).scope_logs;
147-
assertEquals(2, scopeLogsList.size());
146+
assertThat(scopeLogsList).hasSize(2);
148147
ScopeLogs firstScope = scopeLogsList.get(0);
149148
ScopeLogs secondScope = scopeLogsList.get(1);
150149
List<LogRecord> firstScopeLogs = firstScope.log_records;
151150
List<LogRecord> secondScopeLogs = secondScope.log_records;
152-
assertEquals(1, firstScopeLogs.size());
153-
assertEquals(1, secondScopeLogs.size());
151+
assertThat(firstScopeLogs).hasSize(1);
152+
assertThat(secondScopeLogs).hasSize(1);
154153

155154
assertThat(mapFromProto(proto)).containsExactlyInAnyOrderElementsOf(signals);
156155
}
@@ -162,19 +161,19 @@ void verifyMultipleLogsWithDifferentResource() {
162161
ExportLogsServiceRequest proto = mapToProto(signals);
163162

164163
List<ResourceLogs> resourceLogsList = proto.resource_logs;
165-
assertEquals(2, resourceLogsList.size());
164+
assertThat(resourceLogsList).hasSize(2);
166165
ResourceLogs firstResourceLogs = resourceLogsList.get(0);
167166
ResourceLogs secondResourceLogs = resourceLogsList.get(1);
168167
List<ScopeLogs> firstScopeLogsList = firstResourceLogs.scope_logs;
169168
List<ScopeLogs> secondScopeLogsList = secondResourceLogs.scope_logs;
170-
assertEquals(1, firstScopeLogsList.size());
171-
assertEquals(1, secondScopeLogsList.size());
169+
assertThat(firstScopeLogsList).hasSize(1);
170+
assertThat(secondScopeLogsList).hasSize(1);
172171
ScopeLogs firstScope = firstScopeLogsList.get(0);
173172
ScopeLogs secondScope = secondScopeLogsList.get(0);
174173
List<LogRecord> firstScopeLogs = firstScope.log_records;
175174
List<LogRecord> secondScopeLogs = secondScope.log_records;
176-
assertEquals(1, firstScopeLogs.size());
177-
assertEquals(1, secondScopeLogs.size());
175+
assertThat(firstScopeLogs).hasSize(1);
176+
assertThat(secondScopeLogs).hasSize(1);
178177

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

191-
assertEquals("test.event.name", firstLog.event_name);
190+
assertThat(firstLog.event_name).isEqualTo("test.event.name");
192191
assertThat(mapFromProto(result)).containsExactlyInAnyOrderElementsOf(signals);
193192
}
194193

‎disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/mapping/metrics/MetricDataMapperTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import static io.opentelemetry.contrib.disk.buffering.testutils.TestData.makeLongGauge;
1010
import static io.opentelemetry.contrib.disk.buffering.testutils.TestData.makeLongPointData;
1111
import static org.assertj.core.api.Assertions.assertThat;
12-
import static org.junit.jupiter.api.Assertions.assertEquals;
1312

1413
import io.opentelemetry.api.trace.SpanContext;
1514
import io.opentelemetry.api.trace.TraceFlags;
@@ -121,9 +120,10 @@ void verifySummaryMapping() {
121120

122121
Metric proto = mapToProto(summaryMetric);
123122

124-
assertEquals(
125-
summaryMetric,
126-
mapToSdk(proto, summaryMetric.getResource(), summaryMetric.getInstrumentationScopeInfo()));
123+
assertThat(
124+
mapToSdk(
125+
proto, summaryMetric.getResource(), summaryMetric.getInstrumentationScopeInfo()))
126+
.isEqualTo(summaryMetric);
127127
}
128128

129129
@Test

‎disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/mapping/metrics/ProtoMetricsDataMapperTest.java‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
package io.opentelemetry.contrib.disk.buffering.internal.serialization.mapping.metrics;
77

88
import static org.assertj.core.api.Assertions.assertThat;
9-
import static org.junit.jupiter.api.Assertions.assertEquals;
109

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

3534
List<ResourceMetrics> resourceMetrics = proto.resource_metrics;
36-
assertEquals(1, resourceMetrics.size());
37-
assertEquals(1, resourceMetrics.get(0).scope_metrics.size());
38-
assertEquals(1, resourceMetrics.get(0).scope_metrics.get(0).metrics.size());
35+
assertThat(resourceMetrics).hasSize(1);
36+
assertThat(resourceMetrics.get(0).scope_metrics).hasSize(1);
37+
assertThat(resourceMetrics.get(0).scope_metrics.get(0).metrics).hasSize(1);
3938

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

5453
List<ResourceMetrics> resourceMetrics = proto.resource_metrics;
55-
assertEquals(1, resourceMetrics.size());
54+
assertThat(resourceMetrics).hasSize(1);
5655
List<ScopeMetrics> scopeMetrics = resourceMetrics.get(0).scope_metrics;
57-
assertEquals(1, scopeMetrics.size());
56+
assertThat(scopeMetrics).hasSize(1);
5857
List<Metric> metrics = scopeMetrics.get(0).metrics;
59-
assertEquals(2, metrics.size());
58+
assertThat(metrics).hasSize(2);
6059

6160
List<MetricData> result = mapFromProto(proto);
6261

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

8382
List<ResourceMetrics> resourceMetrics = proto.resource_metrics;
84-
assertEquals(1, resourceMetrics.size());
83+
assertThat(resourceMetrics).hasSize(1);
8584
List<ScopeMetrics> scopeMetrics = resourceMetrics.get(0).scope_metrics;
86-
assertEquals(2, scopeMetrics.size());
85+
assertThat(scopeMetrics).hasSize(2);
8786
ScopeMetrics firstScope = scopeMetrics.get(0);
8887
ScopeMetrics secondScope = scopeMetrics.get(1);
8988
List<Metric> firstScopeMetrics = firstScope.metrics;
9089
List<Metric> secondScopeMetrics = secondScope.metrics;
91-
assertEquals(1, firstScopeMetrics.size());
92-
assertEquals(1, secondScopeMetrics.size());
90+
assertThat(firstScopeMetrics).hasSize(1);
91+
assertThat(secondScopeMetrics).hasSize(1);
9392

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

118117
List<ResourceMetrics> resourceMetrics = proto.resource_metrics;
119-
assertEquals(2, resourceMetrics.size());
118+
assertThat(resourceMetrics).hasSize(2);
120119
ResourceMetrics firstResourceMetrics = resourceMetrics.get(0);
121120
ResourceMetrics secondResourceMetrics = resourceMetrics.get(1);
122121
List<ScopeMetrics> firstScopeMetrics = firstResourceMetrics.scope_metrics;
123122
List<ScopeMetrics> secondScopeMetrics = secondResourceMetrics.scope_metrics;
124-
assertEquals(1, firstScopeMetrics.size());
125-
assertEquals(1, secondScopeMetrics.size());
123+
assertThat(firstScopeMetrics).hasSize(1);
124+
assertThat(secondScopeMetrics).hasSize(1);
126125
ScopeMetrics firstScope = firstScopeMetrics.get(0);
127126
ScopeMetrics secondScope = secondScopeMetrics.get(0);
128127
List<Metric> firstMetrics = firstScope.metrics;
129128
List<Metric> secondMetrics = secondScope.metrics;
130-
assertEquals(1, firstMetrics.size());
131-
assertEquals(1, secondMetrics.size());
129+
assertThat(firstMetrics).hasSize(1);
130+
assertThat(secondMetrics).hasSize(1);
132131

133132
assertThat(mapFromProto(proto)).containsExactlyInAnyOrderElementsOf(expectedSignals);
134133
}

0 commit comments

Comments
 (0)