From 331abcba6348a35f8c6cf7a73475bd231d6b4b74 Mon Sep 17 00:00:00 2001 From: Justin Richer Date: Wed, 16 Apr 2014 22:05:03 -0400 Subject: [PATCH] added stats mock to unit tests Conflicts: openid-connect-server/src/test/java/org/mitre/oauth2/service/impl/TestDefaultOAuth2ClientDetailsEntityService.java --- .../impl/TestDefaultOAuth2ClientDetailsEntityService.java | 6 +++++- .../service/impl/TestDefaultApprovedSiteService.java | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/openid-connect-server/src/test/java/org/mitre/oauth2/service/impl/TestDefaultOAuth2ClientDetailsEntityService.java b/openid-connect-server/src/test/java/org/mitre/oauth2/service/impl/TestDefaultOAuth2ClientDetailsEntityService.java index 5ed160a80..c7c44b1c3 100644 --- a/openid-connect-server/src/test/java/org/mitre/oauth2/service/impl/TestDefaultOAuth2ClientDetailsEntityService.java +++ b/openid-connect-server/src/test/java/org/mitre/oauth2/service/impl/TestDefaultOAuth2ClientDetailsEntityService.java @@ -27,6 +27,7 @@ import org.mitre.oauth2.repository.OAuth2TokenRepository; import org.mitre.openid.connect.model.WhitelistedSite; import org.mitre.openid.connect.service.ApprovedSiteService; import org.mitre.openid.connect.service.BlacklistedSiteService; +import org.mitre.openid.connect.service.StatsService; import org.mitre.openid.connect.service.WhitelistedSiteService; import org.mockito.InjectMocks; import org.mockito.Matchers; @@ -64,12 +65,15 @@ public class TestDefaultOAuth2ClientDetailsEntityService { @Mock private BlacklistedSiteService blacklistedSiteService; + @Mock + private StatsService statsService; + @InjectMocks private DefaultOAuth2ClientDetailsEntityService service; @Before public void prepare() { - Mockito.reset(clientRepository, tokenRepository, approvedSiteService, whitelistedSiteService, blacklistedSiteService); + Mockito.reset(clientRepository, tokenRepository, approvedSiteService, whitelistedSiteService, blacklistedSiteService, statsService); } /** diff --git a/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestDefaultApprovedSiteService.java b/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestDefaultApprovedSiteService.java index e8757bf85..9e06ba756 100644 --- a/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestDefaultApprovedSiteService.java +++ b/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestDefaultApprovedSiteService.java @@ -26,6 +26,7 @@ import org.mitre.oauth2.model.ClientDetailsEntity; import org.mitre.openid.connect.model.ApprovedSite; import org.mitre.openid.connect.repository.ApprovedSiteRepository; import org.mitre.openid.connect.service.ApprovedSiteService; +import org.mitre.openid.connect.service.StatsService; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Mockito; @@ -50,6 +51,9 @@ public class TestDefaultApprovedSiteService { @Mock private ApprovedSiteRepository repository; + + @Mock + private StatsService statsService; @InjectMocks private ApprovedSiteService service = new DefaultApprovedSiteService(); @@ -80,7 +84,7 @@ public class TestDefaultApprovedSiteService { site3.setUserId("user2"); site3.setClientId(clientId); - Mockito.reset(repository); + Mockito.reset(repository, statsService); }