TD-5168 Investigate the build failure for the dependabot Pull Request

sherif-olaboye · sherif-olaboye · commit a4fffacc0343 · 2024-12-24T10:16:30.000Z
diff --git a/DigitalLearningSolutions.Web.Tests/Controllers/Login/LoginControllerTests.cs b/DigitalLearningSolutions.Web.Tests/Controllers/Login/LoginControllerTests.cs
@@ -138,7 +138,7 @@ public async Task Invalid_model_should_render_basic_form_with_error()
 
             // Then
             result.Should().BeViewResult().WithViewName("Index").ModelAs<LoginViewModel>();
-            Assert.IsFalse(controller.ModelState.IsValid);
+            Assert.That(controller.ModelState.IsValid, Is.False);
         }
 
         [Test]
@@ -263,7 +263,7 @@ public async Task Invalid_credentials_should_render_basic_form_with_error()
 
             // Then
             result.Should().BeViewResult().WithViewName("Index").ModelAs<LoginViewModel>();
-            Assert.IsFalse(controller.ModelState.IsValid);
+            Assert.That(controller.ModelState.IsValid, Is.False);
         }
 
         [Test]
@@ -279,7 +279,7 @@ public async Task Login_to_unclaimed_delegate_account_should_render_basic_form_w
 
             // Then
             result.Should().BeViewResult().WithViewName("Index").ModelAs<LoginViewModel>();
-            Assert.IsFalse(controller.ModelState.IsValid);
+            Assert.That(controller.ModelState.IsValid, Is.False);
         }
 
         [Test]
diff --git a/DigitalLearningSolutions.Web.Tests/Controllers/Register/ClaimAccountControllerTests.cs b/DigitalLearningSolutions.Web.Tests/Controllers/Register/ClaimAccountControllerTests.cs
@@ -515,7 +515,7 @@ public async Task CompleteRegistrationPost_with_invalid_model_display_with_valid
                 .ModelAs<ClaimAccountCompleteRegistrationViewModel>().Should()
                 .BeEquivalentTo(completeRegistrationViewModel);
 
-            Assert.IsFalse(controller.ModelState.IsValid);
+            Assert.That(controller.ModelState.IsValid, Is.False);
         }
 
         [Test]
diff --git a/DigitalLearningSolutions.Web.Tests/Controllers/SupervisorController/SupervisorControllerTests.cs b/DigitalLearningSolutions.Web.Tests/Controllers/SupervisorController/SupervisorControllerTests.cs
@@ -150,8 +150,8 @@ public void ExportCandidateAssessment_should_return_file_object_with_file_name_i
             // Assert
             Assert.Multiple(() =>
             {
-                Assert.IsNotNull(result);
-                Assert.AreEqual(expectedFileName, result!.FileDownloadName);
+                Assert.That(result, Is.Not.Null);
+                Assert.That(result!.FileDownloadName, Is.EqualTo(expectedFileName));
             });
         }
 
diff --git a/DigitalLearningSolutions.Web.Tests/Controllers/TrackingSystem/Centre/Configuration/CentreConfigurationControllerTests.cs b/DigitalLearningSolutions.Web.Tests/Controllers/TrackingSystem/Centre/Configuration/CentreConfigurationControllerTests.cs
@@ -87,7 +87,7 @@ public void EditCentreWebsiteDetails_should_show_validation_error_to_user_when_g
             // Then
             result.Should().BeViewResult().WithDefaultViewName()
                 .ModelAs<EditCentreWebsiteDetailsViewModel>();
-            Assert.IsFalse(controller.ModelState.IsValid);
+            Assert.That(controller.ModelState.IsValid, Is.False);
         }
 
         [TestCase("OVER_DAILY_LIMIT")]
