Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-17 02:31:14 +01:00
Code Issues Packages Projects Releases Activity

Minor cleanup

Browse Source
This commit is contained in:
Philipp Czora
2019-01-29 10:47:54 +01:00
parent 5eb4d321a9
commit 92df3201ee
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryPermissionRootResourceTest.java
View File

@@ -82,11 +82,11 @@ public class RepositoryPermissionRootResourceTest extends RepositoryTestBase {
private static final ArrayList<RepositoryPermission> TEST_PERMISSIONS = Lists private static final ArrayList<RepositoryPermission> TEST_PERMISSIONS = Lists
.newArrayList( .newArrayList(
new RepositoryPermission("user_write", asList("read","modify"), false), new RepositoryPermission("user_write", asList("read","modify"), false),
new RepositoryPermission("user_read", asList("read"), false), new RepositoryPermission("user_read", singletonList("read"), false),
new RepositoryPermission("user_owner", asList("*"), false), new RepositoryPermission("user_owner", singletonList("*"), false),
new RepositoryPermission("group_read", asList("read"), true), new RepositoryPermission("group_read", singletonList("read"), true),
new RepositoryPermission("group_write", asList("read","modify"), true), new RepositoryPermission("group_write", asList("read","modify"), true),
new RepositoryPermission("group_owner", asList("*"), true) new RepositoryPermission("group_owner", singletonList("*"), true)
); );
private final ExpectedRequest requestGETAllPermissions = new ExpectedRequest() private final ExpectedRequest requestGETAllPermissions = new ExpectedRequest()
.description("GET all permissions") .description("GET all permissions")

10
scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerPerfTest.java
View File

@@ -111,7 +111,6 @@ public class DefaultRepositoryManagerPerfTest {
public void setUpObjectUnderTest(){ public void setUpObjectUnderTest(){
when(repositoryHandler.getType()).thenReturn(new RepositoryType(REPOSITORY_TYPE, REPOSITORY_TYPE, Sets.newHashSet())); when(repositoryHandler.getType()).thenReturn(new RepositoryType(REPOSITORY_TYPE, REPOSITORY_TYPE, Sets.newHashSet()));
Set<RepositoryHandler> handlerSet = ImmutableSet.of(repositoryHandler); Set<RepositoryHandler> handlerSet = ImmutableSet.of(repositoryHandler);
RepositoryMatcher repositoryMatcher = new RepositoryMatcher(Collections.<RepositoryPathMatcher>emptySet());
NamespaceStrategy namespaceStrategy = mock(NamespaceStrategy.class); NamespaceStrategy namespaceStrategy = mock(NamespaceStrategy.class);
repositoryManager = new DefaultRepositoryManager( repositoryManager = new DefaultRepositoryManager(
configuration, configuration,
@@ -138,7 +137,7 @@ public class DefaultRepositoryManagerPerfTest {
/** /**
* Start performance test and ensure that the timeout is not reached. * Start performance test and ensure that the timeout is not reached.
*/ */
@Test(timeout = 6000l) @Test(timeout = 6000L)
public void perfTestGetAll(){ public void perfTestGetAll(){
SecurityUtils.getSubject().login(new UsernamePasswordToken("trillian", "secret")); SecurityUtils.getSubject().login(new UsernamePasswordToken("trillian", "secret"));
@@ -155,7 +154,7 @@ public class DefaultRepositoryManagerPerfTest {
} }
private long calculateAverage(List<Long> times) { private long calculateAverage(List<Long> times) {
Long sum = 0l; Long sum = 0L;
if(!times.isEmpty()) { if(!times.isEmpty()) {
for (Long time : times) { for (Long time : times) {
sum += time; sum += time;
@@ -183,9 +182,8 @@ private long calculateAverage(List<Long> times) {
} }
private Repository createTestRepository(int number) { private Repository createTestRepository(int number) {
Repository repository = new Repository(keyGenerator.createKey(), REPOSITORY_TYPE, "namespace", "repo-" + number); return new Repository(keyGenerator.createKey(), REPOSITORY_TYPE, "namespace", "repo-" + number);
// repository.addPermission(new RepositoryPermission("trillian", PermissionType.READ));
return repository;
} }
static class DummyRealm extends AuthorizingRealm { static class DummyRealm extends AuthorizingRealm {