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

fix unit tests and downstream calls

pull/1161/merge
Justin Richer 2017-03-16 17:55:31 -04:00
parent a926a8f0ab
commit 2a75535dce
2 changed files with 11 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openid-connect-server/src/main/java/org/mitre/oauth2/web/OAuthConfirmationController.java
View File

@ -201,7 +201,7 @@ public class OAuthConfirmationController {
model.put("claims", claimsForScopes);
// client stats
Integer count = statsService.getCountForClientId(client.getId());
Integer count = statsService.getCountForClientId(client.getClientId()).getApprovedSiteCount();
model.put("count", count);

48
openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestDefaultStatsService.java
View File

@ -71,9 +71,6 @@ public class TestDefaultStatsService {
@Mock
private ApprovedSiteService approvedSiteService;
@Mock
private ClientDetailsEntityService clientService;
@InjectMocks
private DefaultStatsService service = new DefaultStatsService();
@ -84,7 +81,7 @@ public class TestDefaultStatsService {
@Before
public void prepare() {
Mockito.reset(approvedSiteService, clientService);
Mockito.reset(approvedSiteService);
Mockito.when(ap1.getUserId()).thenReturn(userId1);
Mockito.when(ap1.getClientId()).thenReturn(clientId1);
@ -111,11 +108,10 @@ public class TestDefaultStatsService {
Mockito.when(client3.getId()).thenReturn(3L);
Mockito.when(client4.getId()).thenReturn(4L);
Mockito.when(clientService.getAllClients()).thenReturn(Sets.newHashSet(client1, client2, client3, client4));
Mockito.when(clientService.loadClientByClientId(clientId1)).thenReturn(client1);
Mockito.when(clientService.loadClientByClientId(clientId2)).thenReturn(client2);
Mockito.when(clientService.loadClientByClientId(clientId3)).thenReturn(client3);
Mockito.when(clientService.loadClientByClientId(clientId4)).thenReturn(client4);
Mockito.when(approvedSiteService.getByClientId(clientId1)).thenReturn(Sets.newHashSet(ap1, ap2));
Mockito.when(approvedSiteService.getByClientId(clientId2)).thenReturn(Sets.newHashSet(ap3));
Mockito.when(approvedSiteService.getByClientId(clientId3)).thenReturn(Sets.newHashSet(ap4));
Mockito.when(approvedSiteService.getByClientId(clientId4)).thenReturn(Sets.newHashSet());
}
@Test
@ -139,37 +135,13 @@ public class TestDefaultStatsService {
assertThat(stats.get("clientCount"), is(3));
}
@Test
public void calculateByClientId_empty() {
Mockito.when(approvedSiteService.getAll()).thenReturn(new HashSet<ApprovedSite>());
Map<Long, Integer> stats = service.getByClientId();
assertThat(stats.get(1L), is(0));
assertThat(stats.get(2L), is(0));
assertThat(stats.get(3L), is(0));
assertThat(stats.get(4L), is(0));
}
@Test
public void calculateByClientId() {
Map<Long, Integer> stats = service.getByClientId();
assertThat(stats.get(1L), is(2));
assertThat(stats.get(2L), is(1));
assertThat(stats.get(3L), is(1));
assertThat(stats.get(4L), is(0));
}
@Test
public void countForClientId() {
assertThat(service.getCountForClientId(1L), is(2));
assertThat(service.getCountForClientId(2L), is(1));
assertThat(service.getCountForClientId(3L), is(1));
assertThat(service.getCountForClientId(4L), is(0));
// stats for ap1..ap4
assertThat(service.getCountForClientId(clientId1).getApprovedSiteCount(), is(2));
assertThat(service.getCountForClientId(clientId2).getApprovedSiteCount(), is(1));
assertThat(service.getCountForClientId(clientId3).getApprovedSiteCount(), is(1));
assertThat(service.getCountForClientId(clientId4).getApprovedSiteCount(), is(0));
}
@Test