diff --git a/DigitalLearningSolutions.Web.Tests/Controllers/TrackingSystem/Delegates/DeactivateDelegateControllerTests.cs b/DigitalLearningSolutions.Web.Tests/Controllers/TrackingSystem/Delegates/DeactivateDelegateControllerTests.cs
@@ -96,7 +96,7 @@ public void Index_post_returns_error_when_no_option_selected_to_deactivate()
 
             // Then
             result.Should().BeViewResult().ModelAs<DeactivateDelegateAccountViewModel>().DelegateId.Should().Be(DelegateId);
-            Assert.IsFalse(controller.ModelState.IsValid);
+            Assert.That(controller.ModelState.IsValid, Is.False);
         }
 
 
diff --git a/DigitalLearningSolutions.Web.Tests/Controllers/TrackingSystem/Delegates/EnrolControllerTests.cs b/DigitalLearningSolutions.Web.Tests/Controllers/TrackingSystem/Delegates/EnrolControllerTests.cs
@@ -72,7 +72,7 @@ public void StartEnrolProcess_calls_expected_methods_and_returns_view()
 
                 result.Should().BeRedirectToActionResult().WithActionName("Index");
 
-                Assert.AreEqual(0, tempDataDictionary.Keys.Count);
+                Assert.That(tempDataDictionary.Keys.Count, Is.EqualTo(0));
             }
         }
     }
diff --git a/DigitalLearningSolutions.Web.Tests/DigitalLearningSolutions.Web.Tests.csproj b/DigitalLearningSolutions.Web.Tests/DigitalLearningSolutions.Web.Tests.csproj
@@ -12,7 +12,7 @@
     <PackageReference Include="FluentAssertions" Version="5.10.3" />
     <PackageReference Include="FluentAssertions.AspNetCore.Mvc" Version="3.2.0" />
     <PackageReference Include="NBuilder" Version="6.1.0" />
-    <PackageReference Include="NUnit" Version="3.14.0" />
+    <PackageReference Include="NUnit" Version="4.3.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
   </ItemGroup>
diff --git a/DigitalLearningSolutions.Web.Tests/Services/CryptoServiceTests.cs b/DigitalLearningSolutions.Web.Tests/Services/CryptoServiceTests.cs
@@ -20,7 +20,7 @@ public void VerifyHashedPassword_Returns_false_if_hashed_password_is_empty()
             var passwordIsCorrect = cryptoService.VerifyHashedPassword(null, "password");
 
             // Then
-            Assert.IsFalse(passwordIsCorrect);
+            Assert.That(passwordIsCorrect, Is.False);
         }
 
         [Test]
@@ -32,7 +32,7 @@ public void VerifyHashedPassword_Returns_true_for_hash_from_GetPasswordHash()
             var passwordIsCorrect = cryptoService.VerifyHashedPassword(passwordHash, password);
 
             // Then
-            Assert.IsTrue(passwordIsCorrect);
+            Assert.That(passwordIsCorrect, Is.True);
         }
     }
 }
diff --git a/DigitalLearningSolutions.Web.Tests/Services/FreshdeskServiceTests.cs b/DigitalLearningSolutions.Web.Tests/Services/FreshdeskServiceTests.cs
@@ -40,7 +40,7 @@ public void CreateNewTicket_returns_ticket_id_API_success()
             var apiResponse = freshdeskService.CreateNewTicket(ticketRequest);
 
             //Assert 
-            Assert.AreEqual(expectedResponse, apiResponse);
+            Assert.That(apiResponse, Is.EqualTo(expectedResponse));
         }
         [Test]
         public void CreateNewTicket_returns_API_Authentication_error()
@@ -60,7 +60,7 @@ public void CreateNewTicket_returns_API_Authentication_error()
             var apiResponse = freshdeskService.CreateNewTicket(ticketRequest);
 
             //Assert 
-            Assert.AreEqual(expectedResponse, apiResponse);
+            Assert.That(apiResponse, Is.EqualTo(expectedResponse));
         }
         [Test]
         public void CreateNewTicket_returns_API_error()
@@ -80,7 +80,7 @@ public void CreateNewTicket_returns_API_error()
             var apiResponse = freshdeskService.CreateNewTicket(ticketRequest);
 
             //Assert 
