From 23bfd33b557894a2c00e3b1ea03328b3d421c61d Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Fri, 28 Aug 2020 16:38:11 +0200 Subject: [PATCH] Fix tests --- go.mod | 2 +- go.sum | 3 ++ pkg/proto/v0/accounts.pb.micro_test.go | 39 ++++++++++++++++++-------- 3 files changed, 32 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 967bd20eb..d2e005035 100644 --- a/go.mod +++ b/go.mod @@ -29,7 +29,7 @@ require ( github.com/onsi/ginkgo v1.10.1 // indirect github.com/onsi/gomega v1.7.0 // indirect github.com/owncloud/ocis-pkg/v2 v2.4.0 - github.com/owncloud/ocis-settings v0.3.0 + github.com/owncloud/ocis-settings v0.3.2-0.20200828130413-0cc0f5bf26fe github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect github.com/restic/calens v0.2.0 github.com/rs/zerolog v1.19.0 diff --git a/go.sum b/go.sum index 5a7bb60bd..809fb7e6e 100644 --- a/go.sum +++ b/go.sum @@ -871,11 +871,14 @@ github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200812103920-db41b5a3d14d h1:eruHqxLf github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200812103920-db41b5a3d14d/go.mod h1:FSzIvhx9HcZcq4jgNaDowNvM7PTX/XCyoMvyfzidUpE= github.com/owncloud/ocis-pkg/v2 v2.3.0 h1:bdDgfPkPdL3D6bGKhQ56pfwT1XdiKBtQ34qErVyXzys= github.com/owncloud/ocis-pkg/v2 v2.3.0/go.mod h1:FSzIvhx9HcZcq4jgNaDowNvM7PTX/XCyoMvyfzidUpE= +github.com/owncloud/ocis-pkg/v2 v2.4.0 h1:/3ZOd4txtwjiNKJA9iLT9BjrJw5YgHSX13fQR4BYfGY= github.com/owncloud/ocis-pkg/v2 v2.4.0/go.mod h1:FSzIvhx9HcZcq4jgNaDowNvM7PTX/XCyoMvyfzidUpE= github.com/owncloud/ocis-settings v0.2.0 h1:pncwKQQdWGyUwO/+O10vcIrgGWWBAF9/PPWOCnD0DU4= github.com/owncloud/ocis-settings v0.2.0/go.mod h1:7+fRwpXe+njcsO0d9Bpxx3V8ZsF99JrL6jCeD9QuxUk= github.com/owncloud/ocis-settings v0.3.0 h1:w1wdqJiMtRNJ5B7sQemvtFQQod31G6dR468GxAV0Y2g= github.com/owncloud/ocis-settings v0.3.0/go.mod h1:vRge9QDkOsc6j76gPBmZs1Z5uOPrV4DIkZCgZCEFwBA= +github.com/owncloud/ocis-settings v0.3.2-0.20200828130413-0cc0f5bf26fe h1:kiU5lz12R0LNJE1/zI2vxesZPWm6BvSO7hvZC8yOoAc= +github.com/owncloud/ocis-settings v0.3.2-0.20200828130413-0cc0f5bf26fe/go.mod h1:vRge9QDkOsc6j76gPBmZs1Z5uOPrV4DIkZCgZCEFwBA= github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c h1:rp5dCmg/yLR3mgFuSOe4oEnDDmGLROTvMragMUXpTQw= github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c/go.mod h1:X07ZCGwUbLaax7L0S3Tw4hpejzu63ZrrQiUe6W0hcy0= github.com/parnurzeal/gorequest v0.2.15/go.mod h1:3Kh2QUMJoqw3icWAecsyzkpY7UzRfDhbRdTjtNwNiUE= diff --git a/pkg/proto/v0/accounts.pb.micro_test.go b/pkg/proto/v0/accounts.pb.micro_test.go index 596d5e510..7386e0cd1 100644 --- a/pkg/proto/v0/accounts.pb.micro_test.go +++ b/pkg/proto/v0/accounts.pb.micro_test.go @@ -1,27 +1,26 @@ package proto_test import ( - context "context" + "context" "errors" "fmt" - "github.com/micro/go-micro/v2/client" - "google.golang.org/genproto/protobuf/field_mask" - "google.golang.org/protobuf/types/known/timestamppb" "log" "os" "path/filepath" "testing" + "github.com/golang/protobuf/ptypes/empty" + "github.com/micro/go-micro/v2/client" + merrors "github.com/micro/go-micro/v2/errors" "github.com/owncloud/ocis-accounts/pkg/command" "github.com/owncloud/ocis-accounts/pkg/config" "github.com/owncloud/ocis-accounts/pkg/proto/v0" svc "github.com/owncloud/ocis-accounts/pkg/service/v0" - "github.com/owncloud/ocis-pkg/v2/service/grpc" + settings "github.com/owncloud/ocis-settings/pkg/proto/v0" "github.com/stretchr/testify/assert" - - "github.com/golang/protobuf/ptypes/empty" - merrors "github.com/micro/go-micro/v2/errors" + "google.golang.org/genproto/protobuf/field_mask" + "google.golang.org/protobuf/types/known/timestamppb" ) var service = grpc.Service{} @@ -31,6 +30,8 @@ const dataPath = "./accounts-store" var newCreatedAccounts = []string{} var newCreatedGroups = []string{} +var mockedRoleAssignment = map[string]string{} + func getAccount(user string) *proto.Account { switch user { case "user1": @@ -165,7 +166,7 @@ func init() { var hdlr *svc.Service var err error - if hdlr, err = svc.New(svc.Logger(command.NewLogger(cfg)), svc.Config(cfg)); err != nil { + if hdlr, err = svc.New(svc.Logger(command.NewLogger(cfg)), svc.Config(cfg), svc.RoleService(buildRoleServiceMock())); err != nil { log.Fatalf("Could not create new service") } @@ -186,6 +187,22 @@ func init() { } } +func buildRoleServiceMock() settings.RoleService { + return settings.MockRoleService{ + AssignRoleToUserFunc: func(ctx context.Context, req *settings.AssignRoleToUserRequest, opts ...client.CallOption) (res *settings.AssignRoleToUserResponse, err error) { + mockedRoleAssignment[req.AccountUuid] = req.RoleId + fmt.Println(mockedRoleAssignment) + fmt.Println("asdf blablabla") + return &settings.AssignRoleToUserResponse{ + Assignment: &settings.UserRoleAssignment{ + AccountUuid: req.AccountUuid, + RoleId: req.RoleId, + }, + }, nil + }, + } +} + func cleanUp(t *testing.T) { datastore := filepath.Join(dataPath, "accounts") @@ -598,7 +615,7 @@ func TestListAccounts(t *testing.T) { checkError(t, err) assert.IsType(t, &proto.ListAccountsResponse{}, resp) - assert.Equal(t, 7, len(resp.Accounts)) + assert.Equal(t, 8, len(resp.Accounts)) assertResponseContainsUser(t, resp, getAccount("user1")) assertResponseContainsUser(t, resp, getAccount("user2")) @@ -612,7 +629,7 @@ func TestListWithoutUserCreation(t *testing.T) { checkError(t, err) // Only 5 default users - assert.Equal(t, 5, len(resp.Accounts)) + assert.Equal(t, 6, len(resp.Accounts)) cleanUp(t) }