Skip to content

Replace TestObservationRegistryAssert.assertThat() with Assertions.assertThat() #43235

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

Closed
wants to merge 1 commit into from
Closed

Replace TestObservationRegistryAssert.assertThat() with Assertions.assertThat() #43235

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
13 changes: 4 additions & 9 deletions ...actuate/autoconfigure/observation/web/client/RestClientObservationConfigurationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.observation.ObservationRegistry;
import io.micrometer.observation.tck.TestObservationRegistry;
import io.micrometer.observation.tck.TestObservationRegistryAssert;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;

Expand Down Expand Up @@ -72,8 +71,7 @@ void restClientCreatedWithBuilderIsInstrumented() {
RestClient restClient = buildRestClient(context);
restClient.get().uri("/projects/{project}", "spring-boot").retrieve().toBodilessEntity();
TestObservationRegistry registry = context.getBean(TestObservationRegistry.class);
TestObservationRegistryAssert.assertThat(registry)
.hasObservationWithNameEqualToIgnoringCase("http.client.requests");
assertThat(registry).hasObservationWithNameEqualToIgnoringCase("http.client.requests");
});
}

Expand All @@ -85,8 +83,7 @@ void restClientCreatedWithBuilderUsesCustomConventionName() {
RestClient restClient = buildRestClient(context);
restClient.get().uri("/projects/{project}", "spring-boot").retrieve().toBodilessEntity();
TestObservationRegistry registry = context.getBean(TestObservationRegistry.class);
TestObservationRegistryAssert.assertThat(registry)
.hasObservationWithNameEqualToIgnoringCase(observationName);
assertThat(registry).hasObservationWithNameEqualToIgnoringCase(observationName);
});
}

Expand All @@ -96,8 +93,7 @@ void restClientCreatedWithBuilderUsesCustomConvention() {
RestClient restClient = buildRestClient(context);
restClient.get().uri("/projects/{project}", "spring-boot").retrieve().toBodilessEntity();
TestObservationRegistry registry = context.getBean(TestObservationRegistry.class);
TestObservationRegistryAssert.assertThat(registry)
.hasObservationWithNameEqualTo("http.client.requests")
assertThat(registry).hasObservationWithNameEqualTo("http.client.requests")
.that()
.hasLowCardinalityKeyValue("project", "spring-boot");
});
Expand All @@ -118,8 +114,7 @@ void afterMaxUrisReachedFurtherUrisAreDenied(CapturedOutput output) {
restClient.get().uri("/test/" + i, String.class).retrieve().toBodilessEntity();
}
TestObservationRegistry registry = context.getBean(TestObservationRegistry.class);
TestObservationRegistryAssert.assertThat(registry)
.hasNumberOfObservationsWithNameEqualTo("http.client.requests", 3);
assertThat(registry).hasNumberOfObservationsWithNameEqualTo("http.client.requests", 3);
MeterRegistry meterRegistry = context.getBean(MeterRegistry.class);
assertThat(meterRegistry.find("http.client.requests").timers()).hasSize(2);
assertThat(output).contains("Reached the maximum number of URI tags for 'http.client.requests'.")
Expand Down
5 changes: 2 additions & 3 deletions ...nfigure/observation/web/client/RestClientObservationConfigurationWithoutMetricsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

import io.micrometer.observation.ObservationRegistry;
import io.micrometer.observation.tck.TestObservationRegistry;
import io.micrometer.observation.tck.TestObservationRegistryAssert;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;

Expand All @@ -34,6 +33,7 @@
import org.springframework.web.client.RestClient;
import org.springframework.web.client.RestClient.Builder;

import static org.assertj.core.api.Assertions.assertThat;
import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo;
import static org.springframework.test.web.client.response.MockRestResponseCreators.withStatus;

Expand All @@ -59,8 +59,7 @@ void restClientCreatedWithBuilderIsInstrumented() {
RestClient restClient = buildRestClient(context);
restClient.get().uri("/projects/{project}", "spring-boot").retrieve().toBodilessEntity();
TestObservationRegistry registry = context.getBean(TestObservationRegistry.class);
TestObservationRegistryAssert.assertThat(registry)
.hasObservationWithNameEqualToIgnoringCase("http.client.requests");
assertThat(registry).hasObservationWithNameEqualToIgnoringCase("http.client.requests");
});
}

