From c9c7dca2cf70e12b5c8921b63d71c308860bc020 Mon Sep 17 00:00:00 2001 From: Maxim Lebedev Date: Wed, 14 Mar 2018 13:59:02 +0500 Subject: [PATCH] :truck: Moved all tests to 'test' directory --- invalid_test.go => test/invalid_test.go | 34 ++++++++++++++----------- valid_test.go => test/valid_test.go | 32 +++++++++++++---------- 2 files changed, 37 insertions(+), 29 deletions(-) rename invalid_test.go => test/invalid_test.go (66%) rename valid_test.go => test/valid_test.go (80%) diff --git a/invalid_test.go b/test/invalid_test.go similarity index 66% rename from invalid_test.go rename to test/invalid_test.go index 2794882..47c6ccd 100644 --- a/invalid_test.go +++ b/test/invalid_test.go @@ -1,6 +1,10 @@ -package telegraph +package telegraph_test -import "testing" +import ( + "testing" + + "github.com/toby3d/telegraph" +) const ( invalidAuthorURL = "lolwat" @@ -8,16 +12,16 @@ const ( invalidContent = 42 ) -var invalidAccount = &Account{} +var invalidAccount = &telegraph.Account{} func TestInvalidContentFormat(t *testing.T) { - if _, err := ContentFormat(invalidContent); err != ErrInvalidDataType { + if _, err := telegraph.ContentFormat(invalidContent); err != telegraph.ErrInvalidDataType { t.Error() } } func TestInvalidCreateAccount(t *testing.T) { - if _, err := CreateAccount(invalidAccount); err == nil { + if _, err := telegraph.CreateAccount(invalidAccount); err == nil { t.Error() } @@ -32,7 +36,7 @@ func TestInvalidCreateAccount(t *testing.T) { } func testInvalidCreatePage(t *testing.T) { - if _, err := invalidAccount.CreatePage(&Page{ + if _, err := invalidAccount.CreatePage(&telegraph.Page{ AuthorURL: invalidAuthorURL, }, false); err == nil { t.Error() @@ -40,7 +44,7 @@ func testInvalidCreatePage(t *testing.T) { } func testInvalidEditAccountInfo(t *testing.T) { - if _, err := invalidAccount.EditAccountInfo(&Account{ + if _, err := invalidAccount.EditAccountInfo(&telegraph.Account{ AuthorURL: invalidAuthorURL, }); err == nil { t.Error() @@ -48,7 +52,7 @@ func testInvalidEditAccountInfo(t *testing.T) { } func testInvalidEditPage(t *testing.T) { - if _, err := invalidAccount.EditPage(&Page{ + if _, err := invalidAccount.EditPage(&telegraph.Page{ AuthorURL: invalidAuthorURL, }, false); err == nil { t.Error() @@ -56,7 +60,7 @@ func testInvalidEditPage(t *testing.T) { } func testInvalidGetAccountInfo(t *testing.T) { - if _, err := invalidAccount.GetAccountInfo(FieldShortName, FieldPageCount); err == nil { + if _, err := invalidAccount.GetAccountInfo(telegraph.FieldShortName, telegraph.FieldPageCount); err == nil { t.Error() } } @@ -80,37 +84,37 @@ func testInvalidGetPageListByLimit(t *testing.T) { } func TestInvalidGetPage(t *testing.T) { - if _, err := GetPage(invalidPageURL, true); err == nil { + if _, err := telegraph.GetPage(invalidPageURL, true); err == nil { t.Error() } } func TestInvalidGetViewsByPage(t *testing.T) { - if _, err := GetViews(invalidPageURL, 2016, 12, 0, -1); err == nil { + if _, err := telegraph.GetViews(invalidPageURL, 2016, 12, 0, -1); err == nil { t.Error() } } func TestInvalidGetViewsByHour(t *testing.T) { - if _, err := GetViews(validPageURL, 0, 0, 0, 42); err == nil { + if _, err := telegraph.GetViews(validPageURL, 0, 0, 0, 42); err == nil { t.Error() } } func TestInvalidGetViewsByDay(t *testing.T) { - if _, err := GetViews(validPageURL, 0, 0, 42, 23); err == nil { + if _, err := telegraph.GetViews(validPageURL, 0, 0, 42, 23); err == nil { t.Error() } } func TestInvalidGetViewsByMonth(t *testing.T) { - if _, err := GetViews(validPageURL, 0, 22, 24, 23); err == nil { + if _, err := telegraph.GetViews(validPageURL, 0, 22, 24, 23); err == nil { t.Error() } } func TestInvalidGetViewsByYear(t *testing.T) { - if _, err := GetViews(validPageURL, 1980, 12, 24, 23); err == nil { + if _, err := telegraph.GetViews(validPageURL, 1980, 12, 24, 23); err == nil { t.Error() } } diff --git a/valid_test.go b/test/valid_test.go similarity index 80% rename from valid_test.go rename to test/valid_test.go index 4e8d7f8..8d06134 100644 --- a/valid_test.go +++ b/test/valid_test.go @@ -1,6 +1,10 @@ -package telegraph +package telegraph_test -import "testing" +import ( + "testing" + + "github.com/toby3d/telegraph" +) const ( validTitle = "Testing" @@ -12,16 +16,16 @@ const ( ) var ( - validAccount *Account - validPage *Page - validContentDOM []Node + validAccount *telegraph.Account + validPage *telegraph.Page + validContentDOM []telegraph.Node validContent = `

Hello, World!

` ) func testValidContentFormatByString(t *testing.T) { var err error - validContentDOM, err = ContentFormat(validContent) + validContentDOM, err = telegraph.ContentFormat(validContent) if err != nil { t.Error(err.Error()) t.FailNow() @@ -33,7 +37,7 @@ func testValidContentFormatByString(t *testing.T) { func testValidContentFormatByBytes(t *testing.T) { var err error - validContentDOM, err = ContentFormat([]byte(validContent)) + validContentDOM, err = telegraph.ContentFormat([]byte(validContent)) if err != nil { t.Error(err.Error()) t.FailNow() @@ -45,7 +49,7 @@ func testValidContentFormatByBytes(t *testing.T) { func TestValidCreateAccount(t *testing.T) { var err error - validAccount, err = CreateAccount(&Account{ + validAccount, err = telegraph.CreateAccount(&telegraph.Account{ ShortName: validShortName, AuthorName: validAuthorName, }) @@ -66,7 +70,7 @@ func testValidCreatePage(t *testing.T) { t.Run("validContentFormatByBytes", testValidContentFormatByBytes) var err error - validPage, err = validAccount.CreatePage(&Page{ + validPage, err = validAccount.CreatePage(&telegraph.Page{ Title: validTitle, AuthorName: validAuthorName, AuthorURL: validAuthorURL, @@ -84,7 +88,7 @@ func testValidCreatePage(t *testing.T) { } func testValidEditAccountInfo(t *testing.T) { - update, err := validAccount.EditAccountInfo(&Account{ + update, err := validAccount.EditAccountInfo(&telegraph.Account{ ShortName: validShortName, AuthorName: validNewAuthorName, AuthorURL: validAuthorURL, @@ -100,7 +104,7 @@ func testValidEditAccountInfo(t *testing.T) { func testValidEditPage(t *testing.T) { var err error - validPage, err = validAccount.EditPage(&Page{ + validPage, err = validAccount.EditPage(&telegraph.Page{ Path: validPage.Path, Title: validTitle, AuthorName: validAuthorName, @@ -113,7 +117,7 @@ func testValidEditPage(t *testing.T) { } func testValidGetAccountInfo(t *testing.T) { - info, err := validAccount.GetAccountInfo(FieldShortName, FieldPageCount) + info, err := validAccount.GetAccountInfo(telegraph.FieldShortName, telegraph.FieldPageCount) if err != nil { t.Error(err.Error()) t.FailNow() @@ -124,7 +128,7 @@ func testValidGetAccountInfo(t *testing.T) { } func TestValidGetPage(t *testing.T) { - page, err := GetPage(validPage.Path, true) + page, err := telegraph.GetPage(validPage.Path, true) if err != nil { t.Error(err.Error()) t.FailNow() @@ -148,7 +152,7 @@ func testValidGetPageList(t *testing.T) { } func TestValidGetViews(t *testing.T) { - stats, err := GetViews(validPageURL, 2016, 12, 0, -1) + stats, err := telegraph.GetViews(validPageURL, 2016, 12, 0, -1) if err != nil { t.Error(err.Error()) t.FailNow()