Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement ListVotes(), DeleteVotes() and add missing tests #43

Merged
merged 4 commits into from
Oct 28, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions changes_reviewer.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,15 @@ type AddReviewerResult struct {
Confirm bool `json:"confirm,omitempty"`
}

// DeleteVoteInput entity contains options for the deletion of a vote.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor nit, there are 2 spaces before "entity".

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Fixed in 95b11af

//
// Gerrit API docs: https://gerrit-review.googlesource.com/Documentation/rest-api-changes.html#delete-vote-input
type DeleteVoteInput struct {
Label string `json:"label,omitempty"`
Notify string `json:"notify,omitempty"`
NotifyDetails map[string]NotifyInfo `json:"notify_details"`
}

// ListReviewers lists the reviewers of a change.
//
// Gerrit API docs: https://gerrit-review.googlesource.com/Documentation/rest-api-changes.html#list-reviewers
Expand Down Expand Up @@ -124,3 +133,31 @@ func (s *ChangesService) DeleteReviewer(changeID, accountID string) (*Response,
u := fmt.Sprintf("changes/%s/reviewers/%s", changeID, accountID)
return s.client.DeleteRequest(u, nil)
}

// ListVotes lists the votes for a specific reviewer of the change.
//
// Gerrit API docs: https://gerrit-review.googlesource.com/Documentation/rest-api-changes.html#list-votes
func (s *ChangesService) ListVotes(changeID string, accountID string) (map[string]int, *Response, error) {
u := fmt.Sprintf("changes/%s/reviewers/%s/votes/", changeID, accountID)
req, err := s.client.NewRequest("GET", u, nil)
if err != nil {
return nil, nil, err
}

var v map[string]int
resp, err := s.client.Do(req, &v)
if err != nil {
return nil, resp, err
}
return v, resp, err
}

// DeleteVote deletes a single vote from a change. Note, that even when the
// last vote of a reviewer is removed the reviewer itself is still listed on
// the change.
//
// Gerrit API docs: https://gerrit-review.googlesource.com/Documentation/rest-api-changes.html#delete-vote
func (s *ChangesService) DeleteVote(changeID string, accountID string, label string, input *DeleteVoteInput) (*Response, error) {
u := fmt.Sprintf("changes/%s/reviewers/%s/votes/%s", changeID, accountID, label)
return s.client.DeleteRequest(u, input)
}
179 changes: 179 additions & 0 deletions changes_reviewer_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,179 @@
package gerrit_test

import (
"fmt"
"net/http"
"net/http/httptest"
"testing"

"github.com/andygrunwald/go-gerrit"
)

func newClient(t *testing.T, server *httptest.Server) *gerrit.Client {
client, err := gerrit.NewClient(server.URL, nil)
if err != nil {
t.Error(err)
}
return client
}

func TestChangesService_ListReviewers(t *testing.T) {
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
expected := "/changes/123/reviewers/"
if r.URL.Path != expected {
t.Errorf("%s != %s", r.URL.Path, expected)
}

fmt.Fprint(w, `[{"_account_id": 1}]`)
}))
defer ts.Close()

client := newClient(t, ts)
data, _, err := client.Changes.ListReviewers("123")
if err != nil {
t.Error(err)
}

if len(*data) != 1 {
t.Error("Length of data !=1 ")
}

if (*data)[0].AccountID != 1 {
t.Error("AccountID != 1")
}
}

func TestChangesService_SuggestReviewers(t *testing.T) {
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
expected := "/changes/123/suggest_reviewers"
if r.URL.Path != expected {
t.Errorf("%s != %s", r.URL.Path, expected)
}

fmt.Fprint(w, `[{"account": {"_account_id": 1}}]`)
}))
defer ts.Close()

client := newClient(t, ts)
data, _, err := client.Changes.SuggestReviewers("123", nil)
if err != nil {
t.Error(err)
}

if len(*data) != 1 {
t.Error("Length of data !=1 ")
}

if (*data)[0].Account.AccountID != 1 {
t.Error("AccountID != 1")
}
}

func TestChangesService_GetReviewer(t *testing.T) {
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
expected := "/changes/123/reviewers/1"
if r.URL.Path != expected {
t.Errorf("%s != %s", r.URL.Path, expected)
}

fmt.Fprint(w, `{"_account_id": 1}`)
}))
defer ts.Close()

client := newClient(t, ts)
data, _, err := client.Changes.GetReviewer("123", "1")
if err != nil {
t.Error(err)
}
if data.AccountID != 1 {
t.Error("AccountID != 1")
}
}

func TestChangesService_AddReviewer(t *testing.T) {
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
expected := "/changes/123/reviewers"
if r.URL.Path != expected {
t.Errorf("%s != %s", r.URL.Path, expected)
}
if r.Method != "POST" {
t.Error("Method != POST")
}

fmt.Fprint(w, `{"confirm": true}`)
}))
defer ts.Close()

client := newClient(t, ts)
data, _, err := client.Changes.AddReviewer("123", &gerrit.ReviewerInput{})
if err != nil {
t.Error(err)
}
if !data.Confirm {
t.Error("Confirm != true")
}
}

func TestChangesService_DeleteReviewer(t *testing.T) {
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
expected := "/changes/123/reviewers/1"
if r.URL.Path != expected {
t.Errorf("%s != %s", r.URL.Path, expected)
}
if r.Method != "DELETE" {
t.Error("Method != DELETE")
}
w.WriteHeader(http.StatusOK)
}))
defer ts.Close()

client := newClient(t, ts)
_, err := client.Changes.DeleteReviewer("123", "1")
if err != nil {
t.Error(err)
}
}

func TestChangesService_ListVotes(t *testing.T) {
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
expected := "/changes/123/reviewers/1/votes/"
if r.URL.Path != expected {
t.Errorf("%s != %s", r.URL.Path, expected)
}
fmt.Fprint(w, `{"Code-Review": 2, "Verified": 1}`)
}))
defer ts.Close()

client := newClient(t, ts)
votes, _, err := client.Changes.ListVotes("123", "1")
if err != nil {
t.Error(err)
}
if votes["Code-Review"] != 2 {
t.Error("Code-Review != 2")
}
if votes["Verified"] != 1 {
t.Error("Verified != 1")
}
}

func TestChangesService_DeleteVote(t *testing.T) {
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
expected := "/changes/123/reviewers/1/votes/Code-Review"
if r.URL.Path != expected {
t.Errorf("%s != %s", r.URL.Path, expected)
}

if r.Method != "DELETE" {
t.Error("Method != DELETE")
}
w.WriteHeader(http.StatusOK)
}))
defer ts.Close()

client := newClient(t, ts)
_, err := client.Changes.DeleteVote("123", "1", "Code-Review", nil)
if err != nil {
t.Error(err)
}
}