Expand Down
13 changes: 4 additions & 9 deletions ...tuate/autoconfigure/observation/web/client/RestTemplateObservationConfigurationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.observation.ObservationRegistry;
import io.micrometer.observation.tck.TestObservationRegistry;
import io.micrometer.observation.tck.TestObservationRegistryAssert;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;

Expand Down Expand Up @@ -70,8 +69,7 @@ void restTemplateCreatedWithBuilderIsInstrumented() {
RestTemplate restTemplate = buildRestTemplate(context);
restTemplate.getForEntity("/projects/{project}", Void.class, "spring-boot");
TestObservationRegistry registry = context.getBean(TestObservationRegistry.class);
TestObservationRegistryAssert.assertThat(registry)
.hasObservationWithNameEqualToIgnoringCase("http.client.requests");
assertThat(registry).hasObservationWithNameEqualToIgnoringCase("http.client.requests");
});
}

Expand All @@ -83,8 +81,7 @@ void restTemplateCreatedWithBuilderUsesCustomConventionName() {
RestTemplate restTemplate = buildRestTemplate(context);
restTemplate.getForEntity("/projects/{project}", Void.class, "spring-boot");
TestObservationRegistry registry = context.getBean(TestObservationRegistry.class);
TestObservationRegistryAssert.assertThat(registry)
.hasObservationWithNameEqualToIgnoringCase(observationName);
assertThat(registry).hasObservationWithNameEqualToIgnoringCase(observationName);
});
}

Expand All @@ -94,8 +91,7 @@ void restTemplateCreatedWithBuilderUsesCustomConvention() {
RestTemplate restTemplate = buildRestTemplate(context);
restTemplate.getForEntity("/projects/{project}", Void.class, "spring-boot");
TestObservationRegistry registry = context.getBean(TestObservationRegistry.class);
TestObservationRegistryAssert.assertThat(registry)
.hasObservationWithNameEqualTo("http.client.requests")
assertThat(registry).hasObservationWithNameEqualTo("http.client.requests")
.that()
.hasLowCardinalityKeyValue("project", "spring-boot");
});
Expand All @@ -115,8 +111,7 @@ void afterMaxUrisReachedFurtherUrisAreDenied(CapturedOutput output) {
restTemplate.getForObject("/test/" + i, String.class);
}
TestObservationRegistry registry = context.getBean(TestObservationRegistry.class);
TestObservationRegistryAssert.assertThat(registry)
.hasNumberOfObservationsWithNameEqualTo("http.client.requests", 3);
assertThat(registry).hasNumberOfObservationsWithNameEqualTo("http.client.requests", 3);
MeterRegistry meterRegistry = context.getBean(MeterRegistry.class);
assertThat(meterRegistry.find("http.client.requests").timers()).hasSize(2);
assertThat(output).contains("Reached the maximum number of URI tags for 'http.client.requests'.")
Expand Down
5 changes: 2 additions & 3 deletions ...igure/observation/web/client/RestTemplateObservationConfigurationWithoutMetricsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

import io.micrometer.observation.ObservationRegistry;
import io.micrometer.observation.tck.TestObservationRegistry;
import io.micrometer.observation.tck.TestObservationRegistryAssert;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;

Expand All @@ -34,6 +33,7 @@
import org.springframework.test.web.client.MockRestServiceServer;
import org.springframework.web.client.RestTemplate;

import static org.assertj.core.api.Assertions.assertThat;
import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo;
import static org.springframework.test.web.client.response.MockRestResponseCreators.withStatus;

Expand All @@ -58,8 +58,7 @@ void restTemplateCreatedWithBuilderIsInstrumented() {
RestTemplate restTemplate = buildRestTemplate(context);
restTemplate.getForEntity("/projects/{project}", Void.class, "spring-boot");
TestObservationRegistry registry = context.getBean(TestObservationRegistry.class);
TestObservationRegistryAssert.assertThat(registry)
.hasObservationWithNameEqualToIgnoringCase("http.client.requests");
assertThat(registry).hasObservationWithNameEqualToIgnoringCase("http.client.requests");
});
}

