DeforaNetworks/corteza
3
0
Fork 0
Code Activity

Fix makefile, add updated mockfiles

Browse Source 
Remove `make test`, we do not want it to test codegen files
Add make `test.internal`
This commit is contained in:
Denis Arh
2019-04-03 18:09:13 +02:00
parent d5212f267c
commit ee4b66e53d
3 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@@ -67,8 +67,8 @@ mailhog.up:
########################################################################################################################
# QA
test: $(GOTEST)
$(GOTEST) -covermode count -coverprofile .cover.out -v ./...
test.internal: $(GOTEST)
$(GOTEST) -covermode count -coverprofile .cover.out -v ./internal/...
$(GO) tool cover -func=.cover.out
test.messaging: $(GOTEST)
@@ -128,7 +128,7 @@ qa: vet critic test
mocks: $(GOMOCK)
# Cleanup all pre-generated
find -name '*_mock_test.go' -delete
find . -name '*_mock_test.go' -delete
rm -rf system/internal/repository/mocks && mkdir -p system/internal/repository/mocks
$(MOCKGEN) -package repository -source system/internal/repository/user.go -destination system/internal/repository/mocks/user.go
@@ -163,4 +163,4 @@ clean:
integration:
drone exec --pipeline integration
drone exec --pipeline integration

2
internal/mail/mail_mock_test.go
View File

@@ -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...)
}

10
internal/rules/resources_mock_test.go
View File

@@ -36,7 +36,6 @@ func (m *MockResourcesInterface) EXPECT() *MockResourcesInterfaceMockRecorder {
// With mocks base method
func (m *MockResourcesInterface) With(ctx context.Context, db *factory.DB) ResourcesInterface {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "With", ctx, db)
ret0, _ := ret[0].(ResourcesInterface)
return ret0
@@ -44,13 +43,11 @@ func (m *MockResourcesInterface) With(ctx context.Context, db *factory.DB) Resou
// With indicates an expected call of With
func (mr *MockResourcesInterfaceMockRecorder) With(ctx, db interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "With", reflect.TypeOf((*MockResourcesInterface)(nil).With), ctx, db)
}
// Check mocks base method
func (m *MockResourcesInterface) Check(resource Resource, operation string, fallbacks ...CheckAccessFunc) Access {
m.ctrl.T.Helper()
varargs := []interface{}{resource, operation}
for _, a := range fallbacks {
varargs = append(varargs, a)
@@ -62,14 +59,12 @@ func (m *MockResourcesInterface) Check(resource Resource, operation string, fall
// Check indicates an expected call of Check
func (mr *MockResourcesInterfaceMockRecorder) Check(resource, operation interface{}, fallbacks ...interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
varargs := append([]interface{}{resource, operation}, fallbacks...)
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Check", reflect.TypeOf((*MockResourcesInterface)(nil).Check), varargs...)
}
// Grant mocks base method
func (m *MockResourcesInterface) Grant(roleID uint64, rules []Rule) error {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Grant", roleID, rules)
ret0, _ := ret[0].(error)
return ret0
@@ -77,13 +72,11 @@ func (m *MockResourcesInterface) Grant(roleID uint64, rules []Rule) error {
// Grant indicates an expected call of Grant
func (mr *MockResourcesInterfaceMockRecorder) Grant(roleID, rules interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Grant", reflect.TypeOf((*MockResourcesInterface)(nil).Grant), roleID, rules)
}
// Read mocks base method
func (m *MockResourcesInterface) Read(roleID uint64) ([]Rule, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Read", roleID)
ret0, _ := ret[0].([]Rule)
ret1, _ := ret[1].(error)
@@ -92,13 +85,11 @@ func (m *MockResourcesInterface) Read(roleID uint64) ([]Rule, error) {
// Read indicates an expected call of Read
func (mr *MockResourcesInterfaceMockRecorder) Read(roleID interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Read", reflect.TypeOf((*MockResourcesInterface)(nil).Read), roleID)
}
// Delete mocks base method
func (m *MockResourcesInterface) Delete(roleID uint64) error {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Delete", roleID)
ret0, _ := ret[0].(error)
return ret0
@@ -106,6 +97,5 @@ func (m *MockResourcesInterface) Delete(roleID uint64) error {
// Delete indicates an expected call of Delete
func (mr *MockResourcesInterfaceMockRecorder) Delete(roleID interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockResourcesInterface)(nil).Delete), roleID)
}