avpon/StructureHelper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

All tests were changed due to Nunit lib changing

Browse Source
This commit is contained in:
Evgeny Redikultsev
2024-12-18 22:16:50 +05:00
parent 0538c6b53c
commit a14433f3cb
43 changed files with 206 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
StructureHelperTests/UnitTests/Ndms/CheckPrimitiveCollectionLogicTests.cs
View File

@@ -42,7 +42,7 @@ namespace StructureHelperTests.UnitTests.Ndms
var result = _mockCheckPrimitiveCollectionLogic.Object.Check();
// Assert
Assert.IsFalse(result);
Assert.That(result, Is.False);
Assert.That(_mockCheckPrimitiveCollectionLogic.Object.CheckResult, Is.EqualTo("Calculator does not contain any primitives\n"));
//_mockTraceLogger.Verify(x => x.AddMessage("Calculator does not contain any primitives\n", TraceLogStatuses.Error), Times.Once);
}
@@ -60,7 +60,7 @@ namespace StructureHelperTests.UnitTests.Ndms
var result = _mockCheckPrimitiveCollectionLogic.Object.Check();
// Assert
Assert.IsFalse(result);
Assert.That(result, Is.False);
Assert.That(_mockCheckPrimitiveCollectionLogic.Object.CheckResult, Is.EqualTo("Rebar check failed\n"));
}
@@ -82,7 +82,7 @@ namespace StructureHelperTests.UnitTests.Ndms
var result = _mockCheckPrimitiveCollectionLogic.Object.Check();
// Assert
Assert.IsFalse(result);
Assert.That(result, Is.False);
Assert.That(_mockCheckPrimitiveCollectionLogic.Object.CheckResult, Is.EqualTo("Host RebarName (HostPrimitiveName) is not included in primitives\n"));
//_mockTraceLogger.Verify(x => x.AddMessage("Host RebarName (HostPrimitiveName) is not included in primitives\n", TraceLogStatuses.Error), Times.Once);
}
@@ -104,7 +104,7 @@ namespace StructureHelperTests.UnitTests.Ndms
var result = _mockCheckPrimitiveCollectionLogic.Object.Check();
// Assert
Assert.IsTrue(result);
Assert.That(result, Is.True);
Assert.That(_mockCheckPrimitiveCollectionLogic.Object.CheckResult, Is.EqualTo(string.Empty));
}
}

4
StructureHelperTests/UnitTests/Ndms/CheckRebarPrimitiveLogicTests.cs
View File

@@ -46,7 +46,7 @@ namespace StructureHelperTests.UnitTests.Ndms
var result = _checkRebarPrimitiveLogic.Check();
// Assert
Assert.IsFalse(result);
Assert.That(result, Is.False);
Assert.That(_checkRebarPrimitiveLogic.CheckResult, Is.EqualTo("Primitive RebarName does not have a host\n"));
//_mockTraceLogger.Verify(x => x.AddMessage("Primitive RebarName does not have a host\n", TraceLogStatuses.Error), Times.Once);
}
@@ -84,7 +84,7 @@ namespace StructureHelperTests.UnitTests.Ndms
var result = _checkRebarPrimitiveLogic.Check();
// Assert
Assert.IsFalse(result);
Assert.That(result, Is.False);
Assert.That(_checkRebarPrimitiveLogic.CheckResult, Is.EqualTo("Material of host of RebarName () does not support cracking\n"));
//_mockTraceLogger.Verify(x => x.AddMessage("Material of host of RebarName () does not support cracking\n", TraceLogStatuses.Error), Times.Once);
}

2
StructureHelperTests/UnitTests/Ndms/Cracks/CrackWidthLogicSP63Test.cs
View File

@@ -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));
}
}

2
StructureHelperTests/UnitTests/Ndms/Cracks/EquivalentDiameterLogicTest.cs
View File

@@ -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));
}
}
}

8
StructureHelperTests/UnitTests/Ndms/Cracks/InputDataTests/CheckTupleCalculatorInputDataTests.cs
View File

@@ -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));
}
};

10
StructureHelperTests/UnitTests/Ndms/Cracks/RebarCalulatorsFactoryTests.cs
View File

@@ -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);

4
StructureHelperTests/UnitTests/Ndms/Cracks/RebarStressResultLogicTests.cs
View File

@@ -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);
}

4
StructureHelperTests/UnitTests/Ndms/Cracks/TensionREbarAreaSumLogicTest.cs
View File

