Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs =================================================================== diff -u -r4540 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs (.../PipingBlighTests.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs (.../PipingBlighTests.cs) (revision 4624) @@ -87,24 +87,24 @@ DamProjectData actualDamProjectData = FillDamFromXmlOutput.CreateDamProjectData(null, output); SurfaceLine2 redesignedSurfaceLine = actualDamProjectData.DesignCalculations[0].PipingDesignResults.RedesignedSurfaceLine; - Assert.AreEqual(0.521, output.Results.CalculationResults[0].PipingDesignResults.BlighFactor, tolerance); - Assert.AreEqual(1.667, output.Results.CalculationResults[0].PipingDesignResults.BlighHcritical, tolerance); - Assert.AreEqual(35.0, output.Results.CalculationResults[0].PipingDesignResults.ExitPointX, tolerance); + Assert.That(output.Results.CalculationResults[0].PipingDesignResults.BlighFactor, Is.EqualTo(0.521).Within(tolerance)); + Assert.That(output.Results.CalculationResults[0].PipingDesignResults.BlighHcritical, Is.EqualTo(1.667).Within(tolerance)); + Assert.That(output.Results.CalculationResults[0].PipingDesignResults.ExitPointX, Is.EqualTo(35.0).Within(tolerance)); Assert.That(redesignedSurfaceLine.GetDikeLength(), Is.EqualTo(25.00).Within(tolerance)); - Assert.AreEqual(true, output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.IsUplift); + Assert.That(output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.IsUplift, Is.EqualTo(true)); // The following values are not the same as in the Dam 15.1.2.24738 release (but explainable) // The upliftfactor in Dam 15.1.2.24738 is 0.351, but that is the Wti Upliftfactor - Assert.AreEqual(0.5825, output.Results.CalculationResults[0].PipingDesignResults.UpliftFactor, tolerance); + Assert.That(output.Results.CalculationResults[0].PipingDesignResults.UpliftFactor, Is.EqualTo(0.5825).Within(tolerance)); // The adjusted PL3/PL4 values in Dam 15.1.2.24738 are not 0.0, but those are the values for stability; for piping no adjustment has to be made - Assert.AreEqual(0.0, output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.Pl3MinUplift, tolerance); - Assert.AreEqual(0.0, output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.Pl3HeadAdjusted, tolerance); - Assert.AreEqual(0.0, output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.Pl3LocationXMinUplift, tolerance); - Assert.AreEqual(0.0, output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.Pl4MinUplift, tolerance); - Assert.AreEqual(0.0, output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.Pl4HeadAdjusted, tolerance); - Assert.AreEqual(0.0, output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.Pl4LocationXMinUplift, tolerance); + Assert.That(output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.Pl3MinUplift, Is.EqualTo(0.0).Within(tolerance)); + Assert.That(output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(0.0).Within(tolerance)); + Assert.That(output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.Pl3LocationXMinUplift, Is.EqualTo(0.0).Within(tolerance)); + Assert.That(output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.Pl4MinUplift, Is.EqualTo(0.0).Within(tolerance)); + Assert.That(output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.Pl4HeadAdjusted, Is.EqualTo(0.0).Within(tolerance)); + Assert.That(output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.Pl4LocationXMinUplift, Is.EqualTo(0.0).Within(tolerance)); } [Test] @@ -119,9 +119,9 @@ Output output = GeneralHelper.RunAfterInputValidation(inputString); - Assert.AreEqual(112, output.Results.CalculationResults.Length); - Assert.AreEqual(0.782, output.Results.CalculationResults[0].PipingDesignResults.BlighFactor, tolerance); - Assert.AreEqual(0.809, output.Results.CalculationResults[111].PipingDesignResults.BlighFactor, tolerance); + Assert.That(output.Results.CalculationResults.Length, Is.EqualTo(112)); + Assert.That(output.Results.CalculationResults[0].PipingDesignResults.BlighFactor, Is.EqualTo(0.782).Within(tolerance)); + Assert.That(output.Results.CalculationResults[111].PipingDesignResults.BlighFactor, Is.EqualTo(0.809).Within(tolerance)); } [Test] @@ -137,31 +137,31 @@ DamProjectData actualDamProjectData = FillDamFromXmlOutput.CreateDamProjectData(null, output); SurfaceLine2 redesignedSurfaceLine = actualDamProjectData.DesignCalculations[0].PipingDesignResults.RedesignedSurfaceLine; - Assert.AreEqual(true, output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.IsUplift); - Assert.AreEqual(1.995, redesignedSurfaceLine.DetermineShoulderHeight(), tolerance); + Assert.That(output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.IsUplift, Is.EqualTo(true)); + Assert.That(redesignedSurfaceLine.DetermineShoulderHeight(), Is.EqualTo(1.995).Within(tolerance)); Assert.That(redesignedSurfaceLine.GetDikeLength(), Is.EqualTo(63.486).Within(tolerance)); - Assert.AreEqual(32.5, redesignedSurfaceLine.DetermineShoulderLength(), tolerance); - Assert.AreEqual(0.0, output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.Pl3MinUplift, tolerance); - Assert.AreEqual(0.0, output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.Pl3HeadAdjusted, tolerance); - Assert.AreEqual(0.0, output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.Pl3LocationXMinUplift, tolerance); - Assert.AreEqual(0.0, output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.Pl4MinUplift, tolerance); - Assert.AreEqual(0.0, output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.Pl4HeadAdjusted, tolerance); - Assert.AreEqual(0.0, output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.Pl4LocationXMinUplift, tolerance); + Assert.That(redesignedSurfaceLine.DetermineShoulderLength(), Is.EqualTo(32.5).Within(tolerance)); + Assert.That(output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.Pl3MinUplift, Is.EqualTo(0.0).Within(tolerance)); + Assert.That(output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(0.0).Within(tolerance)); + Assert.That(output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.Pl3LocationXMinUplift, Is.EqualTo(0.0).Within(tolerance)); + Assert.That(output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.Pl4MinUplift, Is.EqualTo(0.0).Within(tolerance)); + Assert.That(output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.Pl4HeadAdjusted, Is.EqualTo(0.0).Within(tolerance)); + Assert.That(output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.Pl4LocationXMinUplift, Is.EqualTo(0.0).Within(tolerance)); // The following values are not the same as in the Dam 15.1.2.24738 release // The final Bligh calculation at the redesigned situation is done at X = 29.013552941176471 (the "insteek van de berm"), because there an // upliftfactor of 1.99999 is found, but it should have been done at X = 73.486 (the "teen van de dijk") // The BlighFactor in Dam 15.1.2.24738 is 2.092, but that is not correct, because that is the value at X = 29.013552941176471 - Assert.AreEqual(1.323, output.Results.CalculationResults[0].PipingDesignResults.BlighFactor, tolerance); + Assert.That(output.Results.CalculationResults[0].PipingDesignResults.BlighFactor, Is.EqualTo(1.323).Within(tolerance)); // The BlighHcritical in Dam 15.1.2.24738 is 1.268, but that is not correct, because that is the value at X = 29.013552941176471 - Assert.AreEqual(4.232, output.Results.CalculationResults[0].PipingDesignResults.BlighHcritical, tolerance); + Assert.That(output.Results.CalculationResults[0].PipingDesignResults.BlighHcritical, Is.EqualTo(4.232).Within(tolerance)); // The upliftfactor in Dam 15.1.2.24738 is (incorrectly) not shown - Assert.AreEqual(0.5825, output.Results.CalculationResults[0].PipingDesignResults.UpliftFactor, tolerance); + Assert.That(output.Results.CalculationResults[0].PipingDesignResults.UpliftFactor, Is.EqualTo(0.5825).Within(tolerance)); // The ExitPointX in Dam 15.1.2.24738 is (incorrectly) not shown - Assert.AreEqual(73.486, output.Results.CalculationResults[0].PipingDesignResults.ExitPointX, tolerance); + Assert.That(output.Results.CalculationResults[0].PipingDesignResults.ExitPointX, Is.EqualTo(73.486).Within(tolerance)); } [Test] @@ -177,9 +177,9 @@ Output output = GeneralHelper.RunAfterInputValidation(inputString); var locationIndex = 0; - Assert.AreEqual(1.313, output.Results.CalculationResults[locationIndex * 2 + 0].PipingDesignResults.BlighFactor, tolerance); - Assert.AreEqual(1.295, output.Results.CalculationResults[locationIndex * 2 + 1].PipingDesignResults.BlighFactor, tolerance); - Assert.AreEqual((locationIndex + 1) * 2, output.Results.CalculationResults.Length); + Assert.That(output.Results.CalculationResults[locationIndex * 2 + 0].PipingDesignResults.BlighFactor, Is.EqualTo(1.313).Within(tolerance)); + Assert.That(output.Results.CalculationResults[locationIndex * 2 + 1].PipingDesignResults.BlighFactor, Is.EqualTo(1.295).Within(tolerance)); + Assert.That(output.Results.CalculationResults.Length, Is.EqualTo((locationIndex + 1) * 2)); } [Test] @@ -197,15 +197,15 @@ Output output = GeneralHelper.RunAfterInputValidation(inputString); - Assert.AreEqual(2, output.Results.CalculationResults.Length); - Assert.AreEqual("The new shoulder length is too large to fit in the current surface line.", output.Results.CalculationResults[1].PipingDesignResults.ResultMessage); - Assert.AreEqual(CalculationResult.RunFailed, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[1].CalculationResult)); - Assert.AreEqual(2, output.Results.CalculationMessages.Length); - Assert.AreEqual("Location '101', subsoil scenario 'segment1_1D1', design scenario '1': " + + Assert.That(output.Results.CalculationResults.Length, Is.EqualTo(2)); + Assert.That(output.Results.CalculationResults[1].PipingDesignResults.ResultMessage, Is.EqualTo("The new shoulder length is too large to fit in the current surface line.")); + Assert.That(ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[1].CalculationResult), Is.EqualTo(CalculationResult.RunFailed)); + Assert.That(output.Results.CalculationMessages.Length, Is.EqualTo(2)); + Assert.That(output.Results.CalculationMessages[0].Message1, + Is.EqualTo("Location '101', subsoil scenario 'segment1_1D1', design scenario '1': " + "The calculation failed with error message " + "'The design was not successful. " + - "The new shoulder length is too large to fit in the current surface line.'", - output.Results.CalculationMessages[0].Message1); + "The new shoulder length is too large to fit in the current surface line.'")); } [Test] @@ -221,21 +221,21 @@ Output output = GeneralHelper.RunAfterInputValidation(inputString); var locationIndex = 0; - Assert.AreEqual(1.516, output.Results.CalculationResults[locationIndex + 0].PipingDesignResults.BlighFactor, tolerance); - Assert.AreEqual(1.497, output.Results.CalculationResults[locationIndex + 1].PipingDesignResults.BlighFactor, tolerance); + Assert.That(output.Results.CalculationResults[locationIndex + 0].PipingDesignResults.BlighFactor, Is.EqualTo(1.516).Within(tolerance)); + Assert.That(output.Results.CalculationResults[locationIndex + 1].PipingDesignResults.BlighFactor, Is.EqualTo(1.497).Within(tolerance)); locationIndex++; - Assert.AreEqual(1.313, output.Results.CalculationResults[locationIndex * 2 + 0].PipingDesignResults.BlighFactor, tolerance); - Assert.AreEqual(1.295, output.Results.CalculationResults[locationIndex * 2 + 1].PipingDesignResults.BlighFactor, tolerance); + Assert.That(output.Results.CalculationResults[locationIndex * 2 + 0].PipingDesignResults.BlighFactor, Is.EqualTo(1.313).Within(tolerance)); + Assert.That(output.Results.CalculationResults[locationIndex * 2 + 1].PipingDesignResults.BlighFactor, Is.EqualTo(1.295).Within(tolerance)); locationIndex++; - Assert.AreEqual(2.166, output.Results.CalculationResults[locationIndex * 2 + 0].PipingDesignResults.BlighFactor, tolerance); - Assert.AreEqual(1.312, output.Results.CalculationResults[locationIndex * 2 + 1].PipingDesignResults.BlighFactor, tolerance); + Assert.That(output.Results.CalculationResults[locationIndex * 2 + 0].PipingDesignResults.BlighFactor, Is.EqualTo(2.166).Within(tolerance)); + Assert.That(output.Results.CalculationResults[locationIndex * 2 + 1].PipingDesignResults.BlighFactor, Is.EqualTo(1.312).Within(tolerance)); locationIndex++; - Assert.AreEqual(1.486, output.Results.CalculationResults[locationIndex * 2 + 0].PipingDesignResults.BlighFactor, tolerance); - Assert.AreEqual(1.356, output.Results.CalculationResults[locationIndex * 2 + 1].PipingDesignResults.BlighFactor, tolerance); + Assert.That(output.Results.CalculationResults[locationIndex * 2 + 0].PipingDesignResults.BlighFactor, Is.EqualTo(1.486).Within(tolerance)); + Assert.That(output.Results.CalculationResults[locationIndex * 2 + 1].PipingDesignResults.BlighFactor, Is.EqualTo(1.356).Within(tolerance)); locationIndex++; - Assert.AreEqual(1.722, output.Results.CalculationResults[locationIndex * 2 + 0].PipingDesignResults.BlighFactor, tolerance); - Assert.AreEqual(1.311, output.Results.CalculationResults[locationIndex * 2 + 1].PipingDesignResults.BlighFactor, tolerance); - Assert.AreEqual((locationIndex + 1) * 2, output.Results.CalculationResults.Length); + Assert.That(output.Results.CalculationResults[locationIndex * 2 + 0].PipingDesignResults.BlighFactor, Is.EqualTo(1.722).Within(tolerance)); + Assert.That(output.Results.CalculationResults[locationIndex * 2 + 1].PipingDesignResults.BlighFactor, Is.EqualTo(1.311).Within(tolerance)); + Assert.That(output.Results.CalculationResults.Length, Is.EqualTo((locationIndex + 1) * 2)); } [Test] @@ -252,16 +252,16 @@ Output output = GeneralHelper.RunAfterInputValidation(engineInterface, true, outputName); int errorCount = GeneralHelper.DetermineNumberOfCalculationErrors(engineInterface.DamProjectData.CalculationMessages); - Assert.AreEqual(0, errorCount, "There should be no errors during the calculation."); - Assert.AreNotEqual(null, output.Results.CalculationResults); - Assert.AreEqual(6, output.Results.CalculationResults.Length); - Assert.AreEqual(17.208, output.Results.CalculationResults[0].PipingDesignResults.BlighFactor, tolerance); - Assert.AreEqual(90.000, output.Results.CalculationResults[1].PipingDesignResults.BlighFactor, tolerance); - Assert.AreEqual(90.000, output.Results.CalculationResults[2].PipingDesignResults.BlighFactor, tolerance); - Assert.AreEqual(90.000, output.Results.CalculationResults[3].PipingDesignResults.BlighFactor, tolerance); - Assert.AreEqual(7.041, output.Results.CalculationResults[4].PipingDesignResults.BlighFactor, tolerance); - Assert.AreEqual(90.000, output.Results.CalculationResults[5].PipingDesignResults.BlighFactor, tolerance); - Assert.AreEqual(5, output.Results.CalculationMessages.Length); + Assert.That(errorCount, Is.EqualTo(0), "There should be no errors during the calculation."); + Assert.That(output.Results.CalculationResults, Is.Not.EqualTo(null)); + Assert.That(output.Results.CalculationResults.Length, Is.EqualTo(6)); + Assert.That(output.Results.CalculationResults[0].PipingDesignResults.BlighFactor, Is.EqualTo(17.208).Within(tolerance)); + Assert.That(output.Results.CalculationResults[1].PipingDesignResults.BlighFactor, Is.EqualTo(90.000).Within(tolerance)); + Assert.That(output.Results.CalculationResults[2].PipingDesignResults.BlighFactor, Is.EqualTo(90.000).Within(tolerance)); + Assert.That(output.Results.CalculationResults[3].PipingDesignResults.BlighFactor, Is.EqualTo(90.000).Within(tolerance)); + Assert.That(output.Results.CalculationResults[4].PipingDesignResults.BlighFactor, Is.EqualTo(7.041).Within(tolerance)); + Assert.That(output.Results.CalculationResults[5].PipingDesignResults.BlighFactor, Is.EqualTo(90.000).Within(tolerance)); + Assert.That(output.Results.CalculationMessages.Length, Is.EqualTo(5)); Assert.IsTrue(output.Results.CalculationMessages[0].Message1.Contains("no uplift")); Assert.IsTrue(output.Results.CalculationMessages[1].Message1.Contains("no uplift")); Assert.IsTrue(output.Results.CalculationMessages[2].Message1.Contains("no uplift"));