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

merge with branch issue-340

Browse Source
This commit is contained in:
Sebastian Sdorra
2013-05-11 19:08:07 +02:00
parent 65e400345b 4c1ebc4d8d
commit e440feb5f5
50 changed files with 4115 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scm-webapp/src/test/java/sonia/scm/security/ScmRealmTest.java
View File

@@ -35,6 +35,7 @@ package sonia.scm.security;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Provider;
@@ -50,6 +51,8 @@ import org.apache.shiro.subject.PrincipalCollection;
import org.junit.Test;
import org.mockito.Mockito;
import sonia.scm.cache.MapCacheManager;
import sonia.scm.config.ScmConfiguration;
import sonia.scm.group.Group;
@@ -76,6 +79,7 @@ import static org.mockito.Mockito.*;
//~--- JDK imports ------------------------------------------------------------
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.concurrent.atomic.AtomicLong;
@@ -464,9 +468,16 @@ public class ScmRealmTest
AuthenticationResult.NOT_FOUND
);
SecuritySystem securitySystem = mock(SecuritySystem.class);
when(
securitySystem.getPermissions(Mockito.<Predicate>any())
).thenReturn(
Collections.EMPTY_LIST
);
return new ScmRealm(
new ScmConfiguration(),
securitySystem,
new MapCacheManager(),
userManager,
groupManager,