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

merge + refactor getStoreDirectory

Browse Source
This commit is contained in:
Mohamed Karray
2018-11-28 15:14:49 +01:00
parent 7a1de0f67b 00ab764dab
commit fb79cbfd02
98 changed files with 1474 additions and 1534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scm-webapp/src/test/java/sonia/scm/user/DefaultUserManagerTest.java
View File

@@ -45,6 +45,9 @@ import org.junit.Test;
import org.mockito.ArgumentCaptor;
import sonia.scm.NotFoundException;
import sonia.scm.repository.InitialRepositoryLocationResolver;
import sonia.scm.repository.RepositoryDAO;
import sonia.scm.repository.RepositoryLocationResolver;
import sonia.scm.store.JAXBConfigurationStoreFactory;
import sonia.scm.user.xml.XmlUserDAO;
@@ -72,7 +75,7 @@ public class DefaultUserManagerTest extends UserManagerTestBase
public ShiroRule shiro = new ShiroRule();
private UserDAO userDAO = mock(UserDAO.class);
private UserDAO userDAO ;
private User trillian;
/**
@@ -182,6 +185,6 @@ public class DefaultUserManagerTest extends UserManagerTestBase
//~--- methods --------------------------------------------------------------
private XmlUserDAO createXmlUserDAO() {
return new XmlUserDAO(new JAXBConfigurationStoreFactory(locationResolver));
return new XmlUserDAO(new JAXBConfigurationStoreFactory(contextProvider, locationResolver));
}
}