Skip to content

Commit f7f626a

Browse files
bitwisemanbitwiseman
committed
Fix invalid category test
1 parent 3eb2e13 commit f7f626a

File tree

6 files changed

+329
-14
lines changed

6 files changed

+329
-14
lines changed

‎src/test/java/org/kohsuke/github/GHReleaseTest.java‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
import org.junit.Test;
44

5-
import java.util.UUID;
6-
75
import static org.hamcrest.Matchers.*;
86
import static org.junit.Assert.assertThrows;
97

@@ -15,10 +13,9 @@ public void testCreateSimpleRelease() throws Exception {
1513

1614
String tagName = mockGitHub.getMethodName();
1715
GHRelease release = repo.createRelease(tagName).categoryName("announcements").prerelease(false).create();
18-
19-
GHRelease releaseCheck = repo.getRelease(release.getId());
20-
2116
try {
17+
GHRelease releaseCheck = repo.getRelease(release.getId());
18+
2219
assertThat(releaseCheck, notNullValue());
2320
assertThat(releaseCheck.getTagName(), is(tagName));
2421
assertThat(releaseCheck.isPrerelease(), is(false));
@@ -36,9 +33,9 @@ public void testCreateSimpleReleaseWithoutDiscussion() throws Exception {
3633
String tagName = mockGitHub.getMethodName();
3734
GHRelease release = repo.createRelease(tagName).create();
3835

39-
GHRelease releaseCheck = repo.getRelease(release.getId());
40-
4136
try {
37+
GHRelease releaseCheck = repo.getRelease(release.getId());
38+
4239
assertThat(releaseCheck, notNullValue());
4340
assertThat(releaseCheck.getTagName(), is(tagName));
4441
assertThat(releaseCheck.getDiscussionUrl(), nullValue());
@@ -75,7 +72,7 @@ public void testCreateDoubleReleaseFails() throws Exception {
7572
public void testCreateReleaseWithUnknownCategoryFails() throws Exception {
7673
GHRepository repo = gitHub.getRepository("hub4j-test-org/testCreateRelease");
7774

78-
String tagName = UUID.randomUUID().toString();
75+
String tagName = mockGitHub.getMethodName();
7976
String releaseName = "release-" + tagName;
8077

8178
assertThrows(GHFileNotFoundException.class, () -> {
@@ -93,11 +90,10 @@ public void testUpdateRelease() throws Exception {
9390

9491
String tagName = mockGitHub.getMethodName();
9592
GHRelease release = repo.createRelease(tagName).prerelease(true).create();
96-
97-
GHRelease releaseCheck = repo.getRelease(release.getId());
98-
GHRelease updateCheck = releaseCheck.update().categoryName("announcements").prerelease(false).update();
99-
10093
try {
94+
GHRelease releaseCheck = repo.getRelease(release.getId());
95+
GHRelease updateCheck = releaseCheck.update().categoryName("announcements").prerelease(false).update();
96+
10197
assertThat(releaseCheck, notNullValue());
10298
assertThat(releaseCheck.getTagName(), is(tagName));
10399
assertThat(releaseCheck.isPrerelease(), is(true));
@@ -110,8 +106,7 @@ public void testUpdateRelease() throws Exception {
110106

111107
} finally {
112108
release.delete();
113-
assertThat(repo.getRelease(releaseCheck.getId()), nullValue());
114-
assertThat(repo.getRelease(updateCheck.getId()), nullValue());
109+
assertThat(repo.getRelease(release.getId()), nullValue());
115110
}
116111
}
117112

‎src/test/resources/org/kohsuke/github/GHReleaseTest/wiremock/testCreateReleaseWithUnknownCategoryFails/__files/repos_hub4j-test-org_testcreaterelease-2.json‎

Lines changed: 132 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
1+
{
2+
"id": 375534019,
3+
"node_id": "MDEwOlJlcG9zaXRvcnkzNzU1MzQwMTk=",
4+
"name": "testCreateRelease",
5+
"full_name": "hub4j-test-org/testCreateRelease",
6+
"private": false,
7+
"owner": {
8+
"login": "hub4j-test-org",
9+
"id": 7544739,
10+
"node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=",
11+
"avatar_url": "https://avatars.githubusercontent.com/u/7544739?v=4",
12+
"gravatar_id": "",
13+
"url": "https://api.github.com/users/hub4j-test-org",
14+
"html_url": "https://github.com/hub4j-test-org",
15+
"followers_url": "https://api.github.com/users/hub4j-test-org/followers",
16+
"following_url": "https://api.github.com/users/hub4j-test-org/following{/other_user}",
17+
"gists_url": "https://api.github.com/users/hub4j-test-org/gists{/gist_id}",
18+
"starred_url": "https://api.github.com/users/hub4j-test-org/starred{/owner}{/repo}",
19+
"subscriptions_url": "https://api.github.com/users/hub4j-test-org/subscriptions",
20+
"organizations_url": "https://api.github.com/users/hub4j-test-org/orgs",
21+
"repos_url": "https://api.github.com/users/hub4j-test-org/repos",
22+
"events_url": "https://api.github.com/users/hub4j-test-org/events{/privacy}",
23+
"received_events_url": "https://api.github.com/users/hub4j-test-org/received_events",
24+
"type": "Organization",
25+
"site_admin": false
26+
},
27+
"html_url": "https://github.com/hub4j-test-org/testCreateRelease",
28+
"description": null,
29+
"fork": false,
30+
"url": "https://api.github.com/repos/hub4j-test-org/testCreateRelease",
31+
"forks_url": "https://api.github.com/repos/hub4j-test-org/testCreateRelease/forks",
32+
"keys_url": "https://api.github.com/repos/hub4j-test-org/testCreateRelease/keys{/key_id}",
33+
"collaborators_url": "https://api.github.com/repos/hub4j-test-org/testCreateRelease/collaborators{/collaborator}",
34+
"teams_url": "https://api.github.com/repos/hub4j-test-org/testCreateRelease/teams",
35+
"hooks_url": "https://api.github.com/repos/hub4j-test-org/testCreateRelease/hooks",
36+
"issue_events_url": "https://api.github.com/repos/hub4j-test-org/testCreateRelease/issues/events{/number}",
37+
"events_url": "https://api.github.com/repos/hub4j-test-org/testCreateRelease/events",
38+
"assignees_url": "https://api.github.com/repos/hub4j-test-org/testCreateRelease/assignees{/user}",
39+
"branches_url": "https://api.github.com/repos/hub4j-test-org/testCreateRelease/branches{/branch}",
40+
"tags_url": "https://api.github.com/repos/hub4j-test-org/testCreateRelease/tags",
41+
"blobs_url": "https://api.github.com/repos/hub4j-test-org/testCreateRelease/git/blobs{/sha}",
42+
"git_tags_url": "https://api.github.com/repos/hub4j-test-org/testCreateRelease/git/tags{/sha}",
43+
"git_refs_url": "https://api.github.com/repos/hub4j-test-org/testCreateRelease/git/refs{/sha}",
44+
"trees_url": "https://api.github.com/repos/hub4j-test-org/testCreateRelease/git/trees{/sha}",
45+
"statuses_url": "https://api.github.com/repos/hub4j-test-org/testCreateRelease/statuses/{sha}",
46+
"languages_url": "https://api.github.com/repos/hub4j-test-org/testCreateRelease/languages",
47+
"stargazers_url": "https://api.github.com/repos/hub4j-test-org/testCreateRelease/stargazers",
48+
"contributors_url": "https://api.github.com/repos/hub4j-test-org/testCreateRelease/contributors",
49+
"subscribers_url": "https://api.github.com/repos/hub4j-test-org/testCreateRelease/subscribers",
50+
"subscription_url": "https://api.github.com/repos/hub4j-test-org/testCreateRelease/subscription",
51+
"commits_url": "https://api.github.com/repos/hub4j-test-org/testCreateRelease/commits{/sha}",
52+
"git_commits_url": "https://api.github.com/repos/hub4j-test-org/testCreateRelease/git/commits{/sha}",
53+
"comments_url": "https://api.github.com/repos/hub4j-test-org/testCreateRelease/comments{/number}",
54+
"issue_comment_url": "https://api.github.com/repos/hub4j-test-org/testCreateRelease/issues/comments{/number}",
55+
"contents_url": "https://api.github.com/repos/hub4j-test-org/testCreateRelease/contents/{+path}",
56+
"compare_url": "https://api.github.com/repos/hub4j-test-org/testCreateRelease/compare/{base}...{head}",
57+
"merges_url": "https://api.github.com/repos/hub4j-test-org/testCreateRelease/merges",
58+
"archive_url": "https://api.github.com/repos/hub4j-test-org/testCreateRelease/{archive_format}{/ref}",
59+
"downloads_url": "https://api.github.com/repos/hub4j-test-org/testCreateRelease/downloads",
60+
"issues_url": "https://api.github.com/repos/hub4j-test-org/testCreateRelease/issues{/number}",
61+
"pulls_url": "https://api.github.com/repos/hub4j-test-org/testCreateRelease/pulls{/number}",
62+
"milestones_url": "https://api.github.com/repos/hub4j-test-org/testCreateRelease/milestones{/number}",
63+
"notifications_url": "https://api.github.com/repos/hub4j-test-org/testCreateRelease/notifications{?since,all,participating}",
64+
"labels_url": "https://api.github.com/repos/hub4j-test-org/testCreateRelease/labels{/name}",
65+
"releases_url": "https://api.github.com/repos/hub4j-test-org/testCreateRelease/releases{/id}",
66+
"deployments_url": "https://api.github.com/repos/hub4j-test-org/testCreateRelease/deployments",
67+
"created_at": "2021-06-10T01:25:59Z",
68+
"updated_at": "2021-06-10T01:31:14Z",
69+
"pushed_at": "2021-06-14T20:03:30Z",
70+
"git_url": "git://github.com/hub4j-test-org/testCreateRelease.git",
71+
"ssh_url": "[email protected]:hub4j-test-org/testCreateRelease.git",
72+
"clone_url": "https://github.com/hub4j-test-org/testCreateRelease.git",
73+
"svn_url": "https://github.com/hub4j-test-org/testCreateRelease",
74+
"homepage": null,
75+
"size": 11948,
76+
"stargazers_count": 0,
77+
"watchers_count": 0,
78+
"language": "Java",
79+
"has_issues": false,
80+
"has_projects": false,
81+
"has_downloads": true,
82+
"has_wiki": false,
83+
"has_pages": false,
84+
"forks_count": 0,
85+
"mirror_url": null,
86+
"archived": false,
87+
"disabled": false,
88+
"open_issues_count": 0,
89+
"license": {
90+
"key": "mit",
91+
"name": "MIT License",
92+
"spdx_id": "MIT",
93+
"url": "https://api.github.com/licenses/mit",
94+
"node_id": "MDc6TGljZW5zZTEz"
95+
},
96+
"forks": 0,
97+
"open_issues": 0,
98+
"watchers": 0,
99+
"default_branch": "main",
100+
"permissions": {
101+
"admin": true,
102+
"push": true,
103+
"pull": true
104+
},
105+
"temp_clone_token": "",
106+
"allow_squash_merge": true,
107+
"allow_merge_commit": true,
108+
"allow_rebase_merge": true,
109+
"delete_branch_on_merge": false,
110+
"organization": {
111+
"login": "hub4j-test-org",
112+
"id": 7544739,
113+
"node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=",
114+
"avatar_url": "https://avatars.githubusercontent.com/u/7544739?v=4",
115+
"gravatar_id": "",
116+
"url": "https://api.github.com/users/hub4j-test-org",
117+
"html_url": "https://github.com/hub4j-test-org",
118+
"followers_url": "https://api.github.com/users/hub4j-test-org/followers",
119+
"following_url": "https://api.github.com/users/hub4j-test-org/following{/other_user}",
120+
"gists_url": "https://api.github.com/users/hub4j-test-org/gists{/gist_id}",
121+
"starred_url": "https://api.github.com/users/hub4j-test-org/starred{/owner}{/repo}",
122+
"subscriptions_url": "https://api.github.com/users/hub4j-test-org/subscriptions",
123+
"organizations_url": "https://api.github.com/users/hub4j-test-org/orgs",
124+
"repos_url": "https://api.github.com/users/hub4j-test-org/repos",
125+
"events_url": "https://api.github.com/users/hub4j-test-org/events{/privacy}",
126+
"received_events_url": "https://api.github.com/users/hub4j-test-org/received_events",
127+
"type": "Organization",
128+
"site_admin": false
129+
},
130+
"network_count": 0,
131+
"subscribers_count": 11
132+
}

‎src/test/resources/org/kohsuke/github/GHReleaseTest/wiremock/testCreateReleaseWithUnknownCategoryFails/__files/user-1.json‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
{
2+
"login": "bitwiseman",
3+
"id": 1958953,
4+
"node_id": "MDQ6VXNlcjE5NTg5NTM=",
5+
"avatar_url": "https://avatars.githubusercontent.com/u/1958953?v=4",
6+
"gravatar_id": "",
7+
"url": "https://api.github.com/users/bitwiseman",
8+
"html_url": "https://github.com/bitwiseman",
9+
"followers_url": "https://api.github.com/users/bitwiseman/followers",
10+
"following_url": "https://api.github.com/users/bitwiseman/following{/other_user}",
11+
"gists_url": "https://api.github.com/users/bitwiseman/gists{/gist_id}",
12+
"starred_url": "https://api.github.com/users/bitwiseman/starred{/owner}{/repo}",
13+
"subscriptions_url": "https://api.github.com/users/bitwiseman/subscriptions",
14+
"organizations_url": "https://api.github.com/users/bitwiseman/orgs",
15+
"repos_url": "https://api.github.com/users/bitwiseman/repos",
16+
"events_url": "https://api.github.com/users/bitwiseman/events{/privacy}",
17+
"received_events_url": "https://api.github.com/users/bitwiseman/received_events",
18+
"type": "User",
19+
"site_admin": false,
20+
"name": "Liam Newman",
21+
"company": "Cloudbees, Inc.",
22+
"blog": "",
23+
"location": "Seattle, WA, USA",
24+
"email": "[email protected]",
25+
"hireable": null,
26+
"bio": null,
27+
"twitter_username": "bitwiseman",
28+
"public_repos": 209,
29+
"public_gists": 8,
30+
"followers": 187,
31+
"following": 12,
32+
"created_at": "2012-07-11T20:38:33Z",
33+
"updated_at": "2021-06-14T20:00:35Z",
34+
"private_gists": 19,
35+
"total_private_repos": 21,
36+
"owned_private_repos": 0,
37+
"disk_usage": 33700,
38+
"collaborators": 0,
39+
"two_factor_authentication": true,
40+
"plan": {
41+
"name": "free",
42+
"space": 976562499,
43+
"collaborators": 0,
44+
"private_repos": 10000
45+
}
46+
}

‎src/test/resources/org/kohsuke/github/GHReleaseTest/wiremock/testCreateReleaseWithUnknownCategoryFails/mappings/repos_hub4j-test-org_testcreaterelease-2.json‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
{
2+
"id": "467b7a17-b090-4498-a03e-428f78110f2d",
3+
"name": "repos_hub4j-test-org_testcreaterelease",
4+
"request": {
5+
"url": "/repos/hub4j-test-org/testCreateRelease",
6+
"method": "GET",
7+
"headers": {
8+
"Accept": {
9+
"equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
10+
}
11+
}
12+
},
13+
"response": {
14+
"status": 200,
15+
"bodyFileName": "repos_hub4j-test-org_testcreaterelease-2.json",
16+
"headers": {
17+
"Server": "GitHub.com",
18+
"Date": "Mon, 14 Jun 2021 20:07:53 GMT",
19+
"Content-Type": "application/json; charset=utf-8",
20+
"Cache-Control": "private, max-age=60, s-maxage=60",
21+
"Vary": [
22+
"Accept, Authorization, Cookie, X-GitHub-OTP",
23+
"Accept-Encoding, Accept, X-Requested-With"
24+
],
25+
"ETag": "W/\"32a66bfea0e2a70e2dc6c6616328f0abbea8bbc5fb6977d402c6832f472e15a7\"",
26+
"Last-Modified": "Thu, 10 Jun 2021 01:31:14 GMT",
27+
"X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, workflow, write:discussion",
28+
"X-Accepted-OAuth-Scopes": "repo",
29+
"X-GitHub-Media-Type": "unknown, github.v3",
30+
"X-RateLimit-Limit": "5000",
31+
"X-RateLimit-Remaining": "4925",
32+
"X-RateLimit-Reset": "1623701637",
33+
"X-RateLimit-Used": "75",
34+
"X-RateLimit-Resource": "core",
35+
"Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
36+
"X-Frame-Options": "deny",
37+
"X-Content-Type-Options": "nosniff",
38+
"X-XSS-Protection": "0",
39+
"Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
40+
"Content-Security-Policy": "default-src 'none'",
41+
"X-GitHub-Request-Id": "F69E:0CE1:2ECAB7:3EA336:60C7B719"
42+
}
43+
},
44+
"uuid": "467b7a17-b090-4498-a03e-428f78110f2d",
45+
"persistent": true,
46+
"insertionIndex": 2
47+
}

‎src/test/resources/org/kohsuke/github/GHReleaseTest/wiremock/testCreateReleaseWithUnknownCategoryFails/mappings/repos_hub4j-test-org_testcreaterelease_releases-3.json‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
{
2+
"id": "78307b46-4de1-4554-a60f-d2285eaf5ab8",
3+
"name": "repos_hub4j-test-org_testcreaterelease_releases",
4+
"request": {
5+
"url": "/repos/hub4j-test-org/testCreateRelease/releases",
6+
"method": "POST",
7+
"headers": {
8+
"Accept": {
9+
"equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
10+
}
11+
},
12+
"bodyPatterns": [
13+
{
14+
"equalToJson": "{\"discussion_category_name\":\"an invalid cateogry\",\"tag_name\":\"testCreateReleaseWithUnknownCategoryFails\",\"prerelease\":false,\"name\":\"release-testCreateReleaseWithUnknownCategoryFails\"}",
15+
"ignoreArrayOrder": true,
16+
"ignoreExtraElements": false
17+
}
18+
]
19+
},
20+
"response": {
21+
"status": 404,
22+
"body": "{\"message\":\"Discussion could not be created. Make sure you passed a valid category name.\",\"documentation_url\":\"https://docs.github.com/rest/reference/repos#create-a-release\"}",
23+
"headers": {
24+
"Server": "GitHub.com",
25+
"Date": "Mon, 14 Jun 2021 20:07:53 GMT",
26+
"Content-Type": "application/json; charset=utf-8",
27+
"X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, workflow, write:discussion",
28+
"X-Accepted-OAuth-Scopes": "repo",
29+
"X-GitHub-Media-Type": "unknown, github.v3",
30+
"X-RateLimit-Limit": "5000",
31+
"X-RateLimit-Remaining": "4924",
32+
"X-RateLimit-Reset": "1623701637",
33+
"X-RateLimit-Used": "76",
34+
"X-RateLimit-Resource": "core",
35+
"Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
36+
"X-Frame-Options": "deny",
37+
"X-Content-Type-Options": "nosniff",
38+
"X-XSS-Protection": "0",
39+
"Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
40+
"Content-Security-Policy": "default-src 'none'",
41+
"Vary": "Accept-Encoding, Accept, X-Requested-With",
42+
"X-GitHub-Request-Id": "F6A0:0CE8:71F565:825F84:60C7B719"
43+
}
44+
},
45+
"uuid": "78307b46-4de1-4554-a60f-d2285eaf5ab8",
46+
"persistent": true,
47+
"insertionIndex": 3
48+
}

‎src/test/resources/org/kohsuke/github/GHReleaseTest/wiremock/testCreateReleaseWithUnknownCategoryFails/mappings/user-1.json‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
{
2+
"id": "b410b598-fc14-48cc-8e39-1277b3df0846",
3+
"name": "user",
4+
"request": {
5+
"url": "/user",
6+
"method": "GET",
7+
"headers": {
8+
"Accept": {
9+
"equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
10+
}
11+
}
12+
},
13+
"response": {
14+
"status": 200,
15+
"bodyFileName": "user-1.json",
16+
"headers": {
17+
"Server": "GitHub.com",
18+
"Date": "Mon, 14 Jun 2021 20:07:52 GMT",
19+
"Content-Type": "application/json; charset=utf-8",
20+
"Cache-Control": "private, max-age=60, s-maxage=60",
21+
"Vary": [
22+
"Accept, Authorization, Cookie, X-GitHub-OTP",
23+
"Accept-Encoding, Accept, X-Requested-With"
24+
],
25+
"ETag": "W/\"c1e456100f9b085b8b6a8fc43a8973a0aa267ed9d24814f8e51a312db9835a71\"",
26+
"Last-Modified": "Mon, 14 Jun 2021 20:00:35 GMT",
27+
"X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, workflow, write:discussion",
28+
"X-Accepted-OAuth-Scopes": "",
29+
"X-GitHub-Media-Type": "unknown, github.v3",
30+
"X-RateLimit-Limit": "5000",
31+
"X-RateLimit-Remaining": "4927",
32+
"X-RateLimit-Reset": "1623701637",
33+
"X-RateLimit-Used": "73",
34+
"X-RateLimit-Resource": "core",
35+
"Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
36+
"X-Frame-Options": "deny",
37+
"X-Content-Type-Options": "nosniff",
38+
"X-XSS-Protection": "0",
39+
"Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
40+
"Content-Security-Policy": "default-src 'none'",
41+
"X-GitHub-Request-Id": "F69A:0D59:E2AB80:F2F137:60C7B718"
42+
}
43+
},
44+
"uuid": "b410b598-fc14-48cc-8e39-1277b3df0846",
45+
"persistent": true,
46+
"insertionIndex": 1
47+
}

0 commit comments

Comments
 (0)