Expand Down
17 changes: 6 additions & 11 deletions .../actuate/autoconfigure/observation/web/client/WebClientObservationConfigurationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.observation.ObservationRegistry;
import io.micrometer.observation.tck.TestObservationRegistry;
import io.micrometer.observation.tck.TestObservationRegistryAssert;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import reactor.core.publisher.Mono;
Expand Down Expand Up @@ -84,14 +83,13 @@ void shouldUseCustomConventionIfAvailable() {
TestObservationRegistry registry = context.getBean(TestObservationRegistry.class);
WebClient.Builder builder = context.getBean(WebClient.Builder.class);
WebClient webClient = mockWebClient(builder);
TestObservationRegistryAssert.assertThat(registry).doesNotHaveAnyObservation();
assertThat(registry).doesNotHaveAnyObservation();
webClient.get()
.uri("https://example.org/projects/{project}", "spring-boot")
.retrieve()
.toBodilessEntity()
.block(Duration.ofSeconds(30));
TestObservationRegistryAssert.assertThat(registry)
.hasObservationWithNameEqualTo("http.client.requests")
assertThat(registry).hasObservationWithNameEqualTo("http.client.requests")
.that()
.hasLowCardinalityKeyValue("project", "spring-boot");
});
Expand All @@ -101,8 +99,7 @@ void shouldUseCustomConventionIfAvailable() {
void afterMaxUrisReachedFurtherUrisAreDenied(CapturedOutput output) {
this.contextRunner.withPropertyValues("management.metrics.web.client.max-uri-tags=2").run((context) -> {
TestObservationRegistry registry = getInitializedRegistry(context);
TestObservationRegistryAssert.assertThat(registry)
.hasNumberOfObservationsWithNameEqualTo("http.client.requests", 3);
assertThat(registry).hasNumberOfObservationsWithNameEqualTo("http.client.requests", 3);
MeterRegistry meterRegistry = context.getBean(MeterRegistry.class);
assertThat(meterRegistry.find("http.client.requests").timers()).hasSize(1);
// MeterFilter.maximumAllowableTags() works with prefix matching.
Expand All @@ -116,8 +113,7 @@ void afterMaxUrisReachedFurtherUrisAreDenied(CapturedOutput output) {
void shouldNotDenyNorLogIfMaxUrisIsNotReached(CapturedOutput output) {
this.contextRunner.withPropertyValues("management.metrics.web.client.max-uri-tags=5").run((context) -> {
TestObservationRegistry registry = getInitializedRegistry(context);
TestObservationRegistryAssert.assertThat(registry)
.hasNumberOfObservationsWithNameEqualTo("http.client.requests", 3);
assertThat(registry).hasNumberOfObservationsWithNameEqualTo("http.client.requests", 3);
MeterRegistry meterRegistry = context.getBean(MeterRegistry.class);
assertThat(meterRegistry.find("http.client.requests").timers()).hasSize(3);
assertThat(output).doesNotContain("Reached the maximum number of URI tags for 'http.client.requests'.")
Expand All @@ -140,14 +136,13 @@ private TestObservationRegistry getInitializedRegistry(AssertableApplicationCont

private void validateWebClient(WebClient.Builder builder, TestObservationRegistry registry) {
WebClient webClient = mockWebClient(builder);
TestObservationRegistryAssert.assertThat(registry).doesNotHaveAnyObservation();
assertThat(registry).doesNotHaveAnyObservation();
webClient.get()
.uri("https://example.org/projects/{project}", "spring-boot")
.retrieve()
.toBodilessEntity()
.block(Duration.ofSeconds(30));
TestObservationRegistryAssert.assertThat(registry)
.hasObservationWithNameEqualTo("http.client.requests")
assertThat(registry).hasObservationWithNameEqualTo("http.client.requests")
.that()
.hasLowCardinalityKeyValue("uri", "/projects/{project}");
}
Expand Down