Skip to content

Commit dae8410

Browse files
trasktrask
authored
Use assertj consistently everywhere (open-telemetry#2254)
1 parent ca98ba3 commit dae8410

File tree

4 files changed

+28
-34
lines changed

4 files changed

+28
-34
lines changed

‎gcp-auth-extension/src/test/java/io/opentelemetry/contrib/gcp/auth/GcpAuthAutoConfigurationCustomizerProviderTest.java‎

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111
import static io.opentelemetry.contrib.gcp.auth.GcpAuthAutoConfigurationCustomizerProvider.SIGNAL_TYPE_METRICS;
1212
import static io.opentelemetry.contrib.gcp.auth.GcpAuthAutoConfigurationCustomizerProvider.SIGNAL_TYPE_TRACES;
1313
import static org.assertj.core.api.Assertions.assertThat;
14-
import static org.junit.jupiter.api.Assertions.assertEquals;
15-
import static org.junit.jupiter.api.Assertions.assertThrows;
16-
import static org.junit.jupiter.api.Assertions.assertTrue;
14+
import static org.assertj.core.api.Assertions.assertThatThrownBy;
1715
import static org.mockito.ArgumentMatchers.any;
1816
import static org.mockito.Mockito.mock;
1917
import static org.mockito.Mockito.when;
@@ -165,12 +163,12 @@ void testTraceCustomizerOtlpHttp() {
165163
generateTestSpan(sdk);
166164
CompletableResultCode code = sdk.shutdown();
167165
CompletableResultCode joinResult = code.join(10, TimeUnit.SECONDS);
168-
assertTrue(joinResult.isSuccess());
166+
assertThat(joinResult.isSuccess()).isTrue();
169167

170168
Mockito.verify(mockOtlpHttpSpanExporter, Mockito.times(1)).toBuilder();
171169
Mockito.verify(spyOtlpHttpSpanExporterBuilder, Mockito.times(1))
172170
.setHeaders(traceHeaderSupplierCaptor.capture());
173-
assertEquals(2, traceHeaderSupplierCaptor.getValue().get().size());
171+
assertThat(traceHeaderSupplierCaptor.getValue().get().size()).isEqualTo(2);
174172
assertThat(authHeadersQuotaProjectIsPresent(traceHeaderSupplierCaptor.getValue().get()))
175173
.isTrue();
176174

@@ -218,12 +216,12 @@ void testTraceCustomizerOtlpGrpc() {
218216
generateTestSpan(sdk);
219217
CompletableResultCode code = sdk.shutdown();
220218
CompletableResultCode joinResult = code.join(10, TimeUnit.SECONDS);
221-
assertTrue(joinResult.isSuccess());
219+
assertThat(joinResult.isSuccess()).isTrue();
222220

223221
Mockito.verify(mockOtlpGrpcSpanExporter, Mockito.times(1)).toBuilder();
224222
Mockito.verify(spyOtlpGrpcSpanExporterBuilder, Mockito.times(1))
225223
.setHeaders(traceHeaderSupplierCaptor.capture());
226-
assertEquals(2, traceHeaderSupplierCaptor.getValue().get().size());
224+
assertThat(traceHeaderSupplierCaptor.getValue().get().size()).isEqualTo(2);
227225
assertThat(authHeadersQuotaProjectIsPresent(traceHeaderSupplierCaptor.getValue().get()))
228226
.isTrue();
229227

@@ -274,12 +272,12 @@ void testMetricCustomizerOtlpHttp() {
274272
generateTestMetric(sdk);
275273
CompletableResultCode code = sdk.shutdown();
276274
CompletableResultCode joinResult = code.join(10, TimeUnit.SECONDS);
277-
assertTrue(joinResult.isSuccess());
275+
assertThat(joinResult.isSuccess()).isTrue();
278276

279277
Mockito.verify(mockOtlpHttpMetricExporter, Mockito.times(1)).toBuilder();
280278
Mockito.verify(spyOtlpHttpMetricExporterBuilder, Mockito.times(1))
281279
.setHeaders(metricHeaderSupplierCaptor.capture());
282-
assertEquals(2, metricHeaderSupplierCaptor.getValue().get().size());
280+
assertThat(metricHeaderSupplierCaptor.getValue().get().size()).isEqualTo(2);
283281
assertThat(authHeadersQuotaProjectIsPresent(metricHeaderSupplierCaptor.getValue().get()))
284282
.isTrue();
285283

@@ -335,12 +333,12 @@ void testMetricCustomizerOtlpGrpc() {
335333
generateTestMetric(sdk);
336334
CompletableResultCode code = sdk.shutdown();
337335
CompletableResultCode joinResult = code.join(10, TimeUnit.SECONDS);
338-
assertTrue(joinResult.isSuccess());
336+
assertThat(joinResult.isSuccess()).isTrue();
339337

340338
Mockito.verify(mockOtlpGrpcMetricExporter, Mockito.times(1)).toBuilder();
341339
Mockito.verify(spyOtlpGrpcMetricExporterBuilder, Mockito.times(1))
342340
.setHeaders(metricHeaderSupplierCaptor.capture());
343-
assertEquals(2, metricHeaderSupplierCaptor.getValue().get().size());
341+
assertThat(metricHeaderSupplierCaptor.getValue().get().size()).isEqualTo(2);
344342
assertThat(authHeadersQuotaProjectIsPresent(metricHeaderSupplierCaptor.getValue().get()))
345343
.isTrue();
346344

@@ -378,9 +376,8 @@ void testCustomizerFailWithMissingResourceProject() {
378376
.when(GoogleCredentials::getApplicationDefault)
379377
.thenReturn(mockedGoogleCredentials);
380378

381-
assertThrows(
382-
ConfigurationException.class,
383-
() -> buildOpenTelemetrySdkWithExporter(mockOtlpGrpcSpanExporter));
379+
assertThatThrownBy(() -> buildOpenTelemetrySdkWithExporter(mockOtlpGrpcSpanExporter))
380+
.isInstanceOf(ConfigurationException.class);
384381
}
385382
}
386383

@@ -440,7 +437,7 @@ void testQuotaProjectBehavior(QuotaProjectIdTestBehavior testCase) throws IOExce
440437
generateTestSpan(sdk);
441438
CompletableResultCode code = sdk.shutdown();
442439
CompletableResultCode joinResult = code.join(10, TimeUnit.SECONDS);
443-
assertTrue(joinResult.isSuccess());
440+
assertThat(joinResult.isSuccess()).isTrue();
444441
Mockito.verify(spyOtlpGrpcSpanExporterBuilder, Mockito.times(1))
445442
.setHeaders(traceHeaderSupplierCaptor.capture());
446443

@@ -509,14 +506,14 @@ void testTargetSignalsBehavior(TargetSignalBehavior testCase) {
509506
generateTestSpan(sdk);
510507
CompletableResultCode code = sdk.shutdown();
511508
CompletableResultCode joinResult = code.join(10, TimeUnit.SECONDS);
512-
assertTrue(joinResult.isSuccess());
509+
assertThat(joinResult.isSuccess()).isTrue();
513510

514511
// Check Traces modification conditions
515512
if (testCase.getExpectedIsTraceSignalModified()) {
516513
// If traces signal is expected to be modified, auth headers must be present
517514
Mockito.verify(spyOtlpGrpcSpanExporterBuilder, Mockito.times(1))
518515
.setHeaders(traceHeaderSupplierCaptor.capture());
519-
assertEquals(2, traceHeaderSupplierCaptor.getValue().get().size());
516+
assertThat(traceHeaderSupplierCaptor.getValue().get().size()).isEqualTo(2);
520517
assertThat(authHeadersQuotaProjectIsPresent(traceHeaderSupplierCaptor.getValue().get()))
521518
.isTrue();
522519
} else {
@@ -530,7 +527,7 @@ void testTargetSignalsBehavior(TargetSignalBehavior testCase) {
530527
// If metrics signal is expected to be modified, auth headers must be present
531528
Mockito.verify(spyOtlpGrpcMetricExporterBuilder, Mockito.times(1))
532529
.setHeaders(metricHeaderSupplierCaptor.capture());
533-
assertEquals(2, metricHeaderSupplierCaptor.getValue().get().size());
530+
assertThat(metricHeaderSupplierCaptor.getValue().get().size()).isEqualTo(2);
534531
assertThat(authHeadersQuotaProjectIsPresent(metricHeaderSupplierCaptor.getValue().get()))
535532
.isTrue();
536533
} else {

‎gcp-auth-extension/src/test/java/io/opentelemetry/contrib/gcp/auth/GcpAuthExtensionEndToEndTest.java‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@
77

88
import static io.opentelemetry.contrib.gcp.auth.GcpAuthAutoConfigurationCustomizerProvider.GCP_USER_PROJECT_ID_KEY;
99
import static io.opentelemetry.contrib.gcp.auth.GcpAuthAutoConfigurationCustomizerProvider.QUOTA_USER_PROJECT_HEADER;
10+
import static org.assertj.core.api.Assertions.assertThat;
1011
import static org.awaitility.Awaitility.await;
11-
import static org.junit.jupiter.api.Assertions.assertFalse;
12-
import static org.junit.jupiter.api.Assertions.assertTrue;
1312
import static org.mockserver.model.HttpRequest.request;
1413
import static org.mockserver.model.HttpResponse.response;
1514
import static org.mockserver.stop.Stop.stopQuietly;
@@ -160,24 +159,22 @@ public X509Certificate[] getAcceptedIssuers() {
160159
private static void verifyResourceAttributes(List<ResourceSpans> extractedResourceSpans) {
161160
extractedResourceSpans.forEach(
162161
resourceSpan ->
163-
assertTrue(
164-
resourceSpan
165-
.getResource()
166-
.getAttributesList()
167-
.contains(
168-
KeyValue.newBuilder()
169-
.setKey(GCP_USER_PROJECT_ID_KEY)
170-
.setValue(AnyValue.newBuilder().setStringValue(DUMMY_GCP_PROJECT))
171-
.build())));
162+
assertThat(resourceSpan.getResource().getAttributesList())
163+
.contains(
164+
KeyValue.newBuilder()
165+
.setKey(GCP_USER_PROJECT_ID_KEY)
166+
.setValue(AnyValue.newBuilder().setStringValue(DUMMY_GCP_PROJECT))
167+
.build()));
172168
}
173169

174170
private static void verifyRequestHeaders(List<Headers> extractedHeaders) {
175-
assertFalse(extractedHeaders.isEmpty());
171+
assertThat(extractedHeaders).isNotEmpty();
176172
// verify if extension added the required headers
177173
extractedHeaders.forEach(
178174
headers -> {
179-
assertTrue(headers.containsEntry(QUOTA_USER_PROJECT_HEADER, DUMMY_GCP_QUOTA_PROJECT));
180-
assertTrue(headers.containsEntry("Authorization", "Bearer fake.access_token"));
175+
assertThat(headers.containsEntry(QUOTA_USER_PROJECT_HEADER, DUMMY_GCP_QUOTA_PROJECT))
176+
.isTrue();
177+
assertThat(headers.containsEntry("Authorization", "Bearer fake.access_token")).isTrue();
181178
});
182179
}
183180

‎opamp-client/src/test/java/io/opentelemetry/opamp/client/internal/request/service/HttpRequestServiceTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
package io.opentelemetry.opamp.client.internal.request.service;
77

88
import static org.assertj.core.api.Assertions.assertThat;
9-
import static org.junit.jupiter.api.Assertions.fail;
9+
import static org.assertj.core.api.Assertions.fail;
1010
import static org.mockito.ArgumentMatchers.any;
1111
import static org.mockito.Mockito.clearInvocations;
1212
import static org.mockito.Mockito.doThrow;

‎opamp-client/src/test/java/io/opentelemetry/opamp/client/internal/request/service/WebSocketRequestServiceTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
package io.opentelemetry.opamp.client.internal.request.service;
77

88
import static org.assertj.core.api.Assertions.assertThat;
9-
import static org.junit.jupiter.api.Assertions.fail;
9+
import static org.assertj.core.api.Assertions.fail;
1010
import static org.mockito.ArgumentMatchers.any;
1111
import static org.mockito.Mockito.clearInvocations;
1212
import static org.mockito.Mockito.inOrder;

0 commit comments

Comments
 (0)