mirror of
https://github.com/scm-manager/scm-manager.git
synced 2025-11-12 16:35:45 +01:00
fix repository manager test
This commit is contained in:
@@ -37,11 +37,14 @@ package sonia.scm.repository;
|
||||
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import org.apache.shiro.subject.Subject;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
import sonia.scm.Type;
|
||||
import sonia.scm.repository.xml.XmlRepositoryDAO;
|
||||
import sonia.scm.config.ScmConfiguration;
|
||||
import sonia.scm.repository.xml.XmlRepositoryDAO;
|
||||
import sonia.scm.store.JAXBStoreFactory;
|
||||
import sonia.scm.store.StoreFactory;
|
||||
import sonia.scm.util.MockUtil;
|
||||
@@ -73,7 +76,7 @@ public class DefaultRepositoryManagerTest extends RepositoryManagerTestBase
|
||||
*/
|
||||
@Test
|
||||
public void getRepositoryFromRequestUriTest()
|
||||
throws RepositoryException, IOException
|
||||
throws RepositoryException, IOException
|
||||
{
|
||||
RepositoryManager m = createManager();
|
||||
|
||||
@@ -86,12 +89,26 @@ public class DefaultRepositoryManagerTest extends RepositoryManagerTestBase
|
||||
assertEquals("scm-test", m.getFromUri("hg/scm-test").getName());
|
||||
assertEquals("scm-test", m.getFromUri("/hg/scm-test").getName());
|
||||
assertEquals("project1/test-1",
|
||||
m.getFromUri("/git/project1/test-1").getName());
|
||||
m.getFromUri("/git/project1/test-1").getName());
|
||||
assertEquals("project1/test-1",
|
||||
m.getFromUri("/git/project1/test-1/ka/some/path").getName());
|
||||
m.getFromUri("/git/project1/test-1/ka/some/path").getName());
|
||||
assertNull(m.getFromUri("/git/project1/test-3/ka/some/path"));
|
||||
}
|
||||
|
||||
//~--- set methods ----------------------------------------------------------
|
||||
|
||||
/**
|
||||
* Method description
|
||||
*
|
||||
*/
|
||||
@Before
|
||||
public void setAdminSubject()
|
||||
{
|
||||
Subject admin = MockUtil.createAdminSubject();
|
||||
|
||||
setSubject(admin);
|
||||
}
|
||||
|
||||
//~--- methods --------------------------------------------------------------
|
||||
|
||||
/**
|
||||
@@ -138,8 +155,7 @@ public class DefaultRepositoryManagerTest extends RepositoryManagerTestBase
|
||||
ScmConfiguration configuration = new ScmConfiguration();
|
||||
|
||||
return new DefaultRepositoryManager(configuration, contextProvider,
|
||||
MockUtil.getAdminSecurityContextProvider(), repositoryDAO,
|
||||
handlerSet, listenerProvider, hookProvider);
|
||||
repositoryDAO, handlerSet, listenerProvider, hookProvider);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -153,7 +169,7 @@ public class DefaultRepositoryManagerTest extends RepositoryManagerTestBase
|
||||
* @throws RepositoryException
|
||||
*/
|
||||
private void createRepository(RepositoryManager m, Repository repository)
|
||||
throws RepositoryException, IOException
|
||||
throws RepositoryException, IOException
|
||||
{
|
||||
m.create(repository);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user