github
/
OpenID-Connect-Java-Spring-Server
mirror of https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

removed setter/getter from DefaultUserInfoUserDetailsService and updated test class with Mockito annotations.

pull/357/merge
William Kim 2013-06-14 10:59:34 -04:00 committed by Justin Richer
parent 5428848627
commit 4ee904cbfd
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultUserInfoUserDetailsService.java
View File

@ -85,12 +85,4 @@ public class DefaultUserInfoUserDetailsService implements UserDetailsService {
this.admins = admins; this.admins = admins;
} }
public UserInfoRepository getUserInfoRepository() {
return repository;
}
public void setUserInfoRepository(UserInfoRepository repository) {
this.repository = repository;
}
} }

16
openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestDefaultUserInfoUserDetailsService.java
View File

@ -9,20 +9,29 @@ import java.util.ArrayList;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith;
import org.mitre.openid.connect.model.DefaultUserInfo; import org.mitre.openid.connect.model.DefaultUserInfo;
import org.mitre.openid.connect.model.UserInfo; import org.mitre.openid.connect.model.UserInfo;
import org.mitre.openid.connect.repository.UserInfoRepository; import org.mitre.openid.connect.repository.UserInfoRepository;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito; import org.mockito.Mockito;
import org.mockito.runners.MockitoJUnitRunner;
import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.security.core.userdetails.UsernameNotFoundException;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
@RunWith(MockitoJUnitRunner.class)
public class TestDefaultUserInfoUserDetailsService { public class TestDefaultUserInfoUserDetailsService {
private DefaultUserInfoUserDetailsService service; @InjectMocks
private DefaultUserInfoUserDetailsService service = new DefaultUserInfoUserDetailsService();
@Mock
private UserInfoRepository userInfoRepository; private UserInfoRepository userInfoRepository;
private UserInfo userInfoAdmin; private UserInfo userInfoAdmin;
private UserInfo userInfoRegular; private UserInfo userInfoRegular;
private String adminUsername = "username"; private String adminUsername = "username";
@ -36,9 +45,8 @@ public class TestDefaultUserInfoUserDetailsService {
*/ */
@Before @Before
public void prepare() { public void prepare() {
userInfoRepository = Mockito.mock(UserInfoRepository.class);
service = new DefaultUserInfoUserDetailsService();
service.setUserInfoRepository(userInfoRepository);
service.setAdmins(Lists.newArrayList(adminUsername)); service.setAdmins(Lists.newArrayList(adminUsername));
userInfoAdmin = new DefaultUserInfo(); userInfoAdmin = new DefaultUserInfo();