From 4bd004d95566d4c0411ae5ca41f8bd29c016775a Mon Sep 17 00:00:00 2001 From: Maxim Lebedev Date: Thu, 29 Nov 2018 19:44:58 +0500 Subject: [PATCH] :recycle: Tests refactor --- test/invalid_test.go | 105 +++++++++++++--------------------------- test/valid_test.go | 113 ++++++++++--------------------------------- 2 files changed, 58 insertions(+), 160 deletions(-) diff --git a/test/invalid_test.go b/test/invalid_test.go index d8e3dce..387fac7 100644 --- a/test/invalid_test.go +++ b/test/invalid_test.go @@ -4,6 +4,7 @@ import ( "testing" "time" + "github.com/stretchr/testify/assert" "gitlab.com/toby3d/telegraph" ) @@ -16,15 +17,13 @@ const ( var invalidAccount = new(telegraph.Account) func TestInvalidContentFormat(t *testing.T) { - if _, err := telegraph.ContentFormat(invalidContent); err != telegraph.ErrInvalidDataType { - t.Error() - } + _, err := telegraph.ContentFormat(invalidContent) + assert.EqualError(t, telegraph.ErrInvalidDataType, err.Error()) } func TestInvalidCreateAccount(t *testing.T) { - if _, err := telegraph.CreateAccount(invalidAccount); err == nil { - t.Error() - } + _, err := telegraph.CreateAccount(invalidAccount) + assert.Error(t, err) t.Run("invalidCreatePage", testInvalidCreatePage) t.Run("invalidEditAccountInfo", testInvalidEditAccountInfo) @@ -37,109 +36,71 @@ func TestInvalidCreateAccount(t *testing.T) { } func testInvalidCreatePage(t *testing.T) { - if _, err := invalidAccount.CreatePage(&telegraph.Page{ - AuthorURL: invalidAuthorURL, - }, false); err == nil { - t.Error() - } + _, err := invalidAccount.CreatePage(&telegraph.Page{AuthorURL: invalidAuthorURL}, false) + assert.Error(t, err) } func testInvalidEditAccountInfo(t *testing.T) { - if _, err := invalidAccount.EditAccountInfo(&telegraph.Account{ - AuthorURL: invalidAuthorURL, - }); err == nil { - t.Error() - } + _, err := invalidAccount.EditAccountInfo(&telegraph.Account{AuthorURL: invalidAuthorURL}) + assert.Error(t, err) } func testInvalidEditPage(t *testing.T) { - if _, err := invalidAccount.EditPage(&telegraph.Page{ - AuthorURL: invalidAuthorURL, - }, false); err == nil { - t.Error() - } + _, err := invalidAccount.EditPage(&telegraph.Page{AuthorURL: invalidAuthorURL}, false) + assert.Error(t, err) } func testInvalidGetAccountInfo(t *testing.T) { - if _, err := invalidAccount.GetAccountInfo( - telegraph.FieldShortName, - telegraph.FieldPageCount, - ); err == nil { - t.Error() - } + _, err := invalidAccount.GetAccountInfo(telegraph.FieldShortName, telegraph.FieldPageCount) + assert.Error(t, err) } func testInvalidGetPageList(t *testing.T) { - if _, err := invalidAccount.GetPageList(0, 3); err == nil { - t.Error() - } + _, err := invalidAccount.GetPageList(0, 3) + assert.Error(t, err) } func testInvalidGetPageListByOffset(t *testing.T) { - if _, err := invalidAccount.GetPageList(-42, 3); err == nil { - t.Error() - } + _, err := invalidAccount.GetPageList(-42, 3) + assert.Error(t, err) } func testInvalidGetPageListByLimit(t *testing.T) { - if _, err := invalidAccount.GetPageList(0, 9000); err == nil { - t.Error() - } + _, err := invalidAccount.GetPageList(0, 9000) + assert.Error(t, err) } func TestInvalidGetPage(t *testing.T) { - if _, err := telegraph.GetPage(invalidPageURL, true); err == nil { - t.Error() - } + _, err := telegraph.GetPage(invalidPageURL, true) + assert.Error(t, err) } func TestInvalidGetViewsByPage(t *testing.T) { - if _, err := telegraph.GetViews( - invalidPageURL, - time.Date(2016, time.December, 0, 0, 0, 0, 0, time.UTC), - ); err == nil { - t.Error() - } + _, err := telegraph.GetViews(invalidPageURL, time.Date(2016, time.December, 0, 0, 0, 0, 0, time.UTC)) + assert.Error(t, err) } func TestInvalidGetViewsByHour(t *testing.T) { - if _, err := telegraph.GetViews( - validPageURL, - time.Date(0, 0, 0, 42, 0, 0, 0, time.UTC), - ); err == nil { - t.Error() - } + _, err := telegraph.GetViews(validPageURL, time.Date(0, 0, 0, 42, 0, 0, 0, time.UTC)) + assert.Error(t, err) } func TestInvalidGetViewsByDay(t *testing.T) { - if _, err := telegraph.GetViews( - validPageURL, - time.Date(0, 0, 42, 23, 0, 0, 0, time.UTC), - ); err == nil { - t.Error() - } + _, err := telegraph.GetViews(validPageURL, time.Date(0, 0, 42, 23, 0, 0, 0, time.UTC)) + assert.Error(t, err) } func TestInvalidGetViewsByMonth(t *testing.T) { - if _, err := telegraph.GetViews( - validPageURL, - time.Date(0, 22, 24, 23, 0, 0, 0, time.UTC), - ); err == nil { - t.Error() - } + _, err := telegraph.GetViews(validPageURL, time.Date(0, 22, 24, 23, 0, 0, 0, time.UTC)) + assert.Error(t, err) } func TestInvalidGetViewsByYear(t *testing.T) { - if _, err := telegraph.GetViews( - validPageURL, - time.Date(1980, time.December, 24, 23, 0, 0, 0, time.UTC), - ); err == nil { - t.Error() - } + _, err := telegraph.GetViews(validPageURL, time.Date(1980, time.December, 24, 23, 0, 0, 0, time.UTC)) + assert.Error(t, err) } func testInvalidRevokeAccessToken(t *testing.T) { - if _, err := invalidAccount.RevokeAccessToken(); err == nil { - t.Error() - } + _, err := invalidAccount.RevokeAccessToken() + assert.Error(t, err) } diff --git a/test/valid_test.go b/test/valid_test.go index 5bca5eb..d901147 100644 --- a/test/valid_test.go +++ b/test/valid_test.go @@ -4,6 +4,7 @@ import ( "testing" "time" + "github.com/stretchr/testify/assert" "gitlab.com/toby3d/telegraph" ) @@ -18,34 +19,24 @@ const ( var ( validContentDOM []telegraph.Node + validAccount *telegraph.Account + validPage *telegraph.Page - validAccount = new(telegraph.Account) - validPage = new(telegraph.Page) validContent = `

Hello, World!

` ) func testValidContentFormatByString(t *testing.T) { var err error validContentDOM, err = telegraph.ContentFormat(validContent) - if err != nil { - t.Error(err.Error()) - t.FailNow() - } - if len(validContentDOM) <= 0 { - t.Error("DOM content is nil") - } + assert.NoError(t, err) + assert.NotEmpty(t, validContentDOM) } func testValidContentFormatByBytes(t *testing.T) { var err error validContentDOM, err = telegraph.ContentFormat([]byte(validContent)) - if err != nil { - t.Error(err.Error()) - t.FailNow() - } - if len(validContentDOM) <= 0 { - t.Error("DOM content is nil") - } + assert.NoError(t, err) + assert.NotEmpty(t, validContentDOM) } func TestValidCreateAccount(t *testing.T) { @@ -54,10 +45,7 @@ func TestValidCreateAccount(t *testing.T) { ShortName: validShortName, // AuthorName: validAuthorName, }) - if err != nil { - t.Error(err.Error()) - t.FailNow() - } + assert.NoError(t, err) t.Run("validCreatePage", testValidCreatePage) t.Run("validEditAccountInfo", testValidEditAccountInfo) @@ -77,14 +65,8 @@ func testValidCreatePage(t *testing.T) { AuthorURL: validAuthorURL, Content: validContentDOM, }, true) - if err != nil { - t.Error(err.Error()) - t.FailNow() - } - if validPage.URL == "" { - t.Error("new page not contain URL") - } - + assert.NoError(t, err) + assert.NotEmpty(t, validPage.URL) t.Run("validEditPage", testValidEditPage) } @@ -94,13 +76,8 @@ func testValidEditAccountInfo(t *testing.T) { AuthorName: validNewAuthorName, AuthorURL: validAuthorURL, }) - if err != nil { - t.Error(err.Error()) - t.FailNow() - } - if update.AuthorName == validAccount.AuthorName { - t.Error("account not updated") - } + assert.NoError(t, err) + assert.NotEqual(t, validAccount.AuthorName, update.AuthorName) } func testValidEditPage(t *testing.T) { @@ -111,78 +88,38 @@ func testValidEditPage(t *testing.T) { AuthorName: validAuthorName, Content: validContentDOM, }, true) - if err != nil { - t.Error(err.Error()) - t.FailNow() - } + assert.NoError(t, err) } func testValidGetAccountInfo(t *testing.T) { - info, err := validAccount.GetAccountInfo( - telegraph.FieldShortName, - telegraph.FieldPageCount, - ) - if err != nil { - t.Error(err.Error()) - t.FailNow() - } - if info.ShortName != validAccount.ShortName { - t.Error("get wrong account info") - } + info, err := validAccount.GetAccountInfo(telegraph.FieldShortName, telegraph.FieldPageCount) + assert.NoError(t, err) + assert.Equal(t, validAccount.ShortName, info.ShortName) } func TestValidGetPage(t *testing.T) { page, err := telegraph.GetPage(validPage.Path, true) - if err != nil { - t.Error(err.Error()) - t.FailNow() - } - - if page.Title != validPage.Title { - t.Error("get wrong page") - } + assert.NoError(t, err) + assert.Equal(t, validPage.Title, page.Title) } func testValidGetPageList(t *testing.T) { pages, err := validAccount.GetPageList(0, 3) - if err != nil { - t.Error(err.Error()) - t.FailNow() - } - - if pages.TotalCount <= 0 { - t.Error("no one page in page list") - } + assert.NoError(t, err) + assert.NotZero(t, pages.TotalCount) } func TestValidGetViews(t *testing.T) { - stats, err := telegraph.GetViews( - validPageURL, - time.Date(2016, time.December, 0, 0, 0, 0, 0, time.UTC), - ) - if err != nil { - t.Error(err.Error()) - t.FailNow() - } - + stats, err := telegraph.GetViews(validPageURL, time.Date(2016, time.December, 0, 0, 0, 0, 0, time.UTC)) + assert.NoError(t, err) t.Log("get", stats.Views, "views") } func testValidRevokeAccessToken(t *testing.T) { oldToken := validAccount.AccessToken - var err error validAccount, err = validAccount.RevokeAccessToken() - if err != nil { - t.Error(err.Error()) - t.FailNow() - } - - if validAccount.AccessToken == "" { - t.Error("revokeAccessToken return nothing") - } - - if oldToken == validAccount.AccessToken { - t.Error("old and new tokens are equal") - } + assert.NoError(t, err) + assert.NotEmpty(t, validAccount.AccessToken) + assert.NotEqual(t, validAccount.AccessToken, oldToken) }