Skip to content

Commit 933b7d3

Browse files
philwebbphilwebb
committed
Merge pull request #43235 from izeye
* pr/43235: Polish 'Replace TestObservationRegistryAssert.assertThat()'' Replace TestObservationRegistryAssert.assertThat() Closes gh-43235
2 parents 59317d5 + c9a8454 commit 933b7d3

File tree

5 files changed

+23
-40
lines changed

5 files changed

+23
-40
lines changed

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/web/client/RestClientObservationConfigurationTests.java

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2023 the original author or authors.
2+
* Copyright 2012-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
2020
import io.micrometer.core.instrument.MeterRegistry;
2121
import io.micrometer.observation.ObservationRegistry;
2222
import io.micrometer.observation.tck.TestObservationRegistry;
23-
import io.micrometer.observation.tck.TestObservationRegistryAssert;
2423
import org.junit.jupiter.api.Test;
2524
import org.junit.jupiter.api.extension.ExtendWith;
2625

@@ -72,8 +71,7 @@ void restClientCreatedWithBuilderIsInstrumented() {
7271
RestClient restClient = buildRestClient(context);
7372
restClient.get().uri("/projects/{project}", "spring-boot").retrieve().toBodilessEntity();
7473
TestObservationRegistry registry = context.getBean(TestObservationRegistry.class);
75-
TestObservationRegistryAssert.assertThat(registry)
76-
.hasObservationWithNameEqualToIgnoringCase("http.client.requests");
74+
assertThat(registry).hasObservationWithNameEqualToIgnoringCase("http.client.requests");
7775
});
7876
}
7977

@@ -85,8 +83,7 @@ void restClientCreatedWithBuilderUsesCustomConventionName() {
8583
RestClient restClient = buildRestClient(context);
8684
restClient.get().uri("/projects/{project}", "spring-boot").retrieve().toBodilessEntity();
8785
TestObservationRegistry registry = context.getBean(TestObservationRegistry.class);
88-
TestObservationRegistryAssert.assertThat(registry)
89-
.hasObservationWithNameEqualToIgnoringCase(observationName);
86+
assertThat(registry).hasObservationWithNameEqualToIgnoringCase(observationName);
9087
});
9188
}
9289

@@ -96,8 +93,7 @@ void restClientCreatedWithBuilderUsesCustomConvention() {
9693
RestClient restClient = buildRestClient(context);
9794
restClient.get().uri("/projects/{project}", "spring-boot").retrieve().toBodilessEntity();
9895
TestObservationRegistry registry = context.getBean(TestObservationRegistry.class);
99-
TestObservationRegistryAssert.assertThat(registry)
100-
.hasObservationWithNameEqualTo("http.client.requests")
96+
assertThat(registry).hasObservationWithNameEqualTo("http.client.requests")
10197
.that()
10298
.hasLowCardinalityKeyValue("project", "spring-boot");
10399
});
@@ -118,8 +114,7 @@ void afterMaxUrisReachedFurtherUrisAreDenied(CapturedOutput output) {
118114
restClient.get().uri("/test/" + i, String.class).retrieve().toBodilessEntity();
119115
}
120116
TestObservationRegistry registry = context.getBean(TestObservationRegistry.class);
121-
TestObservationRegistryAssert.assertThat(registry)
122-
.hasNumberOfObservationsWithNameEqualTo("http.client.requests", 3);
117+
assertThat(registry).hasNumberOfObservationsWithNameEqualTo("http.client.requests", 3);
123118
MeterRegistry meterRegistry = context.getBean(MeterRegistry.class);
124119
assertThat(meterRegistry.find("http.client.requests").timers()).hasSize(2);
125120
assertThat(output).contains("Reached the maximum number of URI tags for 'http.client.requests'.")

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/web/client/RestClientObservationConfigurationWithoutMetricsTests.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2023 the original author or authors.
2+
* Copyright 2012-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
1818

1919
import io.micrometer.observation.ObservationRegistry;
2020
import io.micrometer.observation.tck.TestObservationRegistry;
21-
import io.micrometer.observation.tck.TestObservationRegistryAssert;
2221
import org.junit.jupiter.api.Test;
2322
import org.junit.jupiter.api.extension.ExtendWith;
2423

