All tests were changed due to Nunit lib changing

StructureHelperTests/UnitTests/Ndms/Cracks/CrackWidthLogicSP63Test.cs

@@ -30,7 +30,7 @@ namespace StructureHelperTests.UnitTests.Ndms.Cracks
             //Act
             var width = logic.GetCrackWidth();
             //Assert
-            Assert.AreEqual(expectedWidth, width, 0.000001d);
+            Assert.That(width, Is.EqualTo(expectedWidth).Within(0.000001d));
         }
 
     }

StructureHelperTests/UnitTests/Ndms/Cracks/EquivalentDiameterLogicTest.cs

@@ -30,7 +30,7 @@ namespace StructureHelperTests.UnitTests.Ndms.Cracks
             //Act
             var eqDiametr = logic.GetAverageDiameter();
             //Assert
-            Assert.AreEqual(expectedDiameter, eqDiametr, 0.0001d);
+            Assert.That(eqDiametr, Is.EqualTo(expectedDiameter).Within(0.0001d));
         }
     }
 }

StructureHelperTests/UnitTests/Ndms/Cracks/InputDataTests/CheckTupleCalculatorInputDataTests.cs

@@ -28,7 +28,7 @@ public class CheckTupleCalculatorInputDataTests
         var result = _checkTupleCalculatorInputData.Check();
 
         // Assert
-        Assert.IsFalse(result);
+        Assert.That(result, Is.False);
         Assert.That(_checkTupleCalculatorInputData.CheckResult, Is.EqualTo(ErrorStrings.ParameterIsNull + ": InputData"));
     }
 
@@ -46,7 +46,7 @@ public class CheckTupleCalculatorInputDataTests
         var result = _checkTupleCalculatorInputData.Check();
 
         // Assert
-        Assert.IsFalse(result);
+        Assert.That(result, Is.False);
         Assert.That(_checkTupleCalculatorInputData.CheckResult, Is.EqualTo("Collection does not have any primitives"));
     }
 
@@ -64,7 +64,7 @@ public class CheckTupleCalculatorInputDataTests
         var result = _checkTupleCalculatorInputData.Check();
 
         // Assert
-        Assert.IsFalse(result);
+        Assert.That(result, Is.False);
         Assert.That(_checkTupleCalculatorInputData.CheckResult, Is.EqualTo("User crack input data is null"));
     }
 
@@ -82,7 +82,7 @@ public class CheckTupleCalculatorInputDataTests
         var result = _checkTupleCalculatorInputData.Check();
 
         // Assert
-        Assert.IsTrue(result);
+        Assert.That(result, Is.True);
         Assert.That(_checkTupleCalculatorInputData.CheckResult, Is.EqualTo(string.Empty));
     }
 };

StructureHelperTests/UnitTests/Ndms/Cracks/RebarCalulatorsFactoryTests.cs

@@ -38,9 +38,9 @@ namespace StructureHelperTests.UnitTests.Ndms.Cracks
 
             // Assert
             var calculator = calculators[0];
-            Assert.NotNull(calculator);
-            Assert.AreEqual(rebarCrackInputData, calculator.InputData);
-            Assert.Null(calculator.TraceLogger);
+            Assert.That(calculator, Is.Not.Null);
+            Assert.That(calculator.InputData, Is.EqualTo(rebarCrackInputData));
+            Assert.That(calculator.TraceLogger, Is.Null);
         }
 
         [Test]
@@ -75,8 +75,8 @@ namespace StructureHelperTests.UnitTests.Ndms.Cracks
             var calculators = factory.GetCalculators();
 
             // Assert
-            Assert.AreEqual(2, calculators.Count);
-            Assert.AreEqual(rebarInputData1, calculators[0].InputData);
+            Assert.That(calculators.Count, Is.EqualTo(2));
+            Assert.That(calculators[0].InputData, Is.EqualTo(rebarInputData1));
             //Assert.AreEqual(rebarInputData2, calculators[1].InputData);
             //Assert.AreEqual(mockLogger.Object, calculators[0].TraceLogger);
             //Assert.AreEqual(mockLogger.Object, calculators[1].TraceLogger);

