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.

Sign up for GitHub

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

Jump to bottom

新增 Dummy Logger for Testing #193

Open
wants to merge 6 commits into
base: development
Choose a base branch
from
Open

新增 Dummy Logger for Testing #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bc3bf86
Add dummy logger for testing
SivWatt Apr 24, 2021
b8a1bdc
using dummy logger in test code
SivWatt Apr 24, 2021
84c4b43
Add default logger and dummy logger
SivWatt May 1, 2021
f934b28
Merge branch 'development' into poc/mock-logger
SivWatt May 1, 2021
6f57202
Merge development and fix test case
SivWatt May 1, 2021
5b854be
Add logger test cases
SivWatt May 1, 2021
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
4 changes: 2 additions & 2 deletions internal/delivery/http/http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ type Delivery struct {
}

// TODO: explain what this method to
func NewHTTPDelivery(usecase usecase.Usecase) *Delivery {
func NewHTTPDelivery(usecase usecase.Usecase, logger logging.Logger) *Delivery {
delivery := &Delivery{
logger: logging.NewLogger(),
logger: logger,
usecase: usecase,
}
return delivery
Expand Down
6 changes: 4 additions & 2 deletions internal/delivery/http/route_append_comment_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,16 @@ import (
"net/url"
"strings"
"testing"

"github.com/Ptt-official-app/Ptt-backend/internal/logging"
)

// TestAppendCommentBadRequest test request post `/v1/boards/{}/articles/{}` post
// with no body
func TestAppendCommentBadRequest(t *testing.T) {
userID := "id"
usecase := NewMockUsecase()
delivery := NewHTTPDelivery(usecase)
delivery := NewHTTPDelivery(usecase, logging.DefaultDummyLogger)

req, err := http.NewRequest("POST", "/v1/boards/test/articles/test", nil)
if err != nil {
Expand All @@ -38,7 +40,7 @@ func TestAppendCommentBadRequest(t *testing.T) {
func TestAppendCommentResponse(t *testing.T) {
userID := "id"
usecase := NewMockUsecase()
delivery := NewHTTPDelivery(usecase)
delivery := NewHTTPDelivery(usecase, logging.DefaultDummyLogger)

v := url.Values{}
v.Set("action", "append_comment")
Expand Down
6 changes: 4 additions & 2 deletions internal/delivery/http/route_boards_articles_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@ import (
"net/http/httptest"
"net/url"
"testing"

"github.com/Ptt-official-app/Ptt-backend/internal/logging"
)

func TestGetBoardArticlesBadRequest(t *testing.T) {
userID := "id"
usecase := NewMockUsecase()
delivery := NewHTTPDelivery(usecase)
delivery := NewHTTPDelivery(usecase, logging.DefaultDummyLogger)

title := ""
author := ""
Expand Down Expand Up @@ -45,7 +47,7 @@ func TestGetBoardArticlesBadRequest(t *testing.T) {
func TestGetBoardArticlesResponse(t *testing.T) {
userID := "id"
usecase := NewMockUsecase()
delivery := NewHTTPDelivery(usecase)
delivery := NewHTTPDelivery(usecase, logging.DefaultDummyLogger)

titleContain := "test_posts"
author := "test01"
Expand Down
10 changes: 6 additions & 4 deletions internal/delivery/http/route_boards_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@ import (
"strconv"
"strings"
"testing"

"github.com/Ptt-official-app/Ptt-backend/internal/logging"
)

func TestGetPopularBoardList(t *testing.T) {

usecase := NewMockUsecase()
delivery := NewHTTPDelivery(usecase)
delivery := NewHTTPDelivery(usecase, logging.DefaultDummyLogger)
req, err := http.NewRequest("GET", "/v1/popular-boards", nil)
if err != nil {
t.Fatal(err)
Expand Down Expand Up @@ -57,7 +59,7 @@ func TestGetPopularBoardList(t *testing.T) {
func TestGetBoardList(t *testing.T) {
userID := "id"
usecase := NewMockUsecase()
delivery := NewHTTPDelivery(usecase)
delivery := NewHTTPDelivery(usecase, logging.DefaultDummyLogger)

req, err := http.NewRequest("GET", "/v1/boards/", nil)
if err != nil {
Expand Down Expand Up @@ -108,7 +110,7 @@ func TestGetBoardList(t *testing.T) {
func TestGetBoardInformation(t *testing.T) {
userID := "id"
usecase := NewMockUsecase()
delivery := NewHTTPDelivery(usecase)
delivery := NewHTTPDelivery(usecase, logging.DefaultDummyLogger)

req, err := http.NewRequest("GET", "/v1/boards/SYSOP/information", nil)
if err != nil {
Expand Down Expand Up @@ -158,7 +160,7 @@ func TestGetBoardInformation(t *testing.T) {
func TestGetBoardSettings(t *testing.T) {
userID := "id"
usecase := NewMockUsecase()
delivery := NewHTTPDelivery(usecase)
delivery := NewHTTPDelivery(usecase, logging.DefaultDummyLogger)

req, err := http.NewRequest("GET", "/v1/boards/SYSOP/settings", nil)
if err != nil {
Expand Down
4 changes: 3 additions & 1 deletion internal/delivery/http/route_boards_treasures_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@ import (
"net/http"
"net/http/httptest"
"testing"

"github.com/Ptt-official-app/Ptt-backend/internal/logging"
)

func TestFetchBoardTreasures(t *testing.T) {
usecase := NewMockUsecase()
delivery := NewHTTPDelivery(usecase)
delivery := NewHTTPDelivery(usecase, logging.DefaultDummyLogger)
req, err := http.NewRequest(http.MethodGet, "/v1/boards/1/treasures", nil)
if err != nil {
t.Fatal(err)
Expand Down
4 changes: 3 additions & 1 deletion internal/delivery/http/route_classes_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@ import (
"net/http"
"net/http/httptest"
"testing"

"github.com/Ptt-official-app/Ptt-backend/internal/logging"
)

func TestGetClassesList(t *testing.T) {
userID := "id"
usecase := NewMockUsecase()
delivery := NewHTTPDelivery(usecase)
delivery := NewHTTPDelivery(usecase, logging.DefaultDummyLogger)
req, err := http.NewRequest("GET", "/v1/classes/1", nil)
if err != nil {
t.Fatal(err)
Expand Down
4 changes: 3 additions & 1 deletion internal/delivery/http/route_create_article_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@ import (
"net/url"
"strings"
"testing"

"github.com/Ptt-official-app/Ptt-backend/internal/logging"
)

func TestCreateArticleResponse(t *testing.T) {
userID := "id"
usecase := NewMockUsecase()
delivery := NewHTTPDelivery(usecase)
delivery := NewHTTPDelivery(usecase, logging.DefaultDummyLogger)

v := url.Values{}
v.Set("action", "add_article")
Expand Down
8 changes: 5 additions & 3 deletions internal/delivery/http/route_forward_article_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,16 @@ import (
"net/url"
"strings"
"testing"

"github.com/Ptt-official-app/Ptt-backend/internal/logging"
)

// TestForwardArticleBadRequest test request post `/v1/boards/{}/articles/{}` post
// with no body
func TestForwardArticleBadRequest(t *testing.T) {
userID := "id"
usecase := NewMockUsecase()
delivery := NewHTTPDelivery(usecase)
delivery := NewHTTPDelivery(usecase, logging.DefaultDummyLogger)

req, err := http.NewRequest("POST", "/v1/boards/test/articles/test", nil)
if err != nil {
Expand All @@ -40,7 +42,7 @@ func TestForwardArticleBadRequest(t *testing.T) {
func TestForwardArticleInternalServerError(t *testing.T) {
userID := "id"
usecase := NewMockUsecase()
delivery := NewHTTPDelivery(usecase)
delivery := NewHTTPDelivery(usecase, logging.DefaultDummyLogger)

v := url.Values{}
v.Set("action", "forward_article")
Expand Down Expand Up @@ -71,7 +73,7 @@ func TestForwardArticleInternalServerError(t *testing.T) {
func TestForwardArticleResponse(t *testing.T) {
userID := "id"
usecase := NewMockUsecase()
delivery := NewHTTPDelivery(usecase)
delivery := NewHTTPDelivery(usecase, logging.DefaultDummyLogger)

v := url.Values{}
v.Set("action", "forward_article")
Expand Down
4 changes: 3 additions & 1 deletion internal/delivery/http/route_popular_articles_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@ import (
"net/http"
"net/http/httptest"
"testing"

"github.com/Ptt-official-app/Ptt-backend/internal/logging"
)

func TestGetPopularArticles(t *testing.T) {
usecase := NewMockUsecase()
delivery := NewHTTPDelivery(usecase)
delivery := NewHTTPDelivery(usecase, logging.DefaultDummyLogger)
req, err := http.NewRequest("GET", "/v1/popular-articles", nil)
if err != nil {
t.Fatal(err)
Expand Down
18 changes: 10 additions & 8 deletions internal/delivery/http/route_users_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import (
"strings"
"testing"
"time"

"github.com/Ptt-official-app/Ptt-backend/internal/logging"
)

// TestGetUserInformation is a test function which will test getUserInformation (/v1/users/{{user_id}}/favorites)
Expand All @@ -33,7 +35,7 @@ func TestGetUserInformation(t *testing.T) {
"plan": map[string]interface{}{},
}
usecase := NewMockUsecase()
delivery := NewHTTPDelivery(usecase)
delivery := NewHTTPDelivery(usecase, logging.DefaultDummyLogger)
req, err := http.NewRequest("GET", "/v1/users/SYSOP/information", nil)
if err != nil {
t.Fatal(err)
Expand Down Expand Up @@ -135,7 +137,7 @@ func TestParseUserPath(t *testing.T) {
func TestGetUserFavorite(t *testing.T) {
userID := "id"
usecase := NewMockUsecase()
delivery := NewHTTPDelivery(usecase)
delivery := NewHTTPDelivery(usecase, logging.DefaultDummyLogger)
req, err := http.NewRequest("GET", "/v1/users/SYSOP/favorites", nil)
if err != nil {
t.Fatal(err)
Expand Down Expand Up @@ -177,7 +179,7 @@ func TestGetUserFavorite(t *testing.T) {
func TestGetUserPreference(t *testing.T) {
userID := "id"
usecase := NewMockUsecase()
delivery := NewHTTPDelivery(usecase)
delivery := NewHTTPDelivery(usecase, logging.DefaultDummyLogger)
req, err := http.NewRequest("GET", "/v1/users/SYSOP/preferences", nil)
if err != nil {
t.Fatal(err)
Expand Down Expand Up @@ -219,7 +221,7 @@ func TestGetUserArticles(t *testing.T) {

userID := "id"
mockUsecase := NewMockUsecase()
mockDelivery := NewHTTPDelivery(mockUsecase)
mockDelivery := NewHTTPDelivery(mockUsecase, logging.DefaultDummyLogger)

req, err := http.NewRequest("GET", "/v1/users/user/articles", nil)
if err != nil {
Expand Down Expand Up @@ -256,7 +258,7 @@ func TestGetUserArticles(t *testing.T) {
func TestGetUserComments(t *testing.T) {
userID := "id"
mockUsecase := NewMockUsecase()
mockDelivery := NewHTTPDelivery(mockUsecase)
mockDelivery := NewHTTPDelivery(mockUsecase, logging.DefaultDummyLogger)

req, err := http.NewRequest("GET", "/v1/users/user/comments", nil)
if err != nil {
Expand Down Expand Up @@ -299,7 +301,7 @@ func TestGetUserComments(t *testing.T) {
func TestGetUserDrafts(t *testing.T) {
userID := "id"
mockUsecase := NewMockUsecase()
mockDelivery := NewHTTPDelivery(mockUsecase)
mockDelivery := NewHTTPDelivery(mockUsecase, logging.DefaultDummyLogger)

req, err := http.NewRequest("GET", "/v1/users/user/drafts/1", nil)
if err != nil {
Expand Down Expand Up @@ -341,7 +343,7 @@ func TestGetUserDrafts(t *testing.T) {
func TestUpdateUserDraft(t *testing.T) {
userID := "id"
mockUsecase := NewMockUsecase()
mockDelivery := NewHTTPDelivery(mockUsecase)
mockDelivery := NewHTTPDelivery(mockUsecase, logging.DefaultDummyLogger)

v := url.Values{}
v.Set("action", "update_draft")
Expand Down Expand Up @@ -388,7 +390,7 @@ func TestUpdateUserDraft(t *testing.T) {
func TestDeleteUserDraft(t *testing.T) {
userID := "id"
mockUsecase := NewMockUsecase()
mockDelivery := NewHTTPDelivery(mockUsecase)
mockDelivery := NewHTTPDelivery(mockUsecase, logging.DefaultDummyLogger)

v := url.Values{}
v.Set("action", "delete_draft")
Expand Down
2 changes: 2 additions & 0 deletions internal/logging/logger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import (
"log"
)

var DefaultLogger Logger = NewLogger()

// Logger is the interface that wraps the basic Logging methods.
//
// Logger follows the Syslog Message Severities in RFC5424.
Expand Down
Loading