mirror of
https://github.com/scm-manager/scm-manager.git
synced 2025-11-17 10:41:06 +01:00
added injection support for authentication, group, repository and user listeners
This commit is contained in:
@@ -35,12 +35,16 @@ package sonia.scm.repository;
|
||||
|
||||
//~--- non-JDK imports --------------------------------------------------------
|
||||
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import sonia.scm.Manager;
|
||||
import sonia.scm.repository.xml.XmlRepositoryManager;
|
||||
import sonia.scm.store.JAXBStoreFactory;
|
||||
import sonia.scm.store.StoreFactory;
|
||||
import sonia.scm.util.MockUtil;
|
||||
|
||||
import static org.mockito.Mockito.*;
|
||||
|
||||
//~--- JDK imports ------------------------------------------------------------
|
||||
|
||||
import java.util.HashSet;
|
||||
@@ -68,8 +72,12 @@ public class XmlRepositoryManagerTest extends RepositoryManagerTestBase
|
||||
factory.init(contextProvider);
|
||||
handlerSet.add(new DummyRepositoryHandler(factory));
|
||||
|
||||
Provider<Set<RepositoryListener>> listenerProvider = mock(Provider.class);
|
||||
|
||||
when(listenerProvider.get()).thenReturn(new HashSet<RepositoryListener>());
|
||||
|
||||
return new XmlRepositoryManager(contextProvider,
|
||||
MockUtil.getAdminSecurityContextProvider(),
|
||||
factory, handlerSet);
|
||||
factory, handlerSet, listenerProvider);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -35,10 +35,19 @@ package sonia.scm.user;
|
||||
|
||||
//~--- non-JDK imports --------------------------------------------------------
|
||||
|
||||
import sonia.scm.util.MockUtil;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import sonia.scm.store.JAXBStoreFactory;
|
||||
import sonia.scm.store.StoreFactory;
|
||||
import sonia.scm.user.xml.XmlUserManager;
|
||||
import sonia.scm.util.MockUtil;
|
||||
|
||||
import static org.mockito.Mockito.*;
|
||||
|
||||
//~--- JDK imports ------------------------------------------------------------
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
*
|
||||
@@ -60,7 +69,11 @@ public class XmlUserManagerTest extends UserManagerTestBase
|
||||
|
||||
factory.init(contextProvider);
|
||||
|
||||
Provider<Set<UserListener>> listenerProvider = mock(Provider.class);
|
||||
|
||||
when(listenerProvider.get()).thenReturn(new HashSet<UserListener>());
|
||||
|
||||
return new XmlUserManager(MockUtil.getAdminSecurityContextProvider(),
|
||||
factory);
|
||||
factory, listenerProvider);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -35,6 +35,8 @@ package sonia.scm.web.security;
|
||||
|
||||
//~--- non-JDK imports --------------------------------------------------------
|
||||
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import org.junit.Test;
|
||||
|
||||
import sonia.scm.AbstractTestBase;
|
||||
@@ -48,6 +50,8 @@ import sonia.scm.util.MockUtil;
|
||||
|
||||
import static org.junit.Assert.*;
|
||||
|
||||
import static org.mockito.Mockito.*;
|
||||
|
||||
//~--- JDK imports ------------------------------------------------------------
|
||||
|
||||
import java.io.IOException;
|
||||
@@ -130,8 +134,15 @@ public class ChainAuthenticationManagerTest extends AbstractTestBase
|
||||
trillian.setPassword("trillian123");
|
||||
handlerSet.add(new SingleUserAuthenticaionHandler("trilliansType",
|
||||
trillian));
|
||||
|
||||
Provider<Set<AuthenticationListener>> listenerProvider =
|
||||
mock(Provider.class);
|
||||
|
||||
when(listenerProvider.get()).thenReturn(
|
||||
new HashSet<AuthenticationListener>());
|
||||
manager = new ChainAuthenticatonManager(handlerSet,
|
||||
new MessageDigestEncryptionHandler(), cacheManager);
|
||||
new MessageDigestEncryptionHandler(), cacheManager,
|
||||
listenerProvider);
|
||||
manager.init(contextProvider);
|
||||
request = MockUtil.getHttpServletRequest();
|
||||
response = MockUtil.getHttpServletResponse();
|
||||
|
||||
@@ -35,6 +35,8 @@ package sonia.scm.web.security;
|
||||
|
||||
//~--- non-JDK imports --------------------------------------------------------
|
||||
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import org.junit.Test;
|
||||
|
||||
import sonia.scm.AbstractTestBase;
|
||||
@@ -43,14 +45,20 @@ import sonia.scm.security.MessageDigestEncryptionHandler;
|
||||
import sonia.scm.store.JAXBStoreFactory;
|
||||
import sonia.scm.store.StoreFactory;
|
||||
import sonia.scm.user.User;
|
||||
import sonia.scm.user.UserListener;
|
||||
import sonia.scm.user.UserTestData;
|
||||
import sonia.scm.user.xml.XmlUserManager;
|
||||
import sonia.scm.util.MockUtil;
|
||||
|
||||
import static org.junit.Assert.*;
|
||||
|
||||
import static org.mockito.Mockito.*;
|
||||
|
||||
//~--- JDK imports ------------------------------------------------------------
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
@@ -127,9 +135,13 @@ public class XmlAuthenticationHandlerTest extends AbstractTestBase
|
||||
|
||||
storeFactory.init(contextProvider);
|
||||
|
||||
Provider<Set<UserListener>> listenerProvider = mock(Provider.class);
|
||||
|
||||
when(listenerProvider.get()).thenReturn(new HashSet<UserListener>());
|
||||
|
||||
XmlUserManager userManager =
|
||||
new XmlUserManager(MockUtil.getAdminSecurityContextProvider(),
|
||||
storeFactory);
|
||||
storeFactory, listenerProvider);
|
||||
|
||||
userManager.init(contextProvider);
|
||||
userManager.create(slarti);
|
||||
|
||||
Reference in New Issue
Block a user