From 9c6bb4b1e9c6a7be486dc878a9ed592b131947dc Mon Sep 17 00:00:00 2001 From: Jonas Franz Date: Fri, 11 May 2018 14:36:08 +0200 Subject: [PATCH] Add unit tests for Review Signed-off-by: Jonas Franz --- models/fixtures/comment.yml | 10 ++++ models/fixtures/review.yml | 32 +++++++++++ models/review.go | 2 +- models/review_test.go | 106 ++++++++++++++++++++++++++++++++++++ 4 files changed, 149 insertions(+), 1 deletion(-) create mode 100644 models/fixtures/review.yml create mode 100644 models/review_test.go diff --git a/models/fixtures/comment.yml b/models/fixtures/comment.yml index 34df02d28c..83fcf55fb1 100644 --- a/models/fixtures/comment.yml +++ b/models/fixtures/comment.yml @@ -20,3 +20,13 @@ issue_id: 1 # in repo_id 1 content: "meh..." created_unix: 946684812 +- + id: 4 + type: 19 # code comment + poster_id: 1 + issue_id: 2 + content: "meh..." + review_id: 1 + line: 4 + tree_path: "README.md" + created_unix: 946684812 diff --git a/models/fixtures/review.yml b/models/fixtures/review.yml new file mode 100644 index 0000000000..17defd1b3a --- /dev/null +++ b/models/fixtures/review.yml @@ -0,0 +1,32 @@ +- + id: 1 + type: 1 + reviewer_id: 1 + issue_id: 2 + content: "Demo Review" + updated_unix: 946684810 + created_unix: 946684810 +- + id: 2 + type: 1 + reviewer_id: 534543 + issue_id: 534543 + content: "Invalid Review #1" + updated_unix: 946684810 + created_unix: 946684810 +- + id: 3 + type: 1 + reviewer_id: 1 + issue_id: 343545 + content: "Invalid Review #2" + updated_unix: 946684810 + created_unix: 946684810 +- + id: 4 + type: 0 # Pending review + reviewer_id: 1 + issue_id: 2 + content: "Pending Review" + updated_unix: 946684810 + created_unix: 946684810 diff --git a/models/review.go b/models/review.go index 9719e3371c..e5d4527ea3 100644 --- a/models/review.go +++ b/models/review.go @@ -60,7 +60,7 @@ type Review struct { } func (r *Review) loadCodeComments(e Engine) (err error) { - r.CodeComments, err = findComments(e, FindCommentsOptions{IssueID: r.IssueID, ReviewID: r.ID}) + r.CodeComments, err = findComments(e, FindCommentsOptions{IssueID: r.IssueID, ReviewID: r.ID, Type: CommentTypeCode}) return } diff --git a/models/review_test.go b/models/review_test.go new file mode 100644 index 0000000000..5ac1e16bfc --- /dev/null +++ b/models/review_test.go @@ -0,0 +1,106 @@ +package models + +import ( + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestGetReviewByID(t *testing.T) { + assert.NoError(t, PrepareTestDatabase()) + review, err := GetReviewByID(1) + assert.NoError(t, err) + assert.Equal(t, "Demo Review", review.Content) + assert.Equal(t, ReviewTypeApprove, review.Type) + + _, err = GetReviewByID(23892) + assert.Error(t, err) + assert.True(t, IsErrReviewNotExist(err), "IsErrReviewNotExist") +} + +func TestReview_LoadAttributes(t *testing.T) { + assert.NoError(t, PrepareTestDatabase()) + review := AssertExistsAndLoadBean(t, &Review{ID: 1}).(*Review) + assert.NoError(t, review.LoadAttributes()) + assert.NotNil(t, review.Issue) + assert.NotNil(t, review.Reviewer) + + invalidReview1 := AssertExistsAndLoadBean(t, &Review{ID: 2}).(*Review) + assert.Error(t, invalidReview1.LoadAttributes()) + + invalidReview2 := AssertExistsAndLoadBean(t, &Review{ID: 3}).(*Review) + assert.Error(t, invalidReview2.LoadAttributes()) + +} + +func TestReview_LoadCodeComments(t *testing.T) { + assert.NoError(t, PrepareTestDatabase()) + + review := AssertExistsAndLoadBean(t, &Review{ID: 1}).(*Review) + assert.NoError(t, review.LoadCodeComments()) + assert.Len(t, review.CodeComments, 1) + assert.Equal(t, int64(4), review.CodeComments[0].Line) +} + +func TestReviewType_Icon(t *testing.T) { + assert.Equal(t, "eye", ReviewTypeApprove.Icon()) + assert.Equal(t, "x", ReviewTypeReject.Icon()) + assert.Equal(t, "comment", ReviewTypeComment.Icon()) + assert.Equal(t, "comment", ReviewTypeUnknown.Icon()) + assert.Equal(t, "comment", ReviewType(4).Icon()) +} + +func TestFindReviews(t *testing.T) { + assert.NoError(t, PrepareTestDatabase()) + reviews, err := FindReviews(FindReviewOptions{ + Type: ReviewTypeApprove, + IssueID: 2, + ReviewerID: 1, + }) + assert.NoError(t, err) + assert.Len(t, reviews, 1) + assert.Equal(t, "Demo Review", reviews[0].Content) +} + +func TestGetCurrentReview(t *testing.T) { + assert.NoError(t, PrepareTestDatabase()) + issue := AssertExistsAndLoadBean(t, &Issue{ID: 2}).(*Issue) + user := AssertExistsAndLoadBean(t, &User{ID: 1}).(*User) + + review, err := GetCurrentReview(user, issue) + assert.NoError(t, err) + assert.NotNil(t, review) + assert.Equal(t, ReviewTypePending, review.Type) + assert.Equal(t, "Pending Review", review.Content ) + + user2 := AssertExistsAndLoadBean(t, &User{ID: 2}).(*User) + review2, err := GetCurrentReview(user2, issue) + assert.Error(t, err) + assert.True(t, IsErrReviewNotExist(err)) + assert.Nil(t, review2) +} + +func TestCreateReview(t *testing.T) { + assert.NoError(t, PrepareTestDatabase()) + + issue := AssertExistsAndLoadBean(t, &Issue{ID: 2}).(*Issue) + user := AssertExistsAndLoadBean(t, &User{ID: 1}).(*User) + + review, err := CreateReview(CreateReviewOptions{ + Content: "New Review", + Type: ReviewTypePending, + Issue: issue, + Reviewer: user, + }) + assert.NoError(t, err) + assert.Equal(t, "New Review", review.Content) + AssertExistsAndLoadBean(t, &Review{Content: "New Review"}) +} + +func TestUpdateReview(t *testing.T) { + assert.NoError(t, PrepareTestDatabase()) + review := AssertExistsAndLoadBean(t, &Review{ID: 1}).(*Review) + review.Content = "Updated Review" + assert.NoError(t, UpdateReview(review)) + AssertExistsAndLoadBean(t, &Review{ID: 1, Content: "Updated Review"}) +}