From d9cf93b59abff05688c4a2ff6e114c564d463c26 Mon Sep 17 00:00:00 2001 From: Eduard Heimbuch Date: Thu, 17 Oct 2019 11:17:33 +0200 Subject: [PATCH] cleanup --- .../scm/config/ScmConfigurationChangedListenerTest.java | 8 ++------ .../scm/security/DefaultAuthorizationCollectorTest.java | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/scm-core/src/test/java/sonia/scm/config/ScmConfigurationChangedListenerTest.java b/scm-core/src/test/java/sonia/scm/config/ScmConfigurationChangedListenerTest.java index ab2a4f7f26..67a275c0ad 100644 --- a/scm-core/src/test/java/sonia/scm/config/ScmConfigurationChangedListenerTest.java +++ b/scm-core/src/test/java/sonia/scm/config/ScmConfigurationChangedListenerTest.java @@ -49,12 +49,8 @@ class ScmConfigurationChangedListenerTest { @Test void shouldNotCreateAnonymousUserIfAnonymousAccessDisabled() { - ScmConfiguration changes = new ScmConfiguration(); - changes.setAnonymousAccessEnabled(false); - scmConfiguration.load(changes); - - listener.handleEvent(new ScmConfigurationChangedEvent(scmConfiguration)); + //anonymous access disabled by default + listener.handleEvent(new ScmConfigurationChangedEvent(scmConfiguration)); verify(userManager, never()).create(any()); } - } diff --git a/scm-webapp/src/test/java/sonia/scm/security/DefaultAuthorizationCollectorTest.java b/scm-webapp/src/test/java/sonia/scm/security/DefaultAuthorizationCollectorTest.java index 08216e9fd2..e15702daca 100644 --- a/scm-webapp/src/test/java/sonia/scm/security/DefaultAuthorizationCollectorTest.java +++ b/scm-webapp/src/test/java/sonia/scm/security/DefaultAuthorizationCollectorTest.java @@ -181,10 +181,10 @@ public class DefaultAuthorizationCollectorTest { configuration = "classpath:sonia/scm/shiro-001.ini" ) public void testCollectWithoutPermissionsForAnonymousUser() { - User anonymous = SCMContext.ANONYMOUS; - authenticate(anonymous, "anon"); + authenticate(SCMContext.ANONYMOUS, "anon"); AuthorizationInfo authInfo = collector.collect(); + assertThat(authInfo.getRoles(), Matchers.contains(Role.USER)); assertThat(authInfo.getStringPermissions(), hasSize(1)); assertThat(authInfo.getStringPermissions(), containsInAnyOrder("user:read:_anonymous")); assertThat(authInfo.getObjectPermissions(), nullValue());