Merge pull request #37 from kripsy/implement-unit-test-09112023

add tests
kripsy · Nov 10, 2023 · 2a74016 · 2a74016
2 parents 5bacc23 + 848c10c
commit 2a74016
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 4 deletions.
diff --git a/internal/server/controller/grpc_secret_controller_test.go b/internal/server/controller/grpc_secret_controller_test.go
@@ -125,6 +125,19 @@ func TestGrpcServerMultipartUploadFile(t *testing.T) {
 			},
 			expectedError: status.Error(codes.Internal, ""),
 		},
+		{
+			name: "Error get bucket",
+			setupMocks: func(mockStream *mocks.MockGophKeeperService_MultipartUploadFileServer,
+				mockSecretUseCase *mocks.MockSecretUseCase,
+				mockSyncStatus *mocks.MockSyncStatus) {
+				//nolint:staticcheck
+				newCtx := context.WithValue(context.Background(), utils.USERNAMECONTEXTKEY, "")
+				//nolint:staticcheck
+				newCtx = context.WithValue(newCtx, utils.USERIDCONTEXTKEY, 1)
+				mockStream.EXPECT().Context().Return(newCtx).AnyTimes()
+			},
+			expectedError: status.Error(codes.Internal, ""),
+		},
 		{
 			name: "Couldn't parse GUID",
 			setupMocks: func(mockStream *mocks.MockGophKeeperService_MultipartUploadFileServer,
@@ -468,6 +481,48 @@ func TestApplyChanges(t *testing.T) {
 				utils.USERNAMECONTEXTKEY, "user"), utils.USERIDCONTEXTKEY, 1),
 			errCode: codes.InvalidArgument,
 		},
+		{
+			name: "Cannot get userID",
+			req: &pb.ApplyChangesRequest{
+				Guid: "",
+			},
+			setup: func(ctx context.Context) {
+
+			},
+			wantErr: true,
+			ctx: context.WithValue(context.WithValue(context.Background(),
+				//nolint:staticcheck
+				utils.USERNAMECONTEXTKEY, "user"), utils.USERIDCONTEXTKEY+"fake", 1),
+			errCode: codes.InvalidArgument,
+		},
+		{
+			name: "Cannot get userName",
+			req: &pb.ApplyChangesRequest{
+				Guid: "",
+			},
+			setup: func(ctx context.Context) {
+
+			},
+			wantErr: true,
+			ctx: context.WithValue(context.WithValue(context.Background(),
+				//nolint:staticcheck
+				utils.USERNAMECONTEXTKEY+"fake", "user"), utils.USERIDCONTEXTKEY, 1),
+			errCode: codes.InvalidArgument,
+		},
+		{
+			name: "Cannot get bucketname",
+			req: &pb.ApplyChangesRequest{
+				Guid: "",
+			},
+			setup: func(ctx context.Context) {
+
+			},
+			wantErr: true,
+			ctx: context.WithValue(context.WithValue(context.Background(),
+				//nolint:staticcheck
+				utils.USERNAMECONTEXTKEY, ""), utils.USERIDCONTEXTKEY, 1),
+			errCode: codes.InvalidArgument,
+		},
 	}
 
 	for _, tt := range tests {

diff --git a/internal/utils/minioutils.go b/internal/utils/minioutils.go
@@ -24,10 +24,6 @@ func FromUser2BucketName(_ context.Context, username string, userID int) (string
 	if username == "" {
 		return "", fmt.Errorf("%w", ErrIncorrectUserName)
 	}
-	bucketName := username + str
-	if bucketName == "" {
-		return "", fmt.Errorf("%w", ErrIncorrectBucket)
-	}
 
 	return (prefix + username + str), nil
 }