Skip to content

Use assertj consistently everywhere #2254

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 #2254

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
33 changes: 15 additions & 18 deletions ...ava/io/opentelemetry/contrib/gcp/auth/GcpAuthAutoConfigurationCustomizerProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@
import static io.opentelemetry.contrib.gcp.auth.GcpAuthAutoConfigurationCustomizerProvider.SIGNAL_TYPE_METRICS;
import static io.opentelemetry.contrib.gcp.auth.GcpAuthAutoConfigurationCustomizerProvider.SIGNAL_TYPE_TRACES;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
Expand Down Expand Up @@ -165,12 +163,12 @@ void testTraceCustomizerOtlpHttp() {
generateTestSpan(sdk);
CompletableResultCode code = sdk.shutdown();
CompletableResultCode joinResult = code.join(10, TimeUnit.SECONDS);
assertTrue(joinResult.isSuccess());
assertThat(joinResult.isSuccess()).isTrue();

Mockito.verify(mockOtlpHttpSpanExporter, Mockito.times(1)).toBuilder();
Mockito.verify(spyOtlpHttpSpanExporterBuilder, Mockito.times(1))
.setHeaders(traceHeaderSupplierCaptor.capture());
assertEquals(2, traceHeaderSupplierCaptor.getValue().get().size());
assertThat(traceHeaderSupplierCaptor.getValue().get().size()).isEqualTo(2);
assertThat(authHeadersQuotaProjectIsPresent(traceHeaderSupplierCaptor.getValue().get()))
.isTrue();

Expand Down Expand Up @@ -218,12 +216,12 @@ void testTraceCustomizerOtlpGrpc() {
generateTestSpan(sdk);
CompletableResultCode code = sdk.shutdown();
CompletableResultCode joinResult = code.join(10, TimeUnit.SECONDS);
assertTrue(joinResult.isSuccess());
assertThat(joinResult.isSuccess()).isTrue();

Mockito.verify(mockOtlpGrpcSpanExporter, Mockito.times(1)).toBuilder();
Mockito.verify(spyOtlpGrpcSpanExporterBuilder, Mockito.times(1))
.setHeaders(traceHeaderSupplierCaptor.capture());
assertEquals(2, traceHeaderSupplierCaptor.getValue().get().size());
assertThat(traceHeaderSupplierCaptor.getValue().get().size()).isEqualTo(2);
assertThat(authHeadersQuotaProjectIsPresent(traceHeaderSupplierCaptor.getValue().get()))
.isTrue();

Expand Down Expand Up @@ -274,12 +272,12 @@ void testMetricCustomizerOtlpHttp() {
generateTestMetric(sdk);
CompletableResultCode code = sdk.shutdown();
CompletableResultCode joinResult = code.join(10, TimeUnit.SECONDS);
assertTrue(joinResult.isSuccess());
assertThat(joinResult.isSuccess()).isTrue();

Mockito.verify(mockOtlpHttpMetricExporter, Mockito.times(1)).toBuilder();
Mockito.verify(spyOtlpHttpMetricExporterBuilder, Mockito.times(1))
.setHeaders(metricHeaderSupplierCaptor.capture());
assertEquals(2, metricHeaderSupplierCaptor.getValue().get().size());
assertThat(metricHeaderSupplierCaptor.getValue().get().size()).isEqualTo(2);
assertThat(authHeadersQuotaProjectIsPresent(metricHeaderSupplierCaptor.getValue().get()))
.isTrue();

Expand Down Expand Up @@ -335,12 +333,12 @@ void testMetricCustomizerOtlpGrpc() {
generateTestMetric(sdk);
CompletableResultCode code = sdk.shutdown();
CompletableResultCode joinResult = code.join(10, TimeUnit.SECONDS);
assertTrue(joinResult.isSuccess());
assertThat(joinResult.isSuccess()).isTrue();

Mockito.verify(mockOtlpGrpcMetricExporter, Mockito.times(1)).toBuilder();
Mockito.verify(spyOtlpGrpcMetricExporterBuilder, Mockito.times(1))
.setHeaders(metricHeaderSupplierCaptor.capture());
assertEquals(2, metricHeaderSupplierCaptor.getValue().get().size());
assertThat(metricHeaderSupplierCaptor.getValue().get().size()).isEqualTo(2);
assertThat(authHeadersQuotaProjectIsPresent(metricHeaderSupplierCaptor.getValue().get()))
.isTrue();

Expand Down Expand Up @@ -378,9 +376,8 @@ void testCustomizerFailWithMissingResourceProject() {
.when(GoogleCredentials::getApplicationDefault)
.thenReturn(mockedGoogleCredentials);

assertThrows(
ConfigurationException.class,
() -> buildOpenTelemetrySdkWithExporter(mockOtlpGrpcSpanExporter));
assertThatThrownBy(() -> buildOpenTelemetrySdkWithExporter(mockOtlpGrpcSpanExporter))
.isInstanceOf(ConfigurationException.class);
}
}

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

Expand Down Expand Up @@ -509,14 +506,14 @@ void testTargetSignalsBehavior(TargetSignalBehavior testCase) {
generateTestSpan(sdk);
CompletableResultCode code = sdk.shutdown();
CompletableResultCode joinResult = code.join(10, TimeUnit.SECONDS);
assertTrue(joinResult.isSuccess());
assertThat(joinResult.isSuccess()).isTrue();

// Check Traces modification conditions
if (testCase.getExpectedIsTraceSignalModified()) {
// If traces signal is expected to be modified, auth headers must be present
Mockito.verify(spyOtlpGrpcSpanExporterBuilder, Mockito.times(1))
.setHeaders(traceHeaderSupplierCaptor.capture());
assertEquals(2, traceHeaderSupplierCaptor.getValue().get().size());
assertThat(traceHeaderSupplierCaptor.getValue().get().size()).isEqualTo(2);
assertThat(authHeadersQuotaProjectIsPresent(traceHeaderSupplierCaptor.getValue().get()))
.isTrue();
} else {
Expand All @@ -530,7 +527,7 @@ void testTargetSignalsBehavior(TargetSignalBehavior testCase) {
// If metrics signal is expected to be modified, auth headers must be present
Mockito.verify(spyOtlpGrpcMetricExporterBuilder, Mockito.times(1))
.setHeaders(metricHeaderSupplierCaptor.capture());
assertEquals(2, metricHeaderSupplierCaptor.getValue().get().size());
assertThat(metricHeaderSupplierCaptor.getValue().get().size()).isEqualTo(2);
assertThat(authHeadersQuotaProjectIsPresent(metricHeaderSupplierCaptor.getValue().get()))
.isTrue();
} else {
Expand Down
25 changes: 11 additions & 14 deletions ...tension/src/test/java/io/opentelemetry/contrib/gcp/auth/GcpAuthExtensionEndToEndTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@

import static io.opentelemetry.contrib.gcp.auth.GcpAuthAutoConfigurationCustomizerProvider.GCP_USER_PROJECT_ID_KEY;
import static io.opentelemetry.contrib.gcp.auth.GcpAuthAutoConfigurationCustomizerProvider.QUOTA_USER_PROJECT_HEADER;
import static org.assertj.core.api.Assertions.assertThat;
import static org.awaitility.Awaitility.await;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockserver.model.HttpRequest.request;
import static org.mockserver.model.HttpResponse.response;
import static org.mockserver.stop.Stop.stopQuietly;
Expand Down Expand Up @@ -160,24 +159,22 @@ public X509Certificate[] getAcceptedIssuers() {
private static void verifyResourceAttributes(List<ResourceSpans> extractedResourceSpans) {
extractedResourceSpans.forEach(
resourceSpan ->
assertTrue(
resourceSpan
.getResource()
.getAttributesList()
.contains(
KeyValue.newBuilder()
.setKey(GCP_USER_PROJECT_ID_KEY)
.setValue(AnyValue.newBuilder().setStringValue(DUMMY_GCP_PROJECT))
.build())));
assertThat(resourceSpan.getResource().getAttributesList())
.contains(
KeyValue.newBuilder()
.setKey(GCP_USER_PROJECT_ID_KEY)
.setValue(AnyValue.newBuilder().setStringValue(DUMMY_GCP_PROJECT))
.build()));
}

private static void verifyRequestHeaders(List<Headers> extractedHeaders) {
assertFalse(extractedHeaders.isEmpty());
assertThat(extractedHeaders).isNotEmpty();
// verify if extension added the required headers
extractedHeaders.forEach(
headers -> {
assertTrue(headers.containsEntry(QUOTA_USER_PROJECT_HEADER, DUMMY_GCP_QUOTA_PROJECT));
assertTrue(headers.containsEntry("Authorization", "Bearer fake.access_token"));
assertThat(headers.containsEntry(QUOTA_USER_PROJECT_HEADER, DUMMY_GCP_QUOTA_PROJECT))
.isTrue();
assertThat(headers.containsEntry("Authorization", "Bearer fake.access_token")).isTrue();
});
}

Expand Down
2 changes: 1 addition & 1 deletion ...t/java/io/opentelemetry/opamp/client/internal/request/service/HttpRequestServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
package io.opentelemetry.opamp.client.internal.request.service;

import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.fail;
import static org.assertj.core.api.Assertions.fail;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.clearInvocations;
import static org.mockito.Mockito.doThrow;
Expand Down
2 changes: 1 addition & 1 deletion ...a/io/opentelemetry/opamp/client/internal/request/service/WebSocketRequestServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
package io.opentelemetry.opamp.client.internal.request.service;

import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.fail;
import static org.assertj.core.api.Assertions.fail;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.clearInvocations;
import static org.mockito.Mockito.inOrder;
Expand Down
Loading