diff --git a/src/test/java/org/kohsuke/github/GHEventPayloadTest.java b/src/test/java/org/kohsuke/github/GHEventPayloadTest.java index db88196b17..dcafcaaa4a 100644 --- a/src/test/java/org/kohsuke/github/GHEventPayloadTest.java +++ b/src/test/java/org/kohsuke/github/GHEventPayloadTest.java @@ -1001,9 +1001,9 @@ public void InstallationCreatedEvent() throws Exception { assertThat(event.getInstallation().getAccount().getLogin(), is("CronFire")); assertThat(event.getRepositories().isEmpty(), is(false)); - assertThat(event.getRepositories().get(0).getId(), is(1296269)); + assertThat(event.getRepositories().get(0).getId(), is(1296269L)); assertThat(event.getRawRepositories().isEmpty(), is(false)); - assertThat(event.getRawRepositories().get(0).getId(), is(1296269)); + assertThat(event.getRawRepositories().get(0).getId(), is(1296269L)); assertThat(event.getSender().getLogin(), is("Haarolean")); } @@ -1026,8 +1026,8 @@ public void InstallationDeletedEvent() throws Exception { assertThat(event.getInstallation().getAccount().getLogin(), is("octocat")); assertThrows(IllegalStateException.class, () -> event.getRepositories().isEmpty()); - assertThat(event.getRepositories().isEmpty(), is(false)); - assertThat(event.getRepositories().get(0).getId(), is(1296269)); + assertThat(event.getRawRepositories().isEmpty(), is(false)); + assertThat(event.getRawRepositories().get(0).getId(), is(1296269L)); assertThat(event.getSender().getLogin(), is("octocat")); } diff --git a/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/InstallationCreatedEvent/__files/repos_octocat_hello-world-1.json b/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/InstallationCreatedEvent/__files/repos_octocat_hello-world-1.json deleted file mode 100644 index fd3c1ce7ca..0000000000 --- a/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/InstallationCreatedEvent/__files/repos_octocat_hello-world-1.json +++ /dev/null @@ -1,108 +0,0 @@ -{ - "id": 1296269, - "node_id": "MDEwOlJlcG9zaXRvcnkxMjk2MjY5", - "name": "Hello-World", - "full_name": "octocat/Hello-World", - "private": false, - "owner": { - "login": "octocat", - "id": 583231, - "node_id": "MDQ6VXNlcjU4MzIzMQ==", - "avatar_url": "https://avatars.githubusercontent.com/u/583231?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/octocat", - "html_url": "https://github.com/octocat", - "followers_url": "https://api.github.com/users/octocat/followers", - "following_url": "https://api.github.com/users/octocat/following{/other_user}", - "gists_url": "https://api.github.com/users/octocat/gists{/gist_id}", - "starred_url": "https://api.github.com/users/octocat/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/octocat/subscriptions", - "organizations_url": "https://api.github.com/users/octocat/orgs", - "repos_url": "https://api.github.com/users/octocat/repos", - "events_url": "https://api.github.com/users/octocat/events{/privacy}", - "received_events_url": "https://api.github.com/users/octocat/received_events", - "type": "User", - "site_admin": false - }, - "html_url": "https://github.com/octocat/Hello-World", - "description": "My first repository on GitHub!", - "fork": false, - "url": "https://api.github.com/repos/octocat/Hello-World", - "forks_url": "https://api.github.com/repos/octocat/Hello-World/forks", - "keys_url": "https://api.github.com/repos/octocat/Hello-World/keys{/key_id}", - "collaborators_url": "https://api.github.com/repos/octocat/Hello-World/collaborators{/collaborator}", - "teams_url": "https://api.github.com/repos/octocat/Hello-World/teams", - "hooks_url": "https://api.github.com/repos/octocat/Hello-World/hooks", - "issue_events_url": "https://api.github.com/repos/octocat/Hello-World/issues/events{/number}", - "events_url": "https://api.github.com/repos/octocat/Hello-World/events", - "assignees_url": "https://api.github.com/repos/octocat/Hello-World/assignees{/user}", - "branches_url": "https://api.github.com/repos/octocat/Hello-World/branches{/branch}", - "tags_url": "https://api.github.com/repos/octocat/Hello-World/tags", - "blobs_url": "https://api.github.com/repos/octocat/Hello-World/git/blobs{/sha}", - "git_tags_url": "https://api.github.com/repos/octocat/Hello-World/git/tags{/sha}", - "git_refs_url": "https://api.github.com/repos/octocat/Hello-World/git/refs{/sha}", - "trees_url": "https://api.github.com/repos/octocat/Hello-World/git/trees{/sha}", - "statuses_url": "https://api.github.com/repos/octocat/Hello-World/statuses/{sha}", - "languages_url": "https://api.github.com/repos/octocat/Hello-World/languages", - "stargazers_url": "https://api.github.com/repos/octocat/Hello-World/stargazers", - "contributors_url": "https://api.github.com/repos/octocat/Hello-World/contributors", - "subscribers_url": "https://api.github.com/repos/octocat/Hello-World/subscribers", - "subscription_url": "https://api.github.com/repos/octocat/Hello-World/subscription", - "commits_url": "https://api.github.com/repos/octocat/Hello-World/commits{/sha}", - "git_commits_url": "https://api.github.com/repos/octocat/Hello-World/git/commits{/sha}", - "comments_url": "https://api.github.com/repos/octocat/Hello-World/comments{/number}", - "issue_comment_url": "https://api.github.com/repos/octocat/Hello-World/issues/comments{/number}", - "contents_url": "https://api.github.com/repos/octocat/Hello-World/contents/{+path}", - "compare_url": "https://api.github.com/repos/octocat/Hello-World/compare/{base}...{head}", - "merges_url": "https://api.github.com/repos/octocat/Hello-World/merges", - "archive_url": "https://api.github.com/repos/octocat/Hello-World/{archive_format}{/ref}", - "downloads_url": "https://api.github.com/repos/octocat/Hello-World/downloads", - "issues_url": "https://api.github.com/repos/octocat/Hello-World/issues{/number}", - "pulls_url": "https://api.github.com/repos/octocat/Hello-World/pulls{/number}", - "milestones_url": "https://api.github.com/repos/octocat/Hello-World/milestones{/number}", - "notifications_url": "https://api.github.com/repos/octocat/Hello-World/notifications{?since,all,participating}", - "labels_url": "https://api.github.com/repos/octocat/Hello-World/labels{/name}", - "releases_url": "https://api.github.com/repos/octocat/Hello-World/releases{/id}", - "deployments_url": "https://api.github.com/repos/octocat/Hello-World/deployments", - "created_at": "2011-01-26T19:01:12Z", - "updated_at": "2022-02-03T00:06:57Z", - "pushed_at": "2022-01-30T18:13:40Z", - "git_url": "git://github.com/octocat/Hello-World.git", - "ssh_url": "git@github.com:octocat/Hello-World.git", - "clone_url": "https://github.com/octocat/Hello-World.git", - "svn_url": "https://github.com/octocat/Hello-World", - "homepage": "", - "size": 1, - "stargazers_count": 1764, - "watchers_count": 1764, - "language": null, - "has_issues": true, - "has_projects": true, - "has_downloads": true, - "has_wiki": true, - "has_pages": false, - "forks_count": 1682, - "mirror_url": null, - "archived": false, - "disabled": false, - "open_issues_count": 802, - "license": null, - "allow_forking": true, - "is_template": false, - "topics": [], - "visibility": "public", - "forks": 1682, - "open_issues": 802, - "watchers": 1764, - "default_branch": "master", - "permissions": { - "admin": false, - "maintain": false, - "push": false, - "triage": false, - "pull": true - }, - "temp_clone_token": "", - "network_count": 1682, - "subscribers_count": 1731 -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/InstallationCreatedEvent/mappings/repos_octocat_hello-world-1.json b/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/InstallationCreatedEvent/mappings/repos_octocat_hello-world-1.json deleted file mode 100644 index 942435fa56..0000000000 --- a/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/InstallationCreatedEvent/mappings/repos_octocat_hello-world-1.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "id": "825b1b2a-1bcf-4273-9204-54f989479669", - "name": "repos_octocat_hello-world", - "request": { - "url": "/repos/octocat/Hello-World", - "method": "GET", - "headers": { - "Accept": { - "equalTo": "application/vnd.github.baptiste-preview+json, application/vnd.github.nebula-preview+json" - } - } - }, - "response": { - "status": 200, - "bodyFileName": "repos_octocat_hello-world-1.json", - "headers": { - "Server": "GitHub.com", - "Date": "Thu, 03 Feb 2022 14:07:49 GMT", - "Content-Type": "application/json; charset=utf-8", - "Cache-Control": "private, max-age=60, s-maxage=60", - "Vary": [ - "Accept, Authorization, Cookie, X-GitHub-OTP", - "Accept-Encoding, Accept, X-Requested-With" - ], - "ETag": "W/\"54ebfbf708e274f11202ea42a54ccb98955c89b119059c79c8f1bf7e76126198\"", - "Last-Modified": "Thu, 03 Feb 2022 00:06:57 GMT", - "X-OAuth-Scopes": "admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, gist, notifications, repo, user, workflow, write:discussion", - "X-Accepted-OAuth-Scopes": "repo", - "X-GitHub-Media-Type": "github.v3; param=baptiste-preview.nebula-preview; format=json", - "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4999", - "X-RateLimit-Reset": "1643900869", - "X-RateLimit-Used": "1", - "X-RateLimit-Resource": "core", - "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", - "X-Frame-Options": "deny", - "X-Content-Type-Options": "nosniff", - "X-XSS-Protection": "0", - "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", - "Content-Security-Policy": "default-src 'none'", - "X-GitHub-Request-Id": "AD00:CEBF:18E9BF0:19A3623:61FBE1B5" - } - }, - "uuid": "825b1b2a-1bcf-4273-9204-54f989479669", - "persistent": true, - "insertionIndex": 1 -} \ No newline at end of file