From 80de99292900c068195afd7ee96e5bea20c42eec Mon Sep 17 00:00:00 2001 From: lprimak Date: Sat, 7 Nov 2026 17:24:21 -0600 Subject: [PATCH] bugfix(test): flaky test core/.../DefaultSecurityManagerTest fixed --- .../shiro/mgt/DefaultSecurityManagerTest.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/core/src/test/java/org/apache/shiro/mgt/DefaultSecurityManagerTest.java b/core/src/test/java/org/apache/shiro/mgt/DefaultSecurityManagerTest.java index ba47492d23..73f1babce5 100644 --- a/core/src/test/java/org/apache/shiro/mgt/DefaultSecurityManagerTest.java +++ b/core/src/test/java/org/apache/shiro/mgt/DefaultSecurityManagerTest.java @@ -60,20 +60,18 @@ public void setup() { section.put("guest", "guest, guest"); section.put("lonestarr", "vespa, goodguy"); sm.setRealm(new IniRealm(ini)); - SecurityUtils.setSecurityManager(sm); } @AfterEach @Override public void tearDown() { - SecurityUtils.setSecurityManager(null); sm.destroy(); super.tearDown(); } @Test void testDefaultConfig() { - Subject subject = SecurityUtils.getSubject(); + Subject subject = new Subject.Builder(sm).buildSubject(); AuthenticationToken token = new UsernamePasswordToken("guest", "guest"); subject.login(token); @@ -99,7 +97,7 @@ void testDefaultConfig() { @SuppressWarnings("checkstyle:MagicNumber") @Test void testAutoCreateSessionAfterInvalidation() { - Subject subject = SecurityUtils.getSubject(); + Subject subject = new Subject.Builder(sm).buildSubject(); Session session = subject.getSession(); String key = "foo"; @@ -128,7 +126,7 @@ void testAutoCreateSessionAfterInvalidation() { @Test void testSubjectReuseAfterLogout() { - Subject subject = SecurityUtils.getSubject(); + Subject subject = new Subject.Builder(sm).buildSubject(); AuthenticationToken token = new UsernamePasswordToken("guest", "guest"); subject.login(token); @@ -195,19 +193,18 @@ void testNewSubjectWithoutThreadSecurityManager() { void testNewSubjectWithoutSessionCreationEnabled() { PrincipalCollection principals = ImmutablePrincipalCollection.ofSinglePrincipal("guest", "asd"); // this tests that calling `buildSubject` doesn't throw an exception due to session-creation being disabled - Subject subject = new Subject.Builder().principals(principals).sessionCreationEnabled(false).buildSubject(); + Subject subject = new Subject.Builder(sm).principals(principals).sessionCreationEnabled(false).buildSubject(); assertThat(subject.getPrincipal()).isEqualTo("guest"); } @Test void testNewSubjectWithSubjectFactoryThatDisablesSessionCreation() { - ((DefaultSecurityManager) SecurityUtils.getSecurityManager()) - .setSubjectFactory(new SessionCreationDisabledSubjectFactory()); + sm.setSubjectFactory(new SessionCreationDisabledSubjectFactory()); PrincipalCollection principals = ImmutablePrincipalCollection.ofSinglePrincipal("guest", "asd"); // this tests that calling `buildSubject` doesn't throw an exception due to session-creation being disabled - Subject subject = new Subject.Builder().principals(principals).buildSubject(); + Subject subject = new Subject.Builder(sm).principals(principals).buildSubject(); assertThat(subject.getPrincipal()).isEqualTo("guest"); }