Merge pull request hub4j#282 from apemberton/org-fix

kohsuke · kohsuke · commit 01fcbc24e840 · 2016-06-03T13:52:26.000+09:00
related to JENKINS-34834. updating test for similar condition
diff --git a/src/test/java/org/kohsuke/github/AppTest.java b/src/test/java/org/kohsuke/github/AppTest.java
@@ -221,10 +221,12 @@ public void testMyOrganizations() throws IOException {
     }
 
     @Test
-    public void testMyTeamsContainsAllMyOrganizations() throws IOException {
+    public void testMyOrganizationsContainMyTeams() throws IOException {
         Map<String, Set<GHTeam>> teams = gitHub.getMyTeams();
         Map<String, GHOrganization> myOrganizations = gitHub.getMyOrganizations();
-        assertEquals(teams.keySet(), myOrganizations.keySet());
+        //GitHub no longer has default 'owners' team, so there may be organization memberships without a team
+        //https://help.github.com/articles/about-improved-organization-permissions/
+        assertTrue(myOrganizations.keySet().containsAll(teams.keySet()));
     }
     
     @Test

Original file line number	Diff line number	Diff line change
`@@ -221,10 +221,12 @@ public void testMyOrganizations() throws IOException {`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`@Test`
`224`		`- public void testMyTeamsContainsAllMyOrganizations() throws IOException {`
	`224`	`+ public void testMyOrganizationsContainMyTeams() throws IOException {`
`225`	`225`	`Map<String, Set<GHTeam>> teams = gitHub.getMyTeams();`
`226`	`226`	`Map<String, GHOrganization> myOrganizations = gitHub.getMyOrganizations();`
`227`		`- assertEquals(teams.keySet(), myOrganizations.keySet());`
	`227`	`+ //GitHub no longer has default 'owners' team, so there may be organization memberships without a team`
	`228`	`+ //https://help.github.com/articles/about-improved-organization-permissions/`
	`229`	`+ assertTrue(myOrganizations.keySet().containsAll(teams.keySet()));`
`228`	`230`	`}`
`229`	`231`
`230`	`232`	`@Test`