Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs =================================================================== diff -u -r4591 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 4591) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 4624) @@ -89,7 +89,7 @@ Output output = GeneralHelper.RunAfterInputValidation(inputString); - Assert.AreEqual(1.282, output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, tolerance); + Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.282).Within(tolerance)); } /// Test for different segmentFailureMechanismType @@ -125,32 +125,32 @@ Output output = GeneralHelper.RunAfterInputValidation(inputString); - Assert.AreEqual(1.282, output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, tolerance); + Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.282).Within(tolerance)); // NumberOfIterations=0 - Assert.AreEqual(0, output.Results.CalculationResults[0].StabilityDesignResults.NumberOfIterations); + Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.NumberOfIterations, Is.EqualTo(0)); // ResultMessage "" - Assert.AreEqual("", output.Results.CalculationResults[0].StabilityDesignResults.ResultMessage); + Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.ResultMessage, Is.EqualTo("")); // Check that a line is specified Assert.IsNotNull(output.Results.CalculationResults[0].StabilityDesignResults.RedesignedSurfaceLine); // Profile name = DWP_1.sti - Assert.AreEqual("DWP_1.sti", output.Results.CalculationResults[0].ProfileName); + Assert.That(output.Results.CalculationResults[0].ProfileName, Is.EqualTo("DWP_1.sti")); // Uplift UpliftSituation upliftSituation = output.Results.CalculationResults[0].StabilityDesignResults.UpliftSituation; Assert.IsNotNull(upliftSituation); - Assert.AreEqual(true, upliftSituation.IsUplift); - Assert.AreEqual(1.141, upliftSituation.Pl3MinUplift, tolerance); - Assert.AreEqual(4.4, upliftSituation.Pl3HeadAdjusted, tolerance); - Assert.AreEqual(60.64, upliftSituation.Pl3LocationXMinUplift, tolerance); - Assert.AreEqual(0.0, upliftSituation.Pl4MinUplift, tolerance); - Assert.AreEqual(0.0, upliftSituation.Pl4HeadAdjusted, tolerance); - Assert.AreEqual(0.0, upliftSituation.Pl4LocationXMinUplift, tolerance); + Assert.That(upliftSituation.IsUplift, Is.EqualTo(true)); + Assert.That(upliftSituation.Pl3MinUplift, Is.EqualTo(1.141).Within(tolerance)); + Assert.That(upliftSituation.Pl3HeadAdjusted, Is.EqualTo(4.4).Within(tolerance)); + Assert.That(upliftSituation.Pl3LocationXMinUplift, Is.EqualTo(60.64).Within(tolerance)); + Assert.That(upliftSituation.Pl4MinUplift, Is.EqualTo(0.0).Within(tolerance)); + Assert.That(upliftSituation.Pl4HeadAdjusted, Is.EqualTo(0.0).Within(tolerance)); + Assert.That(upliftSituation.Pl4LocationXMinUplift, Is.EqualTo(0.0).Within(tolerance)); // Calculation Result - Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[0].CalculationResult)); + Assert.That(ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[0].CalculationResult), Is.EqualTo(CalculationResult.Succeeded)); } [Test, Category(Categories.Slow), Ignore("This test is not yet implemented, waits on stix implementation.")] @@ -177,32 +177,32 @@ Output output = GeneralHelper.RunAfterInputValidation(inputString); - Assert.AreEqual(1.115, output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, tolerance); + Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.115).Within(tolerance)); // NumberOfIterations=0 - Assert.AreEqual(0, output.Results.CalculationResults[0].StabilityDesignResults.NumberOfIterations); + Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.NumberOfIterations, Is.EqualTo(0)); // ResultMessage "" - Assert.AreEqual("", output.Results.CalculationResults[0].StabilityDesignResults.ResultMessage); + Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.ResultMessage, Is.EqualTo("")); // Check that a line is specified Assert.IsNotNull(output.Results.CalculationResults[0].StabilityDesignResults.RedesignedSurfaceLine); // Profile name = DWP_1.sti - Assert.AreEqual("DWP_1.sti", output.Results.CalculationResults[0].ProfileName); + Assert.That(output.Results.CalculationResults[0].ProfileName, Is.EqualTo("DWP_1.sti")); // Uplift UpliftSituation upliftSituation = output.Results.CalculationResults[0].StabilityDesignResults.UpliftSituation; Assert.IsNotNull(upliftSituation); - Assert.AreEqual(true, upliftSituation.IsUplift); - Assert.AreEqual(1.141, upliftSituation.Pl3MinUplift, tolerance); - Assert.AreEqual(4.4, upliftSituation.Pl3HeadAdjusted, tolerance); - Assert.AreEqual(60.64, upliftSituation.Pl3LocationXMinUplift, tolerance); - Assert.AreEqual(0.0, upliftSituation.Pl4MinUplift, tolerance); - Assert.AreEqual(0.0, upliftSituation.Pl4HeadAdjusted, tolerance); - Assert.AreEqual(0.0, upliftSituation.Pl4LocationXMinUplift, tolerance); + Assert.That(upliftSituation.IsUplift, Is.EqualTo(true)); + Assert.That(upliftSituation.Pl3MinUplift, Is.EqualTo(1.141).Within(tolerance)); + Assert.That(upliftSituation.Pl3HeadAdjusted, Is.EqualTo(4.4).Within(tolerance)); + Assert.That(upliftSituation.Pl3LocationXMinUplift, Is.EqualTo(60.64).Within(tolerance)); + Assert.That(upliftSituation.Pl4MinUplift, Is.EqualTo(0.0).Within(tolerance)); + Assert.That(upliftSituation.Pl4HeadAdjusted, Is.EqualTo(0.0).Within(tolerance)); + Assert.That(upliftSituation.Pl4LocationXMinUplift, Is.EqualTo(0.0).Within(tolerance)); // Calculation Result - Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[0].CalculationResult)); + Assert.That(ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[0].CalculationResult), Is.EqualTo(CalculationResult.Succeeded)); } [Test, Category(Categories.Slow), Ignore("This test is not yet implemented, waits on stix implementation.")] @@ -231,28 +231,28 @@ // Bishop DesignResult result = output.Results.CalculationResults[0]; - Assert.AreEqual(1.282, result.StabilityDesignResults.SafetyFactor, tolerance); + Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.282).Within(tolerance)); Assert.IsNotNull(result.StabilityDesignResults.UpliftSituation); Assert.IsTrue(result.StabilityDesignResults.UpliftSituation.IsUplift); - Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.Bishop, result.StabilityDesignResults.StabilityModelType); - Assert.AreEqual("Loc(DWP_1)_Sce(1)_Pro(DWP_1)", result.BaseFileName); + Assert.That(result.StabilityDesignResults.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.Bishop)); + Assert.That(result.BaseFileName, Is.EqualTo("Loc(DWP_1)_Sce(1)_Pro(DWP_1)")); // Uplift Van result = output.Results.CalculationResults[1]; - Assert.AreEqual(1.115, result.StabilityDesignResults.SafetyFactor, tolerance); + Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.115).Within(tolerance)); Assert.IsNotNull(result.StabilityDesignResults.UpliftSituation); - Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, result.StabilityDesignResults.StabilityModelType); - Assert.AreEqual("Loc(DWP_1)_Sce(1)_Pro(DWP_1)", result.BaseFileName); + Assert.That(result.StabilityDesignResults.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan)); + Assert.That(result.BaseFileName, Is.EqualTo("Loc(DWP_1)_Sce(1)_Pro(DWP_1)")); // Worst of Bishop and Uplift Van result = output.Results.CalculationResults[2]; - Assert.AreEqual(1.115, result.StabilityDesignResults.SafetyFactor, tolerance); + Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.115).Within(tolerance)); Assert.IsNotNull(result.StabilityDesignResults.UpliftSituation); - Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, result.StabilityDesignResults.StabilityModelType); - Assert.AreEqual("Loc(DWP_1)_Sce(1)_Pro(DWP_1)", result.BaseFileName); + Assert.That(result.StabilityDesignResults.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan)); + Assert.That(result.BaseFileName, Is.EqualTo("Loc(DWP_1)_Sce(1)_Pro(DWP_1)")); // Calculation Result - Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[0].CalculationResult)); - Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[1].CalculationResult)); - Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[2].CalculationResult)); + Assert.That(ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[0].CalculationResult), Is.EqualTo(CalculationResult.Succeeded)); + Assert.That(ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[1].CalculationResult), Is.EqualTo(CalculationResult.Succeeded)); + Assert.That(ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[2].CalculationResult), Is.EqualTo(CalculationResult.Succeeded)); } [Test, Category(Categories.Slow), Ignore("This test is not yet implemented, waits on stix implementation.")] @@ -281,25 +281,25 @@ // Bishop DesignResultStabilityDesignResults result = output.Results.CalculationResults[0].StabilityDesignResults; - Assert.AreEqual(0.452, result.SafetyFactor, tolerance); + Assert.That(result.SafetyFactor, Is.EqualTo(0.452).Within(tolerance)); Assert.IsNotNull(result.UpliftSituation); Assert.IsTrue(result.UpliftSituation.IsUplift); - Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.Bishop, result.StabilityModelType); + Assert.That(result.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.Bishop)); // Uplift Van result = output.Results.CalculationResults[1].StabilityDesignResults; - Assert.AreEqual(0.574, result.SafetyFactor, tolerance); + Assert.That(result.SafetyFactor, Is.EqualTo(0.574).Within(tolerance)); Assert.IsNotNull(result.UpliftSituation); - Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, result.StabilityModelType); + Assert.That(result.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan)); // Worst of Bishop and Uplift Van result = output.Results.CalculationResults[2].StabilityDesignResults; - Assert.AreEqual(0.452, result.SafetyFactor, tolerance); + Assert.That(result.SafetyFactor, Is.EqualTo(0.452).Within(tolerance)); Assert.IsNotNull(result.UpliftSituation); - Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, result.StabilityModelType); + Assert.That(result.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan)); // Calculation Result - Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[0].CalculationResult)); - Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[1].CalculationResult)); - Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[2].CalculationResult)); + Assert.That(ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[0].CalculationResult), Is.EqualTo(CalculationResult.Succeeded)); + Assert.That(ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[1].CalculationResult), Is.EqualTo(CalculationResult.Succeeded)); + Assert.That(ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[2].CalculationResult), Is.EqualTo(CalculationResult.Succeeded)); } [Test, Category(Categories.Slow), Ignore("This test is not yet implemented, waits on stix implementation.")] @@ -329,26 +329,26 @@ // Bishop DesignResultStabilityDesignResults result = output.Results.CalculationResults[0].StabilityDesignResults; Assert.IsTrue(result.SafetyFactorSpecified); - Assert.AreEqual(1.458, result.SafetyFactor, tolerance); + Assert.That(result.SafetyFactor, Is.EqualTo(1.458).Within(tolerance)); Assert.IsNotNull(result.UpliftSituation); Assert.IsFalse(result.UpliftSituation.IsUplift); - Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.Bishop, result.StabilityModelType); + Assert.That(result.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.Bishop)); // Uplift Van result = output.Results.CalculationResults[1].StabilityDesignResults; Assert.IsFalse(result.SafetyFactorSpecified); Assert.IsNotNull(result.UpliftSituation); - Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, result.StabilityModelType); + Assert.That(result.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan)); // Worst of Bishop and Uplift Van result = output.Results.CalculationResults[2].StabilityDesignResults; Assert.IsTrue(result.SafetyFactorSpecified); - Assert.AreEqual(1.458, result.SafetyFactor, tolerance); + Assert.That(result.SafetyFactor, Is.EqualTo(1.458).Within(tolerance)); Assert.IsNotNull(result.UpliftSituation); - Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, result.StabilityModelType); + Assert.That(result.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan)); // Calculation Result - Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[0].CalculationResult)); - Assert.AreEqual(CalculationResult.NoRun, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[1].CalculationResult)); - Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[2].CalculationResult)); + Assert.That(ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[0].CalculationResult), Is.EqualTo(CalculationResult.Succeeded)); + Assert.That(ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[1].CalculationResult), Is.EqualTo(CalculationResult.NoRun)); + Assert.That(ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[2].CalculationResult), Is.EqualTo(CalculationResult.Succeeded)); } [Test, Category(Categories.Slow), Ignore("This test is not yet implemented, waits on stix implementation.")] @@ -381,21 +381,21 @@ Output output = GeneralHelper.RunAfterInputValidation(inputString); - Assert.AreEqual(2, output.Results.CalculationResults.Length); + Assert.That(output.Results.CalculationResults.Length, Is.EqualTo(2)); DesignResult result = output.Results.CalculationResults[0]; // SafetyFactor=1.972 (Zone Areas) - Assert.AreEqual(1.972, result.StabilityDesignResults.SafetyFactor, tolerance); - Assert.AreEqual("DWP_10_2", result.LocationName); - Assert.AreEqual("DWP_10.sti", result.ProfileName); - Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(result.CalculationResult)); + Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.972).Within(tolerance)); + Assert.That(result.LocationName, Is.EqualTo("DWP_10_2")); + Assert.That(result.ProfileName, Is.EqualTo("DWP_10.sti")); + Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), Is.EqualTo(CalculationResult.Succeeded)); result = output.Results.CalculationResults[1]; // SafetyFactor=2.034 (Forbidden Zone) - Assert.AreEqual(2.034, result.StabilityDesignResults.SafetyFactor, tolerance); - Assert.AreEqual("DWP_10_6", result.LocationName); - Assert.AreEqual("DWP_10.sti", result.ProfileName); - Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(result.CalculationResult)); + Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(2.034).Within(tolerance)); + Assert.That(result.LocationName, Is.EqualTo("DWP_10_6")); + Assert.That(result.ProfileName, Is.EqualTo("DWP_10.sti")); + Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), Is.EqualTo(CalculationResult.Succeeded)); } [Test, Category(Categories.Slow)] @@ -424,38 +424,38 @@ Output output = GeneralHelper.RunAfterInputValidation(inputString); - Assert.AreEqual(4, output.Results.CalculationResults.Length); + Assert.That(output.Results.CalculationResults.Length, Is.EqualTo(4)); DesignResult result = output.Results.CalculationResults[0]; - Assert.AreEqual("6-4-3-A-1-C", result.LocationName); - Assert.AreEqual("6-4-3-A-1-C_1_s", result.ProfileName); + Assert.That(result.LocationName, Is.EqualTo("6-4-3-A-1-C")); + Assert.That(result.ProfileName, Is.EqualTo("6-4-3-A-1-C_1_s")); // Calculation Result - Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(result.CalculationResult)); + Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), Is.EqualTo(CalculationResult.Succeeded)); // SafetyFactor=1.814 - Assert.AreEqual(1.814, result.StabilityDesignResults.SafetyFactor, tolerance); + Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.814).Within(tolerance)); result = output.Results.CalculationResults[1]; - Assert.AreEqual("6-4-3-A-1-C", result.LocationName); - Assert.AreEqual("6-4-3-A-1-C_2_s", result.ProfileName); + Assert.That(result.LocationName, Is.EqualTo("6-4-3-A-1-C")); + Assert.That(result.ProfileName, Is.EqualTo("6-4-3-A-1-C_2_s")); // Calculation Result - Assert.AreEqual(CalculationResult.RunFailed, ConversionHelper.ConvertToCalculationResult(result.CalculationResult)); + Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), Is.EqualTo(CalculationResult.RunFailed)); // SafetyFactor not specified Assert.IsFalse(result.StabilityDesignResults.SafetyFactorSpecified); result = output.Results.CalculationResults[2]; - Assert.AreEqual("6-4-3-B-1-D", result.LocationName); - Assert.AreEqual("6-4-3-B-1-D_1_s", result.ProfileName); + Assert.That(result.LocationName, Is.EqualTo("6-4-3-B-1-D")); + Assert.That(result.ProfileName, Is.EqualTo("6-4-3-B-1-D_1_s")); // Calculation Result - Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(result.CalculationResult)); + Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), Is.EqualTo(CalculationResult.Succeeded)); // SafetyFactor=2.099 - Assert.AreEqual(2.099, result.StabilityDesignResults.SafetyFactor, tolerance); + Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(2.099).Within(tolerance)); result = output.Results.CalculationResults[3]; - Assert.AreEqual("6-4-3-B-1-D", result.LocationName); - Assert.AreEqual("6-4-3-B-1-D_2_s", result.ProfileName); + Assert.That(result.LocationName, Is.EqualTo("6-4-3-B-1-D")); + Assert.That(result.ProfileName, Is.EqualTo("6-4-3-B-1-D_2_s")); // Calculation Result - Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(result.CalculationResult)); + Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), Is.EqualTo(CalculationResult.Succeeded)); // SafetyFactor=2.300 - Assert.AreEqual(2.300, result.StabilityDesignResults.SafetyFactor, tolerance); + Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(2.300).Within(tolerance)); } [Test, Category(Categories.Slow), Ignore("This test is not yet implemented, waits on stix implementation.")] @@ -486,33 +486,33 @@ Output output = GeneralHelper.RunAfterInputValidation(inputString); int expectedCount = output.Results.CalculationResults.Length; - Assert.AreEqual(12, expectedCount, "12 results expected but only " + expectedCount); + Assert.That(expectedCount, Is.EqualTo(12), "12 results expected but only " + expectedCount); DesignResult result = output.Results.CalculationResults[3]; - Assert.AreEqual("6-4-3-A-1-C", result.LocationName); - Assert.AreEqual("6-4-3-A-1-C_2_s", result.ProfileName); + Assert.That(result.LocationName, Is.EqualTo("6-4-3-A-1-C")); + Assert.That(result.ProfileName, Is.EqualTo("6-4-3-A-1-C_2_s")); // Bishop - Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(result.CalculationResult)); + Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), Is.EqualTo(CalculationResult.Succeeded)); // SafetyFactor=2.219 - Assert.AreEqual(2.219, result.StabilityDesignResults.SafetyFactor, tolerance); - Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.Bishop, result.StabilityDesignResults.StabilityModelType); + Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(2.219).Within(tolerance)); + Assert.That(result.StabilityDesignResults.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.Bishop)); result = output.Results.CalculationResults[4]; - Assert.AreEqual("6-4-3-A-1-C", result.LocationName); - Assert.AreEqual("6-4-3-A-1-C_2_s", result.ProfileName); + Assert.That(result.LocationName, Is.EqualTo("6-4-3-A-1-C")); + Assert.That(result.ProfileName, Is.EqualTo("6-4-3-A-1-C_2_s")); // Uplift Van - Assert.AreEqual(CalculationResult.UnexpectedError, ConversionHelper.ConvertToCalculationResult(result.CalculationResult)); + Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), Is.EqualTo(CalculationResult.UnexpectedError)); // SafetyFactor not specified Assert.IsFalse(result.StabilityDesignResults.SafetyFactorSpecified); - Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, result.StabilityDesignResults.StabilityModelType); + Assert.That(result.StabilityDesignResults.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan)); result = output.Results.CalculationResults[5]; - Assert.AreEqual("6-4-3-A-1-C", result.LocationName); - Assert.AreEqual("6-4-3-A-1-C_2_s", result.ProfileName); + Assert.That(result.LocationName, Is.EqualTo("6-4-3-A-1-C")); + Assert.That(result.ProfileName, Is.EqualTo("6-4-3-A-1-C_2_s")); // Bishop/Uplift Van - Assert.AreEqual(CalculationResult.UnexpectedError, ConversionHelper.ConvertToCalculationResult(result.CalculationResult)); + Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), Is.EqualTo(CalculationResult.UnexpectedError)); // SafetyFactor not specified Assert.IsFalse(result.StabilityDesignResults.SafetyFactorSpecified); - Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, result.StabilityDesignResults.StabilityModelType); + Assert.That(result.StabilityDesignResults.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan)); } [Test, Category(Categories.Slow), Ignore("This test is not yet implemented, waits on stix implementation.")] @@ -539,11 +539,11 @@ Output output = GeneralHelper.RunAfterInputValidation(inputString, false); - Assert.AreEqual("Location 'DWP_13', subsoil scenario 'DWP_13.sti', design scenario '1': " + + Assert.That(output.Results.CalculationMessages[0].Message1, + Is.EqualTo("Location 'DWP_13', subsoil scenario 'DWP_13.sti', design scenario '1': " + "The calculation failed with error message " + "'The design was not successful. " + - "The new shoulder height with topslope exceeds the allowed maximum height.'", - output.Results.CalculationMessages[0].Message1); + "The new shoulder height with topslope exceeds the allowed maximum height.'")); } [Test, Category(Categories.Slow)] @@ -567,11 +567,11 @@ Output output = GeneralHelper.RunAfterInputValidation(engineInterface, true, "Results_Single_Core" + ".xml"); - Assert.AreEqual(18, output.Results.CalculationResults.Length); - Assert.AreEqual(3008, output.Results.CalculationMessages.Length); + Assert.That(output.Results.CalculationResults.Length, Is.EqualTo(18)); + Assert.That(output.Results.CalculationMessages.Length, Is.EqualTo(3008)); int resultsFound = CheckLargeResultsSets.CheckResultsDesignBishopAdaptionWithScenariosForHeadPl3CalculatesCorrect( output.Results.CalculationResults); - Assert.AreEqual(18, resultsFound); + Assert.That(resultsFound, Is.EqualTo(18)); } [Test, Category(Categories.Slow)] @@ -595,7 +595,7 @@ Output output = GeneralHelper.RunAfterInputValidation(inputString); - Assert.AreEqual(1.724, output.Results.CalculationResults.First().StabilityDesignResults.SafetyFactor, tolerance); + Assert.That(output.Results.CalculationResults.First().StabilityDesignResults.SafetyFactor, Is.EqualTo(1.724).Within(tolerance)); } [Test, Category(Categories.Slow), Ignore("This test is not yet implemented, waits on stix implementation.")] @@ -632,21 +632,21 @@ DamProjectData actualDamProjectData = FillDamFromXmlOutput.CreateDamProjectData(null, output); - Assert.AreEqual(calculationResult, ConversionHelper.ConvertToCalculationResult( - output.Results.CalculationResults[0].CalculationResult)); + Assert.That(ConversionHelper.ConvertToCalculationResult( + output.Results.CalculationResults[0].CalculationResult), Is.EqualTo(calculationResult)); DesignResultStabilityDesignResults stabilityDesignResults = output.Results.CalculationResults[0].StabilityDesignResults; - Assert.AreEqual(expectedSafetyFactor, stabilityDesignResults.SafetyFactor, tolerance); - Assert.AreEqual(expectedNumberOfIterations, stabilityDesignResults.NumberOfIterations); - Assert.AreEqual(expectedResultMessage, stabilityDesignResults.ResultMessage); + Assert.That(stabilityDesignResults.SafetyFactor, Is.EqualTo(expectedSafetyFactor).Within(tolerance)); + Assert.That(stabilityDesignResults.NumberOfIterations, Is.EqualTo(expectedNumberOfIterations)); + Assert.That(stabilityDesignResults.ResultMessage, Is.EqualTo(expectedResultMessage)); SurfaceLine2 redesignedSurfaceLine = actualDamProjectData.DesignCalculations[0].StabilityDesignResults.RedesignedSurfaceLine; if (redesignedSurfaceLine != null) { Assert.That(redesignedSurfaceLine.GetDikeLength(), Is.EqualTo(expectedDikeLength).Within(tolerance)); GeometryPoint pointShoulderBaseInside = redesignedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside); if (pointShoulderBaseInside != null) { - Assert.AreEqual(expectedShoulderHeight, pointShoulderBaseInside.Z, tolerance); + Assert.That(pointShoulderBaseInside.Z, Is.EqualTo(expectedShoulderHeight).Within(tolerance)); } } } @@ -674,9 +674,9 @@ Output output = GeneralHelper.RunAfterInputValidation(inputString, false); - Assert.AreEqual(2, output.Results.CalculationMessages.Length); - Assert.AreEqual(MessageMessageType.Warning, output.Results.CalculationMessages[0].MessageType); - Assert.AreEqual("Geen ondergrond profielen beschikbaar voor locatie '12-2_027'", output.Results.CalculationMessages[0].Message1); + Assert.That(output.Results.CalculationMessages.Length, Is.EqualTo(2)); + Assert.That(output.Results.CalculationMessages[0].MessageType, Is.EqualTo(MessageMessageType.Warning)); + Assert.That(output.Results.CalculationMessages[0].Message1, Is.EqualTo("Geen ondergrond profielen beschikbaar voor locatie '12-2_027'")); } [Test, Ignore("This test is not yet implemented, waits on stix implementation.")] @@ -704,7 +704,7 @@ // Test to see if calculation does NOT work in this case as it must fail with water level above dike top. Output output = GetOutputStringForProject(analysisType); - Assert.AreEqual(2, output.Results.CalculationMessages.Length); + Assert.That(output.Results.CalculationMessages.Length, Is.EqualTo(2)); } [Test, Category(Categories.Slow)] @@ -734,30 +734,30 @@ Output output = GeneralHelper.RunAfterInputValidation(inputString); // one location is calculated with 3 1D profiles - Assert.AreEqual(3, output.Results.CalculationResults.Length); - Assert.AreEqual("6-4-1-A-1-F", output.Results.CalculationResults[0].LocationName); - Assert.AreEqual("6-4-1-A-1-F_1_s", output.Results.CalculationResults[0].ProfileName); - Assert.AreEqual("6-4-1-A-1-F", output.Results.CalculationResults[1].LocationName); - Assert.AreEqual("6-4-1-A-1-F_2_s", output.Results.CalculationResults[1].ProfileName); - Assert.AreEqual("6-4-1-A-1-F", output.Results.CalculationResults[2].LocationName); - Assert.AreEqual("6-4-1-A-1-F_3_s", output.Results.CalculationResults[2].ProfileName); + Assert.That(output.Results.CalculationResults.Length, Is.EqualTo(3)); + Assert.That(output.Results.CalculationResults[0].LocationName, Is.EqualTo("6-4-1-A-1-F")); + Assert.That(output.Results.CalculationResults[0].ProfileName, Is.EqualTo("6-4-1-A-1-F_1_s")); + Assert.That(output.Results.CalculationResults[1].LocationName, Is.EqualTo("6-4-1-A-1-F")); + Assert.That(output.Results.CalculationResults[1].ProfileName, Is.EqualTo("6-4-1-A-1-F_2_s")); + Assert.That(output.Results.CalculationResults[2].LocationName, Is.EqualTo("6-4-1-A-1-F")); + Assert.That(output.Results.CalculationResults[2].ProfileName, Is.EqualTo("6-4-1-A-1-F_3_s")); DesignResult result = output.Results.CalculationResults[0]; // SafetyFactor=1.682 - Assert.AreEqual(1.682, result.StabilityDesignResults.SafetyFactor, tolerance); + Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.682).Within(tolerance)); // skip testing some of the results like uplift etc. // Calculation Result - Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(result.CalculationResult)); + Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), Is.EqualTo(CalculationResult.Succeeded)); // test safety factor for other profiles result = output.Results.CalculationResults[1]; // SafetyFactor=1.644 - Assert.AreEqual(1.644, result.StabilityDesignResults.SafetyFactor, tolerance); + Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.644).Within(tolerance)); result = output.Results.CalculationResults[2]; // SafetyFactor=1.682 - Assert.AreEqual(1.682, result.StabilityDesignResults.SafetyFactor, tolerance); + Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.682).Within(tolerance)); // Stix file var fileList = new List @@ -806,26 +806,26 @@ // one location is calculated with 3 1D profiles // However, profile 6-4-1-A-1-F_3_s has no UpliftVan occuring and thus has no result - Assert.AreEqual(2, output.Results.CalculationResults.Length); - Assert.AreEqual("6-4-1-A-1-F", output.Results.CalculationResults[0].LocationName); - Assert.AreEqual("6-4-1-A-1-F_1_s", output.Results.CalculationResults[0].ProfileName); - Assert.AreEqual("6-4-1-A-1-F", output.Results.CalculationResults[1].LocationName); - Assert.AreEqual("6-4-1-A-1-F_2_s", output.Results.CalculationResults[1].ProfileName); + Assert.That(output.Results.CalculationResults.Length, Is.EqualTo(2)); + Assert.That(output.Results.CalculationResults[0].LocationName, Is.EqualTo("6-4-1-A-1-F")); + Assert.That(output.Results.CalculationResults[0].ProfileName, Is.EqualTo("6-4-1-A-1-F_1_s")); + Assert.That(output.Results.CalculationResults[1].LocationName, Is.EqualTo("6-4-1-A-1-F")); + Assert.That(output.Results.CalculationResults[1].ProfileName, Is.EqualTo("6-4-1-A-1-F_2_s")); DesignResult result = output.Results.CalculationResults[0]; // SafetyFactor=1.638 DSTAB 1.518 (1.079) - Assert.AreEqual(1.638, result.StabilityDesignResults.SafetyFactor, tolerance); + Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.638).Within(tolerance)); // skip testing some of the results like uplift etc. // Calculation Result - Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(result.CalculationResult)); + Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), Is.EqualTo(CalculationResult.Succeeded)); // test safety factor for other profiles result = output.Results.CalculationResults[1]; // SafetyFactor=1.551 DSTAB 1.414. 1.097 - Assert.AreEqual(1.551, result.StabilityDesignResults.SafetyFactor, tolerance); - Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(result.CalculationResult)); + Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.551).Within(tolerance)); + Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), Is.EqualTo(CalculationResult.Succeeded)); var fileList = new List { @@ -869,27 +869,27 @@ Output output = GeneralHelper.RunAfterInputValidation(inputString); // one location is calculated with 3 1D profiles - Assert.AreEqual(3, output.Results.CalculationResults.Length); - Assert.AreEqual("6-4-1-A-1-F", output.Results.CalculationResults[0].LocationName); - Assert.AreEqual("6-4-1-A-1-F_1_s", output.Results.CalculationResults[0].ProfileName); - Assert.AreEqual("6-4-1-A-1-F", output.Results.CalculationResults[1].LocationName); - Assert.AreEqual("6-4-1-A-1-F_2_s", output.Results.CalculationResults[1].ProfileName); - Assert.AreEqual("6-4-1-A-1-F", output.Results.CalculationResults[2].LocationName); - Assert.AreEqual("6-4-1-A-1-F_3_s", output.Results.CalculationResults[2].ProfileName); + Assert.That(output.Results.CalculationResults.Length, Is.EqualTo(3)); + Assert.That(output.Results.CalculationResults[0].LocationName, Is.EqualTo("6-4-1-A-1-F")); + Assert.That(output.Results.CalculationResults[0].ProfileName, Is.EqualTo("6-4-1-A-1-F_1_s")); + Assert.That(output.Results.CalculationResults[1].LocationName, Is.EqualTo("6-4-1-A-1-F")); + Assert.That(output.Results.CalculationResults[1].ProfileName, Is.EqualTo("6-4-1-A-1-F_2_s")); + Assert.That(output.Results.CalculationResults[2].LocationName, Is.EqualTo("6-4-1-A-1-F")); + Assert.That(output.Results.CalculationResults[2].ProfileName, Is.EqualTo("6-4-1-A-1-F_3_s")); DesignResult result = output.Results.CalculationResults[0]; // SafetyFactor=1.638 - Assert.AreEqual(1.638, result.StabilityDesignResults.SafetyFactor, tolerance); + Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.638).Within(tolerance)); // skip testing some of the results like uplift etc. // Calculation Result - Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(result.CalculationResult)); + Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), Is.EqualTo(CalculationResult.Succeeded)); // test safety factor for other profiles result = output.Results.CalculationResults[1]; // SafetyFactor=1.551 - Assert.AreEqual(1.551, result.StabilityDesignResults.SafetyFactor, tolerance); + Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.551).Within(tolerance)); // Stix file var fileList = new List @@ -939,25 +939,25 @@ Output output = GeneralHelper.RunAfterInputValidation(inputString); // one location is calculated with 3 1D profiles - Assert.AreEqual(3, output.Results.CalculationResults.Length); - Assert.AreEqual("6-4-1-A-1-F", output.Results.CalculationResults[0].LocationName); - Assert.AreEqual("6-4-1-A-1-F_1_s", output.Results.CalculationResults[0].ProfileName); - Assert.AreEqual("6-4-1-A-1-F", output.Results.CalculationResults[1].LocationName); - Assert.AreEqual("6-4-1-A-1-F_2_s", output.Results.CalculationResults[1].ProfileName); + Assert.That(output.Results.CalculationResults.Length, Is.EqualTo(3)); + Assert.That(output.Results.CalculationResults[0].LocationName, Is.EqualTo("6-4-1-A-1-F")); + Assert.That(output.Results.CalculationResults[0].ProfileName, Is.EqualTo("6-4-1-A-1-F_1_s")); + Assert.That(output.Results.CalculationResults[1].LocationName, Is.EqualTo("6-4-1-A-1-F")); + Assert.That(output.Results.CalculationResults[1].ProfileName, Is.EqualTo("6-4-1-A-1-F_2_s")); DesignResult result = output.Results.CalculationResults[0]; // SafetyFactor=1.682 - Assert.AreEqual(1.682, result.StabilityDesignResults.SafetyFactor, tolerance); + Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.682).Within(tolerance)); // skip testing some of the results like uplift etc. // Calculation Result - Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(result.CalculationResult)); + Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), Is.EqualTo(CalculationResult.Succeeded)); // test safety factor for other profiles result = output.Results.CalculationResults[1]; // SafetyFactor=1.644 - Assert.AreEqual(1.644, result.StabilityDesignResults.SafetyFactor, tolerance); + Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.644).Within(tolerance)); // Stix file var existingFilesList = new List