From 8a0d2ba81903dbdb54863094deeb3b044ee9b02d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Wed, 23 Jan 2019 10:06:48 +0100 Subject: [PATCH] Rename --- ...signer.java => RepositoryPermissions.java} | 7 ++-- .../RepositoryPermissionAssignerTest.java | 25 ------------- .../security/RepositoryPermissionsTest.java | 36 +++++++++++++++++++ 3 files changed, 39 insertions(+), 29 deletions(-) rename scm-webapp/src/main/java/sonia/scm/security/{RepositoryPermissionAssigner.java => RepositoryPermissions.java} (95%) delete mode 100644 scm-webapp/src/test/java/sonia/scm/security/RepositoryPermissionAssignerTest.java create mode 100644 scm-webapp/src/test/java/sonia/scm/security/RepositoryPermissionsTest.java diff --git a/scm-webapp/src/main/java/sonia/scm/security/RepositoryPermissionAssigner.java b/scm-webapp/src/main/java/sonia/scm/security/RepositoryPermissions.java similarity index 95% rename from scm-webapp/src/main/java/sonia/scm/security/RepositoryPermissionAssigner.java rename to scm-webapp/src/main/java/sonia/scm/security/RepositoryPermissions.java index 59bc489144..463c2def6e 100644 --- a/scm-webapp/src/main/java/sonia/scm/security/RepositoryPermissionAssigner.java +++ b/scm-webapp/src/main/java/sonia/scm/security/RepositoryPermissions.java @@ -21,16 +21,15 @@ import java.util.Enumeration; import java.util.List; import java.util.stream.Collectors; -public class RepositoryPermissionAssigner { +public class RepositoryPermissions { - private static final Logger logger = LoggerFactory.getLogger(RepositoryPermissionAssigner.class); - private static final String NAME = "permissions"; + private static final Logger logger = LoggerFactory.getLogger(RepositoryPermissions.class); private static final String REPOSITORY_PERMISSION_DESCRIPTOR = "META-INF/scm/repository-permissions.xml"; private final ConfigurationEntryStoreFactory storeFactory; private final AvailableRepositoryPermissions availablePermissions; @Inject - public RepositoryPermissionAssigner(ConfigurationEntryStoreFactory storeFactory, PluginLoader pluginLoader) { + public RepositoryPermissions(ConfigurationEntryStoreFactory storeFactory, PluginLoader pluginLoader) { this.storeFactory = storeFactory; this.availablePermissions = readAvailablePermissions(pluginLoader); } diff --git a/scm-webapp/src/test/java/sonia/scm/security/RepositoryPermissionAssignerTest.java b/scm-webapp/src/test/java/sonia/scm/security/RepositoryPermissionAssignerTest.java deleted file mode 100644 index d037c2cbfe..0000000000 --- a/scm-webapp/src/test/java/sonia/scm/security/RepositoryPermissionAssignerTest.java +++ /dev/null @@ -1,25 +0,0 @@ -package sonia.scm.security; - -import org.assertj.core.api.Assertions; -import org.junit.jupiter.api.Test; -import sonia.scm.plugin.PluginLoader; -import sonia.scm.store.ConfigurationEntryStoreFactory; -import sonia.scm.util.ClassLoaders; - -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -class RepositoryPermissionAssignerTest { - - @Test - void x() { - PluginLoader pluginLoader = mock(PluginLoader.class); - when(pluginLoader.getUberClassLoader()).thenReturn(ClassLoaders.getContextClassLoader(DefaultSecuritySystem.class)); - ConfigurationEntryStoreFactory configurationEntryStoreFactory = mock(ConfigurationEntryStoreFactory.class); - RepositoryPermissionAssigner repositoryPermissionAssigner = new RepositoryPermissionAssigner(configurationEntryStoreFactory, pluginLoader); - Assertions.assertThat(repositoryPermissionAssigner.availableVerbs()).isNotEmpty(); - Assertions.assertThat(repositoryPermissionAssigner.availableRoles()).isNotEmpty().noneMatch(r -> r.getVerbs().isEmpty()); - System.out.println(repositoryPermissionAssigner.availableVerbs()); - System.out.println(repositoryPermissionAssigner.availableRoles()); - } -} diff --git a/scm-webapp/src/test/java/sonia/scm/security/RepositoryPermissionsTest.java b/scm-webapp/src/test/java/sonia/scm/security/RepositoryPermissionsTest.java new file mode 100644 index 0000000000..433e91e64c --- /dev/null +++ b/scm-webapp/src/test/java/sonia/scm/security/RepositoryPermissionsTest.java @@ -0,0 +1,36 @@ +package sonia.scm.security; + +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import sonia.scm.plugin.PluginLoader; +import sonia.scm.store.ConfigurationEntryStoreFactory; +import sonia.scm.util.ClassLoaders; + +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +class RepositoryPermissionsTest { + + private RepositoryPermissions repositoryPermissions; + + @BeforeEach + void init() { + PluginLoader pluginLoader = mock(PluginLoader.class); + when(pluginLoader.getUberClassLoader()).thenReturn(ClassLoaders.getContextClassLoader(DefaultSecuritySystem.class)); + ConfigurationEntryStoreFactory configurationEntryStoreFactory = mock(ConfigurationEntryStoreFactory.class); + repositoryPermissions = new RepositoryPermissions(configurationEntryStoreFactory, pluginLoader); + } + + @Test + void shouldReadAvailableRoles() { + Assertions.assertThat(repositoryPermissions.availableRoles()).isNotEmpty().noneMatch(r -> r.getVerbs().isEmpty()); + System.out.println(repositoryPermissions.availableRoles()); + } + + @Test + void shouldReadAvailableVerbs() { + Assertions.assertThat(repositoryPermissions.availableVerbs()).isNotEmpty(); + System.out.println(repositoryPermissions.availableVerbs()); + } +}