@@ -34,6 +33,7 @@
3433
import org.springframework.web.client.RestClient;
3534
import org.springframework.web.client.RestClient.Builder;
3635

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

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

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/web/client/RestTemplateObservationConfigurationTests.java

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2023 the original author or authors.
2+
* Copyright 2012-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
2020
import io.micrometer.core.instrument.MeterRegistry;
2121
import io.micrometer.observation.ObservationRegistry;
2222
import io.micrometer.observation.tck.TestObservationRegistry;
23-
import io.micrometer.observation.tck.TestObservationRegistryAssert;
2423
import org.junit.jupiter.api.Test;
2524
import org.junit.jupiter.api.extension.ExtendWith;
2625

@@ -70,8 +69,7 @@ void restTemplateCreatedWithBuilderIsInstrumented() {
7069
RestTemplate restTemplate = buildRestTemplate(context);
7170
restTemplate.getForEntity("/projects/{project}", Void.class, "spring-boot");
7271
TestObservationRegistry registry = context.getBean(TestObservationRegistry.class);
73-
TestObservationRegistryAssert.assertThat(registry)
74-
.hasObservationWithNameEqualToIgnoringCase("http.client.requests");
72+
assertThat(registry).hasObservationWithNameEqualToIgnoringCase("http.client.requests");
7573
});
7674
}
7775

@@ -83,8 +81,7 @@ void restTemplateCreatedWithBuilderUsesCustomConventionName() {
8381
RestTemplate restTemplate = buildRestTemplate(context);
8482
restTemplate.getForEntity("/projects/{project}", Void.class, "spring-boot");
8583
TestObservationRegistry registry = context.getBean(TestObservationRegistry.class);
86-
TestObservationRegistryAssert.assertThat(registry)
87-
.hasObservationWithNameEqualToIgnoringCase(observationName);
84+
assertThat(registry).hasObservationWithNameEqualToIgnoringCase(observationName);
8885
});
8986
}
9087

@@ -94,8 +91,7 @@ void restTemplateCreatedWithBuilderUsesCustomConvention() {
9491
RestTemplate restTemplate = buildRestTemplate(context);
9592
restTemplate.getForEntity("/projects/{project}", Void.class, "spring-boot");
9693
TestObservationRegistry registry = context.getBean(TestObservationRegistry.class);
97-
TestObservationRegistryAssert.assertThat(registry)
98-
.hasObservationWithNameEqualTo("http.client.requests")
94+
assertThat(registry).hasObservationWithNameEqualTo("http.client.requests")
9995
.that()
10096
.hasLowCardinalityKeyValue("project", "spring-boot");
10197
});
@@ -115,8 +111,7 @@ void afterMaxUrisReachedFurtherUrisAreDenied(CapturedOutput output) {
115111
restTemplate.getForObject("/test/" + i, String.class);
116112
}
117113
TestObservationRegistry registry = context.getBean(TestObservationRegistry.class);
118-
TestObservationRegistryAssert.assertThat(registry)
119-
.hasNumberOfObservationsWithNameEqualTo("http.client.requests", 3);
114+
assertThat(registry).hasNumberOfObservationsWithNameEqualTo("http.client.requests", 3);
120115
MeterRegistry meterRegistry = context.getBean(MeterRegistry.class);
121116
assertThat(meterRegistry.find("http.client.requests").timers()).hasSize(2);
122117
assertThat(output).contains("Reached the maximum number of URI tags for 'http.client.requests'.")

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/web/client/RestTemplateObservationConfigurationWithoutMetricsTests.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2023 the original author or authors.
2+
* Copyright 2012-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
1818

1919
import io.micrometer.observation.ObservationRegistry;
2020
import io.micrometer.observation.tck.TestObservationRegistry;
21-
import io.micrometer.observation.tck.TestObservationRegistryAssert;
2221
import org.junit.jupiter.api.Test;
2322
import org.junit.jupiter.api.extension.ExtendWith;
2423

@@ -34,6 +33,7 @@
3433
import org.springframework.test.web.client.MockRestServiceServer;
3534
import org.springframework.web.client.RestTemplate;
3635

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

