Adapt mocks a bit so that they behave more like NGitLab (#842)

* Adapt mocks a bit so that they behave more like NGitLab

* Remove mock exceptions and use GitLabExceptions

* fix

Author: louis-z

NGitLab.Mock.Tests/CommitsMockTests.cs

@@ -186,7 +186,7 @@ public void Test_create_commit_with_start_branch_and_start_sha()
             },
         });
 
-        Assert.That(handler, Throws.TypeOf<GitLabBadRequestException>()
+        Assert.That(handler, Throws.TypeOf<GitLabException>()
             .With.Message.Contains("start_branch, start_sha are mutually exclusive."));
     }
 
@@ -221,7 +221,7 @@ public void Test_create_commit_with_existing_branch()
             },
         });
 
-        Assert.That(handler, Throws.TypeOf<GitLabBadRequestException>()
+        Assert.That(handler, Throws.TypeOf<GitLabException>()
             .With.Message.Contains("A branch called 'test-branch' already exists."));
     }
 

NGitLab.Mock.Tests/GroupsMockTests.cs

@@ -124,7 +124,7 @@ public void Test_page_groups_with_invalid_perpage_throws()
     {
         using var server = CreateGroupHierarchy();
         var client = server.CreateClient("user1");
-        Assert.ThrowsAsync<Clients.GitLabBadRequestException>(() => client.Groups.PageAsync(new(perPage: 0)));
+        Assert.ThrowsAsync<GitLabException>(() => client.Groups.PageAsync(new(perPage: 0)));
     }
 
     [Test]
@@ -276,7 +276,7 @@ public void Test_page_subgroups_with_invalid_perpage_throws()
     {
         using var server = CreateGroupHierarchy();
         var client = server.CreateClient("user1");
-        Assert.ThrowsAsync<Clients.GitLabBadRequestException>(() => client.Groups.PageSubgroupsAsync(1, new(page: 1, perPage: 0)));
+        Assert.ThrowsAsync<GitLabException>(() => client.Groups.PageSubgroupsAsync(1, new(page: 1, perPage: 0)));
     }
 
     [Test]

NGitLab.Mock.Tests/ProjectsMockTests.cs

@@ -47,6 +47,45 @@ public void Test_projects_created_can_be_found()
         Assert.That(project.Namespace.FullPath, Is.EqualTo("testgroup"));
     }
 
+    [Test]
+    public void GetProjectAsync_WhenProjectDoesNotExist_ShouldThrowNotFound()
+    {
+        // Arrange
+        using var server = new GitLabConfig()
+            .WithUser("TestUser", isDefault: true)
+            .BuildServer();
+        var gitLabClient = server.CreateClient();
+        var projectClient = gitLabClient.Projects;
+
+        // Act/Assert
+        var ex = Assert.ThrowsAsync<GitLabException>(() => projectClient.GetAsync("baz1234"));
+
+        Assert.That(ex.StatusCode, Is.EqualTo(HttpStatusCode.NotFound));
+    }
+
+    [Test]
+    public void GetProjectAsync_WhenProjectInaccessible_ShouldThrowNotFound()
+    {
+        // Arrange
+        using var server = new GitLabConfig()
+            .WithUser("TestUser1", isDefault: true)
+            .WithUser("TestUser2")
+            .BuildServer();
+        var testUser1ProjectClient = server.CreateClient("TestUser1").Projects;
+        var testUser2ProjectClient = server.CreateClient("TestUser2").Projects;
+
+        var testUser2Project = testUser2ProjectClient.Create(new ProjectCreate
+        {
+            Name = $"Project_Test_{Guid.NewGuid()}",
+            VisibilityLevel = VisibilityLevel.Private,
+        });
+
+        // Act/Assert
+        var ex = Assert.ThrowsAsync<GitLabException>(() => testUser1ProjectClient.GetAsync(testUser2Project.Id));
+
+        Assert.That(ex.StatusCode, Is.EqualTo(HttpStatusCode.NotFound));
+    }
+
     [Test]
     public void Test_project_can_be_cloned_by_default()
     {

NGitLab.Mock.Tests/RepositoryMockTests.cs

@@ -33,7 +33,7 @@ public void Test_create_commit_in_new_branch_fails_if_both_start_branch_and_sha_
                     FilePath = "README.md",
                 },
             },
-        }), Throws.TypeOf<GitLabBadRequestException>()
+        }), Throws.TypeOf<GitLabException>()
                   .With.Message.Contains("GitLab server returned an error (BadRequest): start_branch, start_sha are mutually exclusive."));
     }
 
@@ -66,7 +66,7 @@ public void Test_create_a_new_commit_with_start_branch_fails_if_branch_already_e
                     FilePath = "README.md",
                 },
             },
-        }), Throws.TypeOf<GitLabBadRequestException>()
+        }), Throws.TypeOf<GitLabException>()
                   .With.Message.Contains($"A branch called '{newBranch}' already exists."));
     }
 
@@ -99,7 +99,7 @@ public void Test_create_a_new_commit_with_start_sha_fails_if_branch_already_exis
                     FilePath = "README.md",
                 },
             },
-        }), Throws.TypeOf<GitLabBadRequestException>()
+        }), Throws.TypeOf<GitLabException>()
                   .With.Message.Contains($"A branch called '{newBranch}' already exists."));
     }
 
@@ -190,7 +190,7 @@ public void Test_create_a_new_commit_on_nonexistent_branch()
                     FilePath = "README.md",
                 },
             },
