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

merge

Browse Source
This commit is contained in:
Mohamed Karray
2018-11-29 16:59:04 +01:00
parent 37f4a2b669
commit 171f4e2f07
5 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scm-test/src/main/java/sonia/scm/AbstractTestBase.java
View File

@@ -90,8 +90,8 @@ public class AbstractTestBase
assertTrue(tempDirectory.mkdirs());
contextProvider = MockUtil.getSCMContextProvider(tempDirectory);
fileSystem = new DefaultFileSystem();
InitialRepositoryLocationResolver initialRepoLocationResolver = new InitialRepositoryLocationResolver(contextProvider);
repositoryLocationResolver = new RepositoryLocationResolver(repositoryDAO, initialRepoLocationResolver);
InitialRepositoryLocationResolver initialRepoLocationResolver = new InitialRepositoryLocationResolver();
repositoryLocationResolver = new RepositoryLocationResolver(contextProvider, repositoryDAO, initialRepoLocationResolver);
postSetUp();
}

4
scm-test/src/main/java/sonia/scm/ManagerTestBase.java
View File

@@ -72,9 +72,9 @@ public abstract class ManagerTestBase<T extends ModelObject>
temp = tempFolder.newFolder();
}
contextProvider = MockUtil.getSCMContextProvider(temp);
InitialRepositoryLocationResolver initialRepositoryLocationResolver = new InitialRepositoryLocationResolver(contextProvider);
InitialRepositoryLocationResolver initialRepositoryLocationResolver = new InitialRepositoryLocationResolver();
RepositoryDAO repoDao = mock(RepositoryDAO.class);
locationResolver = new RepositoryLocationResolver(repoDao ,initialRepositoryLocationResolver);
locationResolver = new RepositoryLocationResolver(contextProvider, repoDao ,initialRepositoryLocationResolver);
manager = createManager();
manager.init(contextProvider);
}