-            Assert.AreEqual(expectedResponse, apiResponse);
+            Assert.That(apiResponse, Is.EqualTo(expectedResponse));
         }
         [Test]
         public async Task CreateNewTicket_returns_API_data_if_retrieved()
@@ -100,7 +100,7 @@ public async Task CreateNewTicket_returns_API_data_if_retrieved()
             var apiResponse = freshdeskService.CreateNewTicket(ticketRequest);
 
             //Assert 
-            Assert.AreEqual(expectedResponse, apiResponse);
+            Assert.That(apiResponse, Is.EqualTo(expectedResponse));
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ public async Task Invalid_model_should_render_basic_form_with_error()`
`138`	`138`
`139`	`139`	`// Then`
`140`	`140`	`result.Should().BeViewResult().WithViewName("Index").ModelAs<LoginViewModel>();`
`141`		`- Assert.IsFalse(controller.ModelState.IsValid);`
	`141`	`+ Assert.That(controller.ModelState.IsValid, Is.False);`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`[Test]`
`@@ -263,7 +263,7 @@ public async Task Invalid_credentials_should_render_basic_form_with_error()`
`263`	`263`
`264`	`264`	`// Then`
`265`	`265`	`result.Should().BeViewResult().WithViewName("Index").ModelAs<LoginViewModel>();`
`266`		`- Assert.IsFalse(controller.ModelState.IsValid);`
	`266`	`+ Assert.That(controller.ModelState.IsValid, Is.False);`
`267`	`267`	`}`
`268`	`268`
`269`	`269`	`[Test]`
`@@ -279,7 +279,7 @@ public async Task Login_to_unclaimed_delegate_account_should_render_basic_form_w`
`279`	`279`
`280`	`280`	`// Then`
`281`	`281`	`result.Should().BeViewResult().WithViewName("Index").ModelAs<LoginViewModel>();`
`282`		`- Assert.IsFalse(controller.ModelState.IsValid);`
	`282`	`+ Assert.That(controller.ModelState.IsValid, Is.False);`
`283`	`283`	`}`
`284`	`284`
`285`	`285`	`[Test]`
Original file line number	Diff line number	Diff line change
`@@ -515,7 +515,7 @@ public async Task CompleteRegistrationPost_with_invalid_model_display_with_valid`
`515`	`515`	`.ModelAs<ClaimAccountCompleteRegistrationViewModel>().Should()`
`516`	`516`	`.BeEquivalentTo(completeRegistrationViewModel);`
`517`	`517`
`518`		`- Assert.IsFalse(controller.ModelState.IsValid);`
	`518`	`+ Assert.That(controller.ModelState.IsValid, Is.False);`
`519`	`519`	`}`
`520`	`520`
`521`	`521`	`[Test]`
Original file line number	Diff line number	Diff line change
`@@ -150,8 +150,8 @@ public void ExportCandidateAssessment_should_return_file_object_with_file_name_i`
`150`	`150`	`// Assert`
`151`	`151`	`Assert.Multiple(() =>`
`152`	`152`	`{`
`153`		`- Assert.IsNotNull(result);`
`154`		`- Assert.AreEqual(expectedFileName, result!.FileDownloadName);`
	`153`	`+ Assert.That(result, Is.Not.Null);`
	`154`	`+ Assert.That(result!.FileDownloadName, Is.EqualTo(expectedFileName));`
`155`	`155`	`});`
`156`	`156`	`}`
`157`	`157`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public void EditCentreWebsiteDetails_should_show_validation_error_to_user_when_g`
`87`	`87`	`// Then`
`88`	`88`	`result.Should().BeViewResult().WithDefaultViewName()`
`89`	`89`	`.ModelAs<EditCentreWebsiteDetailsViewModel>();`
`90`		`- Assert.IsFalse(controller.ModelState.IsValid);`
	`90`	`+ Assert.That(controller.ModelState.IsValid, Is.False);`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`[TestCase("OVER_DAILY_LIMIT")]`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ public void Index_post_returns_error_when_no_option_selected_to_deactivate()`
`96`	`96`
`97`	`97`	`// Then`
`98`	`98`	`result.Should().BeViewResult().ModelAs<DeactivateDelegateAccountViewModel>().DelegateId.Should().Be(DelegateId);`
`99`		`- Assert.IsFalse(controller.ModelState.IsValid);`
	`99`	`+ Assert.That(controller.ModelState.IsValid, Is.False);`
