Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(http): add zero value mock implementation of u/r mapping service

pull/10616/head
Jade McGough 2018-10-16 15:14:16 -07:00
parent d280b7ea43
commit 9180e13093
5 changed files with 61 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
http/bucket_test.go
View File

@ -120,7 +120,8 @@ func TestService_handleGetBuckets(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
h := NewBucketHandler()
mappingService := mock.NewUserResourceMappingService()
h := NewBucketHandler(mappingService)
h.BucketService = tt.fields.BucketService
r := httptest.NewRequest("GET", "http://any.url", nil)
@ -232,7 +233,8 @@ func TestService_handleGetBucket(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
h := NewBucketHandler()
mappingService := mock.NewUserResourceMappingService()
h := NewBucketHandler(mappingService)
h.BucketService = tt.fields.BucketService
r := httptest.NewRequest("GET", "http://any.url", nil)
@ -325,7 +327,8 @@ func TestService_handlePostBucket(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
h := NewBucketHandler()
mappingService := mock.NewUserResourceMappingService()
h := NewBucketHandler(mappingService)
h.BucketService = tt.fields.BucketService
b, err := json.Marshal(newBucket(tt.args.bucket))
@ -415,7 +418,8 @@ func TestService_handleDeleteBucket(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
h := NewBucketHandler()
mappingService := mock.NewUserResourceMappingService()
h := NewBucketHandler(mappingService)
h.BucketService = tt.fields.BucketService
r := httptest.NewRequest("GET", "http://any.url", nil)
@ -542,7 +546,8 @@ func TestService_handlePatchBucket(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
h := NewBucketHandler()
mappingService := mock.NewUserResourceMappingService()
h := NewBucketHandler(mappingService)
h.BucketService = tt.fields.BucketService
upd := platform.BucketUpdate{}
@ -607,7 +612,8 @@ func initBucketService(f platformtesting.BucketFields, t *testing.T) (platform.B
}
}
handler := NewBucketHandler()
mappingService := mock.NewUserResourceMappingService()
handler := NewBucketHandler(mappingService)
handler.BucketService = svc
server := httptest.NewServer(handler)
client := BucketService{

27
http/dashboard_test.go
View File

@ -136,7 +136,8 @@ func TestService_handleGetDashboards(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
h := NewDashboardHandler()
mappingService := mock.NewUserResourceMappingService()
h := NewDashboardHandler(mappingService)
h.DashboardService = tt.fields.DashboardService
r := httptest.NewRequest("GET", "http://any.url", nil)
@ -268,7 +269,8 @@ func TestService_handleGetDashboard(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
h := NewDashboardHandler()
mappingService := mock.NewUserResourceMappingService()
h := NewDashboardHandler(mappingService)
h.DashboardService = tt.fields.DashboardService
r := httptest.NewRequest("GET", "http://any.url", nil)
@ -382,7 +384,8 @@ func TestService_handlePostDashboard(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
h := NewDashboardHandler()
mappingService := mock.NewUserResourceMappingService()
h := NewDashboardHandler(mappingService)
h.DashboardService = tt.fields.DashboardService
b, err := json.Marshal(tt.args.dashboard)
@ -471,7 +474,8 @@ func TestService_handleDeleteDashboard(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
h := NewDashboardHandler()
mappingService := mock.NewUserResourceMappingService()
h := NewDashboardHandler(mappingService)
h.DashboardService = tt.fields.DashboardService
r := httptest.NewRequest("GET", "http://any.url", nil)
@ -630,7 +634,8 @@ func TestService_handlePatchDashboard(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
h := NewDashboardHandler()
mappingService := mock.NewUserResourceMappingService()
h := NewDashboardHandler(mappingService)
h.DashboardService = tt.fields.DashboardService
upd := platform.DashboardUpdate{}
@ -738,7 +743,8 @@ func TestService_handlePostDashboardCell(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
h := NewDashboardHandler()
mappingService := mock.NewUserResourceMappingService()
h := NewDashboardHandler(mappingService)
h.DashboardService = tt.fields.DashboardService
b, err := json.Marshal(tt.args.cell)
@ -820,7 +826,8 @@ func TestService_handleDeleteDashboardCell(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
h := NewDashboardHandler()
mappingService := mock.NewUserResourceMappingService()
h := NewDashboardHandler(mappingService)
h.DashboardService = tt.fields.DashboardService
r := httptest.NewRequest("GET", "http://any.url", nil)
@ -933,7 +940,8 @@ func TestService_handlePatchDashboardCell(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
h := NewDashboardHandler()
mappingService := mock.NewUserResourceMappingService()
h := NewDashboardHandler(mappingService)
h.DashboardService = tt.fields.DashboardService
upd := platform.CellUpdate{}
@ -1030,7 +1038,8 @@ func initDashboardService(f platformtesting.DashboardFields, t *testing.T) (plat
}
}
handler := NewDashboardHandler()
mappingService := mock.NewUserResourceMappingService()
handler := NewDashboardHandler(mappingService)
handler.DashboardService = svc
server := httptest.NewServer(handler)
client := DashboardService{

4
http/org_test.go
View File

@ -7,6 +7,7 @@ import (
"github.com/influxdata/platform"
"github.com/influxdata/platform/inmem"
"github.com/influxdata/platform/mock"
platformtesting "github.com/influxdata/platform/testing"
)
@ -22,7 +23,8 @@ func initOrganizationService(f platformtesting.OrganizationFields, t *testing.T)
}
}
handler := NewOrgHandler(svc)
mappingService := mock.NewUserResourceMappingService()
handler := NewOrgHandler(mappingService)
handler.OrganizationService = svc
handler.BucketService = svc
server := httptest.NewServer(handler)

15
http/view_test.go
View File

@ -126,7 +126,8 @@ func TestService_handleGetViews(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
h := NewViewHandler()
mappingService := mock.NewUserResourceMappingService()
h := NewViewHandler(mappingService)
h.ViewService = tt.fields.ViewService
r := httptest.NewRequest("GET", "http://any.url", nil)
@ -234,7 +235,8 @@ func TestService_handleGetView(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
h := NewViewHandler()
mappingService := mock.NewUserResourceMappingService()
h := NewViewHandler(mappingService)
h.ViewService = tt.fields.ViewService
r := httptest.NewRequest("GET", "http://any.url", nil)
@ -336,7 +338,8 @@ func TestService_handlePostViews(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
h := NewViewHandler()
mappingService := mock.NewUserResourceMappingService()
h := NewViewHandler(mappingService)
h.ViewService = tt.fields.ViewService
b, err := json.Marshal(tt.args.view)
@ -425,7 +428,8 @@ func TestService_handleDeleteView(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
h := NewViewHandler()
mappingService := mock.NewUserResourceMappingService()
h := NewViewHandler(mappingService)
h.ViewService = tt.fields.ViewService
r := httptest.NewRequest("GET", "http://any.url", nil)
@ -578,7 +582,8 @@ func TestService_handlePatchView(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
h := NewViewHandler()
mappingService := mock.NewUserResourceMappingService()
h := NewViewHandler(mappingService)
h.ViewService = tt.fields.ViewService
upd := platform.ViewUpdate{}

24
mock/user_resource_mapping_service.go
View File

@ -9,19 +9,31 @@ import (
var _ platform.UserResourceMappingService = &UserResourceMappingService{}
type UserResourceMappingService struct {
FindMappingsF func(context.Context, platform.UserResourceMappingFilter) ([]*platform.UserResourceMapping, int, error)
CreateMappingF func(context.Context, *platform.UserResourceMapping) error
DeleteMappingF func(context.Context, platform.ID, platform.ID) error
FindMappingsFn func(context.Context, platform.UserResourceMappingFilter) ([]*platform.UserResourceMapping, int, error)
CreateMappingFn func(context.Context, *platform.UserResourceMapping) error
DeleteMappingFn func(context.Context, platform.ID, platform.ID) error
}
// NewUserResourceMappingService returns a mock of UserResourceMappingService
// where its methods will return zero values.
func NewUserResourceMappingService() *UserResourceMappingService {
return &UserResourceMappingService{
FindMappingsFn: func(context.Context, platform.UserResourceMappingFilter) ([]*platform.UserResourceMapping, int, error) {
return nil, 0, nil
},
CreateMappingFn: func(context.Context, *platform.UserResourceMapping) error { return nil },
DeleteMappingFn: func(context.Context, platform.ID, platform.ID) error { return nil },
}
}
func (s *UserResourceMappingService) FindUserResourceMappings(ctx context.Context, filter platform.UserResourceMappingFilter, opt ...platform.FindOptions) ([]*platform.UserResourceMapping, int, error) {
return s.FindMappingsF(ctx, filter)
return s.FindMappingsFn(ctx, filter)
}
func (s *UserResourceMappingService) CreateUserResourceMapping(ctx context.Context, m *platform.UserResourceMapping) error {
return s.CreateMappingF(ctx, m)
return s.CreateMappingFn(ctx, m)
}
func (s *UserResourceMappingService) DeleteUserResourceMapping(ctx context.Context, resourceID platform.ID, userID platform.ID) error {
return s.DeleteMappingF(ctx, resourceID, userID)
return s.DeleteMappingFn(ctx, resourceID, userID)
}