root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '3.4.x' 

Closes gh-45997
This commit is contained in:
Andy Wilkinson 2025-06-17 19:19:22 +01:00
parent 943fd348b4 d7e20968d1
commit 2e423a75a6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/audit/AuditEventsEndpointDocumentationTests.java
View File

@ -16,7 +16,7 @@
package org.springframework.boot.actuate.autoconfigure.audit;
import java.time.OffsetDateTime;
import java.time.Instant;
import java.time.format.DateTimeFormatter;
import java.util.Collections;
import java.util.List;
@ -67,10 +67,10 @@ class AuditEventsEndpointDocumentationTests extends MockMvcEndpointDocumentation
@Test
void filteredAuditEvents() {
OffsetDateTime now = OffsetDateTime.now();
String queryTimestamp = DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(now);
given(this.repository.find("alice", now.toInstant(), "logout"))
.willReturn(List.of(new AuditEvent("alice", "logout", Collections.emptyMap())));
String queryTimestamp = "2017-11-07T09:37Z";
Instant instant = Instant.from(DateTimeFormatter.ISO_OFFSET_DATE_TIME.parse(queryTimestamp));
given(this.repository.find("alice", instant, "logout"))
.willReturn(List.of(new AuditEvent(instant.plusSeconds(73), "alice", "logout", Collections.emptyMap())));
assertThat(this.mvc.get()
.uri("/actuator/auditevents")
.param("principal", "alice")
@ -85,7 +85,7 @@ class AuditEventsEndpointDocumentationTests extends MockMvcEndpointDocumentation
.description("Restricts the events to those with the given principal. Optional."),
parameterWithName("type")
.description("Restricts the events to those with the given type. Optional."))));
then(this.repository).should().find("alice", now.toInstant(), "logout");
then(this.repository).should().find("alice", instant, "logout");
}
@Configuration(proxyBeanMethods = false)