@@ -58,8 +58,7 @@ void restTemplateCreatedWithBuilderIsInstrumented() {
5858
RestTemplate restTemplate = buildRestTemplate(context);
5959
restTemplate.getForEntity("/projects/{project}", Void.class, "spring-boot");
6060
TestObservationRegistry registry = context.getBean(TestObservationRegistry.class);
61-
TestObservationRegistryAssert.assertThat(registry)
62-
.hasObservationWithNameEqualToIgnoringCase("http.client.requests");
61+
assertThat(registry).hasObservationWithNameEqualToIgnoringCase("http.client.requests");
6362
});
6463
}
6564

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/web/client/WebClientObservationConfigurationTests.java

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2023 the original author or authors.
2+
* Copyright 2012-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@
2222
import io.micrometer.core.instrument.MeterRegistry;
2323
import io.micrometer.observation.ObservationRegistry;
2424
import io.micrometer.observation.tck.TestObservationRegistry;
25-
import io.micrometer.observation.tck.TestObservationRegistryAssert;
2625
import org.junit.jupiter.api.Test;
2726
import org.junit.jupiter.api.extension.ExtendWith;
2827
import reactor.core.publisher.Mono;
@@ -84,14 +83,13 @@ void shouldUseCustomConventionIfAvailable() {
8483
TestObservationRegistry registry = context.getBean(TestObservationRegistry.class);
8584
WebClient.Builder builder = context.getBean(WebClient.Builder.class);
8685
WebClient webClient = mockWebClient(builder);
87-
TestObservationRegistryAssert.assertThat(registry).doesNotHaveAnyObservation();
86+
assertThat(registry).doesNotHaveAnyObservation();
8887
webClient.get()
8988
.uri("https://example.org/projects/{project}", "spring-boot")
9089
.retrieve()
9190
.toBodilessEntity()
9291
.block(Duration.ofSeconds(30));
93-
TestObservationRegistryAssert.assertThat(registry)
94-
.hasObservationWithNameEqualTo("http.client.requests")
92+
assertThat(registry).hasObservationWithNameEqualTo("http.client.requests")
9593
.that()
9694
.hasLowCardinalityKeyValue("project", "spring-boot");
9795
});
@@ -101,8 +99,7 @@ void shouldUseCustomConventionIfAvailable() {
10199
void afterMaxUrisReachedFurtherUrisAreDenied(CapturedOutput output) {
102100
this.contextRunner.withPropertyValues("management.metrics.web.client.max-uri-tags=2").run((context) -> {
103101
TestObservationRegistry registry = getInitializedRegistry(context);
104-
TestObservationRegistryAssert.assertThat(registry)
105-
.hasNumberOfObservationsWithNameEqualTo("http.client.requests", 3);
102+
assertThat(registry).hasNumberOfObservationsWithNameEqualTo("http.client.requests", 3);
106103
MeterRegistry meterRegistry = context.getBean(MeterRegistry.class);
107104
assertThat(meterRegistry.find("http.client.requests").timers()).hasSize(1);
108105
// MeterFilter.maximumAllowableTags() works with prefix matching.
@@ -116,8 +113,7 @@ void afterMaxUrisReachedFurtherUrisAreDenied(CapturedOutput output) {
116113
void shouldNotDenyNorLogIfMaxUrisIsNotReached(CapturedOutput output) {
117114
this.contextRunner.withPropertyValues("management.metrics.web.client.max-uri-tags=5").run((context) -> {
118115
TestObservationRegistry registry = getInitializedRegistry(context);
119-
TestObservationRegistryAssert.assertThat(registry)
120-
.hasNumberOfObservationsWithNameEqualTo("http.client.requests", 3);
116+
assertThat(registry).hasNumberOfObservationsWithNameEqualTo("http.client.requests", 3);
121117
MeterRegistry meterRegistry = context.getBean(MeterRegistry.class);
122118
assertThat(meterRegistry.find("http.client.requests").timers()).hasSize(3);
123119
assertThat(output).doesNotContain("Reached the maximum number of URI tags for 'http.client.requests'.")
@@ -140,14 +136,13 @@ private TestObservationRegistry getInitializedRegistry(AssertableApplicationCont
140136

141137
private void validateWebClient(WebClient.Builder builder, TestObservationRegistry registry) {
142138
WebClient webClient = mockWebClient(builder);
143-
TestObservationRegistryAssert.assertThat(registry).doesNotHaveAnyObservation();
139+
assertThat(registry).doesNotHaveAnyObservation();
144140
webClient.get()
145141
.uri("https://example.org/projects/{project}", "spring-boot")
146142
.retrieve()
147143
.toBodilessEntity()
148144
.block(Duration.ofSeconds(30));
149-
TestObservationRegistryAssert.assertThat(registry)
150-
.hasObservationWithNameEqualTo("http.client.requests")
145+
assertThat(registry).hasObservationWithNameEqualTo("http.client.requests")
151146
.that()
152147
.hasLowCardinalityKeyValue("uri", "/projects/{project}");
153148
}

0 commit comments

Comments
 (0)