-        }), Throws.TypeOf<GitLabBadRequestException>()
+        }), Throws.TypeOf<GitLabException>()
                   .With.Message.Contains("You can only create or edit files when you are on a branch."));
     }
 

NGitLab.Mock/Clients/BranchClient.cs

@@ -69,7 +69,7 @@ public Branch this[string name]
                 var project = GetProject(_projectId, ProjectPermission.View);
                 var branch = project.Repository.GetBranch(name);
                 if (branch == null)
-                    throw new GitLabNotFoundException();
+                    throw GitLabException.NotFound();
 
                 return branch.ToBranchClient(project);
             }

NGitLab.Mock/Clients/ClientBase.cs

@@ -38,7 +38,7 @@ protected Group GetGroup(object id, GroupPermission permissions)
         };
 
         if (group == null || !group.CanUserViewGroup(Context.User))
-            throw new GitLabNotFoundException("Group does not exist or user doesn't have permission to view it");
+            throw GitLabException.NotFound("Group does not exist or user doesn't have permission to view it");
 
         switch (permissions)
         {
@@ -48,12 +48,12 @@ protected Group GetGroup(object id, GroupPermission permissions)
 
             case GroupPermission.Edit:
                 if (!group.CanUserEditGroup(Context.User))
-                    throw new GitLabForbiddenException($"User '{Context.User.Name}' does not have the permission to edit the group '{group.Name}'");
+                    throw GitLabException.Forbidden($"User '{Context.User.Name}' does not have the permission to edit the group '{group.Name}'");
                 break;
 
             case GroupPermission.Delete:
                 if (!group.CanUserDeleteGroup(Context.User))
-                    throw new GitLabForbiddenException($"User '{Context.User.Name}' does not have the permission to delete the group '{group.Name}'");
+                    throw GitLabException.Forbidden($"User '{Context.User.Name}' does not have the permission to delete the group '{group.Name}'");
                 break;
 
             default:
@@ -85,8 +85,8 @@ protected Project GetProject(object id, ProjectPermission permissions)
             _ => throw new ArgumentException($"Id of type '{id.GetType()}' is not supported"),
         };
 
-        if (project == null || !project.CanUserViewProject(Context.User))
-            throw new GitLabNotFoundException("Project does not exist or User doesn't have permission to view it");
+        if (project is null || !project.CanUserViewProject(Context.User))
+            throw GitLabException.NotFound("Project does not exist or User doesn't have permission to view it");
 
         switch (permissions)
         {
@@ -96,17 +96,17 @@ protected Project GetProject(object id, ProjectPermission permissions)
 
             case ProjectPermission.Contribute:
                 if (!project.CanUserContributeToProject(Context.User))
-                    throw new GitLabForbiddenException($"User '{Context.User.Name}' does not have the permission to contribute to the project '{project.Name}'");
+                    throw GitLabException.Forbidden($"User '{Context.User.Name}' does not have the permission to contribute to the project '{project.Name}'");
                 break;
 
             case ProjectPermission.Edit:
                 if (!project.CanUserEditProject(Context.User))
-                    throw new GitLabForbiddenException($"User '{Context.User.Name}' does not have the permission to edit the project '{project.Name}'");
+                    throw GitLabException.Forbidden($"User '{Context.User.Name}' does not have the permission to edit the project '{project.Name}'");
                 break;
 
             case ProjectPermission.Delete:
                 if (!project.CanUserDeleteProject(Context.User))
-                    throw new GitLabForbiddenException($"User '{Context.User.Name}' does not have the permission to delete the project '{project.Name}'");
+                    throw GitLabException.Forbidden($"User '{Context.User.Name}' does not have the permission to delete the project '{project.Name}'");
                 break;
 
             default:
@@ -120,7 +120,7 @@ protected User GetUser(long userId)
     {
         var user = Server.Users.GetById(userId);
         if (user == null)
-            throw new GitLabNotFoundException();
+            throw GitLabException.NotFound();
 
         return user;
     }
@@ -130,7 +130,7 @@ protected Issue GetIssue(long projectId, long issueId)
         var project = GetProject(projectId, ProjectPermission.View);
         var issue = project.Issues.GetByIid(issueId);
         if (issue == null)
-            throw new GitLabNotFoundException();
+            throw GitLabException.NotFound();
 
         return issue;
     }
@@ -140,7 +140,7 @@ protected Milestone GetMilestone(long projectId, long milestoneId)
         var project = GetProject(projectId, ProjectPermission.View);
         var milestone = project.Milestones.GetByIid(milestoneId);
         if (milestone == null)
-            throw new GitLabNotFoundException();
+            throw GitLabException.NotFound();
 
         return milestone;
     }
@@ -150,7 +150,7 @@ protected MergeRequest GetMergeRequest(long projectId, long mergeRequestIid)
         var project = GetProject(projectId, ProjectPermission.View);
         var mergeRequest = project.MergeRequests.GetByIid(mergeRequestIid);
         if (mergeRequest == null)
-            throw new GitLabNotFoundException();
+            throw GitLabException.NotFound();
 
         return mergeRequest;
     }

NGitLab.Mock/Clients/FileClient.cs

@@ -99,7 +99,7 @@ public bool FileExists(string filePath, string @ref)
             {
                 return Get(filePath, @ref) != null;
             }
-            catch (GitLabNotFoundException)
+            catch (GitLabException ex) when (ex.StatusCode is HttpStatusCode.NotFound)
             {
                 return false;
             }