StructureHelperTests/UnitTests/Ndms/Cracks/RebarStressResultLogicTests.cs

@@ -46,8 +46,8 @@ namespace StructureHelperTests.UnitTests.Ndms.Cracks
             // Act
             var result = _rebarStressResultLogic.GetRebarStressResult();
 
-            // Assert
-            Assert.AreEqual(mockRebarStressResult, result);
+            // Assert;
+            Assert.That(result, Is.EqualTo(mockRebarStressResult));
             _mockRebarStressCalculator.Verify(x => x.Run(), Times.Once);
         }
 

StructureHelperTests/UnitTests/Ndms/Cracks/TensionREbarAreaSumLogicTest.cs

@@ -46,7 +46,7 @@ namespace StructureHelperTests.UnitTests.Ndms.Cracks
             // Assert
             // Expected result calculation:
             // rebarArea = 1.0 * 1.0 + 2.0 * 1.0 + 3.0 * 1.0 = 6.0
-            Assert.AreEqual(6.0, result);
+            Assert.That(result, Is.EqualTo(6.0));
 
         }
 
@@ -76,7 +76,7 @@ namespace StructureHelperTests.UnitTests.Ndms.Cracks
 
             // Act & Assert
             var ex = Assert.Throws<StructureHelperException>(() => logic.GetTensionRebarArea());
-            StringAssert.Contains("Collection of rebars does not contain any tensile rebars", ex.Message);
+            Assert.That(ex.Message, Does.Contain("Collection of rebars does not contain any tensile rebars"));
         }
     }
 }

StructureHelperTests/UnitTests/Ndms/Cracks/TensionRebarAreaByStrainLogicTest.cs

@@ -53,7 +53,7 @@ namespace StructureHelperTests.UnitTests.Ndms.Cracks
             // reducedArea for rebar 2 = 2.0 * 1.0 / 1.5 = 1.333...
             // reducedArea for rebar 3 = 3.0 * 1.5 / 1.5 = 3.0
             // sumArea = 0.333... + 1.333... + 3.0 = 4.666...
-            Assert.AreEqual(4.666666666666667, result, 9);
+            Assert.That(result, Is.EqualTo(4.666666666666667).Within(9));
         }
         [Test]
         public void GetTensionRebarArea_ShouldThrowException_WhenNoRebarsInTension()
@@ -81,7 +81,8 @@ namespace StructureHelperTests.UnitTests.Ndms.Cracks
 
             // Act & Assert
             var ex = Assert.Throws<StructureHelperException>(() => logic.GetTensionRebarArea());
-            StringAssert.Contains("Collection of rebars does not contain any tensile rebars", ex.Message);
+            Assert.That(ex.Message, Does.Contain("Collection of rebars does not contain any tensile rebars"));
+
 
         }
     }

StructureHelperTests/UnitTests/Ndms/Cracks/TupleRebarCrackSolverTest.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Moq;
 using NUnit.Framework;
+using StructureHelperCommon.Models.Calculators;
 using StructureHelperLogics.NdmCalculations.Cracking;
 using StructureHelperLogics.NdmCalculations.Primitives;
 
@@ -37,9 +38,9 @@ namespace StructureHelperTests.UnitTests.Ndms.Cracks
 
             // Assert
             mockCalculator.Verify(c => c.Run(), Times.Once);
-            Assert.True(solver.IsResultValid);
-            Assert.NotNull(solver.Result);
-            Assert.True(solver.Result.All(r => r.IsValid));
+            Assert.That(solver.IsResultValid, Is.True);
+            Assert.That(solver.Result, Is.Not.Null);
+            Assert.That(solver.Result.All(r => r.IsValid), Is.True);
         }
 
         [Test]
@@ -73,7 +74,7 @@ namespace StructureHelperTests.UnitTests.Ndms.Cracks
             // Assert
             mockCalculator1.Verify(c => c.Run(), Times.Once);
             mockCalculator2.Verify(c => c.Run(), Times.Once);
-            Assert.False(solver.IsResultValid);
+            Assert.That(solver.IsResultValid, Is.False);
         }
     }
 }