Integration Tests: Avoid asserting on errors for permission tests (#20643)

* Added integration tests for PropertyTypeUsageService and adjusted assert in management API permissions test.

* Commented or fixed management API integration tests verifying permissions where we were asserting on an error response.

Author: AndyButland

src/Umbraco.Core/Persistence/Repositories/IPropertyTypeUsageRepository.cs

@@ -1,7 +1,17 @@
 namespace Umbraco.Cms.Core.Persistence.Repositories;
 
+/// <summary>
+/// Defines repository methods for querying property type usage.
+/// </summary>
 public interface IPropertyTypeUsageRepository
 {
+    /// <summary>
+    /// Determines whether there are any saved property values for the specified content type and property alias.
+    /// </summary>
     Task<bool> HasSavedPropertyValuesAsync(Guid contentTypeKey, string propertyAlias);
+
+    /// <summary>
+    /// Determines whether a content type with the specified unique identifier exists.
+    /// </summary>
     Task<bool> ContentTypeExistAsync(Guid contentTypeKey);
 }

src/Umbraco.Core/Services/IPropertyTypeUsageService.cs

@@ -2,6 +2,9 @@
 
 namespace Umbraco.Cms.Core.Services;
 
+/// <summary>
+/// Defines service methods for querying property type usage.
+/// </summary>
 public interface IPropertyTypeUsageService
 {
     /// <summary>

src/Umbraco.Core/Services/PropertyTypeUsageService.cs

@@ -4,19 +4,25 @@
 
 namespace Umbraco.Cms.Core.Services;
 
+/// <inheritdoc/>
 public class PropertyTypeUsageService : IPropertyTypeUsageService
 {
     private readonly IPropertyTypeUsageRepository _propertyTypeUsageRepository;
-    private readonly IContentTypeService _contentTypeService;
     private readonly ICoreScopeProvider _scopeProvider;
 
+    // TODO (V18): Remove IContentTypeService parameter from constructor.
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PropertyTypeUsageService"/> class.
+    /// </summary>
     public PropertyTypeUsageService(
         IPropertyTypeUsageRepository propertyTypeUsageRepository,
+#pragma warning disable IDE0060 // Remove unused parameter
         IContentTypeService contentTypeService,
+#pragma warning restore IDE0060 // Remove unused parameter
         ICoreScopeProvider scopeProvider)
     {
         _propertyTypeUsageRepository = propertyTypeUsageRepository;
-        _contentTypeService = contentTypeService;
         _scopeProvider = scopeProvider;
     }
 

src/Umbraco.Infrastructure/Persistence/Repositories/Implement/PropertyTypeUsageRepository.cs

@@ -1,4 +1,3 @@
-
 using NPoco;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Persistence.Repositories;
@@ -8,28 +7,26 @@
 
 namespace Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement;
 
+/// <inheritdoc/>
 internal sealed class PropertyTypeUsageRepository : IPropertyTypeUsageRepository
 {
-    private static readonly Guid?[] NodeObjectTypes = new Guid?[]
-    {
+    private static readonly List<Guid> _nodeObjectTypes =
+    [
         Constants.ObjectTypes.DocumentType, Constants.ObjectTypes.MediaType, Constants.ObjectTypes.MemberType,
-    };
+    ];
 
     private readonly IScopeAccessor _scopeAccessor;
 
-    public PropertyTypeUsageRepository(IScopeAccessor scopeAccessor)
-    {
-        _scopeAccessor = scopeAccessor;
-    }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PropertyTypeUsageRepository"/> class.
+    /// </summary>
+    public PropertyTypeUsageRepository(IScopeAccessor scopeAccessor) => _scopeAccessor = scopeAccessor;
 
+    /// <inheritdoc/>
     public Task<bool> HasSavedPropertyValuesAsync(Guid contentTypeKey, string propertyAlias)
     {
-        IUmbracoDatabase? database = _scopeAccessor.AmbientScope?.Database;
-
-        if (database is null)
-        {
-            throw new InvalidOperationException("A scope is required to query the database");
-        }
+        IUmbracoDatabase? database = _scopeAccessor.AmbientScope?.Database
+            ?? throw new InvalidOperationException("A scope is required to query the database");
 
         Sql<ISqlContext> selectQuery = database.SqlContext.Sql()
             .SelectAll()
@@ -47,26 +44,21 @@ public Task<bool> HasSavedPropertyValuesAsync(Guid contentTypeKey, string proper
         return Task.FromResult(database.ExecuteScalar<bool>(hasValuesQuery));
     }
 
+    /// <inheritdoc/>
     public Task<bool> ContentTypeExistAsync(Guid contentTypeKey)
     {
-        IUmbracoDatabase? database = _scopeAccessor.AmbientScope?.Database;
-
-        if (database is null)
-        {
-            throw new InvalidOperationException("A scope is required to query the database");
-        }
+        IUmbracoDatabase? database = _scopeAccessor.AmbientScope?.Database
+            ?? throw new InvalidOperationException("A scope is required to query the database");
 
         Sql<ISqlContext> selectQuery = database.SqlContext.Sql()
             .SelectAll()
             .From<NodeDto>("n")
             .Where<NodeDto>(n => n.UniqueId == contentTypeKey, "n")
-            .Where<NodeDto>(n => NodeObjectTypes.Contains(n.NodeObjectType), "n");
+            .WhereIn<NodeDto>(n => n.NodeObjectType, _nodeObjectTypes, "n");
 
         Sql<ISqlContext> hasValuesQuery = database.SqlContext.Sql()
             .SelectAnyIfExists(selectQuery);
 
         return Task.FromResult(database.ExecuteScalar<bool>(hasValuesQuery));
     }
-
-
 }

tests/Umbraco.Tests.Integration/ManagementApi/HealthCheck/ExecuteActionHealthCheckControllerTests.cs

@@ -27,7 +27,7 @@ public async Task Setup()
 
     protected override UserGroupAssertionModel AdminUserGroupAssertionModel => new()
     {
-        ExpectedStatusCode = HttpStatusCode.InternalServerError
+        ExpectedStatusCode = HttpStatusCode.OK
     };
 
     protected override UserGroupAssertionModel EditorUserGroupAssertionModel => new()
@@ -58,7 +58,7 @@ public async Task Setup()
     protected override async Task<HttpResponseMessage> ClientRequest()
     {
         HealthCheckActionRequestModel healthCheckActionRequest =
-            new() { HealthCheck = new ReferenceByIdModel(_dataIntegrityHealthCheckId), ValueRequired = false };
+            new() { HealthCheck = new ReferenceByIdModel(_dataIntegrityHealthCheckId), ValueRequired = false, Alias = "fixContentPaths" };
         return await Client.PostAsync(Url, JsonContent.Create(healthCheckActionRequest));
     }
 }

tests/Umbraco.Tests.Integration/ManagementApi/LogViewer/AllLogViewerControllerTests.cs

@@ -12,7 +12,7 @@ public class AllLogViewerControllerTests : ManagementApiUserGroupTestBase<AllLog
     // We get the InternalServerError for the admin because it has access, but there is no log file to view
     protected override UserGroupAssertionModel AdminUserGroupAssertionModel => new()
     {
-        ExpectedStatusCode = HttpStatusCode.InternalServerError
+        ExpectedStatusCode = HttpStatusCode.OK
     };
 
     protected override UserGroupAssertionModel EditorUserGroupAssertionModel => new()

tests/Umbraco.Tests.Integration/ManagementApi/LogViewer/AllMessageTemplateLogViewerControllerTests.cs

@@ -11,7 +11,7 @@ public class AllMessageTemplateLogViewerControllerTests : ManagementApiUserGroup
     // We get the InternalServerError for the admin because it has access, but there is no log file to view
     protected override UserGroupAssertionModel AdminUserGroupAssertionModel => new()
     {
-        ExpectedStatusCode = HttpStatusCode.InternalServerError
+        ExpectedStatusCode = HttpStatusCode.OK
     };
 
     protected override UserGroupAssertionModel EditorUserGroupAssertionModel => new()

tests/Umbraco.Tests.Integration/ManagementApi/LogViewer/LogLevelCountLogViewerControllerTests.cs

@@ -11,7 +11,7 @@ public class LogLevelCountLogViewerControllerTests : ManagementApiUserGroupTestB
     // We get the InternalServerError for the admin because it has access, but there is no log file to view
     protected override UserGroupAssertionModel AdminUserGroupAssertionModel => new()
     {
-        ExpectedStatusCode = HttpStatusCode.InternalServerError
+        ExpectedStatusCode = HttpStatusCode.OK
     };
 
     protected override UserGroupAssertionModel EditorUserGroupAssertionModel => new()

tests/Umbraco.Tests.Integration/ManagementApi/LogViewer/ValidateLogFileSizeLogViewerControllerTests.cs

@@ -11,7 +11,7 @@ public class ValidateLogFileSizeLogViewerControllerTests: ManagementApiUserGroup
     // We get the InternalServerError for the admin because it has access, but there is no log file to view
     protected override UserGroupAssertionModel AdminUserGroupAssertionModel => new()
     {
-        ExpectedStatusCode = HttpStatusCode.InternalServerError
+        ExpectedStatusCode = HttpStatusCode.OK
     };
 
     protected override UserGroupAssertionModel EditorUserGroupAssertionModel => new()

tests/Umbraco.Tests.Integration/ManagementApi/PropertyType/IsUsedPropertyTypeControllerTests.cs

@@ -36,7 +36,7 @@ public async Task Setup()
 
     protected override UserGroupAssertionModel AdminUserGroupAssertionModel => new()
     {
-        ExpectedStatusCode = HttpStatusCode.InternalServerError
+        ExpectedStatusCode = HttpStatusCode.OK
     };
 
     protected override UserGroupAssertionModel EditorUserGroupAssertionModel => new()