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

remove old style listeners in favor of event bus

Browse Source
This commit is contained in:
Sebastian Sdorra
2014-01-03 11:32:40 +01:00
parent b5d1f57c88
commit 5e6259f3b7
47 changed files with 239 additions and 1186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -140,10 +140,6 @@ public class DefaultRepositoryManagerTest extends RepositoryManagerTestBase
}
});
Provider<Set<RepositoryListener>> listenerProvider = mock(Provider.class);
when(listenerProvider.get()).thenReturn(new HashSet<RepositoryListener>());
Provider<Set<RepositoryHook>> hookProvider = mock(Provider.class);
when(hookProvider.get()).thenReturn(new HashSet<RepositoryHook>());
@@ -155,7 +151,7 @@ public class DefaultRepositoryManagerTest extends RepositoryManagerTestBase
configuration.setEnableRepositoryArchive(archiveEnabled);
return new DefaultRepositoryManager(configuration, contextProvider,
new DefaultKeyGenerator(), repositoryDAO, handlerSet, listenerProvider,
new DefaultKeyGenerator(), repositoryDAO, handlerSet,
hookProvider, createEmptyPreProcessorUtil());
}

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

@@ -75,12 +75,8 @@ public class DefaultUserManagerTest extends UserManagerTestBase
factory.init(contextProvider);
Provider<Set<UserListener>> listenerProvider = mock(Provider.class);
when(listenerProvider.get()).thenReturn(new HashSet<UserListener>());
XmlUserDAO userDAO = new XmlUserDAO(factory);
return new DefaultUserManager(userDAO, listenerProvider);
return new DefaultUserManager(userDAO);
}
}

3
scm-webapp/src/test/java/sonia/scm/web/security/ChainAuthenticationManagerTest.java
View File

@@ -222,8 +222,7 @@ public class ChainAuthenticationManagerTest extends AbstractTestBase
when(userManager.getDefaultType()).thenReturn(defaultType);
manager = new ChainAuthenticatonManager(userManager, handlerSet,
new MessageDigestEncryptionHandler(), new MapCacheManager(),
Collections.EMPTY_SET);
new MessageDigestEncryptionHandler(), new MapCacheManager());
manager.init(contextProvider);
return manager;

15
scm-webapp/src/test/java/sonia/scm/web/security/DefaultAuthenticationHandlerTest.java
View File

@@ -35,8 +35,6 @@ package sonia.scm.web.security;
//~--- non-JDK imports --------------------------------------------------------
import com.google.inject.Provider;
import org.junit.Test;
import sonia.scm.AbstractTestBase;
@@ -46,20 +44,14 @@ import sonia.scm.store.JAXBStoreFactory;
import sonia.scm.store.StoreFactory;
import sonia.scm.user.DefaultUserManager;
import sonia.scm.user.User;
import sonia.scm.user.UserListener;
import sonia.scm.user.UserTestData;
import sonia.scm.user.xml.XmlUserDAO;
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;
@@ -136,16 +128,11 @@ public class DefaultAuthenticationHandlerTest extends AbstractTestBase
storeFactory.init(contextProvider);
Provider<Set<UserListener>> listenerProvider = mock(Provider.class);
when(listenerProvider.get()).thenReturn(new HashSet<UserListener>());
XmlUserDAO userDAO = new XmlUserDAO(storeFactory);
setSubject(MockUtil.createAdminSubject());
DefaultUserManager userManager = new DefaultUserManager(userDAO,
listenerProvider);
DefaultUserManager userManager = new DefaultUserManager(userDAO);
userManager.init(contextProvider);
userManager.create(slarti);