rename mock package

err0r500 · Aug 10, 2018 · fae3bd5 · fae3bd5
1 parent 0377d99
commit fae3bd5
Show file tree

Hide file tree

Showing 26 changed files with 70 additions and 68 deletions.
diff --git a/Makefile b/Makefile
@@ -35,5 +35,5 @@ clean:
 	if [ -f $(BINARY) ] ; then rm $(BINARY) ; fi
 
 mock:
-	$(GOPATH)/bin/mockgen -source=./uc/INTERACTOR.go -destination=./implem/mock.uc/interactor.go -package=uc && \
-    $(GOPATH)/bin/mockgen -source=./uc/HANDLER.go -destination=./implem/mock.uc/handler.go -package=uc
+	$(GOPATH)/bin/mockgen -source=./uc/INTERACTOR.go -destination=./implem/uc.mock/interactor.go -package=mock && \
+    $(GOPATH)/bin/mockgen -source=./uc/HANDLER.go -destination=./implem/uc.mock/handler.go -package=mock
diff --git a/implem/gin.server/articleComment_test.go b/implem/gin.server/articleComment_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/err0r500/go-realworld-clean/implem/gin.server"
 	"github.com/err0r500/go-realworld-clean/implem/jwt.authHandler"
-	"github.com/err0r500/go-realworld-clean/implem/mock.uc"
+	"github.com/err0r500/go-realworld-clean/implem/uc.mock"
 	"github.com/err0r500/go-realworld-clean/testData"
 	"github.com/gin-gonic/gin"
 	"github.com/golang/mock/gomock"
@@ -23,7 +23,7 @@ func TestArticleCommentGet(t *testing.T) {
 	defer mockCtrl.Finish()
 
 	expectedComment := testData.Article("").Comments
-	ucHandler := uc.NewMockHandler(mockCtrl)
+	ucHandler := mock.NewMockHandler(mockCtrl)
 	ucHandler.EXPECT().
 		CommentsGet(
 			testData.Article("jane").Slug,
@@ -57,7 +57,7 @@ func TestArticleCommentPost(t *testing.T) {
 	defer mockCtrl.Finish()
 
 	expectedComment := testData.Article("").Comments[0]
-	ucHandler := uc.NewMockHandler(mockCtrl)
+	ucHandler := mock.NewMockHandler(mockCtrl)
 	ucHandler.EXPECT().
 		CommentsPost(
 			testData.User("jane").Name,
@@ -118,7 +118,7 @@ func TestArticleCommentDelete(t *testing.T) {
 	mockCtrl := gomock.NewController(t)
 	defer mockCtrl.Finish()
 
-	ucHandler := uc.NewMockHandler(mockCtrl)
+	ucHandler := mock.NewMockHandler(mockCtrl)
 	ucHandler.EXPECT().
 		CommentsDelete(
 			testData.User("jane").Name,

diff --git a/implem/gin.server/articleFavorite_test.go b/implem/gin.server/articleFavorite_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/err0r500/go-realworld-clean/implem/gin.server"
 	"github.com/err0r500/go-realworld-clean/implem/jwt.authHandler"
-	"github.com/err0r500/go-realworld-clean/implem/mock.uc"
+	"github.com/err0r500/go-realworld-clean/implem/uc.mock"
 	"github.com/err0r500/go-realworld-clean/testData"
 	"github.com/gin-gonic/gin"
 	"github.com/golang/mock/gomock"
@@ -22,7 +22,7 @@ func TestArticleFavoritePost(t *testing.T) {
 
 	testUser := testData.User("jane")
 	expectedComment := testData.Article("")
-	ucHandler := uc.NewMockHandler(mockCtrl)
+	ucHandler := mock.NewMockHandler(mockCtrl)
 	ucHandler.EXPECT().
 		FavoritesUpdate(
 			testUser.Name,
@@ -67,7 +67,7 @@ func TestArticleFavoriteDelete(t *testing.T) {
 
 	expectedComment := testData.Article("")
 	testUser := testData.User("jane")
-	ucHandler := uc.NewMockHandler(mockCtrl)
+	ucHandler := mock.NewMockHandler(mockCtrl)
 	ucHandler.EXPECT().
 		FavoritesUpdate(
 			testUser.Name,

diff --git a/implem/gin.server/article_test.go b/implem/gin.server/article_test.go
@@ -9,7 +9,7 @@ import (
 
 	server "github.com/err0r500/go-realworld-clean/implem/gin.server"
 	jwt "github.com/err0r500/go-realworld-clean/implem/jwt.authHandler"
-	"github.com/err0r500/go-realworld-clean/implem/mock.uc"
+	"github.com/err0r500/go-realworld-clean/implem/uc.mock"
 	"github.com/err0r500/go-realworld-clean/testData"
 	"github.com/gin-gonic/gin"
 	"github.com/golang/mock/gomock"
@@ -26,7 +26,7 @@ func TestRouterHandler_articlePost(t *testing.T) {
 	expectedArticle := testData.Article("jane")
 	testUser := testData.User("jane")
 
-	ucHandler := uc.NewMockHandler(mockCtrl)
+	ucHandler := mock.NewMockHandler(mockCtrl)
 	ucHandler.EXPECT().
 		ArticlePost(testUser.Name, gomock.Any()).
 		Return(&testUser, &expectedArticle, nil).
@@ -86,14 +86,14 @@ func TestRouterHandler_articlePut(t *testing.T) {
 	expectedArticle := testData.Article("jane")
 	jwtHandler := jwt.New("mySalt")
 
-	ucHandler := uc.NewMockHandler(mockCtrl)
+	ucHandler := mock.NewMockHandler(mockCtrl)
 	ucHandler.EXPECT().
 		ArticlePut(testUser.Name, expectedArticle.Slug, gomock.Any()).
 		Return(&testUser, &expectedArticle, nil).
 		Times(1)
 
 	gE := gin.Default()
-	server.NewRouterWithLogger(ucHandler, jwtHandler, uc.SimpleLogger{}).SetRoutes(gE)
+	server.NewRouterWithLogger(ucHandler, jwtHandler, mock.SimpleLogger{}).SetRoutes(gE)
 	ts := httptest.NewServer(gE)
 	defer ts.Close()
 
@@ -147,14 +147,14 @@ func TestRouterHandler_articleGet(t *testing.T) {
 
 	expectedArticle := testData.Article("jane")
 	//testUser := testData.User("jane")
-	ucHandler := uc.NewMockHandler(mockCtrl)
+	ucHandler := mock.NewMockHandler(mockCtrl)
 	ucHandler.EXPECT().
 		ArticleGet("", expectedArticle.Slug).
 		Return(nil, &expectedArticle, nil).
 		Times(1)
 
 	gE := gin.Default()
-	server.NewRouterWithLogger(ucHandler, jwt.New("mySalt"), uc.SimpleLogger{}).SetRoutes(gE)
+	server.NewRouterWithLogger(ucHandler, jwt.New("mySalt"), mock.SimpleLogger{}).SetRoutes(gE)
 	ts := httptest.NewServer(gE)
 	defer ts.Close()
 
@@ -171,7 +171,7 @@ func TestRouterHandler_articleDelete(t *testing.T) {
 	defer mockCtrl.Finish()
 
 	expectedArticle := testData.Article("jane")
-	ucHandler := uc.NewMockHandler(mockCtrl)
+	ucHandler := mock.NewMockHandler(mockCtrl)
 	ucHandler.EXPECT().
 		ArticleDelete(testData.User("jane").Name, expectedArticle.Slug).
 		Return(nil).

diff --git a/implem/gin.server/articles_test.go b/implem/gin.server/articles_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/err0r500/go-realworld-clean/domain"
 	"github.com/err0r500/go-realworld-clean/implem/gin.server"
 	jwt "github.com/err0r500/go-realworld-clean/implem/jwt.authHandler"
-	mock "github.com/err0r500/go-realworld-clean/implem/mock.uc"
+	"github.com/err0r500/go-realworld-clean/implem/uc.mock"
 	"github.com/err0r500/go-realworld-clean/testData"
 	"github.com/gin-gonic/gin"
 	"github.com/golang/mock/gomock"

diff --git a/implem/gin.server/profileFollowDelete_test.go b/implem/gin.server/profileFollowDelete_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/err0r500/go-realworld-clean/domain"
 	"github.com/err0r500/go-realworld-clean/implem/gin.server"
 	"github.com/err0r500/go-realworld-clean/implem/jwt.authHandler"
-	"github.com/err0r500/go-realworld-clean/implem/mock.uc"
+	"github.com/err0r500/go-realworld-clean/implem/uc.mock"
 	"github.com/err0r500/go-realworld-clean/testData"
 	"github.com/gin-gonic/gin"
 	"github.com/golang/mock/gomock"
@@ -21,7 +21,7 @@ func TestProfileFollowDelete_happyCase(t *testing.T) {
 	mockCtrl := gomock.NewController(t)
 	defer mockCtrl.Finish()
 
-	ucHandler := uc.NewMockHandler(mockCtrl)
+	ucHandler := mock.NewMockHandler(mockCtrl)
 	ucHandler.EXPECT().
 		ProfileUpdateFollow(testData.User("jane").Name, testData.User("rick").Name, false).
 		Return(&domain.User{}, nil).

diff --git a/implem/gin.server/profileFollowPost_test.go b/implem/gin.server/profileFollowPost_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/err0r500/go-realworld-clean/implem/gin.server"
 	"github.com/err0r500/go-realworld-clean/implem/jwt.authHandler"
-	"github.com/err0r500/go-realworld-clean/implem/mock.uc"
+	"github.com/err0r500/go-realworld-clean/implem/uc.mock"
 	"github.com/err0r500/go-realworld-clean/testData"
 	"github.com/gin-gonic/gin"
 	"github.com/golang/mock/gomock"
@@ -20,7 +20,7 @@ func TestProfileFollowPost_happyCase(t *testing.T) {
 	mockCtrl := gomock.NewController(t)
 	defer mockCtrl.Finish()
 	rick := testData.User("rick")
-	ucHandler := uc.NewMockHandler(mockCtrl)
+	ucHandler := mock.NewMockHandler(mockCtrl)
 	ucHandler.EXPECT().
 		ProfileUpdateFollow(testData.User("jane").Name, rick.Name, true).
 		Return(&rick, nil).

diff --git a/implem/gin.server/profileGet_test.go b/implem/gin.server/profileGet_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/err0r500/go-realworld-clean/implem/gin.server"
 	jwt "github.com/err0r500/go-realworld-clean/implem/jwt.authHandler"
-	"github.com/err0r500/go-realworld-clean/implem/mock.uc"
+	"github.com/err0r500/go-realworld-clean/implem/uc.mock"
 	"github.com/err0r500/go-realworld-clean/testData"
 	"github.com/gin-gonic/gin"
 	"github.com/golang/mock/gomock"
@@ -21,7 +21,7 @@ func TestProfileGet_happyCase(t *testing.T) {
 	defer mockCtrl.Finish()
 
 	jane := testData.User("jane")
-	ucHandler := uc.NewMockHandler(mockCtrl)
+	ucHandler := mock.NewMockHandler(mockCtrl)
 	ucHandler.EXPECT().
 		ProfileGet("", testData.User("rick").Name).
 		Return(&jane, true, nil).
@@ -46,7 +46,7 @@ func TestProfileGet_happyCaseAuthenticated(t *testing.T) {
 	defer mockCtrl.Finish()
 
 	jane := testData.User("jane")
-	ucHandler := uc.NewMockHandler(mockCtrl)
+	ucHandler := mock.NewMockHandler(mockCtrl)
 	ucHandler.EXPECT().
 		ProfileGet(jane.Name, testData.User("rick").Name).
 		Return(&jane, true, nil).

diff --git a/implem/gin.server/tagsGet_test.go b/implem/gin.server/tagsGet_test.go
@@ -8,7 +8,7 @@ import (
 	"errors"
 
 	"github.com/err0r500/go-realworld-clean/implem/gin.server"
-	"github.com/err0r500/go-realworld-clean/implem/mock.uc"
+	"github.com/err0r500/go-realworld-clean/implem/uc.mock"
 	"github.com/err0r500/go-realworld-clean/testData"
 	"github.com/gin-gonic/gin"
 	"github.com/golang/mock/gomock"
@@ -23,7 +23,7 @@ func TestTagsGet_happyCase(t *testing.T) {
 		defer mockCtrl.Finish()
 
 		tags := []string{"tag1", "tag2"}
-		ucHandler := uc.NewMockHandler(mockCtrl)
+		ucHandler := mock.NewMockHandler(mockCtrl)
 		ucHandler.EXPECT().
 			Tags().
 			Return(tags, nil).
@@ -46,7 +46,7 @@ func TestTagsGet_happyCase(t *testing.T) {
 		mockCtrl := gomock.NewController(t)
 		defer mockCtrl.Finish()
 
-		ucHandler := uc.NewMockHandler(mockCtrl)
+		ucHandler := mock.NewMockHandler(mockCtrl)
 		ucHandler.EXPECT().
 			Tags().
 			Return(nil, nil).
@@ -72,14 +72,14 @@ func TestTagsGet_fail(t *testing.T) {
 	mockCtrl := gomock.NewController(t)
 	defer mockCtrl.Finish()
 
-	ucHandler := uc.NewMockHandler(mockCtrl)
+	ucHandler := mock.NewMockHandler(mockCtrl)
 	ucHandler.EXPECT().
 		Tags().
 		Return(nil, errors.New("")).
 		Times(1)
 
 	gE := gin.Default()
-	server.NewRouterWithLogger(ucHandler, nil, uc.SimpleLogger{}).SetRoutes(gE)
+	server.NewRouterWithLogger(ucHandler, nil, mock.SimpleLogger{}).SetRoutes(gE)
 
 	ts := httptest.NewServer(gE)
 	defer ts.Close()

diff --git a/implem/gin.server/userGet_test.go b/implem/gin.server/userGet_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/err0r500/go-realworld-clean/implem/gin.server"
 	jwt "github.com/err0r500/go-realworld-clean/implem/jwt.authHandler"
-	"github.com/err0r500/go-realworld-clean/implem/mock.uc"
+	"github.com/err0r500/go-realworld-clean/implem/uc.mock"
 	"github.com/err0r500/go-realworld-clean/testData"
 	"github.com/gin-gonic/gin"
 	"github.com/golang/mock/gomock"
@@ -22,7 +22,7 @@ func TestUserGet_happyCase(t *testing.T) {
 	defer mockCtrl.Finish()
 
 	jane := testData.User("jane")
-	ucHandler := uc.NewMockHandler(mockCtrl)
+	ucHandler := mock.NewMockHandler(mockCtrl)
 	ucHandler.EXPECT().
 		UserGet(jane.Name).
 		Return(&jane, "authToken", nil).

diff --git a/implem/gin.server/userPatch_test.go b/implem/gin.server/userPatch_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/err0r500/go-realworld-clean/implem/gin.server"
 	"github.com/err0r500/go-realworld-clean/implem/jwt.authHandler"
 	logger "github.com/err0r500/go-realworld-clean/implem/logrus.logger"
-	"github.com/err0r500/go-realworld-clean/implem/mock.uc"
+	"github.com/err0r500/go-realworld-clean/implem/uc.mock"
 	"github.com/err0r500/go-realworld-clean/testData"
 	"github.com/gin-gonic/gin"
 	"github.com/golang/mock/gomock"
@@ -23,7 +23,7 @@ func TestUserPut_happyCase(t *testing.T) {
 	defer mockCtrl.Finish()
 
 	jane := testData.User("jane")
-	ucHandler := uc.NewMockHandler(mockCtrl)
+	ucHandler := mock.NewMockHandler(mockCtrl)
 	ucHandler.EXPECT().
 		UserEdit(testData.User("rick").Name, gomock.Any()).
 		Return(&jane, "token", nil).

diff --git a/implem/gin.server/usersLoginPost_test.go b/implem/gin.server/usersLoginPost_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/err0r500/go-realworld-clean/implem/gin.server"
 	jwt "github.com/err0r500/go-realworld-clean/implem/jwt.authHandler"
-	"github.com/err0r500/go-realworld-clean/implem/mock.uc"
+	"github.com/err0r500/go-realworld-clean/implem/uc.mock"
 	"github.com/err0r500/go-realworld-clean/testData"
 	"github.com/gin-gonic/gin"
 	"github.com/golang/mock/gomock"
@@ -21,7 +21,7 @@ func TestUserLoginPost_happyCase(t *testing.T) {
 	defer mockCtrl.Finish()
 
 	jane := testData.User("jane")
-	ucHandler := uc.NewMockHandler(mockCtrl)
+	ucHandler := mock.NewMockHandler(mockCtrl)
 	ucHandler.EXPECT().
 		UserLogin(jane.Email, jane.Password).
 		Return(&jane, "authToken", nil).

diff --git a/implem/gin.server/usersPost_test.go b/implem/gin.server/usersPost_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/err0r500/go-realworld-clean/implem/gin.server"
 	jwt "github.com/err0r500/go-realworld-clean/implem/jwt.authHandler"
-	"github.com/err0r500/go-realworld-clean/implem/mock.uc"
+	"github.com/err0r500/go-realworld-clean/implem/uc.mock"
 	"github.com/err0r500/go-realworld-clean/testData"
 	"github.com/gin-gonic/gin"
 	"github.com/golang/mock/gomock"
@@ -21,7 +21,7 @@ func TestUserPost_happyCase(t *testing.T) {
 	defer mockCtrl.Finish()
 
 	jane := testData.User("jane")
-	ucHandler := uc.NewMockHandler(mockCtrl)
+	ucHandler := mock.NewMockHandler(mockCtrl)
 	ucHandler.EXPECT().
 		UserCreate(jane.Name, jane.Email, jane.Password).
 		Return(&jane, "authToken", nil).

diff --git a/implem/mock.uc/builder.go → implem/uc.mock/builder.go b/implem/mock.uc/builder.go → implem/uc.mock/builder.go
@@ -1,6 +1,6 @@
 // +build !netgo
 
-package uc
+package mock
 
 import (
 	"log"
@@ -9,8 +9,8 @@ import (
 	"github.com/golang/mock/gomock"
 )
 
-// MockedInteractor : is used in order to update its properties accordingly to each test conditions
-type MockedInteractor struct {
+// Interactor : is used in order to update its properties accordingly to each test conditions
+type Interactor struct {
 	Logger           *MockLogger
 	UserRW           *MockUserRW
 	ArticleRW        *MockArticleRW
@@ -23,7 +23,7 @@ type MockedInteractor struct {
 }
 
 type Tester struct {
-	Calls      func(interactor *MockedInteractor)
+	Calls      func(*Interactor)
 	ShouldPass bool
 }
 
@@ -33,9 +33,9 @@ func (SimpleLogger) Log(logs ...interface{}) {
 	log.Println(logs...)
 }
 
-//NewMockedInteractor : the MockedInteractor constructor
-func NewMockedInteractor(mockCtrl *gomock.Controller) MockedInteractor {
-	return MockedInteractor{
+//NewMockedInteractor : the Interactor constructor
+func NewMockedInteractor(mockCtrl *gomock.Controller) Interactor {
+	return Interactor{
 		Logger:           NewMockLogger(mockCtrl),
 		UserRW:           NewMockUserRW(mockCtrl),
 		ArticleRW:        NewMockArticleRW(mockCtrl),
@@ -49,7 +49,7 @@ func NewMockedInteractor(mockCtrl *gomock.Controller) MockedInteractor {
 }
 
 //GetUCHandler : returns a uc.interactor in order to call its methods aka the use cases to test
-func (i MockedInteractor) GetUCHandler() uc.Handler {
+func (i Interactor) GetUCHandler() uc.Handler {
 	return uc.HandlerConstructor{
 		Logger:           i.Logger,
 		UserRW:           i.UserRW,

diff --git a/implem/mock.uc/handler.go → implem/uc.mock/handler.go b/implem/mock.uc/handler.go → implem/uc.mock/handler.go