From c1b74d1a14ca2c73a9577feb495b50975e9c709f Mon Sep 17 00:00:00 2001 From: Hugo Gonzalez Labrador Date: Tue, 3 Sep 2024 14:56:56 +0200 Subject: [PATCH] fix tests for demo --- pkg/user/manager/demo/demo.go | 15 ++++++++------- pkg/user/manager/demo/demo_test.go | 9 +++++---- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/pkg/user/manager/demo/demo.go b/pkg/user/manager/demo/demo.go index d451795294..6ea270f2c6 100644 --- a/pkg/user/manager/demo/demo.go +++ b/pkg/user/manager/demo/demo.go @@ -28,6 +28,7 @@ import ( "github.com/cs3org/reva/pkg/errtypes" "github.com/cs3org/reva/pkg/user" "github.com/cs3org/reva/pkg/user/manager/registry" + "google.golang.org/protobuf/proto" ) func init() { @@ -57,11 +58,11 @@ func (m *manager) Configure(ml map[string]interface{}) error { func (m *manager) GetUser(ctx context.Context, uid *userpb.UserId, skipFetchingGroups bool) (*userpb.User, error) { if user, ok := m.catalog[uid.OpaqueId]; ok { if uid.Idp == "" || user.Id.Idp == uid.Idp { - u := *user + u := proto.Clone(user).(*userpb.User) if skipFetchingGroups { u.Groups = nil } - return &u, nil + return u, nil } } return nil, errtypes.NotFound(uid.OpaqueId) @@ -70,11 +71,11 @@ func (m *manager) GetUser(ctx context.Context, uid *userpb.UserId, skipFetchingG func (m *manager) GetUserByClaim(ctx context.Context, claim, value string, skipFetchingGroups bool) (*userpb.User, error) { for _, u := range m.catalog { if userClaim, err := extractClaim(u, claim); err == nil && value == userClaim { - user := *u + u2 := proto.Clone(u).(*userpb.User) if skipFetchingGroups { - user.Groups = nil + u2.Groups = nil } - return &user, nil + return u2, nil } } return nil, errtypes.NotFound(value) @@ -103,11 +104,11 @@ func (m *manager) FindUsers(ctx context.Context, query string, skipFetchingGroup users := []*userpb.User{} for _, u := range m.catalog { if userContains(u, query) { - user := *u + user := proto.Clone(u).(*userpb.User) if skipFetchingGroups { user.Groups = nil } - users = append(users, &user) + users = append(users, user) } } return users, nil diff --git a/pkg/user/manager/demo/demo_test.go b/pkg/user/manager/demo/demo_test.go index a22f4d8de3..8c062453bb 100644 --- a/pkg/user/manager/demo/demo_test.go +++ b/pkg/user/manager/demo/demo_test.go @@ -25,6 +25,7 @@ import ( userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" "github.com/cs3org/reva/pkg/errtypes" + "google.golang.org/protobuf/proto" ) var ctx = context.Background() @@ -58,7 +59,7 @@ func TestUserManager(t *testing.T) { // positive test GetUserByClaim by uid resUserByUID, _ := manager.GetUserByClaim(ctx, "uid", "123", false) - if !reflect.DeepEqual(resUserByUID, userEinstein) { + if !proto.Equal(resUserByUID, userEinstein) { t.Fatalf("user differs: expected=%v got=%v", userEinstein, resUserByUID) } @@ -71,13 +72,13 @@ func TestUserManager(t *testing.T) { // positive test GetUserByClaim by mail resUserByEmail, _ := manager.GetUserByClaim(ctx, "mail", "einstein@example.org", false) - if !reflect.DeepEqual(resUserByEmail, userEinstein) { + if !proto.Equal(resUserByEmail, userEinstein) { t.Fatalf("user differs: expected=%v got=%v", userEinstein, resUserByEmail) } // positive test GetUserByClaim by uid without groups resUserByUIDWithoutGroups, _ := manager.GetUserByClaim(ctx, "uid", "123", true) - if !reflect.DeepEqual(resUserByUIDWithoutGroups, userEinsteinWithoutGroups) { + if !proto.Equal(resUserByUIDWithoutGroups, userEinsteinWithoutGroups) { t.Fatalf("user differs: expected=%v got=%v", userEinsteinWithoutGroups, resUserByUIDWithoutGroups) } @@ -96,7 +97,7 @@ func TestUserManager(t *testing.T) { // test FindUsers resUser, _ := manager.FindUsers(ctx, "einstein", false) - if !reflect.DeepEqual(resUser, []*userpb.User{userEinstein}) { + if !proto.Equal(resUser[0], userEinstein) { t.Fatalf("user differs: expected=%v got=%v", []*userpb.User{userEinstein}, resUser) }