@@ -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"));
}
}
}

5
StructureHelperTests/UnitTests/Ndms/Cracks/TensionRebarAreaByStrainLogicTest.cs
View File

@@ -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"));
}
}

9
StructureHelperTests/UnitTests/Ndms/Cracks/TupleRebarCrackSolverTest.cs
View File

@@ -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);
}
}
}

26
StructureHelperTests/UnitTests/Ndms/Triangulations/RectangleTriangulationTest.cs
View File

@@ -52,11 +52,11 @@ namespace StructureHelperTests.UnitTests.Ndms.Triangulations
//Act
var result = logic.GetNdmCollection();
//Assert
Assert.NotNull(result);
Assert.AreEqual(expectedCount, result.Count());
Assert.That(result, Is.Not.Null);
Assert.That(result.Count(), Is.EqualTo(expectedCount));
var firstNdm = result.First();
Assert.AreEqual(expectedFirstCenterX, firstNdm.CenterX);
Assert.AreEqual(expectedFirstCenterY, firstNdm.CenterY);
Assert.That(firstNdm.CenterX, Is.EqualTo(expectedFirstCenterX));
Assert.That(firstNdm.CenterY, Is.EqualTo(expectedFirstCenterY));
}
[TestCase(0d, 0d, 1.0d, 1.0d, true, 1d, 3020418448.8512335d, 3020418448.8512335d)]
[TestCase(0d, 0d, 1.0d, 1.0d, false, 0.94d, 3013186843.9241991d, 3004124682.3615651d)]
@@ -97,9 +97,9 @@ namespace StructureHelperTests.UnitTests.Ndms.Triangulations
//Assert
var area = ndms.Sum(x => x.Area);
var moments = GeometryOperations.GetReducedMomentsOfInertia(ndms);
Assert.AreEqual(expectedArea, area, 0.001d);
Assert.AreEqual(expectedMomX, moments.EIx, 0.001d);
Assert.AreEqual(expectedMomY, moments.EIy, 1d);
Assert.That(area, Is.EqualTo(expectedArea).Within(0.001d));
Assert.That(moments.EIx, Is.EqualTo(expectedMomX).Within(0.001d));
Assert.That(moments.EIy, Is.EqualTo(expectedMomY).Within(1d));
}
[TestCase(0d, 0d, 1.0d, 1.0d, true, 1d, 3020017308.3574591d, 3020017308.3574591d)]
[TestCase(0d, 0d, 1.0d, 1.0d, false, 0.92839999999991407d, 3005633713.5049105d, 3005633713.5049105d)]
@@ -143,9 +143,9 @@ namespace StructureHelperTests.UnitTests.Ndms.Triangulations
//Assert
var area = ndms.Sum(x => x.Area);
var moments = GeometryOperations.GetReducedMomentsOfInertia(ndms);
Assert.AreEqual(expectedArea, area, 0.001d);
Assert.AreEqual(expectedMomX, moments.EIx, 0.001d);
Assert.AreEqual(expectedMomY, moments.EIy, 1d);
Assert.That(area, Is.EqualTo(expectedArea).Within(0.001d));
Assert.That(moments.EIx, Is.EqualTo(expectedMomX).Within(0.001d));
Assert.That(moments.EIy, Is.EqualTo(expectedMomY).Within(1d));
}
[TestCase(0d, 0d, 1.0d, true, 0.78079430967489682d, 1777730450.3666615d, 1776732530.5957441d)]
[TestCase(0d, 0d, 1.0d, false, 0.72079430967490343d, 1770498845.4396176d, 1760438764.1059904d)]
@@ -182,9 +182,9 @@ namespace StructureHelperTests.UnitTests.Ndms.Triangulations
//Assert
var area = ndms.Sum(x => x.Area);
var moments = GeometryOperations.GetReducedMomentsOfInertia(ndms);
Assert.AreEqual(expectedArea, area, 0.001d);
Assert.AreEqual(expectedMomX, moments.EIx, 0.001d);
Assert.AreEqual(expectedMomY, moments.EIy, 1d);
Assert.That(area, Is.EqualTo(expectedArea).Within(0.001d));
Assert.That(moments.EIx, Is.EqualTo(expectedMomX).Within(0.001d));
Assert.That(moments.EIy, Is.EqualTo(expectedMomY).Within(1d));
}
}
}