added stats mock to unit tests
Conflicts: openid-connect-server/src/test/java/org/mitre/oauth2/service/impl/TestDefaultOAuth2ClientDetailsEntityService.javapull/661/merge
parent
06b621e995
commit
331abcba63
|
@ -27,6 +27,7 @@ import org.mitre.oauth2.repository.OAuth2TokenRepository;
|
||||||
import org.mitre.openid.connect.model.WhitelistedSite;
|
import org.mitre.openid.connect.model.WhitelistedSite;
|
||||||
import org.mitre.openid.connect.service.ApprovedSiteService;
|
import org.mitre.openid.connect.service.ApprovedSiteService;
|
||||||
import org.mitre.openid.connect.service.BlacklistedSiteService;
|
import org.mitre.openid.connect.service.BlacklistedSiteService;
|
||||||
|
import org.mitre.openid.connect.service.StatsService;
|
||||||
import org.mitre.openid.connect.service.WhitelistedSiteService;
|
import org.mitre.openid.connect.service.WhitelistedSiteService;
|
||||||
import org.mockito.InjectMocks;
|
import org.mockito.InjectMocks;
|
||||||
import org.mockito.Matchers;
|
import org.mockito.Matchers;
|
||||||
|
@ -64,12 +65,15 @@ public class TestDefaultOAuth2ClientDetailsEntityService {
|
||||||
@Mock
|
@Mock
|
||||||
private BlacklistedSiteService blacklistedSiteService;
|
private BlacklistedSiteService blacklistedSiteService;
|
||||||
|
|
||||||
|
@Mock
|
||||||
|
private StatsService statsService;
|
||||||
|
|
||||||
@InjectMocks
|
@InjectMocks
|
||||||
private DefaultOAuth2ClientDetailsEntityService service;
|
private DefaultOAuth2ClientDetailsEntityService service;
|
||||||
|
|
||||||
@Before
|
@Before
|
||||||
public void prepare() {
|
public void prepare() {
|
||||||
Mockito.reset(clientRepository, tokenRepository, approvedSiteService, whitelistedSiteService, blacklistedSiteService);
|
Mockito.reset(clientRepository, tokenRepository, approvedSiteService, whitelistedSiteService, blacklistedSiteService, statsService);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -26,6 +26,7 @@ import org.mitre.oauth2.model.ClientDetailsEntity;
|
||||||
import org.mitre.openid.connect.model.ApprovedSite;
|
import org.mitre.openid.connect.model.ApprovedSite;
|
||||||
import org.mitre.openid.connect.repository.ApprovedSiteRepository;
|
import org.mitre.openid.connect.repository.ApprovedSiteRepository;
|
||||||
import org.mitre.openid.connect.service.ApprovedSiteService;
|
import org.mitre.openid.connect.service.ApprovedSiteService;
|
||||||
|
import org.mitre.openid.connect.service.StatsService;
|
||||||
import org.mockito.InjectMocks;
|
import org.mockito.InjectMocks;
|
||||||
import org.mockito.Mock;
|
import org.mockito.Mock;
|
||||||
import org.mockito.Mockito;
|
import org.mockito.Mockito;
|
||||||
|
@ -51,6 +52,9 @@ public class TestDefaultApprovedSiteService {
|
||||||
@Mock
|
@Mock
|
||||||
private ApprovedSiteRepository repository;
|
private ApprovedSiteRepository repository;
|
||||||
|
|
||||||
|
@Mock
|
||||||
|
private StatsService statsService;
|
||||||
|
|
||||||
@InjectMocks
|
@InjectMocks
|
||||||
private ApprovedSiteService service = new DefaultApprovedSiteService();
|
private ApprovedSiteService service = new DefaultApprovedSiteService();
|
||||||
|
|
||||||
|
@ -80,7 +84,7 @@ public class TestDefaultApprovedSiteService {
|
||||||
site3.setUserId("user2");
|
site3.setUserId("user2");
|
||||||
site3.setClientId(clientId);
|
site3.setClientId(clientId);
|
||||||
|
|
||||||
Mockito.reset(repository);
|
Mockito.reset(repository, statsService);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue