Update mocks & tests

2019-05-28 20:53:35 +02:00 · 2019-05-28 20:53:35 +02:00 · 328bdeda07
commit 328bdeda07
parent c23e04440c
4 changed files with 20 additions and 51 deletions
--- a/internal/mail/mail_mock_test.go
+++ b/internal/mail/mail_mock_test.go
@ -35,7 +35,6 @@ func (m *MockDialer) EXPECT() *MockDialerMockRecorder {

 // DialAndSend mocks base method
 func (m *MockDialer) DialAndSend(arg0 ...*mail_v2.Message) error {
-	m.ctrl.T.Helper()
 	varargs := []interface{}{}
 	for _, a := range arg0 {
 		varargs = append(varargs, a)
@ -47,6 +46,5 @@ func (m *MockDialer) DialAndSend(arg0 ...*mail_v2.Message) error {

 // DialAndSend indicates an expected call of DialAndSend
 func (mr *MockDialerMockRecorder) DialAndSend(arg0 ...interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DialAndSend", reflect.TypeOf((*MockDialer)(nil).DialAndSend), arg0...)
 }
--- a/system/internal/repository/mocks/credentials.go
+++ b/system/internal/repository/mocks/credentials.go
@ -6,12 +6,11 @@ package repository

 import (
 	context "context"
-	reflect "reflect"
-
 	repository "github.com/cortezaproject/corteza-server/system/internal/repository"
 	types "github.com/cortezaproject/corteza-server/system/types"
 	gomock "github.com/golang/mock/gomock"
 	factory "github.com/titpetric/factory"
+	reflect "reflect"
 )

 // MockCredentialsRepository is a mock of CredentialsRepository interface
@ -39,7 +38,6 @@ func (m *MockCredentialsRepository) EXPECT() *MockCredentialsRepositoryMockRecor

 // With mocks base method
 func (m *MockCredentialsRepository) With(ctx context.Context, db *factory.DB) repository.CredentialsRepository {
-	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "With", ctx, db)
 	ret0, _ := ret[0].(repository.CredentialsRepository)
 	return ret0
@ -47,13 +45,11 @@ func (m *MockCredentialsRepository) With(ctx context.Context, db *factory.DB) re

 // With indicates an expected call of With
 func (mr *MockCredentialsRepositoryMockRecorder) With(ctx, db interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "With", reflect.TypeOf((*MockCredentialsRepository)(nil).With), ctx, db)
 }

 // FindByID mocks base method
 func (m *MockCredentialsRepository) FindByID(ID uint64) (*types.Credentials, error) {
-	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "FindByID", ID)
 	ret0, _ := ret[0].(*types.Credentials)
 	ret1, _ := ret[1].(error)
@ -62,13 +58,11 @@ func (m *MockCredentialsRepository) FindByID(ID uint64) (*types.Credentials, err

 // FindByID indicates an expected call of FindByID
 func (mr *MockCredentialsRepositoryMockRecorder) FindByID(ID interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FindByID", reflect.TypeOf((*MockCredentialsRepository)(nil).FindByID), ID)
 }

 // FindByCredentials mocks base method
 func (m *MockCredentialsRepository) FindByCredentials(kind, credentials string) (types.CredentialsSet, error) {
-	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "FindByCredentials", kind, credentials)
 	ret0, _ := ret[0].(types.CredentialsSet)
 	ret1, _ := ret[1].(error)
@ -77,13 +71,11 @@ func (m *MockCredentialsRepository) FindByCredentials(kind, credentials string)

 // FindByCredentials indicates an expected call of FindByCredentials
 func (mr *MockCredentialsRepositoryMockRecorder) FindByCredentials(kind, credentials interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FindByCredentials", reflect.TypeOf((*MockCredentialsRepository)(nil).FindByCredentials), kind, credentials)
 }

 // FindByKind mocks base method
 func (m *MockCredentialsRepository) FindByKind(ownerID uint64, kind string) (types.CredentialsSet, error) {
-	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "FindByKind", ownerID, kind)
 	ret0, _ := ret[0].(types.CredentialsSet)
 	ret1, _ := ret[1].(error)
@ -92,13 +84,11 @@ func (m *MockCredentialsRepository) FindByKind(ownerID uint64, kind string) (typ

 // FindByKind indicates an expected call of FindByKind
 func (mr *MockCredentialsRepositoryMockRecorder) FindByKind(ownerID, kind interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FindByKind", reflect.TypeOf((*MockCredentialsRepository)(nil).FindByKind), ownerID, kind)
 }

 // FindByOwnerID mocks base method
 func (m *MockCredentialsRepository) FindByOwnerID(ownerID uint64) (types.CredentialsSet, error) {
-	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "FindByOwnerID", ownerID)
 	ret0, _ := ret[0].(types.CredentialsSet)
 	ret1, _ := ret[1].(error)
@ -107,13 +97,11 @@ func (m *MockCredentialsRepository) FindByOwnerID(ownerID uint64) (types.Credent

 // FindByOwnerID indicates an expected call of FindByOwnerID
 func (mr *MockCredentialsRepositoryMockRecorder) FindByOwnerID(ownerID interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FindByOwnerID", reflect.TypeOf((*MockCredentialsRepository)(nil).FindByOwnerID), ownerID)
 }

 // Find mocks base method
 func (m *MockCredentialsRepository) Find() (types.CredentialsSet, error) {
-	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "Find")
 	ret0, _ := ret[0].(types.CredentialsSet)
 	ret1, _ := ret[1].(error)
@ -122,13 +110,11 @@ func (m *MockCredentialsRepository) Find() (types.CredentialsSet, error) {

 // Find indicates an expected call of Find
 func (mr *MockCredentialsRepositoryMockRecorder) Find() *gomock.Call {
-	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Find", reflect.TypeOf((*MockCredentialsRepository)(nil).Find))
 }

 // Create mocks base method
 func (m *MockCredentialsRepository) Create(c *types.Credentials) (*types.Credentials, error) {
-	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "Create", c)
 	ret0, _ := ret[0].(*types.Credentials)
 	ret1, _ := ret[1].(error)
@ -137,13 +123,11 @@ func (m *MockCredentialsRepository) Create(c *types.Credentials) (*types.Credent

 // Create indicates an expected call of Create
 func (mr *MockCredentialsRepositoryMockRecorder) Create(c interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Create", reflect.TypeOf((*MockCredentialsRepository)(nil).Create), c)
 }

 // Update mocks base method
 func (m *MockCredentialsRepository) Update(c *types.Credentials) (*types.Credentials, error) {
-	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "Update", c)
 	ret0, _ := ret[0].(*types.Credentials)
 	ret1, _ := ret[1].(error)
@ -152,13 +136,11 @@ func (m *MockCredentialsRepository) Update(c *types.Credentials) (*types.Credent

 // Update indicates an expected call of Update
 func (mr *MockCredentialsRepositoryMockRecorder) Update(c interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Update", reflect.TypeOf((*MockCredentialsRepository)(nil).Update), c)
 }

 // DeleteByID mocks base method
 func (m *MockCredentialsRepository) DeleteByID(id uint64) error {
-	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "DeleteByID", id)
 	ret0, _ := ret[0].(error)
 	return ret0
@ -166,13 +148,11 @@ func (m *MockCredentialsRepository) DeleteByID(id uint64) error {

 // DeleteByID indicates an expected call of DeleteByID
 func (mr *MockCredentialsRepositoryMockRecorder) DeleteByID(id interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteByID", reflect.TypeOf((*MockCredentialsRepository)(nil).DeleteByID), id)
 }

 // DeleteByKind mocks base method
 func (m *MockCredentialsRepository) DeleteByKind(ownerID uint64, kind string) error {
-	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "DeleteByKind", ownerID, kind)
 	ret0, _ := ret[0].(error)
 	return ret0
@ -180,6 +160,5 @@ func (m *MockCredentialsRepository) DeleteByKind(ownerID uint64, kind string) er

 // DeleteByKind indicates an expected call of DeleteByKind
 func (mr *MockCredentialsRepositoryMockRecorder) DeleteByKind(ownerID, kind interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteByKind", reflect.TypeOf((*MockCredentialsRepository)(nil).DeleteByKind), ownerID, kind)
 }
--- a/system/internal/repository/mocks/user.go
+++ b/system/internal/repository/mocks/user.go
@ -6,13 +6,12 @@ package repository

 import (
 	context "context"
-	io "io"
-	reflect "reflect"
-
 	repository "github.com/cortezaproject/corteza-server/system/internal/repository"
 	types "github.com/cortezaproject/corteza-server/system/types"
 	gomock "github.com/golang/mock/gomock"
 	factory "github.com/titpetric/factory"
+	io "io"
+	reflect "reflect"
 )

 // MockUserRepository is a mock of UserRepository interface
@ -40,7 +39,6 @@ func (m *MockUserRepository) EXPECT() *MockUserRepositoryMockRecorder {

 // With mocks base method
 func (m *MockUserRepository) With(ctx context.Context, db *factory.DB) repository.UserRepository {
-	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "With", ctx, db)
 	ret0, _ := ret[0].(repository.UserRepository)
 	return ret0
@ -48,13 +46,11 @@ func (m *MockUserRepository) With(ctx context.Context, db *factory.DB) repositor

 // With indicates an expected call of With
 func (mr *MockUserRepositoryMockRecorder) With(ctx, db interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "With", reflect.TypeOf((*MockUserRepository)(nil).With), ctx, db)
 }

 // FindByEmail mocks base method
 func (m *MockUserRepository) FindByEmail(email string) (*types.User, error) {
-	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "FindByEmail", email)
 	ret0, _ := ret[0].(*types.User)
 	ret1, _ := ret[1].(error)
@ -63,13 +59,11 @@ func (m *MockUserRepository) FindByEmail(email string) (*types.User, error) {

 // FindByEmail indicates an expected call of FindByEmail
 func (mr *MockUserRepositoryMockRecorder) FindByEmail(email interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FindByEmail", reflect.TypeOf((*MockUserRepository)(nil).FindByEmail), email)
 }

 // FindByUsername mocks base method
 func (m *MockUserRepository) FindByUsername(username string) (*types.User, error) {
-	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "FindByUsername", username)
 	ret0, _ := ret[0].(*types.User)
 	ret1, _ := ret[1].(error)
@ -78,13 +72,11 @@ func (m *MockUserRepository) FindByUsername(username string) (*types.User, error

 // FindByUsername indicates an expected call of FindByUsername
 func (mr *MockUserRepositoryMockRecorder) FindByUsername(username interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FindByUsername", reflect.TypeOf((*MockUserRepository)(nil).FindByUsername), username)
 }

 // FindByID mocks base method
 func (m *MockUserRepository) FindByID(id uint64) (*types.User, error) {
-	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "FindByID", id)
 	ret0, _ := ret[0].(*types.User)
 	ret1, _ := ret[1].(error)
@ -93,13 +85,11 @@ func (m *MockUserRepository) FindByID(id uint64) (*types.User, error) {

 // FindByID indicates an expected call of FindByID
 func (mr *MockUserRepositoryMockRecorder) FindByID(id interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FindByID", reflect.TypeOf((*MockUserRepository)(nil).FindByID), id)
 }

 // FindByIDs mocks base method
 func (m *MockUserRepository) FindByIDs(id ...uint64) (types.UserSet, error) {
-	m.ctrl.T.Helper()
 	varargs := []interface{}{}
 	for _, a := range id {
 		varargs = append(varargs, a)
@ -112,13 +102,11 @@ func (m *MockUserRepository) FindByIDs(id ...uint64) (types.UserSet, error) {

 // FindByIDs indicates an expected call of FindByIDs
 func (mr *MockUserRepositoryMockRecorder) FindByIDs(id ...interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FindByIDs", reflect.TypeOf((*MockUserRepository)(nil).FindByIDs), id...)
 }

 // Find mocks base method
 func (m *MockUserRepository) Find(filter *types.UserFilter) ([]*types.User, error) {
-	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "Find", filter)
 	ret0, _ := ret[0].([]*types.User)
 	ret1, _ := ret[1].(error)
@ -127,13 +115,23 @@ func (m *MockUserRepository) Find(filter *types.UserFilter) ([]*types.User, erro

 // Find indicates an expected call of Find
 func (mr *MockUserRepositoryMockRecorder) Find(filter interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Find", reflect.TypeOf((*MockUserRepository)(nil).Find), filter)
 }

+// Total mocks base method
+func (m *MockUserRepository) Total() uint {
+	ret := m.ctrl.Call(m, "Total")
+	ret0, _ := ret[0].(uint)
+	return ret0
+}
+
+// Total indicates an expected call of Total
+func (mr *MockUserRepositoryMockRecorder) Total() *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Total", reflect.TypeOf((*MockUserRepository)(nil).Total))
+}
+
 // Create mocks base method
 func (m *MockUserRepository) Create(mod *types.User) (*types.User, error) {
-	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "Create", mod)
 	ret0, _ := ret[0].(*types.User)
 	ret1, _ := ret[1].(error)
@ -142,13 +140,11 @@ func (m *MockUserRepository) Create(mod *types.User) (*types.User, error) {

 // Create indicates an expected call of Create
 func (mr *MockUserRepositoryMockRecorder) Create(mod interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Create", reflect.TypeOf((*MockUserRepository)(nil).Create), mod)
 }

 // Update mocks base method
 func (m *MockUserRepository) Update(mod *types.User) (*types.User, error) {
-	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "Update", mod)
 	ret0, _ := ret[0].(*types.User)
 	ret1, _ := ret[1].(error)
@ -157,13 +153,11 @@ func (m *MockUserRepository) Update(mod *types.User) (*types.User, error) {

 // Update indicates an expected call of Update
 func (mr *MockUserRepositoryMockRecorder) Update(mod interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Update", reflect.TypeOf((*MockUserRepository)(nil).Update), mod)
 }

 // BindAvatar mocks base method
 func (m *MockUserRepository) BindAvatar(user *types.User, avatar io.Reader) (*types.User, error) {
-	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "BindAvatar", user, avatar)
 	ret0, _ := ret[0].(*types.User)
 	ret1, _ := ret[1].(error)
@ -172,13 +166,11 @@ func (m *MockUserRepository) BindAvatar(user *types.User, avatar io.Reader) (*ty

 // BindAvatar indicates an expected call of BindAvatar
 func (mr *MockUserRepositoryMockRecorder) BindAvatar(user, avatar interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BindAvatar", reflect.TypeOf((*MockUserRepository)(nil).BindAvatar), user, avatar)
 }

 // SuspendByID mocks base method
 func (m *MockUserRepository) SuspendByID(id uint64) error {
-	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "SuspendByID", id)
 	ret0, _ := ret[0].(error)
 	return ret0
@ -186,13 +178,11 @@ func (m *MockUserRepository) SuspendByID(id uint64) error {

 // SuspendByID indicates an expected call of SuspendByID
 func (mr *MockUserRepositoryMockRecorder) SuspendByID(id interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SuspendByID", reflect.TypeOf((*MockUserRepository)(nil).SuspendByID), id)
 }

 // UnsuspendByID mocks base method
 func (m *MockUserRepository) UnsuspendByID(id uint64) error {
-	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "UnsuspendByID", id)
 	ret0, _ := ret[0].(error)
 	return ret0
@ -200,13 +190,11 @@ func (m *MockUserRepository) UnsuspendByID(id uint64) error {

 // UnsuspendByID indicates an expected call of UnsuspendByID
 func (mr *MockUserRepositoryMockRecorder) UnsuspendByID(id interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UnsuspendByID", reflect.TypeOf((*MockUserRepository)(nil).UnsuspendByID), id)
 }

 // DeleteByID mocks base method
 func (m *MockUserRepository) DeleteByID(id uint64) error {
-	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "DeleteByID", id)
 	ret0, _ := ret[0].(error)
 	return ret0
@ -214,6 +202,5 @@ func (m *MockUserRepository) DeleteByID(id uint64) error {

 // DeleteByID indicates an expected call of DeleteByID
 func (mr *MockUserRepositoryMockRecorder) DeleteByID(id interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteByID", reflect.TypeOf((*MockUserRepository)(nil).DeleteByID), id)
 }
--- a/system/internal/service/auth_test.go
+++ b/system/internal/service/auth_test.go
@ -104,6 +104,11 @@ func TestAuth_External_NonExisting(t *testing.T) {
 		Times(1).
 		Return(u, nil)

+	usrRpoMock.EXPECT().
+		Total().
+		Times(1).
+		Return(uint(1))
+
 	svc := makeMockAuthService(usrRpoMock, crdRpoMock)
 	svc.logger = zap.NewNop()
 	svc.settings.externalEnabled = true