Skip to content

Commit 5c21d05

Browse files
gsmetgsmet
authored
Merge pull request #392 from yrodiere/gh-repo-mock-full-name
Consistently use the full name as identifier for GHRepository mocks
2 parents 54336c6 + 30a8e86 commit 5c21d05

File tree

6 files changed

+45
-45
lines changed

6 files changed

+45
-45
lines changed

‎deployment/src/test/java/io/quarkiverse/githubapp/deployment/junit/GitHubMockContextImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public GHRepository repository(String id) {
6161
DefaultableMocking<? extends GHObject> ghObjectMocking(GHObject original) {
6262
Class<? extends GHObject> type = original.getClass();
6363
if (GHRepository.class.equals(type)) {
64-
return repositories.getOrCreate(((GHRepository) original).getName());
64+
return repositories.getOrCreate(((GHRepository) original).getFullName());
6565
} else {
6666
return nonRepositoryMockMap(type).getOrCreate(original.getId());
6767
}

‎integration-tests/command-airline/src/test/java/io/quarkiverse/githubapp/it/command/airline/DefaultPermissionCliTest.java‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ public class DefaultPermissionCliTest {
2828
void testNoPermissionSet() throws IOException {
2929
given()
3030
.github(mocks -> {
31-
Mockito.when(mocks.repository("quarkus-bot-java-playground").hasPermission(any(GHUser.class),
31+
Mockito.when(mocks.repository("gsmet/quarkus-bot-java-playground").hasPermission(any(GHUser.class),
3232
eq(GHPermissionType.READ)))
3333
.thenReturn(true);
34-
Mockito.when(mocks.repository("quarkus-bot-java-playground").hasPermission(any(GHUser.class),
34+
Mockito.when(mocks.repository("gsmet/quarkus-bot-java-playground").hasPermission(any(GHUser.class),
3535
eq(GHPermissionType.WRITE)))
3636
.thenReturn(true);
37-
Mockito.when(mocks.repository("quarkus-bot-java-playground").hasPermission(any(GHUser.class),
37+
Mockito.when(mocks.repository("gsmet/quarkus-bot-java-playground").hasPermission(any(GHUser.class),
3838
eq(GHPermissionType.ADMIN)))
3939
.thenReturn(false);
4040
})
@@ -47,13 +47,13 @@ void testNoPermissionSet() throws IOException {
4747

4848
given()
4949
.github(mocks -> {
50-
Mockito.when(mocks.repository("quarkus-bot-java-playground").hasPermission(any(GHUser.class),
50+
Mockito.when(mocks.repository("gsmet/quarkus-bot-java-playground").hasPermission(any(GHUser.class),
5151
eq(GHPermissionType.READ)))
5252
.thenReturn(true);
53-
Mockito.when(mocks.repository("quarkus-bot-java-playground").hasPermission(any(GHUser.class),
53+
Mockito.when(mocks.repository("gsmet/quarkus-bot-java-playground").hasPermission(any(GHUser.class),
5454
eq(GHPermissionType.WRITE)))
5555
.thenReturn(false);
56-
Mockito.when(mocks.repository("quarkus-bot-java-playground").hasPermission(any(GHUser.class),
56+
Mockito.when(mocks.repository("gsmet/quarkus-bot-java-playground").hasPermission(any(GHUser.class),
5757
eq(GHPermissionType.ADMIN)))
5858
.thenReturn(false);
5959
})
@@ -69,13 +69,13 @@ void testNoPermissionSet() throws IOException {
6969
void testPermissionOverriddenRead() throws IOException {
7070
given()
7171
.github(mocks -> {
72-
Mockito.when(mocks.repository("quarkus-bot-java-playground").hasPermission(any(GHUser.class),
72+
Mockito.when(mocks.repository("gsmet/quarkus-bot-java-playground").hasPermission(any(GHUser.class),
7373
eq(GHPermissionType.READ)))
7474
.thenReturn(true);
75-
Mockito.when(mocks.repository("quarkus-bot-java-playground").hasPermission(any(GHUser.class),
75+
Mockito.when(mocks.repository("gsmet/quarkus-bot-java-playground").hasPermission(any(GHUser.class),
7676
eq(GHPermissionType.WRITE)))
7777
.thenReturn(false);
78-
Mockito.when(mocks.repository("quarkus-bot-java-playground").hasPermission(any(GHUser.class),
78+
Mockito.when(mocks.repository("gsmet/quarkus-bot-java-playground").hasPermission(any(GHUser.class),
7979
eq(GHPermissionType.ADMIN)))
8080
.thenReturn(false);
8181
})
@@ -88,13 +88,13 @@ void testPermissionOverriddenRead() throws IOException {
8888

8989
given()
9090
.github(mocks -> {
91-
Mockito.when(mocks.repository("quarkus-bot-java-playground").hasPermission(any(GHUser.class),
91+
Mockito.when(mocks.repository("gsmet/quarkus-bot-java-playground").hasPermission(any(GHUser.class),
9292
eq(GHPermissionType.READ)))
9393
.thenReturn(false);
94-
Mockito.when(mocks.repository("quarkus-bot-java-playground").hasPermission(any(GHUser.class),
94+
Mockito.when(mocks.repository("gsmet/quarkus-bot-java-playground").hasPermission(any(GHUser.class),
9595
eq(GHPermissionType.WRITE)))
9696
.thenReturn(false);
97-
Mockito.when(mocks.repository("quarkus-bot-java-playground").hasPermission(any(GHUser.class),
97+
Mockito.when(mocks.repository("gsmet/quarkus-bot-java-playground").hasPermission(any(GHUser.class),
9898
eq(GHPermissionType.ADMIN)))
9999
.thenReturn(false);
100100
})
@@ -110,13 +110,13 @@ void testPermissionOverriddenRead() throws IOException {
110110
void testPermissionOverriddenAdmin() throws IOException {
111111
given()
112112
.github(mocks -> {
113-
Mockito.when(mocks.repository("quarkus-bot-java-playground").hasPermission(any(GHUser.class),
113+
Mockito.when(mocks.repository("gsmet/quarkus-bot-java-playground").hasPermission(any(GHUser.class),
114114
eq(GHPermissionType.READ)))
115115
.thenReturn(true);
116-
Mockito.when(mocks.repository("quarkus-bot-java-playground").hasPermission(any(GHUser.class),
116+
Mockito.when(mocks.repository("gsmet/quarkus-bot-java-playground").hasPermission(any(GHUser.class),
117117
eq(GHPermissionType.WRITE)))
118118
.thenReturn(true);
119-
Mockito.when(mocks.repository("quarkus-bot-java-playground").hasPermission(any(GHUser.class),
119+
Mockito.when(mocks.repository("gsmet/quarkus-bot-java-playground").hasPermission(any(GHUser.class),
120120
eq(GHPermissionType.ADMIN)))
121121
.thenReturn(true);
122122
})
@@ -129,13 +129,13 @@ void testPermissionOverriddenAdmin() throws IOException {
129129

130130
given()
131131
.github(mocks -> {
132-
Mockito.when(mocks.repository("quarkus-bot-java-playground").hasPermission(any(GHUser.class),
132+
Mockito.when(mocks.repository("gsmet/quarkus-bot-java-playground").hasPermission(any(GHUser.class),
133133
eq(GHPermissionType.READ)))
134134
.thenReturn(true);
135-
Mockito.when(mocks.repository("quarkus-bot-java-playground").hasPermission(any(GHUser.class),
135+
Mockito.when(mocks.repository("gsmet/quarkus-bot-java-playground").hasPermission(any(GHUser.class),
136136
eq(GHPermissionType.WRITE)))
137137
.thenReturn(true);
138-
Mockito.when(mocks.repository("quarkus-bot-java-playground").hasPermission(any(GHUser.class),
138+
Mockito.when(mocks.repository("gsmet/quarkus-bot-java-playground").hasPermission(any(GHUser.class),
139139
eq(GHPermissionType.ADMIN)))
140140
.thenReturn(false);
141141
})
@@ -148,7 +148,7 @@ void testPermissionOverriddenAdmin() throws IOException {
148148
}
149149

150150
private void verifyHasPermission(GitHubMockVerificationContext mocks) throws IOException {
151-
verify(mocks.repository("quarkus-bot-java-playground")).hasPermission(any(GHUser.class),
151+
verify(mocks.repository("gsmet/quarkus-bot-java-playground")).hasPermission(any(GHUser.class),
152152
any(GHPermissionType.class));
153153
}
154154

‎integration-tests/command-airline/src/test/java/io/quarkiverse/githubapp/it/command/airline/DefaultTeamCliTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ void testNoTeams() throws IOException {
4141
Mockito.when(team2.hasMember(any(GHUser.class))).thenReturn(false);
4242
teams.add(team2);
4343

44-
Mockito.when(mocks.repository("quarkus-bot-java-playground").getTeams())
44+
Mockito.when(mocks.repository("gsmet/quarkus-bot-java-playground").getTeams())
4545
.thenReturn(teams);
4646
})
4747
.when().payloadFromClasspath("/issue-comment-default-team-no-teams.json")
@@ -68,7 +68,7 @@ void testNoTeams() throws IOException {
6868
Mockito.when(team2.hasMember(any(GHUser.class))).thenReturn(false);
6969
teams.add(team2);
7070

71-
Mockito.when(mocks.repository("quarkus-bot-java-playground").getTeams())
71+
Mockito.when(mocks.repository("gsmet/quarkus-bot-java-playground").getTeams())
7272
.thenReturn(teams);
7373
})
7474
.when().payloadFromClasspath("/issue-comment-default-team-no-teams.json")
@@ -98,7 +98,7 @@ void testTeam2() throws IOException {
9898
Mockito.when(team2.hasMember(any(GHUser.class))).thenReturn(true);
9999
teams.add(team2);
100100

101-
Mockito.when(mocks.repository("quarkus-bot-java-playground").getTeams())
101+
Mockito.when(mocks.repository("gsmet/quarkus-bot-java-playground").getTeams())
102102
.thenReturn(teams);
103103
})
104104
.when().payloadFromClasspath("/issue-comment-default-team-team2.json")
@@ -125,7 +125,7 @@ void testTeam2() throws IOException {
125125
Mockito.when(team2.hasMember(any(GHUser.class))).thenReturn(false);
126126
teams.add(team2);
127127

128-
Mockito.when(mocks.repository("quarkus-bot-java-playground").getTeams())
128+
Mockito.when(mocks.repository("gsmet/quarkus-bot-java-playground").getTeams())
129129
.thenReturn(teams);
130130
})
131131
.when().payloadFromClasspath("/issue-comment-default-team-team2.json")
@@ -140,7 +140,7 @@ void testTeam2() throws IOException {
140140
}
141141

142142
private void verifyGetTeams(GitHubMockVerificationContext mocks) throws IOException {
143-
verify(mocks.repository("quarkus-bot-java-playground")).getTeams();
143+
verify(mocks.repository("gsmet/quarkus-bot-java-playground")).getTeams();
144144
}
145145

146146
private void verifyGetSlug(GitHubMockVerificationContext mocks, long teamId) throws IOException {

‎integration-tests/command-airline/src/test/java/io/quarkiverse/githubapp/it/command/airline/PermissionCliTest.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ void testNoPermission() throws IOException {
3838
void testWritePermission() throws IOException {
3939
given()
4040
.github(mocks -> {
41-
Mockito.when(mocks.repository("quarkus-bot-java-playground").hasPermission(any(GHUser.class),
41+
Mockito.when(mocks.repository("gsmet/quarkus-bot-java-playground").hasPermission(any(GHUser.class),
4242
eq(GHPermissionType.READ)))
4343
.thenReturn(true);
44-
Mockito.when(mocks.repository("quarkus-bot-java-playground").hasPermission(any(GHUser.class),
44+
Mockito.when(mocks.repository("gsmet/quarkus-bot-java-playground").hasPermission(any(GHUser.class),
4545
eq(GHPermissionType.WRITE)))
4646
.thenReturn(true);
47-
Mockito.when(mocks.repository("quarkus-bot-java-playground").hasPermission(any(GHUser.class),
47+
Mockito.when(mocks.repository("gsmet/quarkus-bot-java-playground").hasPermission(any(GHUser.class),
4848
eq(GHPermissionType.ADMIN)))
4949
.thenReturn(false);
5050
})
@@ -57,13 +57,13 @@ void testWritePermission() throws IOException {
5757

5858
given()
5959
.github(mocks -> {
60-
Mockito.when(mocks.repository("quarkus-bot-java-playground").hasPermission(any(GHUser.class),
60+
Mockito.when(mocks.repository("gsmet/quarkus-bot-java-playground").hasPermission(any(GHUser.class),
6161
eq(GHPermissionType.READ)))
6262
.thenReturn(true);
63-
Mockito.when(mocks.repository("quarkus-bot-java-playground").hasPermission(any(GHUser.class),
63+
Mockito.when(mocks.repository("gsmet/quarkus-bot-java-playground").hasPermission(any(GHUser.class),
6464
eq(GHPermissionType.WRITE)))
6565
.thenReturn(false);
66-
Mockito.when(mocks.repository("quarkus-bot-java-playground").hasPermission(any(GHUser.class),
66+
Mockito.when(mocks.repository("gsmet/quarkus-bot-java-playground").hasPermission(any(GHUser.class),
6767
eq(GHPermissionType.ADMIN)))
6868
.thenReturn(false);
6969
})
@@ -79,13 +79,13 @@ void testWritePermission() throws IOException {
7979
void testAdminPermission() throws IOException {
8080
given()
8181
.github(mocks -> {
82-
Mockito.when(mocks.repository("quarkus-bot-java-playground").hasPermission(any(GHUser.class),
82+
Mockito.when(mocks.repository("gsmet/quarkus-bot-java-playground").hasPermission(any(GHUser.class),
8383
eq(GHPermissionType.READ)))
8484
.thenReturn(true);
85-
Mockito.when(mocks.repository("quarkus-bot-java-playground").hasPermission(any(GHUser.class),
85+
Mockito.when(mocks.repository("gsmet/quarkus-bot-java-playground").hasPermission(any(GHUser.class),
8686
eq(GHPermissionType.WRITE)))
8787
.thenReturn(true);
88-
Mockito.when(mocks.repository("quarkus-bot-java-playground").hasPermission(any(GHUser.class),
88+
Mockito.when(mocks.repository("gsmet/quarkus-bot-java-playground").hasPermission(any(GHUser.class),
8989
eq(GHPermissionType.ADMIN)))
9090
.thenReturn(true);
9191
})
@@ -98,13 +98,13 @@ void testAdminPermission() throws IOException {
9898

9999
given()
100100
.github(mocks -> {
101-
Mockito.when(mocks.repository("quarkus-bot-java-playground").hasPermission(any(GHUser.class),
101+
Mockito.when(mocks.repository("gsmet/quarkus-bot-java-playground").hasPermission(any(GHUser.class),
102102
eq(GHPermissionType.READ)))
103103
.thenReturn(true);
104-
Mockito.when(mocks.repository("quarkus-bot-java-playground").hasPermission(any(GHUser.class),
104+
Mockito.when(mocks.repository("gsmet/quarkus-bot-java-playground").hasPermission(any(GHUser.class),
105105
eq(GHPermissionType.WRITE)))
106106
.thenReturn(true);
107-
Mockito.when(mocks.repository("quarkus-bot-java-playground").hasPermission(any(GHUser.class),
107+
Mockito.when(mocks.repository("gsmet/quarkus-bot-java-playground").hasPermission(any(GHUser.class),
108108
eq(GHPermissionType.ADMIN)))
109109
.thenReturn(false);
110110
})
@@ -117,7 +117,7 @@ void testAdminPermission() throws IOException {
117117
}
118118

119119
private void verifyHasPermission(GitHubMockVerificationContext mocks) throws IOException {
120-
verify(mocks.repository("quarkus-bot-java-playground")).hasPermission(any(GHUser.class),
120+
verify(mocks.repository("gsmet/quarkus-bot-java-playground")).hasPermission(any(GHUser.class),
121121
any(GHPermissionType.class));
122122
}
123123

‎integration-tests/command-airline/src/test/java/io/quarkiverse/githubapp/it/command/airline/TeamCliTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ void testTeam1() throws IOException {
4242
Mockito.when(team2.hasMember(any(GHUser.class))).thenReturn(false);
4343
teams.add(team2);
4444

45-
Mockito.when(mocks.repository("quarkus-bot-java-playground").getTeams())
45+
Mockito.when(mocks.repository("gsmet/quarkus-bot-java-playground").getTeams())
4646
.thenReturn(teams);
4747
})
4848
.when().payloadFromClasspath("/issue-comment-team-team1.json")
@@ -69,7 +69,7 @@ void testTeam1() throws IOException {
6969
Mockito.when(team2.hasMember(any(GHUser.class))).thenReturn(true);
7070
teams.add(team2);
7171

72-
Mockito.when(mocks.repository("quarkus-bot-java-playground").getTeams())
72+
Mockito.when(mocks.repository("gsmet/quarkus-bot-java-playground").getTeams())
7373
.thenReturn(teams);
7474
})
7575
.when().payloadFromClasspath("/issue-comment-team-team1.json")
@@ -99,7 +99,7 @@ void testTwoTeams() throws IOException {
9999
Mockito.when(team2.hasMember(any(GHUser.class))).thenReturn(false);
100100
teams.add(team2);
101101

102-
Mockito.when(mocks.repository("quarkus-bot-java-playground").getTeams())
102+
Mockito.when(mocks.repository("gsmet/quarkus-bot-java-playground").getTeams())
103103
.thenReturn(teams);
104104
})
105105
.when().payloadFromClasspath("/issue-comment-team-two-teams.json")
@@ -126,7 +126,7 @@ void testTwoTeams() throws IOException {
126126
Mockito.when(team2.hasMember(any(GHUser.class))).thenReturn(true);
127127
teams.add(team2);
128128

129-
Mockito.when(mocks.repository("quarkus-bot-java-playground").getTeams())
129+
Mockito.when(mocks.repository("gsmet/quarkus-bot-java-playground").getTeams())
130130
.thenReturn(teams);
131131
})
132132
.when().payloadFromClasspath("/issue-comment-team-two-teams.json")
@@ -159,7 +159,7 @@ void testTwoTeams() throws IOException {
159159
Mockito.when(team3.hasMember(any(GHUser.class))).thenReturn(true);
160160
teams.add(team3);
161161

162-
Mockito.when(mocks.repository("quarkus-bot-java-playground").getTeams())
162+
Mockito.when(mocks.repository("gsmet/quarkus-bot-java-playground").getTeams())
163163
.thenReturn(teams);
164164
})
165165
.when().payloadFromClasspath("/issue-comment-team-two-teams.json")
@@ -176,7 +176,7 @@ void testTwoTeams() throws IOException {
176176
}
177177

178178
private void verifyGetTeams(GitHubMockVerificationContext mocks) throws IOException {
179-
verify(mocks.repository("quarkus-bot-java-playground")).getTeams();
179+
verify(mocks.repository("gsmet/quarkus-bot-java-playground")).getTeams();
180180
}
181181

182182
private void verifyGetSlug(GitHubMockVerificationContext mocks, long teamId) throws IOException {

‎testing/src/main/java/io/quarkiverse/githubapp/testing/internal/GitHubMockContextImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ void reset() {
208208
private DefaultableMocking<? extends GHObject> ghObjectMocking(GHObject original) {
209209
Class<? extends GHObject> type = original.getClass();
210210
if (GHRepository.class.equals(type)) {
211-
return repositories.getOrCreate(((GHRepository) original).getName());
211+
return repositories.getOrCreate(((GHRepository) original).getFullName());
212212
} else {
213213
return nonRepositoryMockMap(type).getOrCreate(original.getId());
214214
}

0 commit comments

Comments
 (0)