CodeQL 11: chore(tests): replace Returns((T?)null) casts with ReturnsNull()

test/ClinicalScheduler/ClinicalSchedulerTestBase.cs

@@ -1,6 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using MockQueryable.NSubstitute;
 using NSubstitute;
+using NSubstitute.ReturnsExtensions;
 using Viper.Areas.ClinicalScheduler.Services;
 using Viper.Classes.SQLContext;
 using Viper.Models.ClinicalScheduler;
@@ -227,7 +228,7 @@ protected void SetupUserWithoutManagePermission(string userMothraId = TestUserMo
         /// </summary>
         protected void SetupNullUser()
         {
-            MockUserHelper.GetCurrentUser().Returns((AaudUser?)null);
+            MockUserHelper.GetCurrentUser().ReturnsNull();
         }
 
         /// <summary>
@@ -239,7 +240,7 @@ protected void SetupUserWithPermissions(string? userMothraId, IEnumerable<string
         {
             if (userMothraId == null)
             {
-                MockUserHelper.GetCurrentUser().Returns((AaudUser?)null);
+                MockUserHelper.GetCurrentUser().ReturnsNull();
                 return;
             }
 

test/ClinicalScheduler/IntegrationTestBase.cs

@@ -3,6 +3,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using NSubstitute;
+using NSubstitute.ReturnsExtensions;
 using Viper.Areas.ClinicalScheduler.Services;
 using Viper.Classes.SQLContext;
 using Viper.Models.AAUD;
@@ -130,7 +131,7 @@ protected void SetupUserWithPermissionsForIntegration(string? userMothraId, IEnu
         {
             if (userMothraId == null)
             {
-                MockUserHelper.GetCurrentUser().Returns((AaudUser?)null);
+                MockUserHelper.GetCurrentUser().ReturnsNull();
                 return;
             }
 
@@ -238,7 +239,7 @@ protected void SeedCompleteScheduleScenario(int? baseYear = null)
         /// </summary>
         protected void SetupNullUser()
         {
-            MockUserHelper.GetCurrentUser().Returns((AaudUser?)null);
+            MockUserHelper.GetCurrentUser().ReturnsNull();
         }
 
         public void Dispose()

test/Effort/CourseRelationshipsControllerTests.cs

@@ -4,6 +4,7 @@
 using Microsoft.Extensions.Logging;
 using NSubstitute;
 using NSubstitute.ExceptionExtensions;
+using NSubstitute.ReturnsExtensions;
 using Viper.Areas.Effort.Controllers;
 using Viper.Areas.Effort.Models.DTOs.Requests;
 using Viper.Areas.Effort.Models.DTOs.Responses;
@@ -102,7 +103,7 @@ public async Task GetRelationships_ReturnsOk_WithRelationships()
     public async Task GetRelationships_ReturnsNotFound_WhenCourseNotFound()
     {
         // Arrange
-        _courseServiceMock.GetCourseAsync(999, Arg.Any<CancellationToken>()).Returns((CourseDto?)null);
+        _courseServiceMock.GetCourseAsync(999, Arg.Any<CancellationToken>()).ReturnsNull();
 
         // Act
         var actionResult = await _controller.GetRelationships(999);
@@ -439,7 +440,7 @@ public async Task DeleteRelationship_ReturnsNoContent_OnSuccess()
     public async Task DeleteRelationship_ReturnsNotFound_WhenRelationshipNotFound()
     {
         // Arrange
-        _relationshipServiceMock.GetRelationshipAsync(999, Arg.Any<CancellationToken>()).Returns((CourseRelationshipDto?)null);
+        _relationshipServiceMock.GetRelationshipAsync(999, Arg.Any<CancellationToken>()).ReturnsNull();
 
         // Act
         var actionResult = await _controller.DeleteRelationship(1, 999);

test/Effort/CoursesControllerTests.cs

@@ -4,6 +4,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using NSubstitute;
+using NSubstitute.ReturnsExtensions;
 using NSubstitute.ExceptionExtensions;
 using Viper.Areas.Effort.Controllers;
 using Viper.Areas.Effort.Models.DTOs.Requests;
@@ -149,7 +150,7 @@ public async Task GetCourse_ReturnsOk_WhenCourseExists()
     public async Task GetCourse_ReturnsNotFound_WhenCourseDoesNotExist()
     {
         // Arrange
-        _courseServiceMock.GetCourseAsync(999, Arg.Any<CancellationToken>()).Returns((CourseDto?)null);
+        _courseServiceMock.GetCourseAsync(999, Arg.Any<CancellationToken>()).ReturnsNull();
 
         // Act
         var result = await _controller.GetCourse(999);
@@ -402,7 +403,7 @@ public async Task UpdateCourse_ReturnsNotFound_WhenCourseDoesNotExist()
             CustDept = "VME"
         };
 
-        _courseServiceMock.GetCourseAsync(999, Arg.Any<CancellationToken>()).Returns((CourseDto?)null);
+        _courseServiceMock.GetCourseAsync(999, Arg.Any<CancellationToken>()).ReturnsNull();
 
         // Act
         var result = await _controller.UpdateCourse(999, request);
@@ -493,7 +494,7 @@ public async Task UpdateCourseEnrollment_ReturnsNotFound_WhenCourseDoesNotExist(
         // Arrange
         var request = new UpdateEnrollmentRequest { Enrollment = 50 };
 
-        _courseServiceMock.GetCourseAsync(999, Arg.Any<CancellationToken>()).Returns((CourseDto?)null);
+        _courseServiceMock.GetCourseAsync(999, Arg.Any<CancellationToken>()).ReturnsNull();
 
         // Act
         var result = await _controller.UpdateCourseEnrollment(999, request);
@@ -546,7 +547,7 @@ public async Task DeleteCourse_ReturnsNoContent_OnSuccess()
     public async Task DeleteCourse_ReturnsNotFound_WhenCourseDoesNotExist()
     {
         // Arrange
-        _courseServiceMock.GetCourseAsync(999, Arg.Any<CancellationToken>()).Returns((CourseDto?)null);
+        _courseServiceMock.GetCourseAsync(999, Arg.Any<CancellationToken>()).ReturnsNull();
 
         // Act
         var result = await _controller.DeleteCourse(999);
@@ -712,7 +713,7 @@ public async Task ImportCourse_ReturnsNotFound_WhenBannerCourseNotFound()
             Crn = "99999"
         };
 
-        _courseServiceMock.GetBannerCourseAsync(202410, "99999", Arg.Any<CancellationToken>()).Returns((BannerCourseDto?)null);
+        _courseServiceMock.GetBannerCourseAsync(202410, "99999", Arg.Any<CancellationToken>()).ReturnsNull();
 
         // Act
         var result = await _controller.ImportCourse(request);
@@ -852,7 +853,7 @@ public async Task GetCourseEffort_ReturnsCanAddEffortFalse_WhenTermNotEditable()
     public async Task GetCourseEffort_ReturnsNotFound_WhenCourseNotFound()
     {
         // Arrange
-        _courseServiceMock.GetCourseAsync(TestCourseId, Arg.Any<CancellationToken>()).Returns((CourseDto?)null);
+        _courseServiceMock.GetCourseAsync(TestCourseId, Arg.Any<CancellationToken>()).ReturnsNull();
 
         // Act
         var result = await _controller.GetCourseEffort(TestCourseId);
@@ -940,7 +941,7 @@ public async Task GetPossibleInstructors_ReturnsOk_WhenAuthorized()
     public async Task GetPossibleInstructors_ReturnsNotFound_WhenCourseNotFound()
     {
         // Arrange
-        _courseServiceMock.GetCourseAsync(TestCourseId, Arg.Any<CancellationToken>()).Returns((CourseDto?)null);
+        _courseServiceMock.GetCourseAsync(TestCourseId, Arg.Any<CancellationToken>()).ReturnsNull();
 
         // Act
         var result = await _controller.GetPossibleInstructors(TestCourseId);
@@ -995,7 +996,7 @@ public async Task GetCourseEvaluations_ReturnsOk_WhenAuthorized()
     public async Task GetCourseEvaluations_ReturnsNotFound_WhenCourseNotFound()
     {
         // Arrange
-        _courseServiceMock.GetCourseAsync(TestCourseId, Arg.Any<CancellationToken>()).Returns((CourseDto?)null);
+        _courseServiceMock.GetCourseAsync(TestCourseId, Arg.Any<CancellationToken>()).ReturnsNull();
 
         // Act
         var result = await _controller.GetCourseEvaluations(TestCourseId);
@@ -1090,7 +1091,7 @@ await _evalHarvestServiceMock.Received(1).CreateAdHocEvaluationAsync(
     public async Task CreateEvaluation_ReturnsNotFound_WhenCourseNotFound()
     {
         // Arrange
-        _courseServiceMock.GetCourseAsync(TestCourseId, Arg.Any<CancellationToken>()).Returns((CourseDto?)null);
+        _courseServiceMock.GetCourseAsync(TestCourseId, Arg.Any<CancellationToken>()).ReturnsNull();
 
         var request = new CreateAdHocEvalRequest
         {
@@ -1201,7 +1202,7 @@ public async Task UpdateEvaluation_ReturnsOk_WhenSuccessful()
     public async Task UpdateEvaluation_ReturnsNotFound_WhenCourseNotFound()
     {
         // Arrange
-        _courseServiceMock.GetCourseAsync(TestCourseId, Arg.Any<CancellationToken>()).Returns((CourseDto?)null);
+        _courseServiceMock.GetCourseAsync(TestCourseId, Arg.Any<CancellationToken>()).ReturnsNull();
 
         var request = new UpdateAdHocEvalRequest
         {
@@ -1294,7 +1295,7 @@ public async Task DeleteEvaluation_ReturnsNoContent_WhenSuccessful()
     public async Task DeleteEvaluation_ReturnsNotFound_WhenCourseNotFound()
     {
         // Arrange
-        _courseServiceMock.GetCourseAsync(TestCourseId, Arg.Any<CancellationToken>()).Returns((CourseDto?)null);
+        _courseServiceMock.GetCourseAsync(TestCourseId, Arg.Any<CancellationToken>()).ReturnsNull();
 
         // Act
         var result = await _controller.DeleteEvaluation(TestCourseId, TestQuantId);

test/Effort/EffortIntegrationTestBase.cs

@@ -5,6 +5,7 @@
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.DependencyInjection;
 using NSubstitute;
+using NSubstitute.ReturnsExtensions;
 using Viper.Areas.Effort;
 using Viper.Areas.Effort.Constants;
 using Viper.Areas.Effort.Models.Entities;
@@ -339,7 +340,7 @@ protected void SetupUserWithNoPermissions()
     /// </summary>
     protected void SetupNullUser()
     {
-        MockUserHelper.GetCurrentUser().Returns((AaudUser?)null);
+        MockUserHelper.GetCurrentUser().ReturnsNull();
     }
 
     /// <summary>
@@ -349,7 +350,7 @@ protected void SetupUserWithPermissionsForIntegration(string? userMothraId, IEnu
     {
         if (userMothraId == null)
         {
-            MockUserHelper.GetCurrentUser().Returns((AaudUser?)null);
+            MockUserHelper.GetCurrentUser().ReturnsNull();
             return;
         }
 

test/Effort/EffortRecordsControllerTests.cs

@@ -4,6 +4,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using NSubstitute;
+using NSubstitute.ReturnsExtensions;
 using NSubstitute.ExceptionExtensions;
 using Viper.Areas.Effort.Controllers;
 using Viper.Areas.Effort.Exceptions;
@@ -100,7 +101,7 @@ public async Task GetRecord_ReturnsOk_WhenRecordExistsAndAuthorized()
     public async Task GetRecord_ReturnsNotFound_WhenRecordDoesNotExist()
     {
         // Arrange
-        _recordServiceMock.GetEffortRecordAsync(999, Arg.Any<CancellationToken>()).Returns((InstructorEffortRecordDto?)null);
+        _recordServiceMock.GetEffortRecordAsync(999, Arg.Any<CancellationToken>()).ReturnsNull();
 
         // Act
         var result = await _controller.GetRecord(999);
@@ -270,7 +271,7 @@ public async Task UpdateRecord_ReturnsNotFound_WhenRecordDoesNotExist()
             EffortValue = 30
         };
 
-        _recordServiceMock.GetEffortRecordAsync(999, Arg.Any<CancellationToken>()).Returns((InstructorEffortRecordDto?)null);
+        _recordServiceMock.GetEffortRecordAsync(999, Arg.Any<CancellationToken>()).ReturnsNull();
 
         // Act
         var result = await _controller.UpdateRecord(999, request);
@@ -353,7 +354,7 @@ public async Task DeleteRecord_ReturnsNoContent_WhenSuccessful()
     public async Task DeleteRecord_ReturnsNotFound_WhenRecordDoesNotExist()
     {
         // Arrange
-        _recordServiceMock.GetEffortRecordAsync(999, Arg.Any<CancellationToken>()).Returns((InstructorEffortRecordDto?)null);
+        _recordServiceMock.GetEffortRecordAsync(999, Arg.Any<CancellationToken>()).ReturnsNull();
 
         // Act
         var result = await _controller.DeleteRecord(999, null);

test/Effort/EffortTypesControllerTests.cs

@@ -4,6 +4,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using NSubstitute;
+using NSubstitute.ReturnsExtensions;
 using NSubstitute.ExceptionExtensions;
 using Viper.Areas.Effort.Controllers;
 using Viper.Areas.Effort.Models.DTOs.Requests;
@@ -111,7 +112,7 @@ public async Task GetEffortType_ReturnsOk_WhenFound()
     public async Task GetEffortType_ReturnsNotFound_WhenMissing()
     {
         // Arrange
-        _effortTypeServiceMock.GetEffortTypeAsync("XXX", Arg.Any<CancellationToken>()).Returns((EffortTypeDto?)null);
+        _effortTypeServiceMock.GetEffortTypeAsync("XXX", Arg.Any<CancellationToken>()).ReturnsNull();
 
         // Act
         var result = await _controller.GetEffortType("XXX", CancellationToken.None);
@@ -217,7 +218,7 @@ public async Task UpdateEffortType_ReturnsNotFound_WhenMissing()
             AllowedOn199299 = false,
             AllowedOnRCourses = false
         };
-        _effortTypeServiceMock.UpdateEffortTypeAsync("XXX", request, Arg.Any<CancellationToken>()).Returns((EffortTypeDto?)null);
+        _effortTypeServiceMock.UpdateEffortTypeAsync("XXX", request, Arg.Any<CancellationToken>()).ReturnsNull();
 
         // Act
         var result = await _controller.UpdateEffortType("XXX", request, CancellationToken.None);
@@ -297,7 +298,7 @@ public async Task DeleteEffortType_ReturnsNoContent_OnSuccess()
     public async Task DeleteEffortType_ReturnsNotFound_WhenMissing()
     {
         // Arrange
-        _effortTypeServiceMock.GetEffortTypeAsync("XXX", Arg.Any<CancellationToken>()).Returns((EffortTypeDto?)null);
+        _effortTypeServiceMock.GetEffortTypeAsync("XXX", Arg.Any<CancellationToken>()).ReturnsNull();
 
         // Act
         var result = await _controller.DeleteEffortType("XXX", CancellationToken.None);
@@ -397,7 +398,7 @@ public async Task CanDeleteEffortType_ReturnsCanDeleteTrue_WhenZeroUsage()
     public async Task CanDeleteEffortType_ReturnsNotFound_WhenMissing()
     {
         // Arrange
-        _effortTypeServiceMock.GetEffortTypeAsync("XXX", Arg.Any<CancellationToken>()).Returns((EffortTypeDto?)null);
+        _effortTypeServiceMock.GetEffortTypeAsync("XXX", Arg.Any<CancellationToken>()).ReturnsNull();
 
         // Act
         var result = await _controller.CanDeleteEffortType("XXX", CancellationToken.None);

test/Effort/InstructorsControllerTests.cs

@@ -4,6 +4,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using NSubstitute;
+using NSubstitute.ReturnsExtensions;
 using NSubstitute.ExceptionExtensions;
 using Viper.Areas.Effort.Controllers;
 using Viper.Areas.Effort.Models.DTOs.Requests;
@@ -132,7 +133,7 @@ public async Task GetInstructor_ReturnsOk_WhenInstructorExists()
     public async Task GetInstructor_ReturnsNotFound_WhenInstructorDoesNotExist()
     {
         // Arrange
-        _instructorServiceMock.GetInstructorAsync(999, 202410, Arg.Any<CancellationToken>()).Returns((PersonDto?)null);
+        _instructorServiceMock.GetInstructorAsync(999, 202410, Arg.Any<CancellationToken>()).ReturnsNull();
 
         // Act
         var result = await _controller.GetInstructor(999, 202410);
@@ -318,7 +319,7 @@ public async Task UpdateInstructor_ReturnsNotFound_WhenInstructorDoesNotExist()
             VolunteerWos = false
         };
 
-        _instructorServiceMock.GetInstructorAsync(999, 202410, Arg.Any<CancellationToken>()).Returns((PersonDto?)null);
+        _instructorServiceMock.GetInstructorAsync(999, 202410, Arg.Any<CancellationToken>()).ReturnsNull();
 
         // Act
         var result = await _controller.UpdateInstructor(999, 202410, request);
@@ -377,7 +378,7 @@ public async Task DeleteInstructor_ReturnsNoContent_OnSuccess()
     public async Task DeleteInstructor_ReturnsNotFound_WhenInstructorDoesNotExist()
     {
         // Arrange
-        _instructorServiceMock.GetInstructorAsync(999, 202410, Arg.Any<CancellationToken>()).Returns((PersonDto?)null);
+        _instructorServiceMock.GetInstructorAsync(999, 202410, Arg.Any<CancellationToken>()).ReturnsNull();
 
         // Act
         var result = await _controller.DeleteInstructor(999, 202410);
@@ -529,7 +530,7 @@ public async Task GetInstructorEffortRecords_ReturnsOk_WithEffortRecords()
     public async Task GetInstructorEffortRecords_ReturnsNotFound_WhenInstructorDoesNotExist()
     {
         // Arrange
-        _instructorServiceMock.GetInstructorAsync(999, 202410, Arg.Any<CancellationToken>()).Returns((PersonDto?)null);
+        _instructorServiceMock.GetInstructorAsync(999, 202410, Arg.Any<CancellationToken>()).ReturnsNull();
 
         // Act
         var result = await _controller.GetInstructorEffortRecords(999, 202410);

test/Effort/PercentAssignTypesControllerTests.cs

@@ -3,6 +3,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using NSubstitute;
+using NSubstitute.ReturnsExtensions;
 using Viper.Areas.Effort.Controllers;
 using Viper.Areas.Effort.Models.DTOs.Responses;
 using Viper.Areas.Effort.Services;
@@ -122,7 +123,7 @@ public async Task GetPercentAssignType_ReturnsOk_WhenFound()
     public async Task GetPercentAssignType_ReturnsNotFound_WhenMissing()
     {
         // Arrange
-        _typeServiceMock.GetPercentAssignTypeAsync(999, Arg.Any<CancellationToken>()).Returns((PercentAssignTypeDto?)null);
+        _typeServiceMock.GetPercentAssignTypeAsync(999, Arg.Any<CancellationToken>()).ReturnsNull();
 
         // Act
         var result = await _controller.GetPercentAssignType(999, CancellationToken.None);
@@ -201,7 +202,7 @@ public async Task GetInstructorsByType_ReturnsOk_WithInstructors()
     public async Task GetInstructorsByType_ReturnsNotFound_WhenTypeMissing()
     {
         // Arrange
-        _typeServiceMock.GetInstructorsByTypeAsync(999, Arg.Any<CancellationToken>()).Returns((InstructorsByPercentAssignTypeResponseDto?)null);
+        _typeServiceMock.GetInstructorsByTypeAsync(999, Arg.Any<CancellationToken>()).ReturnsNull();
 
         // Act
         var result = await _controller.GetInstructorsByType(999, CancellationToken.None);

test/Effort/PercentagesControllerTests.cs

@@ -4,6 +4,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using NSubstitute;
+using NSubstitute.ReturnsExtensions;
 using NSubstitute.ExceptionExtensions;
 using Viper.Areas.Effort.Controllers;
 using Viper.Areas.Effort.Models.DTOs.Requests;
@@ -153,7 +154,7 @@ public async Task GetPercentage_ReturnsOk_WhenPercentageExistsAndAuthorized()
     public async Task GetPercentage_ReturnsNotFound_WhenPercentageDoesNotExist()
     {
         // Arrange
-        _percentageServiceMock.GetPercentageAsync(999, Arg.Any<CancellationToken>()).Returns((PercentageDto?)null);
+        _percentageServiceMock.GetPercentageAsync(999, Arg.Any<CancellationToken>()).ReturnsNull();
 
         // Act
         var result = await _controller.GetPercentage(999);
@@ -398,7 +399,7 @@ public async Task UpdatePercentage_ReturnsNotFound_WhenPercentageDoesNotExist()
         // Arrange
         var request = CreateTestUpdateRequest();
 
-        _percentageServiceMock.GetPercentageAsync(999, Arg.Any<CancellationToken>()).Returns((PercentageDto?)null);
+        _percentageServiceMock.GetPercentageAsync(999, Arg.Any<CancellationToken>()).ReturnsNull();
 
         // Act
         var result = await _controller.UpdatePercentage(999, request);
@@ -525,7 +526,7 @@ public async Task DeletePercentage_ReturnsNoContent_WhenSuccessful()
     public async Task DeletePercentage_ReturnsNotFound_WhenPercentageDoesNotExist()
     {
         // Arrange
-        _percentageServiceMock.GetPercentageAsync(999, Arg.Any<CancellationToken>()).Returns((PercentageDto?)null);
+        _percentageServiceMock.GetPercentageAsync(999, Arg.Any<CancellationToken>()).ReturnsNull();
 
         // Act
         var result = await _controller.DeletePercentage(999);