`100`	`100`	`}`
`101`	`101`
`102`	`102`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public void StartEnrolProcess_calls_expected_methods_and_returns_view()`
`72`	`72`
`73`	`73`	`result.Should().BeRedirectToActionResult().WithActionName("Index");`
`74`	`74`
`75`		`- Assert.AreEqual(0, tempDataDictionary.Keys.Count);`
	`75`	`+ Assert.That(tempDataDictionary.Keys.Count, Is.EqualTo(0));`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public void VerifyHashedPassword_Returns_false_if_hashed_password_is_empty()`
`20`	`20`	`var passwordIsCorrect = cryptoService.VerifyHashedPassword(null, "password");`
`21`	`21`
`22`	`22`	`// Then`
`23`		`- Assert.IsFalse(passwordIsCorrect);`
	`23`	`+ Assert.That(passwordIsCorrect, Is.False);`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`[Test]`
`@@ -32,7 +32,7 @@ public void VerifyHashedPassword_Returns_true_for_hash_from_GetPasswordHash()`
`32`	`32`	`var passwordIsCorrect = cryptoService.VerifyHashedPassword(passwordHash, password);`
`33`	`33`
`34`	`34`	`// Then`
`35`		`- Assert.IsTrue(passwordIsCorrect);`
	`35`	`+ Assert.That(passwordIsCorrect, Is.True);`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public void CreateNewTicket_returns_ticket_id_API_success()`
`40`	`40`	`var apiResponse = freshdeskService.CreateNewTicket(ticketRequest);`
`41`	`41`
`42`	`42`	`//Assert`
`43`		`- Assert.AreEqual(expectedResponse, apiResponse);`
	`43`	`+ Assert.That(apiResponse, Is.EqualTo(expectedResponse));`
`44`	`44`	`}`
`45`	`45`	`[Test]`
`46`	`46`	`public void CreateNewTicket_returns_API_Authentication_error()`
`@@ -60,7 +60,7 @@ public void CreateNewTicket_returns_API_Authentication_error()`
`60`	`60`	`var apiResponse = freshdeskService.CreateNewTicket(ticketRequest);`
`61`	`61`
`62`	`62`	`//Assert`
`63`		`- Assert.AreEqual(expectedResponse, apiResponse);`
	`63`	`+ Assert.That(apiResponse, Is.EqualTo(expectedResponse));`
`64`	`64`	`}`
`65`	`65`	`[Test]`
`66`	`66`	`public void CreateNewTicket_returns_API_error()`
`@@ -80,7 +80,7 @@ public void CreateNewTicket_returns_API_error()`
`80`	`80`	`var apiResponse = freshdeskService.CreateNewTicket(ticketRequest);`
`81`	`81`
`82`	`82`	`//Assert`
`83`		`- Assert.AreEqual(expectedResponse, apiResponse);`
	`83`	`+ Assert.That(apiResponse, Is.EqualTo(expectedResponse));`
`84`	`84`	`}`
`85`	`85`	`[Test]`
`86`	`86`	`public async Task CreateNewTicket_returns_API_data_if_retrieved()`
`@@ -100,7 +100,7 @@ public async Task CreateNewTicket_returns_API_data_if_retrieved()`
`100`	`100`	`var apiResponse = freshdeskService.CreateNewTicket(ticketRequest);`
`101`	`101`
`102`	`102`	`//Assert`
`103`		`- Assert.AreEqual(expectedResponse, apiResponse);`
	`103`	`+ Assert.That(apiResponse, Is.EqualTo(expectedResponse));`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`	`}`