Skip to content

Commit 0818345

Browse files
sgtcoolguysgtcoolguy
committed
Fix tests to work with updated API calls
1 parent f988931 commit 0818345

File tree

1 file changed

+7
-22
lines changed

1 file changed

+7
-22
lines changed

‎src/test/java/org/jenkinsci/plugins/GithubRequireOrganizationMembershipACLTest.java

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -193,21 +193,10 @@ private GHMyself mockGHMyselfAs(String username) throws IOException {
193193
private void mockReposFor(GHPerson person, List<String> repositoryNames) throws IOException {
194194
List<GHRepository> repositories = repositoryListOf(repositoryNames);
195195
PagedIterable<GHRepository> pagedRepositories = PowerMockito.mock(PagedIterable.class);
196-
PowerMockito.when(person.listRepositories()).thenReturn(pagedRepositories);
196+
PowerMockito.when(person.listRepositories(100)).thenReturn(pagedRepositories);
197197
PowerMockito.when(pagedRepositories.asList()).thenReturn(repositories);
198198
};
199199

200-
private void mockOrgRepos(GHMyself me, Map<String, List<String>> orgsAndRepoNames) throws IOException {
201-
Set<GHOrganization> organizations = new HashSet();
202-
Set<String> organizationNames = orgsAndRepoNames.keySet();
203-
for (String organizationName : organizationNames) {
204-
List<String> repositories = orgsAndRepoNames.get(organizationName);
205-
organizations.add(mockGHOrganization(organizationName, repositories));
206-
}
207-
GHPersonSet organizationSet = new GHPersonSet(organizations);
208-
PowerMockito.when(me.getAllOrganizations()).thenReturn(organizationSet);
209-
}
210-
211200
private List<GHRepository> repositoryListOf(List<String> repositoryNames) throws IOException {
212201
List<GHRepository> repositoriesSet = new ArrayList<GHRepository>();
213202
for (String repositoryName : repositoryNames) {
@@ -222,6 +211,7 @@ private GHRepository mockGHRepository(String ownerName, String name) throws IOEx
222211
GHRepository ghRepository = PowerMockito.mock(GHRepository.class);
223212
GHUser ghUser = PowerMockito.mock(GHUser.class);
224213
PowerMockito.when(ghUser.getLogin()).thenReturn(ownerName);
214+
PowerMockito.when(ghRepository.getFullName()).thenReturn(ownerName + "/" + name);
225215
PowerMockito.when(ghRepository.getOwner()).thenReturn(ghUser);
226216
PowerMockito.when(ghRepository.getName()).thenReturn(name);
227217
return ghRepository;
@@ -271,8 +261,7 @@ private MultiBranchProject mockMultiBranchProject(String url) {
271261
@Test
272262
public void testCanReadAndBuildOneOfMyRepositories() throws IOException {
273263
GHMyself me = mockGHMyselfAs("Me");
274-
mockReposFor(me, Arrays.asList("me/a-repo"));
275-
mockOrgRepos(me, ImmutableMap.of("some-org", Arrays.asList("some-org/a-public-repo")));
264+
mockReposFor(me, Arrays.asList("me/a-repo", "some-org/a-public-repo"));
276265
String repoUrl = "https://github.com/me/a-repo.git";
277266
Project mockProject = mockProject(repoUrl);
278267
MultiBranchProject mockMultiBranchProject = mockMultiBranchProject(repoUrl);
@@ -300,8 +289,7 @@ protected void tearDown() throws Exception {
300289
@Test
301290
public void testCanReadAndBuildOrgRepositoryICollaborateOn() throws IOException {
302291
GHMyself me = mockGHMyselfAs("Me");
303-
mockReposFor(me, Arrays.asList("me/a-repo"));
304-
mockOrgRepos(me, ImmutableMap.of("some-org", Arrays.asList("some-org/a-private-repo")));
292+
mockReposFor(me, Arrays.asList("me/a-repo", "some-org/a-private-repo"));
305293
String repoUrl = "https://github.com/some-org/a-private-repo.git";
306294
Project mockProject = mockProject(repoUrl);
307295
MultiBranchProject mockMultiBranchProject = mockMultiBranchProject(repoUrl);
@@ -323,8 +311,7 @@ public void testCanReadAndBuildOrgRepositoryICollaborateOn() throws IOException
323311
@Test
324312
public void testCanReadAndBuildOtherOrgPrivateRepositoryICollaborateOn() throws IOException {
325313
GHMyself me = mockGHMyselfAs("Me");
326-
mockReposFor(me, Arrays.asList("me/a-repo"));
327-
mockOrgRepos(me, ImmutableMap.of("some-org", Arrays.asList("some-org/a-private-repo")));
314+
mockReposFor(me, Arrays.asList("me/a-repo", "some-org/a-private-repo"));
328315
GHRepository ghRepository = PowerMockito.mock(GHRepository.class);
329316
PowerMockito.when(gh.getRepository("org-i-dont-belong-to/a-private-repo-i-collaborate-on")).thenReturn(ghRepository);
330317
PowerMockito.when(ghRepository.isPrivate()).thenReturn(true);
@@ -354,8 +341,7 @@ public void testCanReadAndBuildOtherOrgPrivateRepositoryICollaborateOn() throws
354341
@Test
355342
public void testCanNotReadOrBuildRepositoryIDoNotCollaborateOn() throws IOException {
356343
GHMyself me = mockGHMyselfAs("Me");
357-
mockReposFor(me, Arrays.asList("me/a-repo"));
358-
mockOrgRepos(me, ImmutableMap.of("some-org", Arrays.asList("some-org/a-private-repo")));
344+
mockReposFor(me, Arrays.asList("me/a-repo", "some-org/a-private-repo"));
359345
String repoUrl = "https://github.com/some-org/another-private-repo.git";
360346
Project mockProject = mockProject(repoUrl);
361347
MultiBranchProject mockMultiBranchProject = mockMultiBranchProject(repoUrl);
@@ -518,8 +504,7 @@ public void testCannotReadConfigureDeleteAProjectWithoutToAuthenticatedUserReadP
518504
@Test
519505
public void testCannotReadRepositoryWithInvalidRepoUrl() throws IOException {
520506
GHMyself me = mockGHMyselfAs("Me");
521-
mockReposFor(me, Arrays.asList("me/a-repo"));
522-
mockOrgRepos(me, ImmutableMap.of("some-org", Arrays.asList("some-org/a-repo")));
507+
mockReposFor(me, Arrays.asList("me/a-repo", "some-org/a-repo"));
523508
String invalidRepoUrl = "git@github.com//some-org/a-repo.git";
524509
Project mockProject = mockProject(invalidRepoUrl);
525510
GithubRequireOrganizationMembershipACL acl = aclForProject(mockProject);

0 commit comments

Comments
 (0)