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

Merge parallel development

Browse Source
This commit is contained in:
René Pfeuffer
2018-07-02 14:36:04 +02:00
parent 5b5c30f054 ffabda3f83
commit 54776548ea
17 changed files with 478 additions and 978 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,6 +95,8 @@ public class DefaultRepositoryManagerPerfTest {
private final ScmConfiguration configuration = new ScmConfiguration();
private final KeyGenerator keyGenerator = new DefaultKeyGenerator();
private final NamespaceStrategy namespaceStrategy = new DefaultNamespaceStrategy();
@Mock
private RepositoryHandler repositoryHandler;
@@ -120,7 +122,8 @@ public class DefaultRepositoryManagerPerfTest {
repositoryDAO,
handlerSet,
repositoryMatcher,
mock(SpacesStrategy.class));
namespaceStrategy
);
setUpTestRepositories();

4
scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerTest.java
View File

@@ -548,10 +548,12 @@ public class DefaultRepositoryManagerTest extends ManagerTestBase<Repository, Re
ScmConfiguration configuration = new ScmConfiguration();
NamespaceStrategy namespaceStrategy = new DefaultNamespaceStrategy();
configuration.setEnableRepositoryArchive(archiveEnabled);
return new DefaultRepositoryManager(configuration, contextProvider,
keyGenerator, repositoryDAO, handlerSet, createRepositoryMatcher(), mock(SpacesStrategy.class));
keyGenerator, repositoryDAO, handlerSet, createRepositoryMatcher(), namespaceStrategy);
}
private void createRepository(RepositoryManager m, Repository repository)