From 88e64bac0ce3436fa0c3b17a20c17f68e0d07c07 Mon Sep 17 00:00:00 2001 From: Josh Cummings Date: Wed, 16 Nov 2022 13:59:29 -0700 Subject: [PATCH] Polish Tests Issue gh-11992 --- .../ObservationSecurityContextChangedListener.java | 8 ++++---- .../ObservationSecurityContextChangedListenerTests.java | 9 ++++++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/core/src/main/java/org/springframework/security/core/context/ObservationSecurityContextChangedListener.java b/core/src/main/java/org/springframework/security/core/context/ObservationSecurityContextChangedListener.java index a8c141e7f8..ef582c1fbc 100644 --- a/core/src/main/java/org/springframework/security/core/context/ObservationSecurityContextChangedListener.java +++ b/core/src/main/java/org/springframework/security/core/context/ObservationSecurityContextChangedListener.java @@ -33,11 +33,11 @@ import org.springframework.security.core.Authentication; */ public final class ObservationSecurityContextChangedListener implements SecurityContextChangedListener { - private static final String SECURITY_CONTEXT_CREATED = "security.context.created"; + static final String SECURITY_CONTEXT_CREATED = "security.context.created"; - private static final String SECURITY_CONTEXT_CHANGED = "security.context.changed"; + static final String SECURITY_CONTEXT_CHANGED = "security.context.changed"; - private static final String SECURITY_CONTEXT_CLEARED = "security.context.cleared"; + static final String SECURITY_CONTEXT_CLEARED = "security.context.cleared"; private final ObservationRegistry registry; @@ -60,7 +60,7 @@ public final class ObservationSecurityContextChangedListener implements Security return; } if (event.isCleared()) { - observation.event(Observation.Event.of("security.context.cleared")); + observation.event(Observation.Event.of(SECURITY_CONTEXT_CLEARED)); return; } Authentication oldAuthentication = getAuthentication(event.getOldContext()); diff --git a/core/src/test/java/org/springframework/security/core/context/ObservationSecurityContextChangedListenerTests.java b/core/src/test/java/org/springframework/security/core/context/ObservationSecurityContextChangedListenerTests.java index 750a352b64..6fdfc265ba 100644 --- a/core/src/test/java/org/springframework/security/core/context/ObservationSecurityContextChangedListenerTests.java +++ b/core/src/test/java/org/springframework/security/core/context/ObservationSecurityContextChangedListenerTests.java @@ -66,7 +66,8 @@ public class ObservationSecurityContextChangedListenerTests { .securityContextChanged(new SecurityContextChangedEvent(one, SecurityContextChangedEvent.NO_CONTEXT)); ArgumentCaptor event = ArgumentCaptor.forClass(Observation.Event.class); verify(observation).event(event.capture()); - assertThat(event.getValue().getName()).isEqualTo("security.context.cleared"); + assertThat(event.getValue().getName()) + .isEqualTo(ObservationSecurityContextChangedListener.SECURITY_CONTEXT_CLEARED); verifyNoInteractions(one); } @@ -85,7 +86,8 @@ public class ObservationSecurityContextChangedListenerTests { this.tested.securityContextChanged(new SecurityContextChangedEvent(this.one, this.two)); ArgumentCaptor event = ArgumentCaptor.forClass(Observation.Event.class); verify(observation).event(event.capture()); - assertThat(event.getValue().getName()).isEqualTo("security.context.changed"); + assertThat(event.getValue().getName()) + .isEqualTo(ObservationSecurityContextChangedListener.SECURITY_CONTEXT_CHANGED); } @Test @@ -95,7 +97,8 @@ public class ObservationSecurityContextChangedListenerTests { this.tested.securityContextChanged(new SecurityContextChangedEvent(null, this.one)); ArgumentCaptor event = ArgumentCaptor.forClass(Observation.Event.class); verify(observation).event(event.capture()); - assertThat(event.getValue().getName()).isEqualTo("security.context.created"); + assertThat(event.getValue().getName()) + .isEqualTo(ObservationSecurityContextChangedListener.SECURITY_CONTEXT_CREATED); } }