Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/EngineInterfaceTests.cs =================================================================== diff -u -r4540 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/EngineInterfaceTests.cs (.../EngineInterfaceTests.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/EngineInterfaceTests.cs (.../EngineInterfaceTests.cs) (revision 4624) @@ -45,7 +45,7 @@ catch (Exception e) { var expectedMessageNL = "Fout: lege input string"; - Assert.AreEqual(expectedMessageNL, e.Message); + Assert.That(e.Message, Is.EqualTo(expectedMessageNL)); } } @@ -60,7 +60,7 @@ catch (Exception e) { var expectedMessageNL = "Error: empty input string"; - Assert.AreEqual(expectedMessageNL, e.Message); + Assert.That(e.Message, Is.EqualTo(expectedMessageNL)); } } Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Assemblers/Geometry2DSectionAssemblerTest.cs =================================================================== diff -u -r4540 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Assemblers/Geometry2DSectionAssemblerTest.cs (.../Geometry2DSectionAssemblerTest.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Assemblers/Geometry2DSectionAssemblerTest.cs (.../Geometry2DSectionAssemblerTest.cs) (revision 4624) @@ -134,26 +134,26 @@ select element).Single(); // Database - Assert.AreEqual(geometry2DSectionParameters.SoilGeometry2DName, inputElement.AttributeAs(Geometry2DSectionAssembler.XmlAttributeSoilGeometry2DFilename), $"{Geometry2DSectionAssembler.XmlAttributeSoilGeometry2DFilename}"); - Assert.AreEqual(geometry2DSectionParameters.XCoordinateSection, inputElement.AttributeAs(Geometry2DSectionAssembler.XmlAttributeXCoordinateSection), $"{Geometry2DSectionAssembler.XmlAttributeXCoordinateSection}"); + Assert.That(inputElement.AttributeAs(Geometry2DSectionAssembler.XmlAttributeSoilGeometry2DFilename), Is.EqualTo(geometry2DSectionParameters.SoilGeometry2DName), $"{Geometry2DSectionAssembler.XmlAttributeSoilGeometry2DFilename}"); + Assert.That(inputElement.AttributeAs(Geometry2DSectionAssembler.XmlAttributeXCoordinateSection), Is.EqualTo(geometry2DSectionParameters.XCoordinateSection), $"{Geometry2DSectionAssembler.XmlAttributeXCoordinateSection}"); // Profile IEnumerable soilProfileCollectionElements = from element in doc.Root.Descendants() where element.Name.LocalName == XMLAttributes.XmlElementProfile select element; - Assert.AreEqual(1, soilProfileCollectionElements.Count(), "Number of profiles"); + Assert.That(soilProfileCollectionElements.Count(), Is.EqualTo(1), "Number of profiles"); XElement soilProfileElement = soilProfileCollectionElements.Single(); Assert.IsNotNull(soilProfileElement.Attribute(XMLAttributes.XmlAttributeName), $"{XMLAttributes.XmlAttributeName}"); - Assert.AreEqual(geometry2DSectionParameters.SoilProfile.Name, soilProfileElement.AttributeAs(XMLAttributes.XmlAttributeName), $"{XMLAttributes.XmlAttributeName}"); + Assert.That(soilProfileElement.AttributeAs(XMLAttributes.XmlAttributeName), Is.EqualTo(geometry2DSectionParameters.SoilProfile.Name), $"{XMLAttributes.XmlAttributeName}"); Assert.IsNotNull(soilProfileElement.Attribute(XMLAttributes.XmlAttributeXCoordinate), $"{XMLAttributes.XmlAttributeXCoordinate}"); Assert.IsNotNull(soilProfileElement.Attribute(XMLAttributes.XmlAttributeYCoordinate), $"{XMLAttributes.XmlAttributeYCoordinate}"); Assert.IsNotNull(soilProfileElement.Attribute(XMLAttributes.XmlAttributePhreaticLevel), $"{XMLAttributes.XmlAttributePhreaticLevel}"); Assert.IsNotNull(soilProfileElement.Attribute(XMLAttributes.XmlAttributeHasPhreaticLevel), $"{XMLAttributes.XmlAttributeHasPhreaticLevel}"); Assert.IsNotNull(soilProfileElement.Attribute(XMLAttributes.XmlAttributeBottomLevel), $"{XMLAttributes.XmlAttributeBottomLevel}"); - Assert.AreEqual(geometry2DSectionParameters.SoilProfile.BottomLevel, soilProfileElement.AttributeAs(XMLAttributes.XmlAttributeBottomLevel), cTolerance, $"{XMLAttributes.XmlAttributeBottomLevel}"); + Assert.That(soilProfileElement.AttributeAs(XMLAttributes.XmlAttributeBottomLevel), Is.EqualTo(geometry2DSectionParameters.SoilProfile.BottomLevel).Within(cTolerance), $"{XMLAttributes.XmlAttributeBottomLevel}"); // Created no PL line so characteristic layers are unassigned Assert.IsNotNull(soilProfileElement.Attribute(XMLAttributes.XmlAttributeBottomSandLayerID), XMLAttributes.XmlAttributeBottomSandLayerID); Assert.IsNotNull(soilProfileElement.Attribute(XMLAttributes.XmlAttributeInBetweenSandLayerID), XMLAttributes.XmlAttributeInBetweenSandLayerID); @@ -164,25 +164,25 @@ where element.Name.LocalName == XMLAttributes.XmlElementLayers select element; - Assert.AreEqual(1, layersCollectionElements.Count(), "profile layer collection tag"); + Assert.That(layersCollectionElements.Count(), Is.EqualTo(1), "profile layer collection tag"); IEnumerable layerCollectionElements = from element in layersCollectionElements.Descendants() where element.Name.LocalName == XMLAttributes.XmlElementLayer select element; - Assert.AreEqual(geometry2DSectionParameters.SoilProfile.Layers.Count, layerCollectionElements.Count(), "Number of profile layers"); + Assert.That(layerCollectionElements.Count(), Is.EqualTo(geometry2DSectionParameters.SoilProfile.Layers.Count), "Number of profile layers"); IEnumerator layerElementEnumerator = layerCollectionElements.GetEnumerator(); foreach (SoilLayer1D layer in geometry2DSectionParameters.SoilProfile.Layers) { layerElementEnumerator.MoveNext(); XElement layerElement = layerElementEnumerator.Current; Assert.IsNotNull(layerElement.Attribute(XMLAttributes.XmlAttributeID), $"{$"ID of layer #{geometry2DSectionParameters.SoilProfile.Layers.IndexOf(layer)}"}"); - Assert.AreEqual(layer.Name, layerElement.AttributeAs(XMLAttributes.XmlAttributeID), $"ID of layer #{geometry2DSectionParameters.SoilProfile.Layers.IndexOf(layer)}"); + Assert.That(layerElement.AttributeAs(XMLAttributes.XmlAttributeID), Is.EqualTo(layer.Name), $"ID of layer #{geometry2DSectionParameters.SoilProfile.Layers.IndexOf(layer)}"); Assert.IsNotNull(layerElement.Attribute(XMLAttributes.XmlAttributeSoilID), $"{$"SoilID of layer #{geometry2DSectionParameters.SoilProfile.Layers.IndexOf(layer)}"}"); - Assert.AreEqual(layer.Soil.Name, layerElement.AttributeAs(XMLAttributes.XmlAttributeSoilID), $"SoilID of layer #{geometry2DSectionParameters.SoilProfile.Layers.IndexOf(layer)}"); + Assert.That(layerElement.AttributeAs(XMLAttributes.XmlAttributeSoilID), Is.EqualTo(layer.Soil.Name), $"SoilID of layer #{geometry2DSectionParameters.SoilProfile.Layers.IndexOf(layer)}"); Assert.IsNotNull(layerElement.Attribute(XMLAttributes.XmlAttributeTopLevel), $"{$"TopLevel of layer #{geometry2DSectionParameters.SoilProfile.Layers.IndexOf(layer)}"}"); - Assert.AreEqual(layer.TopLevel, layerElement.AttributeAs(XMLAttributes.XmlAttributeTopLevel), $"TopLevel of layer #{geometry2DSectionParameters.SoilProfile.Layers.IndexOf(layer)}"); + Assert.That(layerElement.AttributeAs(XMLAttributes.XmlAttributeTopLevel), Is.EqualTo(layer.TopLevel), $"TopLevel of layer #{geometry2DSectionParameters.SoilProfile.Layers.IndexOf(layer)}"); } } @@ -191,11 +191,11 @@ { XDocument doc = XDocument.Load(outputXml); Geometry2DSectionParameters geometry2DSectionParameters = assembler.CreateOutputObject(doc); - Assert.AreEqual(6, geometry2DSectionParameters.SoilProfile.Layers.Count); - Assert.AreEqual(-10, geometry2DSectionParameters.SoilProfile.BottomLevel, cTolerance); + Assert.That(geometry2DSectionParameters.SoilProfile.Layers.Count, Is.EqualTo(6)); + Assert.That(geometry2DSectionParameters.SoilProfile.BottomLevel, Is.EqualTo(-10).Within(cTolerance)); Assert.IsTrue(geometry2DSectionParameters.SoilProfile.Layers[3].SoilName.Equals("DKN3")); - Assert.AreEqual(-2.8, geometry2DSectionParameters.SoilProfile.Layers[3].TopLevel, cTolerance); + Assert.That(geometry2DSectionParameters.SoilProfile.Layers[3].TopLevel, Is.EqualTo(-2.8).Within(cTolerance)); Assert.IsTrue(geometry2DSectionParameters.SoilGeometry2DName.Equals("1D1.sti")); - Assert.AreEqual(64.0, geometry2DSectionParameters.XCoordinateSection, cTolerance); + Assert.That(geometry2DSectionParameters.XCoordinateSection, Is.EqualTo(64.0).Within(cTolerance)); } } \ No newline at end of file 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 Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapperTests.cs =================================================================== diff -u -r4540 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapperTests.cs (.../WtiPipingSellmeijerRevisedKernelWrapperTests.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapperTests.cs (.../WtiPipingSellmeijerRevisedKernelWrapperTests.cs) (revision 4624) @@ -69,7 +69,7 @@ }; messages.Clear(); kernelWrapper.Validate(damPipingInput, damPipingOutput, out messages); - Assert.AreEqual(0, messages.Count); + Assert.That(messages.Count, Is.EqualTo(0)); } [Test] @@ -128,31 +128,31 @@ kernelWrapper.PostProcess(input, output, designScenario, "", out results); foreach (DesignResult result in results) { - Assert.AreEqual(output.FoSbe, result.PipingDesignResults.Wti2017BackwardErosionSafetyFactor); - Assert.AreEqual(output.Hcbe, result.PipingDesignResults.Wti2017BackwardErosionHcritical); - Assert.AreEqual(output.DeltaPhiCbe, result.PipingDesignResults.Wti2017BackwardErosionDeltaPhiC); - Assert.AreEqual(output.DeltaPhibe, result.PipingDesignResults.Wti2017BackwardErosionDeltaPhiReduced); - Assert.AreEqual(output.FoSu, result.PipingDesignResults.Wti2017UpliftSafetyFactor); - Assert.AreEqual(output.Hcu, result.PipingDesignResults.Wti2017UpliftHcritical); - Assert.AreEqual(output.DeltaPhiCu, result.PipingDesignResults.Wti2017UpliftDeltaPhiC); - Assert.AreEqual(output.FoSh, result.PipingDesignResults.Wti2017HeaveSafetyFactor); - Assert.AreEqual(output.Hch, result.PipingDesignResults.Wti2017HeaveHcritical); - Assert.AreEqual(output.Gradient, result.PipingDesignResults.Wti2017Gradient); - Assert.AreEqual(output.EffectiveStress, result.PipingDesignResults.EffectiveStress); + Assert.That(result.PipingDesignResults.Wti2017BackwardErosionSafetyFactor, Is.EqualTo(output.FoSbe)); + Assert.That(result.PipingDesignResults.Wti2017BackwardErosionHcritical, Is.EqualTo(output.Hcbe)); + Assert.That(result.PipingDesignResults.Wti2017BackwardErosionDeltaPhiC, Is.EqualTo(output.DeltaPhiCbe)); + Assert.That(result.PipingDesignResults.Wti2017BackwardErosionDeltaPhiReduced, Is.EqualTo(output.DeltaPhibe)); + Assert.That(result.PipingDesignResults.Wti2017UpliftSafetyFactor, Is.EqualTo(output.FoSu)); + Assert.That(result.PipingDesignResults.Wti2017UpliftHcritical, Is.EqualTo(output.Hcu)); + Assert.That(result.PipingDesignResults.Wti2017UpliftDeltaPhiC, Is.EqualTo(output.DeltaPhiCu)); + Assert.That(result.PipingDesignResults.Wti2017HeaveSafetyFactor, Is.EqualTo(output.FoSh)); + Assert.That(result.PipingDesignResults.Wti2017HeaveHcritical, Is.EqualTo(output.Hch)); + Assert.That(result.PipingDesignResults.Wti2017Gradient, Is.EqualTo(output.Gradient)); + Assert.That(result.PipingDesignResults.EffectiveStress, Is.EqualTo(output.EffectiveStress)); // CCreep is calculated by hand. - Assert.AreEqual(23.076923076923077, result.PipingDesignResults.CCreep); + Assert.That(result.PipingDesignResults.CCreep, Is.EqualTo(23.076923076923077)); // Overall results (FoS and Hc) are taken from the case with maximum FoS from Uplift (u), Heave (h) and Backward Erorsion (be) // Here this is uplift, so the results must be equal to those of Uplift. - Assert.AreEqual(output.FoSu, result.PipingDesignResults.Wti2017SafetyFactorOverall); - Assert.AreEqual(output.Hcu, result.PipingDesignResults.Wti2017HcriticalOverall); + Assert.That(result.PipingDesignResults.Wti2017SafetyFactorOverall, Is.EqualTo(output.FoSu)); + Assert.That(result.PipingDesignResults.Wti2017HcriticalOverall, Is.EqualTo(output.Hcu)); - Assert.AreEqual(output.ExitPointX, result.PipingDesignResults.LocalExitPointX); - Assert.AreEqual(output.UpliftFactor, result.PipingDesignResults.UpliftFactor); - Assert.AreEqual(output.UpliftSituation, result.PipingDesignResults.UpliftSituation); - Assert.AreEqual(output.CalculationResult, result.CalculationResult); + Assert.That(result.PipingDesignResults.LocalExitPointX, Is.EqualTo(output.ExitPointX)); + Assert.That(result.PipingDesignResults.UpliftFactor, Is.EqualTo(output.UpliftFactor)); + Assert.That(result.PipingDesignResults.UpliftSituation, Is.EqualTo(output.UpliftSituation)); + Assert.That(result.CalculationResult, Is.EqualTo(output.CalculationResult)); - Assert.AreEqual(input.Location.SurfaceLine, result.PipingDesignResults.RedesignedSurfaceLine); + Assert.That(result.PipingDesignResults.RedesignedSurfaceLine, Is.EqualTo(input.Location.SurfaceLine)); } } @@ -199,23 +199,23 @@ const double diff = 0.0001; SurfaceLine2 surfaceLine = FactoryForSurfaceLines.CreateSurfaceLineForWtiPiping(true); PipingSurfaceLine surfaceLinePiping = kernelWrapper.ConvertToPipingSurfaceLine(surfaceLine); - Assert.AreEqual(12, surfaceLinePiping.Points.Count); + Assert.That(surfaceLinePiping.Points.Count, Is.EqualTo(12)); // Check some coordinates and types - Assert.AreEqual(34.5, surfaceLinePiping.Points[2].X, diff); - Assert.AreEqual(5, surfaceLinePiping.Points[2].Z, diff); - Assert.AreEqual(PipingCharacteristicPointType.None, surfaceLinePiping.Points[2].Type); + Assert.That(surfaceLinePiping.Points[2].X, Is.EqualTo(34.5).Within(diff)); + Assert.That(surfaceLinePiping.Points[2].Z, Is.EqualTo(5).Within(diff)); + Assert.That(surfaceLinePiping.Points[2].Type, Is.EqualTo(PipingCharacteristicPointType.None)); - Assert.AreEqual(38.5, surfaceLinePiping.Points[4].X, diff); - Assert.AreEqual(5, surfaceLinePiping.Points[4].Z, diff); - Assert.AreEqual(PipingCharacteristicPointType.None, surfaceLinePiping.Points[4].Type); + Assert.That(surfaceLinePiping.Points[4].X, Is.EqualTo(38.5).Within(diff)); + Assert.That(surfaceLinePiping.Points[4].Z, Is.EqualTo(5).Within(diff)); + Assert.That(surfaceLinePiping.Points[4].Type, Is.EqualTo(PipingCharacteristicPointType.None)); - Assert.AreEqual(58.5, surfaceLinePiping.Points[7].X, diff); - Assert.AreEqual(0, surfaceLinePiping.Points[7].Z, diff); - Assert.AreEqual(PipingCharacteristicPointType.DitchDikeSide, surfaceLinePiping.Points[7].Type); + Assert.That(surfaceLinePiping.Points[7].X, Is.EqualTo(58.5).Within(diff)); + Assert.That(surfaceLinePiping.Points[7].Z, Is.EqualTo(0).Within(diff)); + Assert.That(surfaceLinePiping.Points[7].Type, Is.EqualTo(PipingCharacteristicPointType.DitchDikeSide)); - Assert.AreEqual(61.5, surfaceLinePiping.Points[9].X, diff); - Assert.AreEqual(-1, surfaceLinePiping.Points[9].Z, diff); - Assert.AreEqual(PipingCharacteristicPointType.BottomDitchPolderSide, surfaceLinePiping.Points[9].Type); + Assert.That(surfaceLinePiping.Points[9].X, Is.EqualTo(61.5).Within(diff)); + Assert.That(surfaceLinePiping.Points[9].Z, Is.EqualTo(-1).Within(diff)); + Assert.That(surfaceLinePiping.Points[9].Type, Is.EqualTo(PipingCharacteristicPointType.BottomDitchPolderSide)); } [Test] @@ -225,21 +225,21 @@ var kernelWrapper = new WtiPipingSellmeijerRevisedKernelWrapper(); SoilProfile1D profile = FactoryForSoilProfiles.CreatePipingSellmeijerProfileWithOneSandlayer(); PipingProfile profilePiping = kernelWrapper.ConvertToPipingProfile(profile); - Assert.AreEqual(2, profilePiping.Layers.Count); + Assert.That(profilePiping.Layers.Count, Is.EqualTo(2)); - Assert.AreEqual(10, profilePiping.Layers[0].TopLevel, diff); - Assert.AreEqual(11, profilePiping.Layers[0].AbovePhreaticLevel, diff); - Assert.AreEqual(14, profilePiping.Layers[0].BelowPhreaticLevel, diff); - Assert.AreEqual(false, profilePiping.Layers[0].IsAquifer); - Assert.AreEqual(double.NaN, profilePiping.Layers[0].DryUnitWeight, diff); + Assert.That(profilePiping.Layers[0].TopLevel, Is.EqualTo(10).Within(diff)); + Assert.That(profilePiping.Layers[0].AbovePhreaticLevel, Is.EqualTo(11).Within(diff)); + Assert.That(profilePiping.Layers[0].BelowPhreaticLevel, Is.EqualTo(14).Within(diff)); + Assert.That(profilePiping.Layers[0].IsAquifer, Is.EqualTo(false)); + Assert.That(profilePiping.Layers[0].DryUnitWeight, Is.EqualTo(double.NaN).Within(diff)); - Assert.AreEqual(-2, profilePiping.Layers[1].TopLevel, diff); - Assert.AreEqual(20, profilePiping.Layers[1].AbovePhreaticLevel, diff); - Assert.AreEqual(22, profilePiping.Layers[1].BelowPhreaticLevel, diff); - Assert.AreEqual(true, profilePiping.Layers[1].IsAquifer); - Assert.AreEqual(double.NaN, profilePiping.Layers[1].DryUnitWeight, diff); + Assert.That(profilePiping.Layers[1].TopLevel, Is.EqualTo(-2).Within(diff)); + Assert.That(profilePiping.Layers[1].AbovePhreaticLevel, Is.EqualTo(20).Within(diff)); + Assert.That(profilePiping.Layers[1].BelowPhreaticLevel, Is.EqualTo(22).Within(diff)); + Assert.That(profilePiping.Layers[1].IsAquifer, Is.EqualTo(true)); + Assert.That(profilePiping.Layers[1].DryUnitWeight, Is.EqualTo(double.NaN).Within(diff)); - Assert.AreEqual(-10, profilePiping.BottomLevel, diff); + Assert.That(profilePiping.BottomLevel, Is.EqualTo(-10).Within(diff)); } [Test] @@ -261,17 +261,17 @@ output.DeltaPhiCbe = 1; kernelWrapper.AssignFailedValuesWtiUplift(output); // Uplift - Assert.AreEqual(0, output.FoSu); - Assert.AreEqual(0, output.Hcu); - Assert.AreEqual(0, output.DeltaPhiCu); + Assert.That(output.FoSu, Is.EqualTo(0)); + Assert.That(output.Hcu, Is.EqualTo(0)); + Assert.That(output.DeltaPhiCu, Is.EqualTo(0)); // Heave - Assert.AreEqual(1, output.FoSh); - Assert.AreEqual(1, output.Hch); - Assert.AreEqual(1, output.Gradient); + Assert.That(output.FoSh, Is.EqualTo(1)); + Assert.That(output.Hch, Is.EqualTo(1)); + Assert.That(output.Gradient, Is.EqualTo(1)); // Sellmeijer revised - Assert.AreEqual(1, output.FoSbe); - Assert.AreEqual(1, output.Hcbe); - Assert.AreEqual(1, output.DeltaPhiCbe); + Assert.That(output.FoSbe, Is.EqualTo(1)); + Assert.That(output.Hcbe, Is.EqualTo(1)); + Assert.That(output.DeltaPhiCbe, Is.EqualTo(1)); } [Test] @@ -293,17 +293,17 @@ output.DeltaPhiCbe = 1; kernelWrapper.AssignFailedValuesWtiHeave(output); // Uplift - Assert.AreEqual(1, output.FoSu); - Assert.AreEqual(1, output.Hcu); - Assert.AreEqual(1, output.DeltaPhiCu); + Assert.That(output.FoSu, Is.EqualTo(1)); + Assert.That(output.Hcu, Is.EqualTo(1)); + Assert.That(output.DeltaPhiCu, Is.EqualTo(1)); // Heave - Assert.AreEqual(0, output.FoSh); - Assert.AreEqual(0, output.Hch); - Assert.AreEqual(0, output.Gradient); + Assert.That(output.FoSh, Is.EqualTo(0)); + Assert.That(output.Hch, Is.EqualTo(0)); + Assert.That(output.Gradient, Is.EqualTo(0)); // Sellmeijer revised - Assert.AreEqual(1, output.FoSbe); - Assert.AreEqual(1, output.Hcbe); - Assert.AreEqual(1, output.DeltaPhiCbe); + Assert.That(output.FoSbe, Is.EqualTo(1)); + Assert.That(output.Hcbe, Is.EqualTo(1)); + Assert.That(output.DeltaPhiCbe, Is.EqualTo(1)); } [Test] @@ -325,17 +325,17 @@ output.DeltaPhiCbe = 1; kernelWrapper.AssignFailedValuesWtiSellmeijerRevised(output); // Uplift - Assert.AreEqual(1, output.FoSu); - Assert.AreEqual(1, output.Hcu); - Assert.AreEqual(1, output.DeltaPhiCu); + Assert.That(output.FoSu, Is.EqualTo(1)); + Assert.That(output.Hcu, Is.EqualTo(1)); + Assert.That(output.DeltaPhiCu, Is.EqualTo(1)); // Heave - Assert.AreEqual(1, output.FoSh); - Assert.AreEqual(1, output.Hch); - Assert.AreEqual(1, output.Gradient); + Assert.That(output.FoSh, Is.EqualTo(1)); + Assert.That(output.Hch, Is.EqualTo(1)); + Assert.That(output.Gradient, Is.EqualTo(1)); // Sellmeijer revised - Assert.AreEqual(0, output.FoSbe); - Assert.AreEqual(0, output.Hcbe); - Assert.AreEqual(0, output.DeltaPhiCbe); + Assert.That(output.FoSbe, Is.EqualTo(0)); + Assert.That(output.Hcbe, Is.EqualTo(0)); + Assert.That(output.DeltaPhiCbe, Is.EqualTo(0)); } [TestCase(0, 49.5, 1860.9050036726026, 1302.9335025708217, 1302.6335025708217, 0.037999943884683543)] @@ -403,28 +403,28 @@ // Validate the input List messages; kernelWrapper.Validate(damPipingInput, kernelDataOutput, out messages); - Assert.AreEqual(0, messages.Count); + Assert.That(messages.Count, Is.EqualTo(0)); // Run the dll. All expected results are from calculation by hand. kernelWrapper.Execute(damPipingInput, kernelDataOutput, out messages); var damPipingOutput = (WtiPipingSellmeijerRevisedOutput) kernelDataOutput; - Assert.AreEqual(0, messages.Count); - Assert.AreEqual(expectedFoSbe, damPipingOutput.FoSbe, diff); - Assert.AreEqual(expectedHcbe, damPipingOutput.Hcbe, diff); - Assert.AreEqual(expectedDeltaPhiCbe, damPipingOutput.DeltaPhiCbe, diff); - Assert.AreEqual(0.56948691811077123, damPipingOutput.FoSu, diff); - Assert.AreEqual(0.56948691811077123, damPipingOutput.Hcu, diff); - Assert.AreEqual(0.4271151885830784, damPipingOutput.DeltaPhiCu, diff); - Assert.AreEqual(4.19, damPipingOutput.EffectiveStress, diff); - Assert.AreEqual(expectedSeepageLength, damPipingOutput.SeepageLength, diff); + Assert.That(messages.Count, Is.EqualTo(0)); + Assert.That(damPipingOutput.FoSbe, Is.EqualTo(expectedFoSbe).Within(diff)); + Assert.That(damPipingOutput.Hcbe, Is.EqualTo(expectedHcbe).Within(diff)); + Assert.That(damPipingOutput.DeltaPhiCbe, Is.EqualTo(expectedDeltaPhiCbe).Within(diff)); + Assert.That(damPipingOutput.FoSu, Is.EqualTo(0.56948691811077123).Within(diff)); + Assert.That(damPipingOutput.Hcu, Is.EqualTo(0.56948691811077123).Within(diff)); + Assert.That(damPipingOutput.DeltaPhiCu, Is.EqualTo(0.4271151885830784).Within(diff)); + Assert.That(damPipingOutput.EffectiveStress, Is.EqualTo(4.19).Within(diff)); + Assert.That(damPipingOutput.SeepageLength, Is.EqualTo(expectedSeepageLength).Within(diff)); // Fill the design results List results; kernelWrapper.PostProcess(damKernelInput, damPipingOutput, designScenario, "", out results); foreach (DesignResult result in results) { - Assert.AreEqual(FailureMechanismSystemType.Piping, result.DamFailureMechanismeCalculation.FailureMechanismSystemType); - Assert.AreEqual(PipingModelType.Wti2017, result.DamFailureMechanismeCalculation.PipingModelType); + Assert.That(result.DamFailureMechanismeCalculation.FailureMechanismSystemType, Is.EqualTo(FailureMechanismSystemType.Piping)); + Assert.That(result.DamFailureMechanismeCalculation.PipingModelType, Is.EqualTo(PipingModelType.Wti2017)); Assert.That(result.LocationName, Is.Not.Null.Or.Empty); Assert.That(result.ScenarioName, Is.Not.Null.Or.Empty); Assert.That(result.ProfileName, Is.Not.Null.Or.Empty); @@ -444,12 +444,12 @@ Assert.That(result.PipingDesignResults.Wti2017SafetyFactorOverall, Is.EqualTo(90).Within(diff)); Assert.That(result.PipingDesignResults.Wti2017HcriticalOverall, Is.EqualTo(expectedHcbe).Within(diff)); - Assert.AreEqual(59.5, result.PipingDesignResults.LocalExitPointX); - Assert.AreEqual(0.88258734130293759, result.PipingDesignResults.UpliftFactor); - Assert.AreEqual(true, result.PipingDesignResults.UpliftSituation != null && ((UpliftSituation) result.PipingDesignResults.UpliftSituation).IsUplift); - Assert.AreEqual(CalculationResult.Succeeded, result.CalculationResult); + Assert.That(result.PipingDesignResults.LocalExitPointX, Is.EqualTo(59.5)); + Assert.That(result.PipingDesignResults.UpliftFactor, Is.EqualTo(0.88258734130293759)); + Assert.That(result.PipingDesignResults.UpliftSituation != null && ((UpliftSituation)result.PipingDesignResults.UpliftSituation).IsUplift, Is.EqualTo(true)); + Assert.That(result.CalculationResult, Is.EqualTo(CalculationResult.Succeeded)); - Assert.AreEqual(location.SurfaceLine, result.PipingDesignResults.RedesignedSurfaceLine); + Assert.That(result.PipingDesignResults.RedesignedSurfaceLine, Is.EqualTo(location.SurfaceLine)); } } @@ -499,27 +499,27 @@ kernelWrapper.Prepare(damKernelInput, 0, out kernelDataInput, out kernelDataOutput); var damPipingInput = (WtiPipingSellmeijerRevisedInput) kernelDataInput; var damPipingOutput = (WtiPipingSellmeijerRevisedOutput) kernelDataOutput; - Assert.AreEqual(1.0, damPipingInput.HRiver, diff); - Assert.AreEqual(0.0, damPipingInput.HExit, diff); - Assert.AreEqual(0.3, damPipingInput.Rc, diff); - Assert.AreEqual(1.0, damPipingInput.DTotal, diff); - Assert.AreEqual(8.0, damPipingInput.DAquifer, diff); - Assert.AreEqual(expectedSeepageLength, damPipingInput.SeepageLength, diff); - Assert.AreEqual(0.000200, damPipingInput.D70, diff); - Assert.AreEqual(0.25, damPipingInput.WhitesDragCoefficient, diff); - Assert.AreEqual(37.0, damPipingInput.BeddingAngle, diff); - Assert.AreEqual(1.33E-06, damPipingInput.KinematicViscosityWater, diff); - Assert.AreEqual(0.0001, damPipingInput.DarcyPermeability, diff); - Assert.AreEqual(1.000, damPipingInput.ModelFactorUplift, diff); - Assert.AreEqual(4.19, damPipingInput.EffectiveStress, diff); - Assert.AreEqual(0.75, damPipingInput.PhiExit, diff); - Assert.AreEqual(0.75, damPipingInput.RExit, diff); - Assert.AreEqual(0.00, damPipingInput.PhiPolder, diff); + Assert.That(damPipingInput.HRiver, Is.EqualTo(1.0).Within(diff)); + Assert.That(damPipingInput.HExit, Is.EqualTo(0.0).Within(diff)); + Assert.That(damPipingInput.Rc, Is.EqualTo(0.3).Within(diff)); + Assert.That(damPipingInput.DTotal, Is.EqualTo(1.0).Within(diff)); + Assert.That(damPipingInput.DAquifer, Is.EqualTo(8.0).Within(diff)); + Assert.That(damPipingInput.SeepageLength, Is.EqualTo(expectedSeepageLength).Within(diff)); + Assert.That(damPipingInput.D70, Is.EqualTo(0.000200).Within(diff)); + Assert.That(damPipingInput.WhitesDragCoefficient, Is.EqualTo(0.25).Within(diff)); + Assert.That(damPipingInput.BeddingAngle, Is.EqualTo(37.0).Within(diff)); + Assert.That(damPipingInput.KinematicViscosityWater, Is.EqualTo(1.33E-06).Within(diff)); + Assert.That(damPipingInput.DarcyPermeability, Is.EqualTo(0.0001).Within(diff)); + Assert.That(damPipingInput.ModelFactorUplift, Is.EqualTo(1.000).Within(diff)); + Assert.That(damPipingInput.EffectiveStress, Is.EqualTo(4.19).Within(diff)); + Assert.That(damPipingInput.PhiExit, Is.EqualTo(0.75).Within(diff)); + Assert.That(damPipingInput.RExit, Is.EqualTo(0.75).Within(diff)); + Assert.That(damPipingInput.PhiPolder, Is.EqualTo(0.00).Within(diff)); // All expected results are from calculation by hand. - Assert.AreEqual(4.19, damPipingOutput.EffectiveStress, diff); - Assert.AreEqual(59.50, damPipingOutput.ExitPointX, diff); + Assert.That(damPipingOutput.EffectiveStress, Is.EqualTo(4.19).Within(diff)); + Assert.That(damPipingOutput.ExitPointX, Is.EqualTo(59.50).Within(diff)); Assert.That(damPipingOutput.UpliftFactor, Is.EqualTo(0.88258734130293759).Within(diff)); - Assert.AreEqual(true, damPipingOutput.UpliftSituation.IsUplift); + Assert.That(damPipingOutput.UpliftSituation.IsUplift, Is.EqualTo(true)); } [TestCase(CharacteristicPointType.BottomDitchPolderSide, PipingCharacteristicPointType.BottomDitchPolderSide)] @@ -543,6 +543,6 @@ public void TestConvertToPipingPointType(CharacteristicPointType charPointType, PipingCharacteristicPointType pipingCharacteristicPointType) { var kernelWrapper = new WtiPipingSellmeijerRevisedKernelWrapper(); - Assert.AreEqual(pipingCharacteristicPointType, kernelWrapper.ConvertToPipingPointType(charPointType)); + Assert.That(kernelWrapper.ConvertToPipingPointType(charPointType), Is.EqualTo(pipingCharacteristicPointType)); } } \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Sensors/SensorLocationTests.cs =================================================================== diff -u -r4540 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Sensors/SensorLocationTests.cs (.../SensorLocationTests.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Sensors/SensorLocationTests.cs (.../SensorLocationTests.cs) (revision 4624) @@ -115,7 +115,7 @@ double? actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder, sensorValues, sensor); // assert - Assert.AreEqual(testValue, actualValue); + Assert.That(actualValue, Is.EqualTo(testValue)); } [Test] @@ -185,7 +185,7 @@ double? actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder, sensorValues, sensor); // assert - Assert.AreEqual(testValue, actualValue); + Assert.That(actualValue, Is.EqualTo(testValue)); } [Test] @@ -255,7 +255,7 @@ double? actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver, sensorValues, sensor); // assert - Assert.AreEqual(testValue, actualValue); + Assert.That(actualValue, Is.EqualTo(testValue)); } [Test] @@ -325,7 +325,7 @@ double? actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PlLineOffsetBelowShoulderBaseInside, sensorValues, sensor); // assert - Assert.AreEqual(testValue, actualValue); + Assert.That(actualValue, Is.EqualTo(testValue)); } [Test] @@ -395,7 +395,7 @@ double? actualValue = sensorLocation.GetValue(x => x.SourceTypePl1WaterLevelAtPolder, sensorValues, sensor); // assert - Assert.AreEqual(testValue, actualValue); + Assert.That(actualValue, Is.EqualTo(testValue)); } [Test] @@ -418,7 +418,7 @@ double? actualValue = sensorLocation.GetValue(x => x.SourceTypePl1WaterLevelAtPolder, sensorValues, sensor); // assert - Assert.AreEqual(expectedValue, actualValue); + Assert.That(actualValue, Is.EqualTo(expectedValue)); } [Test] @@ -459,15 +459,15 @@ SensorLocation sensorLocation = CreateValidSensorLocation(); location.RiverLevel = testValue; - Assert.AreEqual(testValue, location.RiverLevel); + Assert.That(location.RiverLevel, Is.EqualTo(testValue)); sensorLocation.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.LocationData; // call double? actualValue = sensorLocation.GetValue(x => x.SourceTypePl1WaterLevelAtRiver, sensorValues, sensor); // assert - Assert.AreEqual(testValue, actualValue); + Assert.That(actualValue, Is.EqualTo(testValue)); } [Test] @@ -490,7 +490,7 @@ double? actualValue = sensorLocation.GetValue(x => x.SourceTypePl1WaterLevelAtRiver, sensorValues, sensor); // assert - Assert.AreEqual(expectedValue, actualValue); + Assert.That(actualValue, Is.EqualTo(expectedValue)); } [Test] @@ -537,7 +537,7 @@ double? actualValue = sensorLocation.GetValue(x => x.SourceTypePl3, sensorValues, sensor); // assert - Assert.AreEqual(testValue, actualValue); + Assert.That(actualValue, Is.EqualTo(testValue)); } [Test] @@ -560,7 +560,7 @@ double? actualValue = sensorLocation.GetValue(x => x.SourceTypePl3, sensorValues, sensor); // assert - Assert.AreEqual(expectedValue, actualValue); + Assert.That(actualValue, Is.EqualTo(expectedValue)); } [Test] @@ -607,7 +607,7 @@ double? actualValue = sensorLocation.GetValue(x => x.SourceTypePl4, sensorValues, sensor); // assert - Assert.AreEqual(testValue, actualValue); + Assert.That(actualValue, Is.EqualTo(testValue)); } [Test] @@ -630,7 +630,7 @@ double? actualValue = sensorLocation.GetValue(x => x.SourceTypePl4, sensorValues, sensor); // assert - Assert.AreEqual(expectedValue, actualValue); + Assert.That(actualValue, Is.EqualTo(expectedValue)); } #endregion Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/PlLinesToWaternetConverterTests.cs =================================================================== diff -u -r4540 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/PlLinesToWaternetConverterTests.cs (.../PlLinesToWaternetConverterTests.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/PlLinesToWaternetConverterTests.cs (.../PlLinesToWaternetConverterTests.cs) (revision 4624) @@ -72,8 +72,8 @@ // Assert Assert.IsNull(waternet.PhreaticLine); - CollectionAssert.IsEmpty(waternet.HeadLineList); - CollectionAssert.IsEmpty(waternet.WaternetLineList); + Assert.That(waternet.HeadLineList, Is.Empty); + Assert.That(waternet.WaternetLineList, Is.Empty); } [Test] @@ -83,8 +83,8 @@ PlLines plLines = CreatePlLinesForTest(); SoilProfile1D soilProfile1D = CreateSoilProfile1DForTest(); - Assert.AreEqual(-2.111, soilProfile1D.InBetweenAquiferLayer.TopLevel, cDif); - Assert.AreEqual(-6.111, soilProfile1D.BottomAquiferLayer.TopLevel, cDif); + Assert.That(soilProfile1D.InBetweenAquiferLayer.TopLevel, Is.EqualTo(-2.111).Within(cDif)); + Assert.That(soilProfile1D.BottomAquiferLayer.TopLevel, Is.EqualTo(-6.111).Within(cDif)); const double penetrationLength = 2.1; const double left = 0; @@ -97,41 +97,41 @@ // Pl 4 gets waternetline to level of BottomAquiferLayer.TopLevel // ex[ected phreatic line from pl 1 - Assert.AreEqual(3, waternet.PhreaticLine.Points.Count); - Assert.AreEqual(0, waternet.PhreaticLine.Points[0].X, cDif); - Assert.AreEqual(0, waternet.PhreaticLine.Points[0].Z, cDif); - Assert.AreEqual(50, waternet.PhreaticLine.Points[1].X, cDif); - Assert.AreEqual(1, waternet.PhreaticLine.Points[1].Z, cDif); - Assert.AreEqual(100, waternet.PhreaticLine.Points[2].X, cDif); - Assert.AreEqual(1, waternet.PhreaticLine.Points[2].Z, cDif); + Assert.That(waternet.PhreaticLine.Points.Count, Is.EqualTo(3)); + Assert.That(waternet.PhreaticLine.Points[0].X, Is.EqualTo(0).Within(cDif)); + Assert.That(waternet.PhreaticLine.Points[0].Z, Is.EqualTo(0).Within(cDif)); + Assert.That(waternet.PhreaticLine.Points[1].X, Is.EqualTo(50).Within(cDif)); + Assert.That(waternet.PhreaticLine.Points[1].Z, Is.EqualTo(1).Within(cDif)); + Assert.That(waternet.PhreaticLine.Points[2].X, Is.EqualTo(100).Within(cDif)); + Assert.That(waternet.PhreaticLine.Points[2].Z, Is.EqualTo(1).Within(cDif)); // expected head lines from pl 2, 3 and 4 - Assert.AreEqual(3, waternet.HeadLineList.Count); - Assert.AreEqual(2, waternet.HeadLineList[0].Points.Count); - Assert.AreEqual(3, waternet.HeadLineList[1].Points.Count); - Assert.AreEqual(2, waternet.HeadLineList[2].Points.Count); + Assert.That(waternet.HeadLineList.Count, Is.EqualTo(3)); + Assert.That(waternet.HeadLineList[0].Points.Count, Is.EqualTo(2)); + Assert.That(waternet.HeadLineList[1].Points.Count, Is.EqualTo(3)); + Assert.That(waternet.HeadLineList[2].Points.Count, Is.EqualTo(2)); // check the points of first head line that represents pl 2 - Assert.AreEqual(0, waternet.HeadLineList[0].Points[0].X, cDif); - Assert.AreEqual(0, waternet.HeadLineList[0].Points[0].Z, cDif); - Assert.AreEqual(100, waternet.HeadLineList[0].Points[1].X, cDif); - Assert.AreEqual(-1, waternet.HeadLineList[0].Points[1].Z, cDif); + Assert.That(waternet.HeadLineList[0].Points[0].X, Is.EqualTo(0).Within(cDif)); + Assert.That(waternet.HeadLineList[0].Points[0].Z, Is.EqualTo(0).Within(cDif)); + Assert.That(waternet.HeadLineList[0].Points[1].X, Is.EqualTo(100).Within(cDif)); + Assert.That(waternet.HeadLineList[0].Points[1].Z, Is.EqualTo(-1).Within(cDif)); // expected waternet lines from pl 2, 3 and 4 - Assert.AreEqual(3, waternet.WaternetLineList.Count); + Assert.That(waternet.WaternetLineList.Count, Is.EqualTo(3)); // expected waternet line 0 is connected to pl2 with level -6.111 + 2.1 = -4.011 - Assert.AreEqual(waternet.HeadLineList[0], waternet.WaternetLineList[0].HeadLine); - Assert.AreEqual(0, waternet.WaternetLineList[0].Points[0].X, cDif); - Assert.AreEqual(-4.011, waternet.WaternetLineList[0].Points[0].Z, cDif); - Assert.AreEqual(100, waternet.WaternetLineList[0].Points[1].X, cDif); - Assert.AreEqual(-4.011, waternet.WaternetLineList[0].Points[1].Z, cDif); + Assert.That(waternet.WaternetLineList[0].HeadLine, Is.EqualTo(waternet.HeadLineList[0])); + Assert.That(waternet.WaternetLineList[0].Points[0].X, Is.EqualTo(0).Within(cDif)); + Assert.That(waternet.WaternetLineList[0].Points[0].Z, Is.EqualTo(-4.011).Within(cDif)); + Assert.That(waternet.WaternetLineList[0].Points[1].X, Is.EqualTo(100).Within(cDif)); + Assert.That(waternet.WaternetLineList[0].Points[1].Z, Is.EqualTo(-4.011).Within(cDif)); // expected waternet line 1 is connected to pl3 with level -6.111 - Assert.AreEqual(waternet.HeadLineList[1], waternet.WaternetLineList[1].HeadLine); - Assert.AreEqual(-6.111, waternet.WaternetLineList[1].Points[0].Z, cDif); + Assert.That(waternet.WaternetLineList[1].HeadLine, Is.EqualTo(waternet.HeadLineList[1])); + Assert.That(waternet.WaternetLineList[1].Points[0].Z, Is.EqualTo(-6.111).Within(cDif)); // expected waternet line 2 is connected to pl4 with level -2.111 - Assert.AreEqual(waternet.HeadLineList[2], waternet.WaternetLineList[2].HeadLine); - Assert.AreEqual(-2.111, waternet.WaternetLineList[2].Points[0].Z, cDif); + Assert.That(waternet.WaternetLineList[2].HeadLine, Is.EqualTo(waternet.HeadLineList[2])); + Assert.That(waternet.WaternetLineList[2].Points[0].Z, Is.EqualTo(-2.111).Within(cDif)); } [Test] @@ -141,22 +141,22 @@ SoilProfile1D soilProfile1D = CreateSoilProfile1DForTest(); Waternet waternet = PlLinesToWaternetConverter.ConvertPlLineToWaternet(plLines, soilProfile1D, 0, 0, 0); // head lines - Assert.AreEqual(3, waternet.HeadLineList.Count); - Assert.AreEqual(2, waternet.HeadLineList[0].Points.Count); - Assert.AreEqual(3, waternet.HeadLineList[1].Points.Count); - Assert.AreEqual(2, waternet.HeadLineList[2].Points.Count); + Assert.That(waternet.HeadLineList.Count, Is.EqualTo(3)); + Assert.That(waternet.HeadLineList[0].Points.Count, Is.EqualTo(2)); + Assert.That(waternet.HeadLineList[1].Points.Count, Is.EqualTo(3)); + Assert.That(waternet.HeadLineList[2].Points.Count, Is.EqualTo(2)); // phreatic line - Assert.AreEqual(3, waternet.PhreaticLine.Points.Count); + Assert.That(waternet.PhreaticLine.Points.Count, Is.EqualTo(3)); // check that no headline are added when Pl2, Pl3 or Pl4 does not exist or has no points plLines.Lines[PlLineType.Pl3] = null; plLines.Lines[PlLineType.Pl4].Points.Clear(); waternet = PlLinesToWaternetConverter.ConvertPlLineToWaternet(plLines, soilProfile1D, 0, 0, 0); // head lines - Assert.AreEqual(1, waternet.HeadLineList.Count); - Assert.AreEqual(2, waternet.HeadLineList[0].Points.Count); + Assert.That(waternet.HeadLineList.Count, Is.EqualTo(1)); + Assert.That(waternet.HeadLineList[0].Points.Count, Is.EqualTo(2)); // phreatic line - Assert.AreEqual(3, waternet.PhreaticLine.Points.Count); + Assert.That(waternet.PhreaticLine.Points.Count, Is.EqualTo(3)); } [Test] @@ -167,26 +167,26 @@ SoilProfile1D soilProfile1D = CreateSoilProfile1DForTest(); const double penetrationLength = 2.1; Waternet waternet = PlLinesToWaternetConverter.ConvertPlLineToWaternet(plLines, soilProfile1D, penetrationLength, 0, 0); - Assert.AreEqual(3, waternet.HeadLineList.Count); - Assert.AreEqual(3, waternet.WaternetLineList.Count); + Assert.That(waternet.HeadLineList.Count, Is.EqualTo(3)); + Assert.That(waternet.WaternetLineList.Count, Is.EqualTo(3)); // check that no waternetlines are added for pl3 when InBetweenAquiferLayer is null soilProfile1D = CreateSoilProfile1DWith1AquiferForTest(); waternet = PlLinesToWaternetConverter.ConvertPlLineToWaternet(plLines, soilProfile1D, penetrationLength, 0, 0); - Assert.AreEqual(3, waternet.HeadLineList.Count); - Assert.AreEqual(2, waternet.WaternetLineList.Count); + Assert.That(waternet.HeadLineList.Count, Is.EqualTo(3)); + Assert.That(waternet.WaternetLineList.Count, Is.EqualTo(2)); // expected waternet line 0 is connected to pl2 with level -6.111 + 2.1 = -4.011 - Assert.AreEqual(waternet.HeadLineList[0], waternet.WaternetLineList[0].HeadLine); - Assert.AreEqual(-4.011, waternet.WaternetLineList[0].Points[0].Z, cDif); + Assert.That(waternet.WaternetLineList[0].HeadLine, Is.EqualTo(waternet.HeadLineList[0])); + Assert.That(waternet.WaternetLineList[0].Points[0].Z, Is.EqualTo(-4.011).Within(cDif)); // expected waternet line 1 is connected to pl3 with level -6.111 - Assert.AreEqual(waternet.HeadLineList[1], waternet.WaternetLineList[1].HeadLine); - Assert.AreEqual(-6.111, waternet.WaternetLineList[1].Points[0].Z, cDif); + Assert.That(waternet.WaternetLineList[1].HeadLine, Is.EqualTo(waternet.HeadLineList[1])); + Assert.That(waternet.WaternetLineList[1].Points[0].Z, Is.EqualTo(-6.111).Within(cDif)); // check that no waternetlines are added for pl2, pl3 and pl4 when BottomAquiferLayer is null soilProfile1D = CreateSoilProfile1DWithoutAquifersForTest(); waternet = PlLinesToWaternetConverter.ConvertPlLineToWaternet(plLines, soilProfile1D, penetrationLength, 0, 0); - Assert.AreEqual(3, waternet.HeadLineList.Count); - Assert.AreEqual(0, waternet.WaternetLineList.Count); + Assert.That(waternet.HeadLineList.Count, Is.EqualTo(3)); + Assert.That(waternet.WaternetLineList.Count, Is.EqualTo(0)); } [Test] @@ -199,11 +199,11 @@ const double right = 50.123; WaternetLine waternetLine = PlLinesToWaternetConverter.CreateWaternetLine(level, left, right); - Assert.AreEqual(2, waternetLine.Points.Count); - Assert.AreEqual(-50.111, waternetLine.Points[0].X, cDif); - Assert.AreEqual(1.234, waternetLine.Points[0].Z, cDif); - Assert.AreEqual(50.123, waternetLine.Points[1].X, cDif); - Assert.AreEqual(1.234, waternetLine.Points[1].Z, cDif); + Assert.That(waternetLine.Points.Count, Is.EqualTo(2)); + Assert.That(waternetLine.Points[0].X, Is.EqualTo(-50.111).Within(cDif)); + Assert.That(waternetLine.Points[0].Z, Is.EqualTo(1.234).Within(cDif)); + Assert.That(waternetLine.Points[1].X, Is.EqualTo(50.123).Within(cDif)); + Assert.That(waternetLine.Points[1].Z, Is.EqualTo(1.234).Within(cDif)); } [Test] @@ -240,21 +240,21 @@ // Assert AssertGeometry(plLines.Lines[PlLineType.Pl1].Points, waternet.PhreaticLine.Points); - Assert.AreEqual(3, waternet.HeadLineList.Count); + Assert.That(waternet.HeadLineList.Count, Is.EqualTo(3)); AssertGeometry(plLines.Lines[PlLineType.Pl2].Points, waternet.HeadLineList[0].Points); AssertGeometry(plLines.Lines[PlLineType.Pl3].Points, waternet.HeadLineList[1].Points); AssertGeometry(plLines.Lines[PlLineType.Pl4].Points, waternet.HeadLineList[2].Points); - Assert.AreEqual(2, waternet.WaternetLineList.Count); + Assert.That(waternet.WaternetLineList.Count, Is.EqualTo(2)); WaternetLine pl2WaternetLine = waternet.WaternetLineList[0]; - Assert.AreSame(waternet.HeadLineList[0], pl2WaternetLine.HeadLine); + Assert.That(pl2WaternetLine.HeadLine, Is.SameAs(waternet.HeadLineList[0])); GeometryPoint[] offSetAquiferCoordinates = expectedBottomAquiferCoordinates.Select(aquiferCoordinate => new GeometryPoint(aquiferCoordinate.X, aquiferCoordinate.Z + penetrationLength)) .ToArray(); AssertGeometry(offSetAquiferCoordinates, pl2WaternetLine.Points); WaternetLine pl3WaternetLine = waternet.WaternetLineList[1]; - Assert.AreSame(waternet.HeadLineList[1], pl3WaternetLine.HeadLine); + Assert.That(pl3WaternetLine.HeadLine, Is.SameAs(waternet.HeadLineList[1])); AssertGeometry(expectedBottomAquiferCoordinates, pl3WaternetLine.Points); } @@ -343,12 +343,12 @@ // Assert AssertGeometry(plLines.Lines[PlLineType.Pl1].Points, waternet.PhreaticLine.Points); - Assert.AreEqual(3, waternet.HeadLineList.Count); + Assert.That(waternet.HeadLineList.Count, Is.EqualTo(3)); AssertGeometry(plLines.Lines[PlLineType.Pl2].Points, waternet.HeadLineList[0].Points); AssertGeometry(plLines.Lines[PlLineType.Pl3].Points, waternet.HeadLineList[1].Points); AssertGeometry(plLines.Lines[PlLineType.Pl4].Points, waternet.HeadLineList[2].Points); - Assert.AreEqual(3, waternet.WaternetLineList.Count); + Assert.That(waternet.WaternetLineList.Count, Is.EqualTo(3)); Point2D[] expectedBottomAquiferCoordinates = { @@ -358,17 +358,17 @@ }; WaternetLine pl2WaternetLine = waternet.WaternetLineList[0]; - Assert.AreSame(waternet.HeadLineList[0], pl2WaternetLine.HeadLine); + Assert.That(pl2WaternetLine.HeadLine, Is.SameAs(waternet.HeadLineList[0])); GeometryPoint[] offSetAquiferCoordinates = expectedBottomAquiferCoordinates.Select(aquiferCoordinate => new GeometryPoint(aquiferCoordinate.X, aquiferCoordinate.Z + penetrationLength)) .ToArray(); AssertGeometry(offSetAquiferCoordinates, pl2WaternetLine.Points); WaternetLine pl3WaternetLine = waternet.WaternetLineList[1]; - Assert.AreSame(waternet.HeadLineList[1], pl3WaternetLine.HeadLine); + Assert.That(pl3WaternetLine.HeadLine, Is.SameAs(waternet.HeadLineList[1])); AssertGeometry(expectedBottomAquiferCoordinates, pl3WaternetLine.Points); WaternetLine pl4WaternetLine = waternet.WaternetLineList[2]; - Assert.AreSame(waternet.HeadLineList[2], pl4WaternetLine.HeadLine); + Assert.That(pl4WaternetLine.HeadLine, Is.SameAs(waternet.HeadLineList[2])); AssertGeometry(new[] { bottomLeftUpperLayer, @@ -454,12 +454,12 @@ // Assert AssertGeometry(plLines.Lines[PlLineType.Pl1].Points, waternet.PhreaticLine.Points); - Assert.AreEqual(3, waternet.HeadLineList.Count); + Assert.That(waternet.HeadLineList.Count, Is.EqualTo(3)); AssertGeometry(plLines.Lines[PlLineType.Pl2].Points, waternet.HeadLineList[0].Points); AssertGeometry(plLines.Lines[PlLineType.Pl3].Points, waternet.HeadLineList[1].Points); AssertGeometry(plLines.Lines[PlLineType.Pl4].Points, waternet.HeadLineList[2].Points); - Assert.AreEqual(3, waternet.WaternetLineList.Count); + Assert.That(waternet.WaternetLineList.Count, Is.EqualTo(3)); Point2D[] expectedBottomAquiferCoordinates = { @@ -468,17 +468,17 @@ }; WaternetLine pl2WaternetLine = waternet.WaternetLineList[0]; - Assert.AreSame(waternet.HeadLineList[0], pl2WaternetLine.HeadLine); + Assert.That(pl2WaternetLine.HeadLine, Is.SameAs(waternet.HeadLineList[0])); GeometryPoint[] offSetAquiferCoordinates = expectedBottomAquiferCoordinates.Select(aquiferCoordinate => new GeometryPoint(aquiferCoordinate.X, aquiferCoordinate.Z + penetrationLength)) .ToArray(); AssertGeometry(offSetAquiferCoordinates, pl2WaternetLine.Points); WaternetLine pl3WaternetLine = waternet.WaternetLineList[1]; - Assert.AreSame(waternet.HeadLineList[1], pl3WaternetLine.HeadLine); + Assert.That(pl3WaternetLine.HeadLine, Is.SameAs(waternet.HeadLineList[1])); AssertGeometry(expectedBottomAquiferCoordinates, pl3WaternetLine.Points); WaternetLine pl4WaternetLine = waternet.WaternetLineList[2]; - Assert.AreSame(waternet.HeadLineList[2], pl4WaternetLine.HeadLine); + Assert.That(pl4WaternetLine.HeadLine, Is.SameAs(waternet.HeadLineList[2])); AssertGeometry(new[] { bottomLeftUpperLayer, @@ -597,12 +597,12 @@ // Assert AssertGeometry(plLines.Lines[PlLineType.Pl1].Points, waternet.PhreaticLine.Points); - Assert.AreEqual(3, waternet.HeadLineList.Count); + Assert.That(waternet.HeadLineList.Count, Is.EqualTo(3)); AssertGeometry(plLines.Lines[PlLineType.Pl2].Points, waternet.HeadLineList[0].Points); AssertGeometry(plLines.Lines[PlLineType.Pl3].Points, waternet.HeadLineList[1].Points); AssertGeometry(plLines.Lines[PlLineType.Pl4].Points, waternet.HeadLineList[2].Points); - Assert.AreEqual(3, waternet.WaternetLineList.Count); + Assert.That(waternet.WaternetLineList.Count, Is.EqualTo(3)); Point2D[] expectedBottomAquiferCoordinates = { @@ -612,17 +612,17 @@ }; WaternetLine pl2WaternetLine = waternet.WaternetLineList[0]; - Assert.AreSame(waternet.HeadLineList[0], pl2WaternetLine.HeadLine); + Assert.That(pl2WaternetLine.HeadLine, Is.SameAs(waternet.HeadLineList[0])); GeometryPoint[] offSetAquiferCoordinates = expectedBottomAquiferCoordinates.Select(aquiferCoordinate => new GeometryPoint(aquiferCoordinate.X, aquiferCoordinate.Z + penetrationLength)) .ToArray(); AssertGeometry(offSetAquiferCoordinates, pl2WaternetLine.Points); WaternetLine pl3WaternetLine = waternet.WaternetLineList[1]; - Assert.AreSame(waternet.HeadLineList[1], pl3WaternetLine.HeadLine); + Assert.That(pl3WaternetLine.HeadLine, Is.SameAs(waternet.HeadLineList[1])); AssertGeometry(expectedBottomAquiferCoordinates, pl3WaternetLine.Points); WaternetLine pl4WaternetLine = waternet.WaternetLineList[2]; - Assert.AreSame(waternet.HeadLineList[2], pl4WaternetLine.HeadLine); + Assert.That(pl4WaternetLine.HeadLine, Is.SameAs(waternet.HeadLineList[2])); AssertGeometry(new[] { new GeometryPoint(leftCoordinate, -10), @@ -739,12 +739,12 @@ // Assert AssertGeometry(plLines.Lines[PlLineType.Pl1].Points, waternet.PhreaticLine.Points); - Assert.AreEqual(3, waternet.HeadLineList.Count); + Assert.That(waternet.HeadLineList.Count, Is.EqualTo(3)); AssertGeometry(plLines.Lines[PlLineType.Pl2].Points, waternet.HeadLineList[0].Points); AssertGeometry(plLines.Lines[PlLineType.Pl3].Points, waternet.HeadLineList[1].Points); AssertGeometry(plLines.Lines[PlLineType.Pl4].Points, waternet.HeadLineList[2].Points); - Assert.AreEqual(3, waternet.WaternetLineList.Count); + Assert.That(waternet.WaternetLineList.Count, Is.EqualTo(3)); Point2D[] expectedBottomAquiferCoordinates = { @@ -754,17 +754,17 @@ }; WaternetLine pl2WaternetLine = waternet.WaternetLineList[0]; - Assert.AreSame(waternet.HeadLineList[0], pl2WaternetLine.HeadLine); + Assert.That(pl2WaternetLine.HeadLine, Is.SameAs(waternet.HeadLineList[0])); GeometryPoint[] offSetAquiferCoordinates = expectedBottomAquiferCoordinates.Select(aquiferCoordinate => new GeometryPoint(aquiferCoordinate.X, aquiferCoordinate.Z + penetrationLength)) .ToArray(); AssertGeometry(offSetAquiferCoordinates, pl2WaternetLine.Points); WaternetLine pl3WaternetLine = waternet.WaternetLineList[1]; - Assert.AreSame(waternet.HeadLineList[1], pl3WaternetLine.HeadLine); + Assert.That(pl3WaternetLine.HeadLine, Is.SameAs(waternet.HeadLineList[1])); AssertGeometry(expectedBottomAquiferCoordinates, pl3WaternetLine.Points); WaternetLine pl4WaternetLine = waternet.WaternetLineList[2]; - Assert.AreSame(waternet.HeadLineList[2], pl4WaternetLine.HeadLine); + Assert.That(pl4WaternetLine.HeadLine, Is.SameAs(waternet.HeadLineList[2])); AssertGeometry(new[] { bottomLeftUpperLayer, @@ -898,12 +898,12 @@ // Assert AssertGeometry(plLines.Lines[PlLineType.Pl1].Points, waternet.PhreaticLine.Points); - Assert.AreEqual(3, waternet.HeadLineList.Count); + Assert.That(waternet.HeadLineList.Count, Is.EqualTo(3)); AssertGeometry(plLines.Lines[PlLineType.Pl2].Points, waternet.HeadLineList[0].Points); AssertGeometry(plLines.Lines[PlLineType.Pl3].Points, waternet.HeadLineList[1].Points); AssertGeometry(plLines.Lines[PlLineType.Pl4].Points, waternet.HeadLineList[2].Points); - Assert.AreEqual(3, waternet.WaternetLineList.Count); + Assert.That(waternet.WaternetLineList.Count, Is.EqualTo(3)); Point2D[] expectedBottomAquiferCoordinates = { @@ -913,17 +913,17 @@ }; WaternetLine pl2WaternetLine = waternet.WaternetLineList[0]; - Assert.AreSame(waternet.HeadLineList[0], pl2WaternetLine.HeadLine); + Assert.That(pl2WaternetLine.HeadLine, Is.SameAs(waternet.HeadLineList[0])); GeometryPoint[] offSetAquiferCoordinates = expectedBottomAquiferCoordinates.Select(aquiferCoordinate => new GeometryPoint(aquiferCoordinate.X, aquiferCoordinate.Z + penetrationLength)) .ToArray(); AssertGeometry(offSetAquiferCoordinates, pl2WaternetLine.Points); WaternetLine pl3WaternetLine = waternet.WaternetLineList[1]; - Assert.AreSame(waternet.HeadLineList[1], pl3WaternetLine.HeadLine); + Assert.That(pl3WaternetLine.HeadLine, Is.SameAs(waternet.HeadLineList[1])); AssertGeometry(expectedBottomAquiferCoordinates, pl3WaternetLine.Points); WaternetLine pl4WaternetLine = waternet.WaternetLineList[2]; - Assert.AreSame(waternet.HeadLineList[2], pl4WaternetLine.HeadLine); + Assert.That(pl4WaternetLine.HeadLine, Is.SameAs(waternet.HeadLineList[2])); AssertGeometry(new[] { bottomLeftUpperLayer, @@ -1057,12 +1057,12 @@ // Assert AssertGeometry(plLines.Lines[PlLineType.Pl1].Points, waternet.PhreaticLine.Points); - Assert.AreEqual(3, waternet.HeadLineList.Count); + Assert.That(waternet.HeadLineList.Count, Is.EqualTo(3)); AssertGeometry(plLines.Lines[PlLineType.Pl2].Points, waternet.HeadLineList[0].Points); AssertGeometry(plLines.Lines[PlLineType.Pl3].Points, waternet.HeadLineList[1].Points); AssertGeometry(plLines.Lines[PlLineType.Pl4].Points, waternet.HeadLineList[2].Points); - Assert.AreEqual(3, waternet.WaternetLineList.Count); + Assert.That(waternet.WaternetLineList.Count, Is.EqualTo(3)); Point2D[] expectedBottomAquiferCoordinates = { @@ -1072,17 +1072,17 @@ }; WaternetLine pl2WaternetLine = waternet.WaternetLineList[0]; - Assert.AreSame(waternet.HeadLineList[0], pl2WaternetLine.HeadLine); + Assert.That(pl2WaternetLine.HeadLine, Is.SameAs(waternet.HeadLineList[0])); GeometryPoint[] offSetAquiferCoordinates = expectedBottomAquiferCoordinates.Select(aquiferCoordinate => new GeometryPoint(aquiferCoordinate.X, aquiferCoordinate.Z + penetrationLength)) .ToArray(); AssertGeometry(offSetAquiferCoordinates, pl2WaternetLine.Points); WaternetLine pl3WaternetLine = waternet.WaternetLineList[1]; - Assert.AreSame(waternet.HeadLineList[1], pl3WaternetLine.HeadLine); + Assert.That(pl3WaternetLine.HeadLine, Is.SameAs(waternet.HeadLineList[1])); AssertGeometry(expectedBottomAquiferCoordinates, pl3WaternetLine.Points); WaternetLine pl4WaternetLine = waternet.WaternetLineList[2]; - Assert.AreSame(waternet.HeadLineList[2], pl4WaternetLine.HeadLine); + Assert.That(pl4WaternetLine.HeadLine, Is.SameAs(waternet.HeadLineList[2])); AssertGeometry(new[] { bottomLeftUpperLayer, @@ -1170,12 +1170,12 @@ // Assert AssertGeometry(plLines.Lines[PlLineType.Pl1].Points, waternet.PhreaticLine.Points); - Assert.AreEqual(3, waternet.HeadLineList.Count); + Assert.That(waternet.HeadLineList.Count, Is.EqualTo(3)); AssertGeometry(plLines.Lines[PlLineType.Pl2].Points, waternet.HeadLineList[0].Points); AssertGeometry(plLines.Lines[PlLineType.Pl3].Points, waternet.HeadLineList[1].Points); AssertGeometry(plLines.Lines[PlLineType.Pl4].Points, waternet.HeadLineList[2].Points); - Assert.AreEqual(2, waternet.WaternetLineList.Count); + Assert.That(waternet.WaternetLineList.Count, Is.EqualTo(2)); Point2D[] expectedBottomAquiferCoordinates = { @@ -1185,13 +1185,13 @@ }; WaternetLine pl2WaternetLine = waternet.WaternetLineList[0]; - Assert.AreSame(waternet.HeadLineList[0], pl2WaternetLine.HeadLine); + Assert.That(pl2WaternetLine.HeadLine, Is.SameAs(waternet.HeadLineList[0])); GeometryPoint[] offSetAquiferCoordinates = expectedBottomAquiferCoordinates.Select(aquiferCoordinate => new GeometryPoint(aquiferCoordinate.X, aquiferCoordinate.Z + penetrationLength)) .ToArray(); AssertGeometry(offSetAquiferCoordinates, pl2WaternetLine.Points); WaternetLine pl3WaternetLine = waternet.WaternetLineList[1]; - Assert.AreSame(waternet.HeadLineList[1], pl3WaternetLine.HeadLine); + Assert.That(pl3WaternetLine.HeadLine, Is.SameAs(waternet.HeadLineList[1])); AssertGeometry(expectedBottomAquiferCoordinates, pl3WaternetLine.Points); } @@ -1263,7 +1263,7 @@ AssertGeometry(plLines.Lines[PlLineType.Pl3].Points, waternet.HeadLineList[1].Points); AssertGeometry(plLines.Lines[PlLineType.Pl4].Points, waternet.HeadLineList[2].Points); - CollectionAssert.IsEmpty(waternet.WaternetLineList); + Assert.That(waternet.WaternetLineList, Is.Empty); } [Test] @@ -1337,7 +1337,7 @@ AssertGeometry(plLines.Lines[PlLineType.Pl3].Points, waternet.HeadLineList[1].Points); AssertGeometry(plLines.Lines[PlLineType.Pl4].Points, waternet.HeadLineList[2].Points); - CollectionAssert.IsEmpty(waternet.WaternetLineList); + Assert.That(waternet.WaternetLineList, Is.Empty); } [Test] @@ -1701,14 +1701,14 @@ private static void AssertGeometry(IEnumerable expectedPoints, IEnumerable actualPoints) { int expectedNrOfPoints = expectedPoints.Count(); - Assert.AreEqual(expectedNrOfPoints, actualPoints.Count()); + Assert.That(actualPoints.Count(), Is.EqualTo(expectedNrOfPoints)); for (var i = 0; i < expectedNrOfPoints; i++) { GeometryPoint expectedPoint = expectedPoints.ElementAt(i); GeometryPoint actualPoint = actualPoints.ElementAt(i); - Assert.AreEqual(expectedPoint.X, actualPoint.X); - Assert.AreEqual(expectedPoint.Z, actualPoint.Z); + Assert.That(actualPoint.X, Is.EqualTo(expectedPoint.X)); + Assert.That(actualPoint.Z, Is.EqualTo(expectedPoint.Z)); } } } \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/DikesDesign/SurfaceLineSlopeAdapterTest.cs =================================================================== diff -u -r4540 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/DikesDesign/SurfaceLineSlopeAdapterTest.cs (.../SurfaceLineSlopeAdapterTest.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/DikesDesign/SurfaceLineSlopeAdapterTest.cs (.../SurfaceLineSlopeAdapterTest.cs) (revision 4624) @@ -377,8 +377,8 @@ X = 4, Z = 0 }; - Assert.AreEqual(6, surfaceLine.Geometry.Count); - Assert.AreEqual(5, adaptedSurfaceLine.Geometry.Count); // in between point should be thrown away + Assert.That(surfaceLine.Geometry.Count, Is.EqualTo(6)); + Assert.That(adaptedSurfaceLine.Geometry.Count, Is.EqualTo(5)); // in between point should be thrown away Assert.IsTrue(expectedPointDikeToeAtPolder.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder))); } @@ -473,10 +473,10 @@ X = 8, Z = 2.0 }; - Assert.AreEqual(expectedPointTrafficLoadOutside.X, adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadOutside).X, cTolerance); - Assert.AreEqual(expectedPointTrafficLoadInside.X, adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadInside).X, cTolerance); - Assert.AreEqual(expectedPointTrafficLoadOutside.Z, adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadOutside).Z, cTolerance); - Assert.AreEqual(expectedPointTrafficLoadInside.Z, adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadInside).Z, cTolerance); + Assert.That(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadOutside).X, Is.EqualTo(expectedPointTrafficLoadOutside.X).Within(cTolerance)); + Assert.That(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadInside).X, Is.EqualTo(expectedPointTrafficLoadInside.X).Within(cTolerance)); + Assert.That(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadOutside).Z, Is.EqualTo(expectedPointTrafficLoadOutside.Z).Within(cTolerance)); + Assert.That(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadInside).Z, Is.EqualTo(expectedPointTrafficLoadInside.Z).Within(cTolerance)); pointTrafficLoadOutside = new GeometryPoint { X = 9.5, @@ -502,10 +502,10 @@ X = 10.5, Z = 1.0 }; - Assert.AreEqual(expectedPointTrafficLoadOutside.X, adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadOutside).X, cTolerance); - Assert.AreEqual(expectedPointTrafficLoadInside.X, adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadInside).X, cTolerance); - Assert.AreEqual(expectedPointTrafficLoadOutside.Z, adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadOutside).Z, cTolerance); - Assert.AreEqual(expectedPointTrafficLoadInside.Z, adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadInside).Z, cTolerance); + Assert.That(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadOutside).X, Is.EqualTo(expectedPointTrafficLoadOutside.X).Within(cTolerance)); + Assert.That(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadInside).X, Is.EqualTo(expectedPointTrafficLoadInside.X).Within(cTolerance)); + Assert.That(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadOutside).Z, Is.EqualTo(expectedPointTrafficLoadOutside.Z).Within(cTolerance)); + Assert.That(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadInside).Z, Is.EqualTo(expectedPointTrafficLoadInside.Z).Within(cTolerance)); } #endregion @@ -1219,8 +1219,8 @@ X = pointDikeToeAtPolder.X + deltaX, Z = pointDikeToeAtPolder.Z }; - Assert.AreEqual(6, surfaceLine.Geometry.Count); - Assert.AreEqual(5, adaptedSurfaceLine.Geometry.Count); // in between point should be thrown away + Assert.That(surfaceLine.Geometry.Count, Is.EqualTo(6)); + Assert.That(adaptedSurfaceLine.Geometry.Count, Is.EqualTo(5)); // in between point should be thrown away Assert.IsTrue(expectedPointDikeToeAtPolder.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder))); } @@ -1315,10 +1315,10 @@ X = 8, Z = 2.5 }; - Assert.AreEqual(expectedPointTrafficLoadOutside.X, adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadOutside).X, cTolerance); - Assert.AreEqual(expectedPointTrafficLoadInside.X, adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadInside).X, cTolerance); - Assert.AreEqual(expectedPointTrafficLoadOutside.Z, adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadOutside).Z, cTolerance); - Assert.AreEqual(expectedPointTrafficLoadInside.Z, adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadInside).Z, cTolerance); + Assert.That(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadOutside).X, Is.EqualTo(expectedPointTrafficLoadOutside.X).Within(cTolerance)); + Assert.That(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadInside).X, Is.EqualTo(expectedPointTrafficLoadInside.X).Within(cTolerance)); + Assert.That(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadOutside).Z, Is.EqualTo(expectedPointTrafficLoadOutside.Z).Within(cTolerance)); + Assert.That(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadInside).Z, Is.EqualTo(expectedPointTrafficLoadInside.Z).Within(cTolerance)); pointTrafficLoadOutside = new GeometryPoint { X = 10.0, @@ -1344,10 +1344,10 @@ X = 13, Z = 1.25 }; - Assert.AreEqual(expectedPointTrafficLoadOutside.X, adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadOutside).X, cTolerance); - Assert.AreEqual(expectedPointTrafficLoadInside.X, adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadInside).X, cTolerance); - Assert.AreEqual(expectedPointTrafficLoadOutside.Z, adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadOutside).Z, cTolerance); - Assert.AreEqual(expectedPointTrafficLoadInside.Z, adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadInside).Z, cTolerance); + Assert.That(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadOutside).X, Is.EqualTo(expectedPointTrafficLoadOutside.X).Within(cTolerance)); + Assert.That(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadInside).X, Is.EqualTo(expectedPointTrafficLoadInside.X).Within(cTolerance)); + Assert.That(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadOutside).Z, Is.EqualTo(expectedPointTrafficLoadOutside.Z).Within(cTolerance)); + Assert.That(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadInside).Z, Is.EqualTo(expectedPointTrafficLoadInside.Z).Within(cTolerance)); } #endregion Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilTests.cs =================================================================== diff -u -r4561 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilTests.cs (.../SoilTests.cs) (revision 4561) +++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilTests.cs (.../SoilTests.cs) (revision 4624) @@ -58,28 +58,28 @@ // When targetSoil.Assign(sourceSoil); - // Then - Assert.AreEqual(sourceSoil.Name, targetSoil.Name); - Assert.AreEqual(sourceSoil.BeddingAngle, targetSoil.BeddingAngle); - Assert.AreEqual(sourceSoil.DiameterD70, targetSoil.DiameterD70); - Assert.AreEqual(sourceSoil.PermeabKx, targetSoil.PermeabKx); - Assert.AreEqual(sourceSoil.WhitesConstant, targetSoil.WhitesConstant); - Assert.AreEqual(sourceSoil.DiameterD90, targetSoil.DiameterD90); - Assert.AreEqual(sourceSoil.Cohesion, targetSoil.Cohesion); - Assert.AreEqual(sourceSoil.FrictionAngle, targetSoil.FrictionAngle); - Assert.AreEqual(sourceSoil.PoP, targetSoil.PoP); - Assert.AreEqual(sourceSoil.Ocr, targetSoil.Ocr); - Assert.AreEqual(sourceSoil.RatioCuPc, targetSoil.RatioCuPc); - Assert.AreEqual(sourceSoil.CuTop, targetSoil.CuTop); - Assert.AreEqual(sourceSoil.CuBottom, targetSoil.CuBottom); - Assert.AreEqual(sourceSoil.UsePop, targetSoil.UsePop); - Assert.AreEqual(sourceSoil.StrengthIncreaseExponent, targetSoil.StrengthIncreaseExponent); - Assert.AreEqual(sourceSoil.ShearStrengthModel, targetSoil.ShearStrengthModel); - Assert.AreEqual(sourceSoil.SigmaTauCurve.Points.Count, targetSoil.SigmaTauCurve.Points.Count); + // Then + Assert.That(targetSoil.Name, Is.EqualTo(sourceSoil.Name)); + Assert.That(targetSoil.BeddingAngle, Is.EqualTo(sourceSoil.BeddingAngle)); + Assert.That(targetSoil.DiameterD70, Is.EqualTo(sourceSoil.DiameterD70)); + Assert.That(targetSoil.PermeabKx, Is.EqualTo(sourceSoil.PermeabKx)); + Assert.That(targetSoil.WhitesConstant, Is.EqualTo(sourceSoil.WhitesConstant)); + Assert.That(targetSoil.DiameterD90, Is.EqualTo(sourceSoil.DiameterD90)); + Assert.That(targetSoil.Cohesion, Is.EqualTo(sourceSoil.Cohesion)); + Assert.That(targetSoil.FrictionAngle, Is.EqualTo(sourceSoil.FrictionAngle)); + Assert.That(targetSoil.PoP, Is.EqualTo(sourceSoil.PoP)); + Assert.That(targetSoil.Ocr, Is.EqualTo(sourceSoil.Ocr)); + Assert.That(targetSoil.RatioCuPc, Is.EqualTo(sourceSoil.RatioCuPc)); + Assert.That(targetSoil.CuTop, Is.EqualTo(sourceSoil.CuTop)); + Assert.That(targetSoil.CuBottom, Is.EqualTo(sourceSoil.CuBottom)); + Assert.That(targetSoil.UsePop, Is.EqualTo(sourceSoil.UsePop)); + Assert.That(targetSoil.StrengthIncreaseExponent, Is.EqualTo(sourceSoil.StrengthIncreaseExponent)); + Assert.That(targetSoil.ShearStrengthModel, Is.EqualTo(sourceSoil.ShearStrengthModel)); + Assert.That(targetSoil.SigmaTauCurve.Points.Count, Is.EqualTo(sourceSoil.SigmaTauCurve.Points.Count)); for (int i = 0; i < sourceSoil.SigmaTauCurve.Points.Count; i++) { - Assert.AreEqual(sourceSoil.SigmaTauCurve.Points[i].Sigma, targetSoil.SigmaTauCurve.Points[i].Sigma); - Assert.AreEqual(sourceSoil.SigmaTauCurve.Points[i].Tau, targetSoil.SigmaTauCurve.Points[i].Tau); + Assert.That(targetSoil.SigmaTauCurve.Points[i].Sigma, Is.EqualTo(sourceSoil.SigmaTauCurve.Points[i].Sigma)); + Assert.That(targetSoil.SigmaTauCurve.Points[i].Tau, Is.EqualTo(sourceSoil.SigmaTauCurve.Points[i].Tau)); } } } \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SigmaTauCurveTests.cs =================================================================== diff -u -r4561 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SigmaTauCurveTests.cs (.../SigmaTauCurveTests.cs) (revision 4561) +++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SigmaTauCurveTests.cs (.../SigmaTauCurveTests.cs) (revision 4624) @@ -40,7 +40,7 @@ // Then Assert.IsNotNull(points); Assert.IsInstanceOf>(points); - Assert.AreEqual(0, points.Count); + Assert.That(points.Count, Is.EqualTo(0)); } [Test] @@ -54,8 +54,8 @@ curve.Points.Add(point); // Then - Assert.AreEqual(1, curve.Points.Count); - Assert.AreEqual(point, curve.Points[0]); + Assert.That(curve.Points.Count, Is.EqualTo(1)); + Assert.That(curve.Points[0], Is.EqualTo(point)); } [Test] @@ -72,11 +72,11 @@ targetCurve.Assign(sourceCurve); // Then - Assert.AreEqual(sourceCurve.Points.Count, targetCurve.Points.Count); + Assert.That(targetCurve.Points.Count, Is.EqualTo(sourceCurve.Points.Count)); for (var i = 0; i < sourceCurve.Points.Count; i++) { - Assert.AreEqual(sourceCurve.Points[i].Sigma, targetCurve.Points[i].Sigma); - Assert.AreEqual(sourceCurve.Points[i].Tau, targetCurve.Points[i].Tau); + Assert.That(targetCurve.Points[i].Sigma, Is.EqualTo(sourceCurve.Points[i].Sigma)); + Assert.That(targetCurve.Points[i].Tau, Is.EqualTo(sourceCurve.Points[i].Tau)); } } } \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/SegmentTests.cs =================================================================== diff -u -r4540 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/SegmentTests.cs (.../SegmentTests.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/SegmentTests.cs (.../SegmentTests.cs) (revision 4624) @@ -32,48 +32,48 @@ public void CanGetMostProbableProbableProfile1DForStability() { Segment segment = CreateSegment(SegmentFailureMechanismType.Stability, SoilProfileType.ProfileType1D); - Assert.AreEqual("profile 1D 2", segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Stability).SoilProfile1D.Name); - Assert.AreEqual("profile 1D 2", segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Stability).Name); - Assert.AreEqual(null, segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Stability)); - Assert.AreEqual(null, segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Piping)); - Assert.AreEqual(null, segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Piping)); - Assert.AreEqual(null, segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Piping)); + Assert.That(segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Stability).SoilProfile1D.Name, Is.EqualTo("profile 1D 2")); + Assert.That(segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Stability).Name, Is.EqualTo("profile 1D 2")); + Assert.That(segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Stability), Is.EqualTo(null)); + Assert.That(segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Piping), Is.EqualTo(null)); + Assert.That(segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Piping), Is.EqualTo(null)); + Assert.That(segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Piping), Is.EqualTo(null)); } [Test] public void CanGetMostProbableProbableProfile1DForPiping() { Segment segment = CreateSegment(SegmentFailureMechanismType.Piping, SoilProfileType.ProfileType1D); - Assert.AreEqual("profile 1D 2", segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Piping).SoilProfile1D.Name); - Assert.AreEqual("profile 1D 2", segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Piping).Name); - Assert.AreEqual(null, segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Piping)); - Assert.AreEqual(null, segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Stability)); - Assert.AreEqual(null, segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Stability)); - Assert.AreEqual(null, segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Stability)); + Assert.That(segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Piping).SoilProfile1D.Name, Is.EqualTo("profile 1D 2")); + Assert.That(segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Piping).Name, Is.EqualTo("profile 1D 2")); + Assert.That(segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Piping), Is.EqualTo(null)); + Assert.That(segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Stability), Is.EqualTo(null)); + Assert.That(segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Stability), Is.EqualTo(null)); + Assert.That(segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Stability), Is.EqualTo(null)); } [Test] public void CanGetMostProbableProbableProfile2DStiFileNameForStability() { Segment segment = CreateSegment(SegmentFailureMechanismType.Stability, SoilProfileType.ProfileTypeStiFile); - Assert.AreEqual("sti filename 2", segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Stability).FullStiFileName); - Assert.AreEqual("sti filename 2", segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Stability)); - Assert.AreEqual(null, segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Stability)); - Assert.AreEqual(null, segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Piping)); - Assert.AreEqual(null, segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Piping)); - Assert.AreEqual(null, segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Piping)); + Assert.That(segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Stability).FullStiFileName, Is.EqualTo("sti filename 2")); + Assert.That(segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Stability), Is.EqualTo("sti filename 2")); + Assert.That(segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Stability), Is.EqualTo(null)); + Assert.That(segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Piping), Is.EqualTo(null)); + Assert.That(segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Piping), Is.EqualTo(null)); + Assert.That(segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Piping), Is.EqualTo(null)); } [Test] public void CanGetMostProbableProbableProfile2DStiFileNameForPiping() { Segment segment = CreateSegment(SegmentFailureMechanismType.Piping, SoilProfileType.ProfileTypeStiFile); - Assert.AreEqual("sti filename 2", segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Piping).FullStiFileName); - Assert.AreEqual("sti filename 2", segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Piping)); - Assert.AreEqual(null, segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Piping)); - Assert.AreEqual(null, segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Stability)); - Assert.AreEqual(null, segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Stability)); - Assert.AreEqual(null, segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Stability)); + Assert.That(segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Piping).FullStiFileName, Is.EqualTo("sti filename 2")); + Assert.That(segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Piping), Is.EqualTo("sti filename 2")); + Assert.That(segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Piping), Is.EqualTo(null)); + Assert.That(segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Stability), Is.EqualTo(null)); + Assert.That(segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Stability), Is.EqualTo(null)); + Assert.That(segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Stability), Is.EqualTo(null)); } private static Segment CreateSegment(SegmentFailureMechanismType segmentFailureMechanismType, SoilProfileType soilProfileType) Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/UpliftLocationDeterminatorTest.cs =================================================================== diff -u -r4540 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/UpliftLocationDeterminatorTest.cs (.../UpliftLocationDeterminatorTest.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/UpliftLocationDeterminatorTest.cs (.../UpliftLocationDeterminatorTest.cs) (revision 4624) @@ -100,9 +100,9 @@ }; UpliftLocationAndResult upliftLocationAndResult = upliftLocationDeterminator.GetLocationAtWithLowestUpliftFactor(); - Assert.AreEqual(cExpectedXCoordinate, upliftLocationAndResult.X, cTolerance); - Assert.AreEqual(cExpectedZCoordinate, upliftLocationAndResult.Z, cTolerance); - Assert.AreEqual(cExpectedUpliftFactor, upliftLocationAndResult.UpliftFactor.Value, cTolerance); + Assert.That(upliftLocationAndResult.X, Is.EqualTo(cExpectedXCoordinate).Within(cTolerance)); + Assert.That(upliftLocationAndResult.Z, Is.EqualTo(cExpectedZCoordinate).Within(cTolerance)); + Assert.That(upliftLocationAndResult.UpliftFactor.Value, Is.EqualTo(cExpectedUpliftFactor).Within(cTolerance)); } [Test] @@ -125,7 +125,7 @@ UpliftLocationAndResult upliftLocationAndResult = upliftLocationDeterminator.GetLocationInPolderNearestDikeWithUpliftFactorLowerThanRequired(1.0); Assert.IsTrue(upliftLocationAndResult.LocationEquals(upliftLocationDeterminator.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder))); - Assert.AreEqual(cExpectedUpliftFactor, upliftLocationAndResult.UpliftFactor.Value, cTolerance); + Assert.That(upliftLocationAndResult.UpliftFactor.Value, Is.EqualTo(cExpectedUpliftFactor).Within(cTolerance)); } /// @@ -158,7 +158,7 @@ UpliftLocationAndResult upliftLocationAndResult = upliftLocationDeterminator.GetLocationInPolderNearestDikeWithUpliftFactorLowerThanRequired(1.0); Assert.IsTrue(upliftLocationAndResult.LocationEquals(upliftLocationDeterminator.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder))); - Assert.AreEqual(cExpectedUpliftFactor, upliftLocationAndResult.UpliftFactor.Value, cTolerance); + Assert.That(upliftLocationAndResult.UpliftFactor.Value, Is.EqualTo(cExpectedUpliftFactor).Within(cTolerance)); } private static PlLines CreatePlLines(SurfaceLine2 surfaceLine, SoilProfile1D soilProfile, double riverLevel, bool isUseOvenDryUnitWeight) Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/PlLinesHelperTests.cs =================================================================== diff -u -r4540 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/PlLinesHelperTests.cs (.../PlLinesHelperTests.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/PlLinesHelperTests.cs (.../PlLinesHelperTests.cs) (revision 4624) @@ -45,8 +45,8 @@ var riverLevel = 1.0; var timeStepDateTime = new DateTime(); PlLines plLines = PlLinesHelper.CreatePlLinesForPiping(timeStepDateTime, location, soilProfile1D, riverLevel); - Assert.AreEqual(4, plLines.PlLineCount); - Assert.AreEqual(8, plLines.Lines[PlLineType.Pl1].Points.Count); + Assert.That(plLines.PlLineCount, Is.EqualTo(4)); + Assert.That(plLines.Lines[PlLineType.Pl1].Points.Count, Is.EqualTo(8)); Assert.IsTrue(new PlLinePoint(0.000, 1.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[0])); Assert.IsTrue(new PlLinePoint(14.900, 1.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[1])); Assert.IsTrue(new PlLinePoint(34.500, 0.500).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[2])); @@ -55,11 +55,11 @@ Assert.IsTrue(new PlLinePoint(58.500, 0.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[5])); Assert.IsTrue(new PlLinePoint(61.500, 0.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[6])); Assert.IsTrue(new PlLinePoint(75.000, 0.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[7])); - Assert.AreEqual(0, plLines.Lines[PlLineType.Pl2].Points.Count); - Assert.AreEqual(2, plLines.Lines[PlLineType.Pl3].Points.Count); + Assert.That(plLines.Lines[PlLineType.Pl2].Points.Count, Is.EqualTo(0)); + Assert.That(plLines.Lines[PlLineType.Pl3].Points.Count, Is.EqualTo(2)); Assert.IsTrue(new PlLinePoint(0.000, 1.000).LocationEquals(plLines.Lines[PlLineType.Pl3].Points[0])); Assert.IsTrue(new PlLinePoint(75.000, 1.000).LocationEquals(plLines.Lines[PlLineType.Pl3].Points[1])); - Assert.AreEqual(0, plLines.Lines[PlLineType.Pl4].Points.Count); + Assert.That(plLines.Lines[PlLineType.Pl4].Points.Count, Is.EqualTo(0)); } [Test] @@ -76,8 +76,8 @@ var riverLevel = 1.0; var timeStepDateTime = new DateTime(); PlLines plLines = PlLinesHelper.CreatePlLinesForPiping(timeStepDateTime, location, soilProfile1D, riverLevel); - Assert.AreEqual(4, plLines.PlLineCount); - Assert.AreEqual(8, plLines.Lines[PlLineType.Pl1].Points.Count); + Assert.That(plLines.PlLineCount, Is.EqualTo(4)); + Assert.That(plLines.Lines[PlLineType.Pl1].Points.Count, Is.EqualTo(8)); Assert.IsTrue(new PlLinePoint(0.000, 1.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[0])); Assert.IsTrue(new PlLinePoint(14.900, 1.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[1])); Assert.IsTrue(new PlLinePoint(34.500, 0.500).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[2])); @@ -86,11 +86,11 @@ Assert.IsTrue(new PlLinePoint(58.500, 0.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[5])); Assert.IsTrue(new PlLinePoint(61.500, 0.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[6])); Assert.IsTrue(new PlLinePoint(75.000, 0.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[7])); - Assert.AreEqual(0, plLines.Lines[PlLineType.Pl2].Points.Count); - Assert.AreEqual(2, plLines.Lines[PlLineType.Pl3].Points.Count); + Assert.That(plLines.Lines[PlLineType.Pl2].Points.Count, Is.EqualTo(0)); + Assert.That(plLines.Lines[PlLineType.Pl3].Points.Count, Is.EqualTo(2)); Assert.IsTrue(new PlLinePoint(0.000, 1.000).LocationEquals(plLines.Lines[PlLineType.Pl3].Points[0])); Assert.IsTrue(new PlLinePoint(75.000, 1.000).LocationEquals(plLines.Lines[PlLineType.Pl3].Points[1])); - Assert.AreEqual(0, plLines.Lines[PlLineType.Pl4].Points.Count); + Assert.That(plLines.Lines[PlLineType.Pl4].Points.Count, Is.EqualTo(0)); } [Test] @@ -117,8 +117,8 @@ var timeStepDateTime = new DateTime(); PlLines plLines = PlLinesHelper.CreatePlLinesForPiping(timeStepDateTime, location, soilProfile1D, riverLevel); - Assert.AreEqual(4, plLines.PlLineCount); - Assert.AreEqual(8, plLines.Lines[PlLineType.Pl1].Points.Count); + Assert.That(plLines.PlLineCount, Is.EqualTo(4)); + Assert.That(plLines.Lines[PlLineType.Pl1].Points.Count, Is.EqualTo(8)); Assert.IsTrue(new PlLinePoint(0.000, 0.500).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[0])); Assert.IsTrue(new PlLinePoint(12.450, 0.500).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[1])); Assert.IsTrue(new PlLinePoint(34.500, 0.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[2])); @@ -127,13 +127,13 @@ Assert.IsTrue(new PlLinePoint(58.500, 0.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[5])); Assert.IsTrue(new PlLinePoint(61.500, 0.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[6])); Assert.IsTrue(new PlLinePoint(75.000, 0.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[7])); - Assert.AreEqual(2, plLines.Lines[PlLineType.Pl2].Points.Count); + Assert.That(plLines.Lines[PlLineType.Pl2].Points.Count, Is.EqualTo(2)); Assert.IsTrue(new PlLinePoint(0.000, 0.500).LocationEquals(plLines.Lines[PlLineType.Pl2].Points[0])); Assert.IsTrue(new PlLinePoint(75.000, 0.500).LocationEquals(plLines.Lines[PlLineType.Pl2].Points[1])); - Assert.AreEqual(2, plLines.Lines[PlLineType.Pl3].Points.Count); + Assert.That(plLines.Lines[PlLineType.Pl3].Points.Count, Is.EqualTo(2)); Assert.IsTrue(new PlLinePoint(0.000, 1.000).LocationEquals(plLines.Lines[PlLineType.Pl3].Points[0])); Assert.IsTrue(new PlLinePoint(75.000, 1.000).LocationEquals(plLines.Lines[PlLineType.Pl3].Points[1])); - Assert.AreEqual(2, plLines.Lines[PlLineType.Pl4].Points.Count); + Assert.That(plLines.Lines[PlLineType.Pl4].Points.Count, Is.EqualTo(2)); Assert.IsTrue(new PlLinePoint(0.000, 0.500).LocationEquals(plLines.Lines[PlLineType.Pl4].Points[0])); Assert.IsTrue(new PlLinePoint(75.000, 0.500).LocationEquals(plLines.Lines[PlLineType.Pl4].Points[1])); } Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/CheckLargeResultsSets.cs =================================================================== diff -u -r4540 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/CheckLargeResultsSets.cs (.../CheckLargeResultsSets.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/CheckLargeResultsSets.cs (.../CheckLargeResultsSets.cs) (revision 4624) @@ -63,80 +63,80 @@ if (timeSeries.LocationId == "Purmer_PU0042+00_K") { TimeSerieEntry firstEntry = timeSeries.Entries.First(); - Assert.AreEqual(1.442, firstEntry.Value, cTolerance, "The computed safety factory is not correct"); + Assert.That(firstEntry.Value, Is.EqualTo(1.442).Within(cTolerance), "The computed safety factory is not correct"); resultsCount++; TimeSerieEntry lastEntry = timeSeries.Entries.Last(); - Assert.AreEqual(1.579, lastEntry.Value, cTolerance, "The computed safety factory is not correct"); + Assert.That(lastEntry.Value, Is.EqualTo(1.579).Within(cTolerance), "The computed safety factory is not correct"); resultsCount++; } if (timeSeries.LocationId == "Purmer_PU0042+00_K_V") { TimeSerieEntry firstEntry = timeSeries.Entries.First(); - Assert.AreEqual(1.365, firstEntry.Value, cTolerance, "The computed safety factory is not correct"); + Assert.That(firstEntry.Value, Is.EqualTo(1.365).Within(cTolerance), "The computed safety factory is not correct"); resultsCount++; TimeSerieEntry lastEntry = timeSeries.Entries.Last(); - Assert.AreEqual(1.481, lastEntry.Value, cTolerance, "The computed safety factory is not correct"); + Assert.That(lastEntry.Value, Is.EqualTo(1.481).Within(cTolerance), "The computed safety factory is not correct"); resultsCount++; } if (timeSeries.LocationId == "Purmer_PU0042+00_R") { TimeSerieEntry firstEntry = timeSeries.Entries.First(); - Assert.AreEqual(1.239, firstEntry.Value, cTolerance, "The computed safety factory is not correct"); + Assert.That(firstEntry.Value, Is.EqualTo(1.239).Within(cTolerance), "The computed safety factory is not correct"); resultsCount++; TimeSerieEntry lastEntry = timeSeries.Entries.Last(); - Assert.AreEqual(1.355, lastEntry.Value, cTolerance, "The computed safety factory is not correct"); + Assert.That(lastEntry.Value, Is.EqualTo(1.355).Within(cTolerance), "The computed safety factory is not correct"); resultsCount++; } if (timeSeries.LocationId == "Purmer_PU0042+00_R_V") { TimeSerieEntry firstEntry = timeSeries.Entries.First(); - Assert.AreEqual(1.168, firstEntry.Value, cTolerance, "The computed safety factory is not correct"); + Assert.That(firstEntry.Value, Is.EqualTo(1.168).Within(cTolerance), "The computed safety factory is not correct"); resultsCount++; TimeSerieEntry lastEntry = timeSeries.Entries.Last(); - Assert.AreEqual(1.272, lastEntry.Value, cTolerance, "The computed safety factory is not correct"); + Assert.That(lastEntry.Value, Is.EqualTo(1.272).Within(cTolerance), "The computed safety factory is not correct"); resultsCount++; } if (timeSeries.LocationId == "Purmer_PU0110+20_K") { TimeSerieEntry firstEntry = timeSeries.Entries.First(); - Assert.AreEqual(Double.NaN, firstEntry.Value, cTolerance, "The computed safety factory is not correct"); + Assert.That(firstEntry.Value, Is.EqualTo(Double.NaN).Within(cTolerance), "The computed safety factory is not correct"); resultsCount++; TimeSerieEntry lastEntry = timeSeries.Entries.Last(); - Assert.AreEqual(Double.NaN, lastEntry.Value, cTolerance, "The computed safety factory is not correct"); + Assert.That(lastEntry.Value, Is.EqualTo(Double.NaN).Within(cTolerance), "The computed safety factory is not correct"); resultsCount++; } if (timeSeries.LocationId == "Purmer_PU0110+20_K_V") { TimeSerieEntry firstEntry = timeSeries.Entries.First(); - Assert.AreEqual(Double.NaN, firstEntry.Value, cTolerance, "The computed safety factory is not correct"); + Assert.That(firstEntry.Value, Is.EqualTo(Double.NaN).Within(cTolerance), "The computed safety factory is not correct"); resultsCount++; TimeSerieEntry lastEntry = timeSeries.Entries.Last(); - Assert.AreEqual(Double.NaN, lastEntry.Value, cTolerance, "The computed safety factory is not correct"); + Assert.That(lastEntry.Value, Is.EqualTo(Double.NaN).Within(cTolerance), "The computed safety factory is not correct"); resultsCount++; } if (timeSeries.LocationId == "Purmer_PU0110+20_R") { TimeSerieEntry firstEntry = timeSeries.Entries.First(); - Assert.AreEqual(Double.NaN, firstEntry.Value, cTolerance, "The computed safety factory is not correct"); + Assert.That(firstEntry.Value, Is.EqualTo(Double.NaN).Within(cTolerance), "The computed safety factory is not correct"); resultsCount++; TimeSerieEntry lastEntry = timeSeries.Entries.Last(); - Assert.AreEqual(Double.NaN, lastEntry.Value, cTolerance, "The computed safety factory is not correct"); + Assert.That(lastEntry.Value, Is.EqualTo(Double.NaN).Within(cTolerance), "The computed safety factory is not correct"); resultsCount++; } if (timeSeries.LocationId == "Purmer_PU0110+20_R_V") { TimeSerieEntry firstEntry = timeSeries.Entries.First(); - Assert.AreEqual(Double.NaN, firstEntry.Value, cTolerance, "The computed safety factory is not correct"); + Assert.That(firstEntry.Value, Is.EqualTo(Double.NaN).Within(cTolerance), "The computed safety factory is not correct"); resultsCount++; TimeSerieEntry lastEntry = timeSeries.Entries.Last(); - Assert.AreEqual(Double.NaN, lastEntry.Value, cTolerance, "The computed safety factory is not correct"); + Assert.That(lastEntry.Value, Is.EqualTo(Double.NaN).Within(cTolerance), "The computed safety factory is not correct"); resultsCount++; } } @@ -145,7 +145,7 @@ } Assert.IsTrue(seriesCount > 0, "No output time series"); - Assert.AreEqual(16, resultsCount, "Incorrect number of results"); + Assert.That(resultsCount, Is.EqualTo(16), "Incorrect number of results"); } public static void CheckResultsDesignBishopWithScenariosForHeadPl3CalculatesCorrect(DesignResult[] calculationResults) @@ -154,128 +154,128 @@ { if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(3)_Pro(segment_627_1D1-KR093_0013-1)")) { - Assert.AreEqual(9.300, designResult.StabilityDesignResults.SafetyFactor, tolerance); - Assert.AreEqual("3", designResult.ScenarioName); - Assert.AreEqual(-0.94, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(9.300).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("3")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.94).Within(tol2Digits)); } if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(4)_Pro(segment_627_1D1-KR093_0013-1)")) { - Assert.AreEqual(7.888, designResult.StabilityDesignResults.SafetyFactor, tolerance); - Assert.AreEqual("4", designResult.ScenarioName); - Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(7.888).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("4")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits)); } if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(3)_Pro(segment_627_1D2-KR093_0013-2)")) { - Assert.AreEqual(7.023, designResult.StabilityDesignResults.SafetyFactor, tolerance); - Assert.AreEqual("3", designResult.ScenarioName); - Assert.AreEqual(-0.94, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(7.023).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("3")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.94).Within(tol2Digits)); } if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(4)_Pro(segment_627_1D2-KR093_0013-2)")) { - Assert.AreEqual(5.968, designResult.StabilityDesignResults.SafetyFactor, tolerance); - Assert.AreEqual("4", designResult.ScenarioName); - Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(5.968).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("4")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits)); } if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(3)_Pro(segment_627_1D3-KR093_0013-3)")) { - Assert.AreEqual(7.555, designResult.StabilityDesignResults.SafetyFactor, tolerance); - Assert.AreEqual("3", designResult.ScenarioName); - Assert.AreEqual(-0.94, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(7.555).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("3")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.94).Within(tol2Digits)); } if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(4)_Pro(segment_627_1D3-KR093_0013-3)")) { - Assert.AreEqual(6.477, designResult.StabilityDesignResults.SafetyFactor, tolerance); - Assert.AreEqual("4", designResult.ScenarioName); - Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(6.477).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("4")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits)); } if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(3)_Pro(segment_629_1D1-KR093_0018-1)")) { - Assert.AreEqual(7.353, designResult.StabilityDesignResults.SafetyFactor, tolerance); - Assert.AreEqual("3", designResult.ScenarioName); - Assert.AreEqual(-1.00, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(7.353).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("3")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-1.00).Within(tol2Digits)); } if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(4)_Pro(segment_629_1D1-KR093_0018-1)")) { - Assert.AreEqual(6.278, designResult.StabilityDesignResults.SafetyFactor, tolerance); - Assert.AreEqual("4", designResult.ScenarioName); - Assert.AreEqual(-0.61, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(6.278).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("4")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.61).Within(tol2Digits)); } if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(3)_Pro(segment_629_1D2-KR093_0018-2)")) { - Assert.AreEqual(5.945, designResult.StabilityDesignResults.SafetyFactor, tolerance); - Assert.AreEqual("3", designResult.ScenarioName); - Assert.AreEqual(-1.00, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(5.945).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("3")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-1.00).Within(tol2Digits)); } if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(4)_Pro(segment_629_1D2-KR093_0018-2)")) { - Assert.AreEqual(1.225, designResult.StabilityDesignResults.SafetyFactor, tolerance); - Assert.AreEqual("4", designResult.ScenarioName); - Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.225).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("4")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits)); } if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(3)_Pro(segment_629_1D3-KR093_0018-3)")) { - Assert.AreEqual(1.608, designResult.StabilityDesignResults.SafetyFactor, tolerance); - Assert.AreEqual("3", designResult.ScenarioName); - Assert.AreEqual(-1.00, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.608).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("3")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-1.00).Within(tol2Digits)); } if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(4)_Pro(segment_629_1D3-KR093_0018-3)")) { - Assert.AreEqual(1.397, designResult.StabilityDesignResults.SafetyFactor, tolerance); - Assert.AreEqual("4", designResult.ScenarioName); - Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.397).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("4")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits)); } if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(3)_Pro(segment_629_1D1-KR093_0019-1)")) { - Assert.AreEqual(4.557, designResult.StabilityDesignResults.SafetyFactor, tolerance); - Assert.AreEqual("3", designResult.ScenarioName); - Assert.AreEqual(-1.03, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(4.557).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("3")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-1.03).Within(tol2Digits)); } if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(4)_Pro(segment_629_1D1-KR093_0019-1)")) { - Assert.AreEqual(3.985, designResult.StabilityDesignResults.SafetyFactor, tolerance); - Assert.AreEqual("4", designResult.ScenarioName); - Assert.AreEqual(-0.57, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(3.985).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("4")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.57).Within(tol2Digits)); } if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(3)_Pro(segment_629_1D2-KR093_0019-2)")) { - Assert.AreEqual(4.087, designResult.StabilityDesignResults.SafetyFactor, tolerance); - Assert.AreEqual("3", designResult.ScenarioName); - Assert.AreEqual(-1.03, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(4.087).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("3")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-1.03).Within(tol2Digits)); } if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(4)_Pro(segment_629_1D2-KR093_0019-2)")) { - Assert.AreEqual(3.418, designResult.StabilityDesignResults.SafetyFactor, tolerance); - Assert.AreEqual("4", designResult.ScenarioName); - Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(3.418).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("4")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits)); } if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(3)_Pro(segment_629_1D3-KR093_0019-3)")) { - Assert.AreEqual(4.432, designResult.StabilityDesignResults.SafetyFactor, tolerance); - Assert.AreEqual("3", designResult.ScenarioName); - Assert.AreEqual(-1.03, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(4.432).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("3")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-1.03).Within(tol2Digits)); } if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(4)_Pro(segment_629_1D3-KR093_0019-3)")) { - Assert.AreEqual(3.745, designResult.StabilityDesignResults.SafetyFactor, tolerance); - Assert.AreEqual("4", designResult.ScenarioName); - Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(3.745).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("4")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits)); } } } @@ -287,145 +287,145 @@ { if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(3)_Pro(segment_627_1D1-KR093_0013-1)_Ite(4)")) { - Assert.AreEqual(5.306, designResult.StabilityDesignResults.SafetyFactor, tolerance); - Assert.AreEqual("3", designResult.ScenarioName); - Assert.AreEqual(-0.94, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(5.306).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("3")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.94).Within(tol2Digits)); resultsFound++; } if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(4)_Pro(segment_627_1D1-KR093_0013-1)_Ite(4)")) { - Assert.AreEqual(4.986, designResult.StabilityDesignResults.SafetyFactor, tolerance); - Assert.AreEqual("4", designResult.ScenarioName); - Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(4.986).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("4")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits)); resultsFound++; } if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(3)_Pro(segment_627_1D2-KR093_0013-2)_Ite(3)")) { - Assert.AreEqual(5.155, designResult.StabilityDesignResults.SafetyFactor, tolerance); - Assert.AreEqual("3", designResult.ScenarioName); - Assert.AreEqual(-0.94, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(5.155).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("3")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.94).Within(tol2Digits)); resultsFound++; } if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(4)_Pro(segment_627_1D2-KR093_0013-2)_Ite(3)")) { - Assert.AreEqual(4.335, designResult.StabilityDesignResults.SafetyFactor, tolerance); - Assert.AreEqual("4", designResult.ScenarioName); - Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(4.335).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("4")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits)); resultsFound++; } if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(3)_Pro(segment_627_1D3-KR093_0013-3)_Ite(3)")) { - Assert.AreEqual(5.188, designResult.StabilityDesignResults.SafetyFactor, tolerance); - Assert.AreEqual("3", designResult.ScenarioName); - Assert.AreEqual(-0.94, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(5.188).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("3")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.94).Within(tol2Digits)); resultsFound++; } if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(4)_Pro(segment_627_1D3-KR093_0013-3)_Ite(3)")) { - Assert.AreEqual(4.784, designResult.StabilityDesignResults.SafetyFactor, tolerance); - Assert.AreEqual("4", designResult.ScenarioName); - Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(4.784).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("4")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits)); resultsFound++; } if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(3)_Pro(segment_629_1D1-KR093_0018-1)_Ite(29)")) { - Assert.AreEqual(1.752, designResult.StabilityDesignResults.SafetyFactor, tolerance); - Assert.AreEqual("3", designResult.ScenarioName); - Assert.AreEqual(-1.00, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.752).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("3")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-1.00).Within(tol2Digits)); resultsFound++; } if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(4)_Pro(segment_629_1D1-KR093_0018-1)_Ite(29)")) { - Assert.AreEqual(1.270, designResult.StabilityDesignResults.SafetyFactor, tolerance); - Assert.AreEqual("4", designResult.ScenarioName); - Assert.AreEqual(-0.52, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.270).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("4")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.52).Within(tol2Digits)); resultsFound++; } if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(3)_Pro(segment_629_1D2-KR093_0018-2)_Ite(29)")) { - Assert.AreEqual(1.409, designResult.StabilityDesignResults.SafetyFactor, tolerance); - Assert.AreEqual("3", designResult.ScenarioName); - Assert.AreEqual(-1.00, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.409).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("3")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-1.00).Within(tol2Digits)); resultsFound++; } if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(4)_Pro(segment_629_1D2-KR093_0018-2)_Ite(29)")) { - Assert.AreEqual(1.224, designResult.StabilityDesignResults.SafetyFactor, tolerance); - Assert.AreEqual("4", designResult.ScenarioName); - Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.224).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("4")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits)); resultsFound++; } if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(3)_Pro(segment_629_1D3-KR093_0018-3)_Ite(29)")) { - Assert.AreEqual(1.598, designResult.StabilityDesignResults.SafetyFactor, tolerance); - Assert.AreEqual("3", designResult.ScenarioName); - Assert.AreEqual(-1.00, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.598).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("3")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-1.00).Within(tol2Digits)); resultsFound++; } if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(4)_Pro(segment_629_1D3-KR093_0018-3)_Ite(29)")) { - Assert.AreEqual(1.382, designResult.StabilityDesignResults.SafetyFactor, tolerance); - Assert.AreEqual("4", designResult.ScenarioName); - Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.382).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("4")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits)); resultsFound++; } if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(3)_Pro(segment_629_1D1-KR093_0019-1)_Ite(25)")) { - Assert.AreEqual(5.848, designResult.StabilityDesignResults.SafetyFactor, tolerance); - Assert.AreEqual("3", designResult.ScenarioName); - Assert.AreEqual(-1.03, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(5.848).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("3")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-1.03).Within(tol2Digits)); resultsFound++; } if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(4)_Pro(segment_629_1D1-KR093_0019-1)_Ite(25)")) { - Assert.AreEqual(5.848, designResult.StabilityDesignResults.SafetyFactor, tolerance); - Assert.AreEqual("4", designResult.ScenarioName); - Assert.AreEqual(-0.57, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(5.848).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("4")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.57).Within(tol2Digits)); resultsFound++; } if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(3)_Pro(segment_629_1D2-KR093_0019-2)_Ite(25)")) { - Assert.AreEqual(1.552, designResult.StabilityDesignResults.SafetyFactor, tolerance); - Assert.AreEqual("3", designResult.ScenarioName); - Assert.AreEqual(-1.03, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.552).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("3")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-1.03).Within(tol2Digits)); resultsFound++; } if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(4)_Pro(segment_629_1D2-KR093_0019-2)_Ite(5)")) { - Assert.AreEqual(2.876, designResult.StabilityDesignResults.SafetyFactor, tolerance); - Assert.AreEqual("4", designResult.ScenarioName); - Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(2.876).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("4")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits)); resultsFound++; } if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(3)_Pro(segment_629_1D3-KR093_0019-3)_Ite(25)")) { - Assert.AreEqual(3.538, designResult.StabilityDesignResults.SafetyFactor, tolerance); - Assert.AreEqual("3", designResult.ScenarioName); - Assert.AreEqual(-1.03, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(3.538).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("3")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-1.03).Within(tol2Digits)); resultsFound++; } if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(4)_Pro(segment_629_1D3-KR093_0019-3)_Ite(25)")) { - Assert.AreEqual(1.503, designResult.StabilityDesignResults.SafetyFactor, tolerance); - Assert.AreEqual("4", designResult.ScenarioName); - Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.503).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("4")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits)); resultsFound++; } } @@ -443,7 +443,7 @@ } Output output = DamXmlSerialization.LoadOutputFromXmlFile(resultsFile); - Assert.AreEqual(output.Results.CalculationResults.Count(), calculationResults.Count(), "Results Count does not match"); + Assert.That(calculationResults.Count(), Is.EqualTo(output.Results.CalculationResults.Count()), "Results Count does not match"); var totalDifferences = 0; foreach (DesignResult expectedDesignResult in output.Results.CalculationResults) { @@ -479,7 +479,7 @@ totalDifferences += result.Differences.Count; } - Assert.AreEqual(0, totalDifferences, "Total differences found comparing design results for " + resultsFile); + Assert.That(totalDifferences, Is.EqualTo(0), "Total differences found comparing design results for " + resultsFile); } private static void WriteDifferencesToLog(string logFile, string baseFileName, ComparisonResult result) Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/ConversionHelperTests.cs =================================================================== diff -u -r4540 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 4624) @@ -34,6 +34,6 @@ public void GivenFailureMechanismSystemTypeWhenConvertingThenReturnsCorrectSegmentFailureMechanismType( FailureMechanismSystemType failureMechanismSystemType, SegmentFailureMechanismType segmentFailureMechanismType) { - Assert.AreEqual(segmentFailureMechanismType, ConversionHelper.ConvertToSegmentFailureMechanismType(failureMechanismSystemType)); + Assert.That(ConversionHelper.ConvertToSegmentFailureMechanismType(failureMechanismSystemType), Is.EqualTo(segmentFailureMechanismType)); } } \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/DikesDesign/SurfaceLineShoulderAdapterTest.cs =================================================================== diff -u -r4540 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/DikesDesign/SurfaceLineShoulderAdapterTest.cs (.../SurfaceLineShoulderAdapterTest.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/DikesDesign/SurfaceLineShoulderAdapterTest.cs (.../SurfaceLineShoulderAdapterTest.cs) (revision 4624) @@ -396,7 +396,7 @@ SurfaceLine2 adaptedSurfaceLine = surfaceLineAdapter.ConstructNewSurfaceLine(shoulderLength, shoulderHeight, false); double expectedZ = pointAtTopPolder.Z; double actualZ = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside).Z; - Assert.AreEqual(expectedZ, actualZ); + Assert.That(actualZ, Is.EqualTo(expectedZ)); } [Test] @@ -450,12 +450,12 @@ SurfaceLine2 adaptedSurfaceLine = surfaceLineAdapter.ConstructNewSurfaceLine(shoulderLength, shoulderHeight, false); double expectedShoulderHeight = Math.Min(shoulderHeight, (surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).Z - surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z)); double expectedShoulderBaseX = pointAtTopPolder.X + (1 - expectedShoulderHeight); - Assert.AreEqual(expectedShoulderBaseX, adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside).X); - Assert.AreEqual(expectedShoulderHeight, adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside).Z); - Assert.AreEqual(expectedShoulderBaseX + shoulderLength, adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside).X); - Assert.AreEqual(expectedShoulderHeight, adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside).Z); - Assert.AreEqual(expectedShoulderBaseX + shoulderLength + surfaceLineAdapter.SlopeOfNewShoulder * expectedShoulderHeight, adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).X); - Assert.AreEqual(0, adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z); + Assert.That(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside).X, Is.EqualTo(expectedShoulderBaseX)); + Assert.That(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside).Z, Is.EqualTo(expectedShoulderHeight)); + Assert.That(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside).X, Is.EqualTo(expectedShoulderBaseX + shoulderLength)); + Assert.That(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside).Z, Is.EqualTo(expectedShoulderHeight)); + Assert.That(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).X, Is.EqualTo(expectedShoulderBaseX + shoulderLength + surfaceLineAdapter.SlopeOfNewShoulder * expectedShoulderHeight)); + Assert.That(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z, Is.EqualTo(0)); } [Test] @@ -518,16 +518,16 @@ SurfaceLine2 adaptedSurfaceLine = surfaceLineAdapter.ConstructNewSurfaceLine(shoulderLength, shoulderHeight, false); var expectedPoint = new GeometryPoint(6.00, 1); GeometryPoint actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder); - Assert.AreEqual(expectedPoint.X, actualPoint.X, pointCoordinateTolerance); - Assert.AreEqual(expectedPoint.Z, actualPoint.Z, pointCoordinateTolerance); + Assert.That(actualPoint.X, Is.EqualTo(expectedPoint.X).Within(pointCoordinateTolerance)); + Assert.That(actualPoint.Z, Is.EqualTo(expectedPoint.Z).Within(pointCoordinateTolerance)); expectedPoint = new GeometryPoint(4.66, 1.67); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside); - Assert.AreEqual(expectedPoint.X, actualPoint.X, pointCoordinateTolerance); - Assert.AreEqual(expectedPoint.Z, actualPoint.Z, pointCoordinateTolerance); + Assert.That(actualPoint.X, Is.EqualTo(expectedPoint.X).Within(pointCoordinateTolerance)); + Assert.That(actualPoint.Z, Is.EqualTo(expectedPoint.Z).Within(pointCoordinateTolerance)); expectedPoint = new GeometryPoint(2.66, 1.67); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside); - Assert.AreEqual(expectedPoint.X, actualPoint.X, pointCoordinateTolerance); - Assert.AreEqual(expectedPoint.Z, actualPoint.Z, pointCoordinateTolerance); + Assert.That(actualPoint.X, Is.EqualTo(expectedPoint.X).Within(pointCoordinateTolerance)); + Assert.That(actualPoint.Z, Is.EqualTo(expectedPoint.Z).Within(pointCoordinateTolerance)); } [Test] @@ -556,8 +556,8 @@ SurfaceLine2 adaptedSurfaceLine = surfaceLineAdapter.ConstructNewSurfaceLine(shoulderLength, shoulderHeight, false); var expectedPoint = new GeometryPoint(2.857, 1.0); GeometryPoint actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside); - Assert.AreEqual(expectedPoint.X, actualPoint.X, pointCoordinateTolerance); - Assert.AreEqual(expectedPoint.Z, actualPoint.Z, pointCoordinateTolerance); + Assert.That(actualPoint.X, Is.EqualTo(expectedPoint.X).Within(pointCoordinateTolerance)); + Assert.That(actualPoint.Z, Is.EqualTo(expectedPoint.Z).Within(pointCoordinateTolerance)); } [Test] @@ -643,13 +643,13 @@ double xSurfaceLevelInside = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside).X; IEnumerable actualExtraPoints = adaptedSurfaceLine.GetPointSegmentIncluding(xToePolder, xSurfaceLevelInside); const int expectedNumberOfPoints = 9; - Assert.AreEqual(expectedNumberOfPoints, adaptedSurfaceLine.Geometry.Points.Count); + Assert.That(adaptedSurfaceLine.Geometry.Points.Count, Is.EqualTo(expectedNumberOfPoints)); const int expectedNumberOfExtraPoints = 3; - Assert.AreEqual(expectedNumberOfExtraPoints, actualExtraPoints.Count()); + Assert.That(actualExtraPoints.Count(), Is.EqualTo(expectedNumberOfExtraPoints)); GeometryPoint actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside); double actualXValue = pointAtSurfaceLevelInside.X; - Assert.AreEqual(actualXValue, actualPoint.X, pointCoordinateTolerance); - Assert.AreEqual(pointAtSurfaceLevelInside.Z, actualPoint.Z, pointCoordinateTolerance); + Assert.That(actualPoint.X, Is.EqualTo(actualXValue).Within(pointCoordinateTolerance)); + Assert.That(actualPoint.Z, Is.EqualTo(pointAtSurfaceLevelInside.Z).Within(pointCoordinateTolerance)); Assert.IsTrue(adaptedSurfaceLine.Geometry.Points.Any(p => p.LocationEquals(extraPoint2))); Assert.IsFalse(adaptedSurfaceLine.Geometry.Points.Any(p => p.LocationEquals(extraPoint1))); } @@ -681,8 +681,8 @@ Assert.IsNull(surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside)); var surfaceLineAdapter = new SurfaceLineShoulderAdapter(surfaceLine, location, 0); SurfaceLine2 adaptedSurfaceLine = surfaceLineAdapter.ConstructNewSurfaceLine(shoulderLength, shoulderHeight, false); - Assert.AreEqual(7, surfaceLine.Geometry.Points.Count); - Assert.AreEqual(8, adaptedSurfaceLine.Geometry.Points.Count); + Assert.That(surfaceLine.Geometry.Points.Count, Is.EqualTo(7)); + Assert.That(adaptedSurfaceLine.Geometry.Points.Count, Is.EqualTo(8)); EvaluateAdaptedSurfaceLineWithSkewedSurfaceLevelInside(surfaceLine, adaptedSurfaceLine, shoulderHeight, shoulderLength); } @@ -715,8 +715,8 @@ SlopeOfNewShoulder = 2 }; SurfaceLine2 adaptedSurfaceLine = surfaceLineAdapter.ConstructNewSurfaceLine(shoulderLength, shoulderHeight, false); - Assert.AreEqual(12, surfaceLine.Geometry.Points.Count); - Assert.AreEqual(9, adaptedSurfaceLine.Geometry.Points.Count); + Assert.That(surfaceLine.Geometry.Points.Count, Is.EqualTo(12)); + Assert.That(adaptedSurfaceLine.Geometry.Points.Count, Is.EqualTo(9)); EvaluateAdaptedSurfaceLineWithSkewedSurfaceLevelInside(surfaceLine, adaptedSurfaceLine, shoulderHeight, shoulderLength); } @@ -752,10 +752,10 @@ X = 10.5, Z = 1.0 }; - Assert.AreEqual(expectedPointTrafficLoadOutside.X, adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadOutside).X, cTolerance); - Assert.AreEqual(expectedPointTrafficLoadInside.X, adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadInside).X, cTolerance); - Assert.AreEqual(expectedPointTrafficLoadOutside.Z, adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadOutside).Z, cTolerance); - Assert.AreEqual(expectedPointTrafficLoadInside.Z, adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadInside).Z, cTolerance); + Assert.That(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadOutside).X, Is.EqualTo(expectedPointTrafficLoadOutside.X).Within(cTolerance)); + Assert.That(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadInside).X, Is.EqualTo(expectedPointTrafficLoadInside.X).Within(cTolerance)); + Assert.That(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadOutside).Z, Is.EqualTo(expectedPointTrafficLoadOutside.Z).Within(cTolerance)); + Assert.That(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadInside).Z, Is.EqualTo(expectedPointTrafficLoadInside.Z).Within(cTolerance)); } [Test] @@ -852,8 +852,8 @@ var expectedDitchPolderSide = new GeometryPoint(14.5, 0); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchPolderSide); Assert.IsTrue(expectedDitchPolderSide.LocationEquals(actualPoint)); - Assert.AreEqual(9, surfaceLine.Geometry.Points.Count); - Assert.AreEqual(12, adaptedSurfaceLine.Geometry.Points.Count); + Assert.That(surfaceLine.Geometry.Points.Count, Is.EqualTo(9)); + Assert.That(adaptedSurfaceLine.Geometry.Points.Count, Is.EqualTo(12)); } [Test] @@ -950,8 +950,8 @@ var expectedDitchPolderSide = new GeometryPoint(14.5, 0); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchPolderSide); Assert.IsTrue(expectedDitchPolderSide.LocationEquals(actualPoint)); - Assert.AreEqual(9, surfaceLine.Geometry.Points.Count); - Assert.AreEqual(12, adaptedSurfaceLine.Geometry.Points.Count); + Assert.That(surfaceLine.Geometry.Points.Count, Is.EqualTo(9)); + Assert.That(adaptedSurfaceLine.Geometry.Points.Count, Is.EqualTo(12)); } [Test] @@ -1042,8 +1042,8 @@ var expectedDikeToePolder = new GeometryPoint(6.5, 0); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder); Assert.IsTrue(expectedDikeToePolder.LocationEquals(actualPoint)); - Assert.AreEqual(10, surfaceLine.Geometry.Points.Count); - Assert.AreEqual(11, adaptedSurfaceLine.Geometry.Points.Count); + Assert.That(surfaceLine.Geometry.Points.Count, Is.EqualTo(10)); + Assert.That(adaptedSurfaceLine.Geometry.Points.Count, Is.EqualTo(11)); } [Test] @@ -1152,8 +1152,8 @@ var expectedDitchPolderSide = new GeometryPoint(18.5, 0); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchPolderSide); Assert.IsTrue(expectedDitchPolderSide.LocationEquals(actualPoint)); - Assert.AreEqual(11, surfaceLine.Geometry.Points.Count); - Assert.AreEqual(11, adaptedSurfaceLine.Geometry.Points.Count); + Assert.That(surfaceLine.Geometry.Points.Count, Is.EqualTo(11)); + Assert.That(adaptedSurfaceLine.Geometry.Points.Count, Is.EqualTo(11)); } [Test] @@ -1242,7 +1242,7 @@ surfaceLine.EnsurePointOfType(apoint2.X, apoint2.Z, null); surfaceLine.EnsurePointOfType(apoint3.X, apoint3.Z, null); surfaceLine.EnsurePointOfType(pointAtSurfaceLevelInside.X, pointAtSurfaceLevelInside.Z, CharacteristicPointType.SurfaceLevelInside); - Assert.AreEqual(12, surfaceLine.Geometry.Points.Count); + Assert.That(surfaceLine.Geometry.Points.Count, Is.EqualTo(12)); var surfaceLineAdapter = new SurfaceLineShoulderAdapter(surfaceLine, location, 0) { SlopeOfNewShoulder = 2 @@ -1272,8 +1272,8 @@ var expectedExtraPointBeyondDitchUnchanged = new GeometryPoint(20, 0); actualPoint = adaptedSurfaceLine.CharacteristicPoints[adaptedSurfaceLine.CharacteristicPoints.Count - 2]; Assert.IsTrue(expectedExtraPointBeyondDitchUnchanged.LocationEquals(actualPoint)); - Assert.AreEqual(12, surfaceLine.Geometry.Count); - Assert.AreEqual(13, adaptedSurfaceLine.Geometry.Count); + Assert.That(surfaceLine.Geometry.Count, Is.EqualTo(12)); + Assert.That(adaptedSurfaceLine.Geometry.Count, Is.EqualTo(13)); } /// @@ -1365,7 +1365,7 @@ surfaceLine.EnsurePointOfType(apoint2.X, apoint2.Z, null); surfaceLine.EnsurePointOfType(apoint3.X, apoint3.Z, null); surfaceLine.EnsurePointOfType(pointAtSurfaceLevelInside.X, pointAtSurfaceLevelInside.Z, CharacteristicPointType.SurfaceLevelInside); - Assert.AreEqual(12, surfaceLine.Geometry.Count); + Assert.That(surfaceLine.Geometry.Count, Is.EqualTo(12)); var surfaceLineAdapter = new SurfaceLineShoulderAdapter(surfaceLine, location, 0) { SlopeOfNewShoulder = 2 @@ -1398,8 +1398,8 @@ var expectedExtraPointBeyondDitchUnchanged2 = new GeometryPoint(20, 0); actualPoint = adaptedSurfaceLine.CharacteristicPoints[adaptedSurfaceLine.CharacteristicPoints.Count - 2]; Assert.IsTrue(expectedExtraPointBeyondDitchUnchanged2.LocationEquals(actualPoint)); - Assert.AreEqual(12, surfaceLine.Geometry.Count); - Assert.AreEqual(14, adaptedSurfaceLine.Geometry.Count); + Assert.That(surfaceLine.Geometry.Count, Is.EqualTo(12)); + Assert.That(adaptedSurfaceLine.Geometry.Count, Is.EqualTo(14)); } [Test] @@ -2166,8 +2166,8 @@ var expectedDitchPolderSide = new GeometryPoint(10.5, 0); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchPolderSide); Assert.IsTrue(expectedDitchPolderSide.LocationEquals(actualPoint)); - Assert.AreEqual(11, surfaceLine.Geometry.Count); - Assert.AreEqual(11, adaptedSurfaceLine.Geometry.Count); + Assert.That(surfaceLine.Geometry.Count, Is.EqualTo(11)); + Assert.That(adaptedSurfaceLine.Geometry.Count, Is.EqualTo(11)); } [Test] @@ -2278,8 +2278,8 @@ var expectedDitchPolderSide = new GeometryPoint(40.5, 0); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchPolderSide); Assert.IsTrue(expectedDitchPolderSide.LocationEquals(actualPoint)); - Assert.AreEqual(11, surfaceLine.Geometry.Count); - Assert.AreEqual(14, adaptedSurfaceLine.Geometry.Count); + Assert.That(surfaceLine.Geometry.Count, Is.EqualTo(11)); + Assert.That(adaptedSurfaceLine.Geometry.Count, Is.EqualTo(14)); } [Test] @@ -2484,8 +2484,8 @@ var expectedDitchPolderSide = new GeometryPoint(13.5, 0); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchPolderSide); Assert.IsTrue(expectedDitchPolderSide.LocationEquals(actualPoint)); - Assert.AreEqual(11, surfaceLine.Geometry.Count); - Assert.AreEqual(11, adaptedSurfaceLine.Geometry.Count); + Assert.That(surfaceLine.Geometry.Count, Is.EqualTo(11)); + Assert.That(adaptedSurfaceLine.Geometry.Count, Is.EqualTo(11)); } [Test] @@ -2638,14 +2638,14 @@ const double cTolerance = 0.0000001; Assert.IsNotNull(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside)); Assert.IsNotNull(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside)); - Assert.AreEqual(surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z + shoulderHeight, adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside).Z, cTolerance); + Assert.That(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside).Z, Is.EqualTo(surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z + shoulderHeight).Within(cTolerance)); double intersectionInsideSlopeWithDikeBaseXCoordinate = surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).X + (surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).Z - surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z); - Assert.AreEqual(intersectionInsideSlopeWithDikeBaseXCoordinate - shoulderHeight, adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside).X, cTolerance); - Assert.AreEqual(surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z + shoulderHeight, adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside).Z, cTolerance); - Assert.AreEqual(intersectionInsideSlopeWithDikeBaseXCoordinate - shoulderHeight + shoulderLength, adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside).X, cTolerance); + Assert.That(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside).X, Is.EqualTo(intersectionInsideSlopeWithDikeBaseXCoordinate - shoulderHeight).Within(cTolerance)); + Assert.That(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside).Z, Is.EqualTo(surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z + shoulderHeight).Within(cTolerance)); + Assert.That(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside).X, Is.EqualTo(intersectionInsideSlopeWithDikeBaseXCoordinate - shoulderHeight + shoulderLength).Within(cTolerance)); double rightShift = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).X - surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).X; - Assert.AreEqual(surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside).X, adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside).X, cTolerance); - Assert.AreEqual(surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside).Z, adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside).Z, cTolerance); + Assert.That(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside).X, Is.EqualTo(surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside).X).Within(cTolerance)); + Assert.That(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside).Z, Is.EqualTo(surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside).Z).Within(cTolerance)); } private SurfaceLine2 CreateSurfaceLineWithShoulderAndSkewedSurfaceLevelInside() Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalIntegrationTests.cs =================================================================== diff -u -r4540 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalIntegrationTests.cs (.../OperationalIntegrationTests.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalIntegrationTests.cs (.../OperationalIntegrationTests.cs) (revision 4624) @@ -58,9 +58,9 @@ Output output = GeneralHelper.RunAfterInputValidation(inputString, true, outputFileName); - Assert.AreEqual(1.226, output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry[0].Value, tolerance); - Assert.AreEqual(1.244, output.Results.OperationalOutputTimeSeries[1].Entries.TimeSerieEntry[0].Value, tolerance); - Assert.AreEqual(1.311, output.Results.OperationalOutputTimeSeries[2].Entries.TimeSerieEntry[0].Value, tolerance); + Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry[0].Value, Is.EqualTo(1.226).Within(tolerance)); + Assert.That(output.Results.OperationalOutputTimeSeries[1].Entries.TimeSerieEntry[0].Value, Is.EqualTo(1.244).Within(tolerance)); + Assert.That(output.Results.OperationalOutputTimeSeries[2].Entries.TimeSerieEntry[0].Value, Is.EqualTo(1.311).Within(tolerance)); } [Test, Category(Categories.WorkInProgress), Ignore("This test is not yet implemented, waits on stix implementation")] @@ -79,7 +79,7 @@ output = RunTestProjectCores(calcDir, outputFileName, 4); string outputMultiCore = DamXmlSerialization.SaveOutputAsXmlString(output); - Assert.AreEqual(outputSingleCore, outputMultiCore); + Assert.That(outputMultiCore, Is.EqualTo(outputSingleCore)); } private Output RunTestProjectCores(string calcDir, string outputFileName, int coreCount) 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")); Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapperTests.cs =================================================================== diff -u -r4540 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapperTests.cs (.../DamPipingBlighKernelWrapperTests.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapperTests.cs (.../DamPipingBlighKernelWrapperTests.cs) (revision 4624) @@ -84,14 +84,14 @@ // Validate the input List messages; kernelWrapper.Validate(damPipingInput, kernelDataOutput, out messages); - Assert.AreEqual(0, messages.Count); + Assert.That(messages.Count, Is.EqualTo(0)); // Run the dll kernelWrapper.Execute(damPipingInput, kernelDataOutput, out messages); var damPipingOutput = (DamPipingBlighOutput) kernelDataOutput; - Assert.AreEqual(0, messages.Count); - Assert.AreEqual(4.5, damPipingOutput.FoSp, diff); - Assert.AreEqual(2.25, damPipingOutput.Hc, diff); + Assert.That(messages.Count, Is.EqualTo(0)); + Assert.That(damPipingOutput.FoSp, Is.EqualTo(4.5).Within(diff)); + Assert.That(damPipingOutput.Hc, Is.EqualTo(2.25).Within(diff)); // Fill the design results var designScenario = new DesignScenario @@ -103,20 +103,20 @@ kernelWrapper.PostProcess(damKernelInput, damPipingOutput, designScenario, "", out results); foreach (DesignResult result in results) { - Assert.AreEqual(FailureMechanismSystemType.Piping, result.DamFailureMechanismeCalculation.FailureMechanismSystemType); - Assert.AreEqual(PipingModelType.Bligh, result.DamFailureMechanismeCalculation.PipingModelType); + Assert.That(result.DamFailureMechanismeCalculation.FailureMechanismSystemType, Is.EqualTo(FailureMechanismSystemType.Piping)); + Assert.That(result.DamFailureMechanismeCalculation.PipingModelType, Is.EqualTo(PipingModelType.Bligh)); Assert.That(result.LocationName, Is.Not.Null.Or.Empty); Assert.That(result.ScenarioName, Is.Not.Null.Or.Empty); Assert.That(result.ProfileName, Is.Not.Null.Or.Empty); Assert.That(result.PipingDesignResults.BlighFactor, Is.EqualTo(4.5).Within(diff)); Assert.That(result.PipingDesignResults.BlighHcritical, Is.EqualTo(2.25).Within(diff)); - Assert.AreEqual(50.5, result.PipingDesignResults.LocalExitPointX); - Assert.AreEqual(0.072811999417504, result.PipingDesignResults.UpliftFactor); - Assert.AreEqual(true, result.PipingDesignResults.UpliftSituation != null && ((UpliftSituation) result.PipingDesignResults.UpliftSituation).IsUplift); - Assert.AreEqual(CalculationResult.Succeeded, result.CalculationResult); + Assert.That(result.PipingDesignResults.LocalExitPointX, Is.EqualTo(50.5)); + Assert.That(result.PipingDesignResults.UpliftFactor, Is.EqualTo(0.072811999417504)); + Assert.That(result.PipingDesignResults.UpliftSituation != null && ((UpliftSituation)result.PipingDesignResults.UpliftSituation).IsUplift, Is.EqualTo(true)); + Assert.That(result.CalculationResult, Is.EqualTo(CalculationResult.Succeeded)); - Assert.AreEqual(location.SurfaceLine, result.PipingDesignResults.RedesignedSurfaceLine); + Assert.That(result.PipingDesignResults.RedesignedSurfaceLine, Is.EqualTo(location.SurfaceLine)); } } @@ -149,12 +149,12 @@ IKernelDataOutput kernelDataOutput; kernelWrapper.Prepare(damKernelInput, 0, out kernelDataInput, out kernelDataOutput); var damPipingInput = (DamPipingBlighInput) kernelDataInput; - Assert.AreEqual(2.0, damPipingInput.HRiver, diff); - Assert.AreEqual(0.0, damPipingInput.HExit, diff); - Assert.AreEqual(0.3, damPipingInput.Rc, diff); - Assert.AreEqual(5.0, damPipingInput.DTotal, diff); - Assert.AreEqual(40.5, damPipingInput.SeepageLength, diff); - Assert.AreEqual(180.0, damPipingInput.D70, diff); + Assert.That(damPipingInput.HRiver, Is.EqualTo(2.0).Within(diff)); + Assert.That(damPipingInput.HExit, Is.EqualTo(0.0).Within(diff)); + Assert.That(damPipingInput.Rc, Is.EqualTo(0.3).Within(diff)); + Assert.That(damPipingInput.DTotal, Is.EqualTo(5.0).Within(diff)); + Assert.That(damPipingInput.SeepageLength, Is.EqualTo(40.5).Within(diff)); + Assert.That(damPipingInput.D70, Is.EqualTo(180.0).Within(diff)); } [Test] @@ -181,7 +181,7 @@ }; messages.Clear(); kernelWrapper.Validate(damPipingInput, damPipingOutput, out messages); - Assert.AreEqual(0, messages.Count); + Assert.That(messages.Count, Is.EqualTo(0)); } [Test] @@ -227,15 +227,15 @@ kernelWrapper.PostProcess(input, output, designScenario, "", out results); foreach (DesignResult result in results) { - Assert.AreEqual(output.FoSp, result.PipingDesignResults.BlighFactor); - Assert.AreEqual(output.Hc, result.PipingDesignResults.BlighHcritical); + Assert.That(result.PipingDesignResults.BlighFactor, Is.EqualTo(output.FoSp)); + Assert.That(result.PipingDesignResults.BlighHcritical, Is.EqualTo(output.Hc)); - Assert.AreEqual(output.ExitPointX, result.PipingDesignResults.LocalExitPointX); - Assert.AreEqual(output.UpliftFactor, result.PipingDesignResults.UpliftFactor); - Assert.AreEqual(output.UpliftSituation, result.PipingDesignResults.UpliftSituation); - Assert.AreEqual(output.CalculationResult, result.CalculationResult); + Assert.That(result.PipingDesignResults.LocalExitPointX, Is.EqualTo(output.ExitPointX)); + Assert.That(result.PipingDesignResults.UpliftFactor, Is.EqualTo(output.UpliftFactor)); + Assert.That(result.PipingDesignResults.UpliftSituation, Is.EqualTo(output.UpliftSituation)); + Assert.That(result.CalculationResult, Is.EqualTo(output.CalculationResult)); - Assert.AreEqual(input.Location.SurfaceLine, result.PipingDesignResults.RedesignedSurfaceLine); + Assert.That(result.PipingDesignResults.RedesignedSurfaceLine, Is.EqualTo(input.Location.SurfaceLine)); } } Index: DamEngine/trunk/src/Deltares.DamEngine.ConsoleRun.Tests/EnvironmentTests.cs =================================================================== diff -u -r4540 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.ConsoleRun.Tests/EnvironmentTests.cs (.../EnvironmentTests.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.ConsoleRun.Tests/EnvironmentTests.cs (.../EnvironmentTests.cs) (revision 4624) @@ -30,7 +30,7 @@ [Test] public void TestIf64Bits() { - Assert.AreEqual(8, IntPtr.Size); + Assert.That(IntPtr.Size, Is.EqualTo(8)); Assert.IsTrue(Environment.Is64BitProcess); } } \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalPulauTekongTests.cs =================================================================== diff -u -r4540 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalPulauTekongTests.cs (.../OperationalPulauTekongTests.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalPulauTekongTests.cs (.../OperationalPulauTekongTests.cs) (revision 4624) @@ -77,10 +77,10 @@ Output output = GeneralHelper.RunAfterInputValidation(inputString, areResultsExpected, outputFileName); - Assert.AreEqual(stabilityOutsideFactor, output.Results.OperationalOutputTimeSeries[0].ParameterId); - Assert.AreEqual(valueEntry1, output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry[0].Value, tolerance); - Assert.AreEqual(stabilityOutsideFactor, output.Results.OperationalOutputTimeSeries[1].ParameterId); - Assert.AreEqual(valueEntry2, output.Results.OperationalOutputTimeSeries[1].Entries.TimeSerieEntry[0].Value, tolerance); + Assert.That(output.Results.OperationalOutputTimeSeries[0].ParameterId, Is.EqualTo(stabilityOutsideFactor)); + Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry[0].Value, Is.EqualTo(valueEntry1).Within(tolerance)); + Assert.That(output.Results.OperationalOutputTimeSeries[1].ParameterId, Is.EqualTo(stabilityOutsideFactor)); + Assert.That(output.Results.OperationalOutputTimeSeries[1].Entries.TimeSerieEntry[0].Value, Is.EqualTo(valueEntry2).Within(tolerance)); } [Test, Category(Categories.MultiCore), Ignore("This test is not yet implemented, waits on stix implementation.")] @@ -100,7 +100,7 @@ output = RunTestProjectCores(calcDir, outputFileName, 4); string outputMultiCore = DamXmlSerialization.SaveOutputAsXmlString(output); - Assert.AreEqual(outputSingleCore, outputMultiCore); + Assert.That(outputMultiCore, Is.EqualTo(outputSingleCore)); } private Output RunTestProjectCores(string calcDir, string outputFileName, int coreCount) Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/DikesDesign/SurfaceLineHeightAdapterTest.cs =================================================================== diff -u -r4540 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/DikesDesign/SurfaceLineHeightAdapterTest.cs (.../SurfaceLineHeightAdapterTest.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/DikesDesign/SurfaceLineHeightAdapterTest.cs (.../SurfaceLineHeightAdapterTest.cs) (revision 4624) @@ -148,7 +148,7 @@ SurfaceLine2 newSurfaceLine = surfaceLineAdapter.ConstructNewSurfaceLine(newDikeHeight); double oldSlope = TanSlopeInside(surfaceLine); double newSlope = TanSlopeInside(newSurfaceLine); - Assert.AreEqual(oldSlope, newSlope, cToleranceSlope); + Assert.That(newSlope, Is.EqualTo(oldSlope).Within(cToleranceSlope)); } [Test] @@ -384,7 +384,7 @@ Assert.IsTrue(expectedPoint.LocationEquals(actualPoint)); double oldSlope = TanSlopeInside(surfaceLine); double newSlope = TanSlopeInside(newSurfaceLine); - Assert.AreEqual(oldSlope, newSlope, 0.001); + Assert.That(newSlope, Is.EqualTo(oldSlope).Within(0.001)); } [Test] @@ -480,8 +480,8 @@ Assert.IsFalse(newSurfaceLine.Geometry.Points.Any(p => p.LocationEquals(pointAtShoulderInsteek))); Assert.IsFalse(newSurfaceLine.Geometry.Points.Any(p => p.LocationEquals(pointAtShoulderTop))); GeometryPoint newPointAtToePolder = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder); - Assert.AreEqual(3, newSurfaceLine.GetPointSegmentIncluding(pointAtTopRiver.X, newPointAtToePolder.X).Count()); - Assert.AreEqual(5, newSurfaceLine.Geometry.Points.Count); + Assert.That(newSurfaceLine.GetPointSegmentIncluding(pointAtTopRiver.X, newPointAtToePolder.X).Count(), Is.EqualTo(3)); + Assert.That(newSurfaceLine.Geometry.Points.Count, Is.EqualTo(5)); } [Test] @@ -703,8 +703,8 @@ const double newDikeHeight = 19.2; var surfaceLineAdapter = new SurfaceLineHeightAdapter(surfaceLine, location, 0); SurfaceLine2 newSurfaceLine = surfaceLineAdapter.ConstructNewSurfaceLine(newDikeHeight); - Assert.AreEqual(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).Z, newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadOutside).Z, cTolerance); - Assert.AreEqual(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).Z, newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadInside).Z, cTolerance); + Assert.That(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadOutside).Z, Is.EqualTo(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).Z).Within(cTolerance)); + Assert.That(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadInside).Z, Is.EqualTo(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).Z).Within(cTolerance)); } /// @@ -762,8 +762,8 @@ surfaceLine.EnsurePointOfType(100, 0, CharacteristicPointType.SurfaceLevelInside); var surfaceLineAdapter = new SurfaceLineHeightAdapter(surfaceLine, location, 0); SurfaceLine2 newSurfaceLine = surfaceLineAdapter.ConstructNewSurfaceLine(newDikeHeight); - Assert.AreEqual(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).Z, newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadOutside).Z); - Assert.AreEqual(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).Z, newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadInside).Z); + Assert.That(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadOutside).Z, Is.EqualTo(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).Z)); + Assert.That(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadInside).Z, Is.EqualTo(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).Z)); } /// @@ -776,18 +776,18 @@ var location = new Location(); const double cTolerance = 0.001; const double newDikeHeight = 4.0; - Assert.AreEqual(10, surfaceLine.Geometry.Points.Count); + Assert.That(surfaceLine.Geometry.Points.Count, Is.EqualTo(10)); var surfaceLineAdapter = new SurfaceLineHeightAdapter(surfaceLine, location, 0); SurfaceLine2 newSurfaceLine = surfaceLineAdapter.ConstructNewSurfaceLine(newDikeHeight); - Assert.AreEqual(6, newSurfaceLine.Geometry.Points.Count); - Assert.AreEqual(7.3333, newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver).X, cTolerance); - Assert.AreEqual(4.0000, newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver).Z, cTolerance); - Assert.AreEqual(9.3333, newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).X, cTolerance); - Assert.AreEqual(4.0000, newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).Z, cTolerance); - Assert.AreEqual(14.6666, newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).X, cTolerance); - Assert.AreEqual(0.0000, newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z, cTolerance); - Assert.AreEqual(100.000, newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside).X, cTolerance); - Assert.AreEqual(0.0000, newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside).Z, cTolerance); + Assert.That(newSurfaceLine.Geometry.Points.Count, Is.EqualTo(6)); + Assert.That(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver).X, Is.EqualTo(7.3333).Within(cTolerance)); + Assert.That(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver).Z, Is.EqualTo(4.0000).Within(cTolerance)); + Assert.That(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).X, Is.EqualTo(9.3333).Within(cTolerance)); + Assert.That(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).Z, Is.EqualTo(4.0000).Within(cTolerance)); + Assert.That(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).X, Is.EqualTo(14.6666).Within(cTolerance)); + Assert.That(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z, Is.EqualTo(0.0000).Within(cTolerance)); + Assert.That(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside).X, Is.EqualTo(100.000).Within(cTolerance)); + Assert.That(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside).Z, Is.EqualTo(0.0000).Within(cTolerance)); } [Test] @@ -835,7 +835,7 @@ }; GeometryPoint actualShoulderBaseInside = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside); Assert.IsTrue(expectedShoulderBaseInside.LocationEquals(actualShoulderBaseInside)); - Assert.AreEqual(9, newSurfaceLine.Geometry.Points.Count); + Assert.That(newSurfaceLine.Geometry.Points.Count, Is.EqualTo(9)); } [Test] @@ -890,7 +890,7 @@ }; GeometryPoint actualShoulderBaseInside = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside); Assert.IsTrue(expectedShoulderBaseInside.LocationEquals(actualShoulderBaseInside)); - Assert.AreEqual(10, newSurfaceLine.Geometry.Points.Count); + Assert.That(newSurfaceLine.Geometry.Points.Count, Is.EqualTo(10)); } [Test] @@ -938,7 +938,7 @@ }; GeometryPoint actualToeInside = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder); Assert.IsTrue(expectedToeInside.LocationEquals(actualToeInside)); - Assert.AreEqual(5, newSurfaceLine.Geometry.Points.Count); + Assert.That(newSurfaceLine.Geometry.Points.Count, Is.EqualTo(5)); } [Test] @@ -986,7 +986,7 @@ }; GeometryPoint actualToeInside = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder); Assert.IsTrue(expectedToeInside.LocationEquals(actualToeInside)); - Assert.AreEqual(6, newSurfaceLine.Geometry.Points.Count); + Assert.That(newSurfaceLine.Geometry.Points.Count, Is.EqualTo(6)); } [Test] @@ -1048,7 +1048,7 @@ }; GeometryPoint actualToeInside = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder); Assert.IsTrue(expectedToeInside.LocationEquals(actualToeInside)); - Assert.AreEqual(7, newSurfaceLine.Geometry.Points.Count); + Assert.That(newSurfaceLine.Geometry.Points.Count, Is.EqualTo(7)); } [Test] @@ -1096,7 +1096,7 @@ }; GeometryPoint actualToeInside = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder); Assert.IsTrue(expectedToeInside.LocationEquals(actualToeInside)); - Assert.AreEqual(5, newSurfaceLine.Geometry.Points.Count); + Assert.That(newSurfaceLine.Geometry.Points.Count, Is.EqualTo(5)); } [Test] @@ -1151,7 +1151,7 @@ }; GeometryPoint actualToeInside = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder); Assert.IsTrue(expectedToeInside.LocationEquals(actualToeInside)); - Assert.AreEqual(6, newSurfaceLine.Geometry.Points.Count); + Assert.That(newSurfaceLine.Geometry.Points.Count, Is.EqualTo(6)); } [Test] @@ -1199,7 +1199,7 @@ }; GeometryPoint actualToeInside = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder); Assert.IsTrue(expectedToeInside.LocationEquals(actualToeInside)); - Assert.AreEqual(6, newSurfaceLine.Geometry.Points.Count); + Assert.That(newSurfaceLine.Geometry.Points.Count, Is.EqualTo(6)); } [Test] @@ -1247,7 +1247,7 @@ }; GeometryPoint actualToeInside = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder); Assert.IsTrue(expectedToeInside.LocationEquals(actualToeInside)); - Assert.AreEqual(6, newSurfaceLine.Geometry.Points.Count); + Assert.That(newSurfaceLine.Geometry.Points.Count, Is.EqualTo(6)); } [Test] @@ -1320,7 +1320,7 @@ }; GeometryPoint actualToeInside = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder); Assert.IsTrue(expectedToeInside.LocationEquals(actualToeInside)); - Assert.AreEqual(10, newSurfaceLine.Geometry.Points.Count); + Assert.That(newSurfaceLine.Geometry.Points.Count, Is.EqualTo(10)); } [Test] @@ -1372,7 +1372,7 @@ }; GeometryPoint actualToeInside = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder); Assert.IsTrue(expectedToeInside.LocationEquals(actualToeInside)); - Assert.AreEqual(6, newSurfaceLine.Geometry.Points.Count); + Assert.That(newSurfaceLine.Geometry.Points.Count, Is.EqualTo(6)); } [Test] Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/SoilVolumeMassCalculatorTest.cs =================================================================== diff -u -r4540 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/SoilVolumeMassCalculatorTest.cs (.../SoilVolumeMassCalculatorTest.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/SoilVolumeMassCalculatorTest.cs (.../SoilVolumeMassCalculatorTest.cs) (revision 4624) @@ -39,7 +39,7 @@ calculator.PhreaticLevel = -0.98; calculator.TopOfLayerToBeEvaluated = -5.0; // See spreadsheet "DAM Volumic weight test" - Assert.AreEqual(76.358, calculator.CalculateTotalMass(), cTolerance); + Assert.That(calculator.CalculateTotalMass(), Is.EqualTo(76.358).Within(cTolerance)); } [Test] @@ -52,7 +52,7 @@ calculator.PhreaticLevel = -1.8; calculator.TopOfLayerToBeEvaluated = -5.0; // See spreadsheet "DAM Volumic weight test" - Assert.AreEqual(230.22, calculator.CalculateTotalMass(), cTolerance); + Assert.That(calculator.CalculateTotalMass(), Is.EqualTo(230.22).Within(cTolerance)); } [Test] @@ -69,7 +69,7 @@ // wet 15 m x 16 kN/m3 = 240 // water above surface 5 m x 10.0 kN/m3 = 50 // Total: 240 + 50 = 290 - Assert.AreEqual(290.0, calculator.CalculateTotalMass(), cTolerance); + Assert.That(calculator.CalculateTotalMass(), Is.EqualTo(290.0).Within(cTolerance)); } [Test] @@ -83,7 +83,7 @@ calculator.TopOfLayerToBeEvaluated = -10; // All dry soil // dry 15 m x 12 kN/m3 = 180 - Assert.AreEqual(180.0, calculator.CalculateTotalMass(), cTolerance); + Assert.That(calculator.CalculateTotalMass(), Is.EqualTo(180.0).Within(cTolerance)); } [Test] @@ -99,7 +99,7 @@ // dry 6 m x 12 kN/m3 = 72 // wet 9 m x 16 kN/m3 = 144 // Total: 72 + 144 = 216 - Assert.AreEqual(216.0, calculator.CalculateTotalMass(), cTolerance); + Assert.That(calculator.CalculateTotalMass(), Is.EqualTo(216.0).Within(cTolerance)); } /// @@ -125,7 +125,7 @@ // dry 6 m x 12 kN/m3 = 72 // wet 9 m x 16 kN/m3 = 144 // Total: 72 + 144 = 216 - Assert.AreEqual(216.0, calculator.CalculateTotalMass(), cTolerance); + Assert.That(calculator.CalculateTotalMass(), Is.EqualTo(216.0).Within(cTolerance)); } [Test] @@ -142,7 +142,7 @@ // dry 8 m x 10 kN/m3 = 80 // wet 12 m x 22 kN/m3 = 264 // Total: 80 + 264 = 344 - Assert.AreEqual(344.0, calculator.CalculateTotalMass(), cTolerance); + Assert.That(calculator.CalculateTotalMass(), Is.EqualTo(344.0).Within(cTolerance)); } [Test] Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs =================================================================== diff -u -r4540 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 4624) @@ -96,7 +96,7 @@ } }; ComparisonResult result = compare.Compare(macroStabilitySoil, actualMacroStabilitySoil); - Assert.AreEqual(0, result.Differences.Count, "Differences found converting/reconverting Soil but this ok now if diff = 3"); + Assert.That(result.Differences.Count, Is.EqualTo(0), "Differences found converting/reconverting Soil but this ok now if diff = 3"); } #endregion @@ -112,7 +112,7 @@ [TestCase(CalculationResult.UserAbort, CalculationResultType.UserAbort)] public void CanConvertToMacroStabilityResultType(CalculationResult calculationResult, CalculationResultType calculationResultType) { - Assert.AreEqual(calculationResultType, ConversionHelper.ConvertToMacroStabilityResultType(calculationResult)); + Assert.That(ConversionHelper.ConvertToMacroStabilityResultType(calculationResult), Is.EqualTo(calculationResultType)); } [TestCase(CalculationResultType.NoInput, CalculationResult.NoInput)] @@ -126,7 +126,7 @@ [TestCase(CalculationResultType.UserAbort, CalculationResult.UserAbort)] public void CanConvertToDamResultType(CalculationResultType calculationResultType, CalculationResult calculationResult) { - Assert.AreEqual(calculationResult, ConversionHelper.ConvertToDamResultType(calculationResultType)); + Assert.That(ConversionHelper.ConvertToDamResultType(calculationResultType), Is.EqualTo(calculationResult)); } #region SearchMethod @@ -137,7 +137,7 @@ [TestCase(SearchAlgorithm.Beeswarm, MStabSearchMethod.BeeSwarm)] public void CanConvertToDamSearchMethod(SearchAlgorithm searchAlgorithm, MStabSearchMethod mStabSearchMethod) { - Assert.AreEqual(mStabSearchMethod, ConversionHelper.ConvertToDamSearchMethod(searchAlgorithm)); + Assert.That(ConversionHelper.ConvertToDamSearchMethod(searchAlgorithm), Is.EqualTo(mStabSearchMethod)); } [TestCase(SearchAlgorithm.BeeswarmAndLevenbergMarquardt)] @@ -154,7 +154,7 @@ [TestCase(MStabSearchMethod.BeeSwarm, SearchAlgorithm.Beeswarm)] public void ConvertToMacroStabilitySearchMethod(MStabSearchMethod mStabSearchMethod, SearchAlgorithm searchAlgorithm) { - Assert.AreEqual(searchAlgorithm, ConversionHelper.ConvertToMacroStabilitySearchMethod(mStabSearchMethod)); + Assert.That(ConversionHelper.ConvertToMacroStabilitySearchMethod(mStabSearchMethod), Is.EqualTo(searchAlgorithm)); } #endregion @@ -166,22 +166,22 @@ [TestCase(StabilityModelOptionType.UpliftVan, MStabModelType.UpliftVan)] public void CanConvertToMStabModelType(StabilityModelOptionType modelOption, MStabModelType mStabModelType) { - Assert.AreEqual(mStabModelType, ConversionHelper.ConvertToMStabModelType(modelOption)); + Assert.That(ConversionHelper.ConvertToMStabModelType(modelOption), Is.EqualTo(mStabModelType)); } [Test] [TestCase(MStabModelType.UpliftVan, StabilityModelOptionType.UpliftVan)] public void CanConvertToModelOptions(MStabModelType mStabModelType, StabilityModelOptionType modelOption) { - Assert.AreEqual(modelOption, ConversionHelper.ConvertToModelOptions(mStabModelType)); + Assert.That(ConversionHelper.ConvertToModelOptions(mStabModelType), Is.EqualTo(modelOption)); } [Test] [TestCase(MStabModelType.Bishop, StabilityModelOptionType.Bishop)] [TestCase(MStabModelType.UpliftVan, StabilityModelOptionType.UpliftVan)] public void CanConvertToModelOptionsOutput(MStabModelType mStabModelType, StabilityModelOptionType modelOption) { - Assert.AreEqual(modelOption, ConversionHelper.ConvertToModelOptionsOutput(mStabModelType)); + Assert.That(ConversionHelper.ConvertToModelOptionsOutput(mStabModelType), Is.EqualTo(modelOption)); } [TestCase(MStabModelType.UpliftSpencer)] @@ -222,14 +222,14 @@ [TestCase(Orientation.Inwards, MStabGridPosition.Right)] public static void CanConvertToMStabGridPosition(Orientation gridOrientation, MStabGridPosition mStabGridPosition) { - Assert.AreEqual(mStabGridPosition, ConversionHelper.ConvertToMStabGridPosition(gridOrientation)); + Assert.That(ConversionHelper.ConvertToMStabGridPosition(gridOrientation), Is.EqualTo(mStabGridPosition)); } [TestCase(MStabGridPosition.Left, Orientation.Outwards)] [TestCase(MStabGridPosition.Right, Orientation.Inwards)] public static void CanConvertToGridOrientation(MStabGridPosition mStabGridPosition, Orientation gridOrientation) { - Assert.AreEqual(gridOrientation, ConversionHelper.ConvertToGridOrientation(mStabGridPosition)); + Assert.That(ConversionHelper.ConvertToGridOrientation(mStabGridPosition), Is.EqualTo(gridOrientation)); } #endregion @@ -241,15 +241,15 @@ public static void CanConvertToDamShearStrengthModel( ShearStrengthModelType kernelShearStrengthModel, ShearStrengthModel damShearStrengthModel) { - Assert.AreEqual(damShearStrengthModel, ConversionHelper.ConvertToDamShearStrengthModel(kernelShearStrengthModel)); + Assert.That(ConversionHelper.ConvertToDamShearStrengthModel(kernelShearStrengthModel), Is.EqualTo(damShearStrengthModel)); } [TestCase(ShearStrengthModel.CPhi, ShearStrengthModelType.MohrCoulomb)] [TestCase(ShearStrengthModel.SuCalculated, ShearStrengthModelType.Shansep)] public static void CanConvertToMacroStabilityShearStrengthModel( ShearStrengthModel damShearStrengthModel, ShearStrengthModelType kernelShearStrengthModel) { - Assert.AreEqual(kernelShearStrengthModel, ConversionHelper.ConvertToMacroStabilityShearStrengthModel(damShearStrengthModel)); + Assert.That(ConversionHelper.ConvertToMacroStabilityShearStrengthModel(damShearStrengthModel), Is.EqualTo(kernelShearStrengthModel)); } #endregion @@ -261,15 +261,15 @@ public static void CanConvertToMacroStabilityWaterpressureInterpolationModel( WaterpressureInterpolationModel damWaterpressureInterpolationModel, WaterPressureInterpolationModel waterpressureInterpolationModel) { - Assert.AreEqual(waterpressureInterpolationModel, ConversionHelper.ConvertToMacroStabilityWaterpressureInterpolationModel(damWaterpressureInterpolationModel)); + Assert.That(ConversionHelper.ConvertToMacroStabilityWaterpressureInterpolationModel(damWaterpressureInterpolationModel), Is.EqualTo(waterpressureInterpolationModel)); } [TestCase(WaterPressureInterpolationModel.Automatic, WaterpressureInterpolationModel.Automatic)] [TestCase(WaterPressureInterpolationModel.Hydrostatic, WaterpressureInterpolationModel.Hydrostatic)] public static void CanConvertToDamWaterpressureInterpolationModel( WaterPressureInterpolationModel waterpressureInterpolationModel, WaterpressureInterpolationModel damWaterpressureInterpolationModel) { - Assert.AreEqual(damWaterpressureInterpolationModel, ConversionHelper.ConvertToDamWaterpressureInterpolationModel(waterpressureInterpolationModel)); + Assert.That(ConversionHelper.ConvertToDamWaterpressureInterpolationModel(waterpressureInterpolationModel), Is.EqualTo(damWaterpressureInterpolationModel)); } #endregion @@ -297,7 +297,7 @@ public static void CanConvertToMacroStabilityWaterpressureInterpolationModel( CharacteristicPointType damCharacteristicPointType, CharacteristicPoint kernelCharacteristicPointType) { - Assert.AreEqual(kernelCharacteristicPointType, ConversionHelper.ConvertToMacroStabilityCharacteristicPointType(damCharacteristicPointType)); + Assert.That(ConversionHelper.ConvertToMacroStabilityCharacteristicPointType(damCharacteristicPointType), Is.EqualTo(kernelCharacteristicPointType)); } [TestCase(CharacteristicPoint.BottomDitchDikeSide, CharacteristicPointType.BottomDitchDikeSide)] @@ -321,7 +321,7 @@ public static void CanConvertToDamWaterpressureInterpolationModel( CharacteristicPoint kernelCharacteristicPointType, CharacteristicPointType damCharacteristicPointType) { - Assert.AreEqual(damCharacteristicPointType, ConversionHelper.ConvertToDamCharacteristicPointType(kernelCharacteristicPointType)); + Assert.That(ConversionHelper.ConvertToDamCharacteristicPointType(kernelCharacteristicPointType), Is.EqualTo(damCharacteristicPointType)); } #endregion @@ -333,8 +333,8 @@ [TestCase(LogMessageType.Error, MessageType.Error)] public void CanConvertLogMessageTypeToKernelLogMessageType(LogMessageType logMessageType, MessageType messageType) { - Assert.AreEqual(messageType, - ConversionHelper.ConvertLogMessageTypeToKernelLogMessageType(logMessageType)); + Assert.That(ConversionHelper.ConvertLogMessageTypeToKernelLogMessageType(logMessageType), + Is.EqualTo(messageType)); } [TestCase(MessageType.Info, LogMessageType.Info)] @@ -343,8 +343,8 @@ public void CanConvertKernelLogMessageTypeToLogMessageType(MessageType kernelLogMessageType, LogMessageType logMessageType) { - Assert.AreEqual(logMessageType, - ConversionHelper.ConvertKernelLogMessageTypeToLogMessageType(kernelLogMessageType)); + Assert.That(ConversionHelper.ConvertKernelLogMessageTypeToLogMessageType(kernelLogMessageType), + Is.EqualTo(logMessageType)); } #endregion Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs =================================================================== diff -u -r4540 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs (.../FillXmlOutputFromDamTests.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs (.../FillXmlOutputFromDamTests.cs) (revision 4624) @@ -89,7 +89,7 @@ // Assert Io.XmlOutput.DesignResult[] calculationResults = output.Results.CalculationResults; int expectedNrOfCalculationResults = project.DesignCalculations.Count; - Assert.AreEqual(expectedNrOfCalculationResults, calculationResults.Length); + Assert.That(calculationResults.Length, Is.EqualTo(expectedNrOfCalculationResults)); for (var i = 0; i < expectedNrOfCalculationResults; i++) { @@ -453,23 +453,23 @@ private static void AssertStabilityDesignResults(StabilityDesignResults expected, DesignResultStabilityDesignResults actual) { - Assert.AreEqual(expected.ResultMessage, actual.ResultMessage); + Assert.That(actual.ResultMessage, Is.EqualTo(expected.ResultMessage)); AssertUpliftSituation(expected.UpliftSituation, actual.UpliftSituation); bool safetyFactorHasValue = expected.SafetyFactor.HasValue; - Assert.AreEqual(safetyFactorHasValue, actual.SafetyFactorSpecified); - Assert.AreEqual(safetyFactorHasValue ? expected.SafetyFactor : 0, actual.SafetyFactor); + Assert.That(actual.SafetyFactorSpecified, Is.EqualTo(safetyFactorHasValue)); + Assert.That(actual.SafetyFactor, Is.EqualTo(safetyFactorHasValue ? expected.SafetyFactor : 0)); bool numberOfIterationsHasValue = expected.NumberOfIterations.HasValue; - Assert.AreEqual(numberOfIterationsHasValue, actual.NumberOfIterationsSpecified); - Assert.AreEqual(numberOfIterationsHasValue ? expected.NumberOfIterations : 0, actual.NumberOfIterations); + Assert.That(actual.NumberOfIterationsSpecified, Is.EqualTo(numberOfIterationsHasValue)); + Assert.That(actual.NumberOfIterations, Is.EqualTo(numberOfIterationsHasValue ? expected.NumberOfIterations : 0)); bool mStabModelTypeHasValue = expected.StabilityModelType.HasValue; - Assert.AreEqual(mStabModelTypeHasValue, actual.StabilityModelTypeSpecified); + Assert.That(actual.StabilityModelTypeSpecified, Is.EqualTo(mStabModelTypeHasValue)); DesignResultStabilityDesignResultsStabilityModelType? expectedModelType = mStabModelTypeHasValue ? Convert(expected.StabilityModelType) : DesignResultStabilityDesignResultsStabilityModelType.Bishop; - Assert.AreEqual(expectedModelType, actual.StabilityModelType); + Assert.That(actual.StabilityModelType, Is.EqualTo(expectedModelType)); AssertSurfaceLine(expected.RedesignedSurfaceLine, actual.RedesignedSurfaceLine); } @@ -482,13 +482,13 @@ return; } - Assert.AreEqual(expected.Value.IsUplift, actual.IsUplift); - Assert.AreEqual(expected.Value.Pl3MinUplift, actual.Pl3MinUplift); - Assert.AreEqual(expected.Value.Pl3HeadAdjusted, actual.Pl3HeadAdjusted); - Assert.AreEqual(expected.Value.Pl3LocationXMinUplift, actual.Pl3LocationXMinUplift); - Assert.AreEqual(expected.Value.Pl4MinUplift, actual.Pl4MinUplift); - Assert.AreEqual(expected.Value.Pl4HeadAdjusted, actual.Pl4HeadAdjusted); - Assert.AreEqual(expected.Value.Pl4LocationXMinUplift, actual.Pl4LocationXMinUplift); + Assert.That(actual.IsUplift, Is.EqualTo(expected.Value.IsUplift)); + Assert.That(actual.Pl3MinUplift, Is.EqualTo(expected.Value.Pl3MinUplift)); + Assert.That(actual.Pl3HeadAdjusted, Is.EqualTo(expected.Value.Pl3HeadAdjusted)); + Assert.That(actual.Pl3LocationXMinUplift, Is.EqualTo(expected.Value.Pl3LocationXMinUplift)); + Assert.That(actual.Pl4MinUplift, Is.EqualTo(expected.Value.Pl4MinUplift)); + Assert.That(actual.Pl4HeadAdjusted, Is.EqualTo(expected.Value.Pl4HeadAdjusted)); + Assert.That(actual.Pl4LocationXMinUplift, Is.EqualTo(expected.Value.Pl4LocationXMinUplift)); } private static void AssertSurfaceLine(SurfaceLine2 expected, SurfaceLine actual) @@ -499,10 +499,10 @@ return; } - Assert.AreEqual(expected.Name, actual.Name); + Assert.That(actual.Name, Is.EqualTo(expected.Name)); int expectedNrOfCharacteristicPoints = expected.CharacteristicPoints.Count; - Assert.AreEqual(expectedNrOfCharacteristicPoints, actual.Points.Length); + Assert.That(actual.Points.Length, Is.EqualTo(expectedNrOfCharacteristicPoints)); for (var i = 0; i < expectedNrOfCharacteristicPoints; i++) { CharacteristicPoint expectedCharacteristicPoint = expected.CharacteristicPoints[i]; @@ -513,10 +513,10 @@ private static void AssertCharacteristicPoint(CharacteristicPoint expected, SurfaceLinePoint actual) { - Assert.AreEqual(expected.X, actual.X); - Assert.AreEqual(expected.Z, actual.Z); - Assert.AreEqual(ConversionHelper.ConvertToInputPointType(expected.CharacteristicPointType), - actual.PointType); + Assert.That(actual.X, Is.EqualTo(expected.X)); + Assert.That(actual.Z, Is.EqualTo(expected.Z)); + Assert.That(actual.PointType, + Is.EqualTo(ConversionHelper.ConvertToInputPointType(expected.CharacteristicPointType))); } private void CompareDamProjectData(DamProjectData actual, DamProjectData expected) @@ -538,6 +538,6 @@ } } - Assert.AreEqual(fakeDiffCount, result.Differences.Count, "Differences found read/write Input object"); + Assert.That(result.Differences.Count, Is.EqualTo(fakeDiffCount), "Differences found read/write Input object"); } } \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/GeometryDataTests.cs =================================================================== diff -u -r4540 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/GeometryDataTests.cs (.../GeometryDataTests.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/GeometryDataTests.cs (.../GeometryDataTests.cs) (revision 4624) @@ -71,29 +71,29 @@ geometrymodel.RemoveDoublesFromNewlyEffectedPointsAndCurves(); // only two points are unique by location - Assert.AreEqual(2, geometrymodel.NewlyEffectedPoints.Count); + Assert.That(geometrymodel.NewlyEffectedPoints.Count, Is.EqualTo(2)); // only two curves hold both head and endpoint with unique locations - Assert.AreEqual(1, geometrymodel.NewlyEffectedCurves.Count); + Assert.That(geometrymodel.NewlyEffectedCurves.Count, Is.EqualTo(1)); } [Test] public void GeometryHelperTestSurfaceTwoVertLayers() { GeometryData gData = CreateGeometrySurface2(); GeometryPointString line = gData.SurfaceLine; - Assert.AreEqual(3, line.Points.Count); - Assert.AreEqual(1.0, line.Points.OrderBy(p => p.X).First().X); - Assert.AreEqual(10.0, line.Points.OrderByDescending(p => p.X).First().X); + Assert.That(line.Points.Count, Is.EqualTo(3)); + Assert.That(line.Points.OrderBy(p => p.X).First().X, Is.EqualTo(1.0)); + Assert.That(line.Points.OrderByDescending(p => p.X).First().X, Is.EqualTo(10.0)); } [Test] public void GeometryDataTestSurfaceTwoHorLayers() { GeometryData gData = CreateGeometrySurface(); GeometryPointString line = gData.SurfaceLine; - Assert.AreEqual(2, line.CalcPoints.Count); - Assert.AreEqual(1.0, line.CalcPoints.OrderBy(p => p.X).First().X); - Assert.AreEqual(10.0, line.CalcPoints.OrderByDescending(p => p.X).First().X); + Assert.That(line.CalcPoints.Count, Is.EqualTo(2)); + Assert.That(line.CalcPoints.OrderBy(p => p.X).First().X, Is.EqualTo(1.0)); + Assert.That(line.CalcPoints.OrderByDescending(p => p.X).First().X, Is.EqualTo(10.0)); } [Test] @@ -119,13 +119,13 @@ geom.NewlyEffectedCurves.Add(new GeometryCurve(p2, p4)); geom.RegenerateGeometry(); - Assert.AreEqual(4, geom.Points.Count); - Assert.AreEqual(4, geom.Curves.Count); - Assert.AreEqual(1, geom.Surfaces.Count); - Assert.AreEqual(0, geom.Surfaces[0].InnerLoops.Count); - Assert.AreEqual(4, geom.Surfaces[0].OuterLoop.Count); - Assert.AreEqual(4, geom.Surfaces[0].OuterLoop.CurveList.Count); - Assert.AreEqual(4, geom.Surfaces[0].OuterLoop.Points.Count); + Assert.That(geom.Points.Count, Is.EqualTo(4)); + Assert.That(geom.Curves.Count, Is.EqualTo(4)); + Assert.That(geom.Surfaces.Count, Is.EqualTo(1)); + Assert.That(geom.Surfaces[0].InnerLoops.Count, Is.EqualTo(0)); + Assert.That(geom.Surfaces[0].OuterLoop.Count, Is.EqualTo(4)); + Assert.That(geom.Surfaces[0].OuterLoop.CurveList.Count, Is.EqualTo(4)); + Assert.That(geom.Surfaces[0].OuterLoop.Points.Count, Is.EqualTo(4)); Assert.IsTrue(geom.Surfaces[0].OuterLoop.HasArea()); Assert.IsTrue(geom.Surfaces[0].OuterLoop.IsLoop()); Assert.IsTrue(geom.Surfaces[0].OuterLoop.IsPointInLoopArea(new Point2D(25, 3))); Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs =================================================================== diff -u -r4574 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs (.../MacroStabilityIoTests.cs) (revision 4574) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs (.../MacroStabilityIoTests.cs) (revision 4624) @@ -128,7 +128,7 @@ }; ComparisonResult result; result = compare.Compare(expectedKernelOutput, kernelOutput); - Assert.AreEqual(0, result.Differences.Count, "Differences found read/write kernel Output"); + Assert.That(result.Differences.Count, Is.EqualTo(0), "Differences found read/write kernel Output"); } private static UpliftVanCalculationGrid CreateExampleUpliftVanCalculationGrid() @@ -226,44 +226,44 @@ }; ComparisonResult result; result = compare.Compare(expectedTrafficLoad, actualTrafficLoad); - Assert.AreEqual(0, result.Differences.Count, "Differences found read/write kernel Traffic Load"); + Assert.That(result.Differences.Count, Is.EqualTo(0), "Differences found read/write kernel Traffic Load"); } private static void CompareUpliftVanCalculationGridSettings(SlipCircleDefinition expectedSlipCircleDefinition, SlipCircleDefinition actualSlipCircleDefinition) { - Assert.AreEqual(expectedSlipCircleDefinition.GridSizeDetermination, actualSlipCircleDefinition.GridSizeDetermination); - Assert.AreEqual(expectedSlipCircleDefinition.UpliftVanTangentLinesDefinition, actualSlipCircleDefinition.UpliftVanTangentLinesDefinition); + Assert.That(actualSlipCircleDefinition.GridSizeDetermination, Is.EqualTo(expectedSlipCircleDefinition.GridSizeDetermination)); + Assert.That(actualSlipCircleDefinition.UpliftVanTangentLinesDefinition, Is.EqualTo(expectedSlipCircleDefinition.UpliftVanTangentLinesDefinition)); // Note: do not test UpliftVanTangentLinesDistance as there is no way to be sure of equal values as determination to and from involves rounding. //Assert.AreEqual(expectedSlipCircleDefinition.UpliftVanTangentLinesDistance, actualSlipCircleDefinition.UpliftVanTangentLinesDistance); } private static void CompareUpliftVanCalculationGrid(UpliftVanCalculationGrid expectedSlipPlaneUpliftVan, UpliftVanCalculationGrid actualSlipPlaneUpliftVan, bool isAutoTangentLine) { - Assert.AreEqual(expectedSlipPlaneUpliftVan.LeftGridXLeft, actualSlipPlaneUpliftVan.LeftGridXLeft); - Assert.AreEqual(expectedSlipPlaneUpliftVan.LeftGridXRight, actualSlipPlaneUpliftVan.LeftGridXRight); - Assert.AreEqual(expectedSlipPlaneUpliftVan.LeftGridZTop, actualSlipPlaneUpliftVan.LeftGridZTop); - Assert.AreEqual(expectedSlipPlaneUpliftVan.LeftGridZBottom, actualSlipPlaneUpliftVan.LeftGridZBottom); - Assert.AreEqual(expectedSlipPlaneUpliftVan.LeftGridXCount, actualSlipPlaneUpliftVan.LeftGridXCount); - Assert.AreEqual(expectedSlipPlaneUpliftVan.LeftGridZCount, actualSlipPlaneUpliftVan.LeftGridZCount); + Assert.That(actualSlipPlaneUpliftVan.LeftGridXLeft, Is.EqualTo(expectedSlipPlaneUpliftVan.LeftGridXLeft)); + Assert.That(actualSlipPlaneUpliftVan.LeftGridXRight, Is.EqualTo(expectedSlipPlaneUpliftVan.LeftGridXRight)); + Assert.That(actualSlipPlaneUpliftVan.LeftGridZTop, Is.EqualTo(expectedSlipPlaneUpliftVan.LeftGridZTop)); + Assert.That(actualSlipPlaneUpliftVan.LeftGridZBottom, Is.EqualTo(expectedSlipPlaneUpliftVan.LeftGridZBottom)); + Assert.That(actualSlipPlaneUpliftVan.LeftGridXCount, Is.EqualTo(expectedSlipPlaneUpliftVan.LeftGridXCount)); + Assert.That(actualSlipPlaneUpliftVan.LeftGridZCount, Is.EqualTo(expectedSlipPlaneUpliftVan.LeftGridZCount)); - Assert.AreEqual(expectedSlipPlaneUpliftVan.RightGridXLeft, actualSlipPlaneUpliftVan.RightGridXLeft); - Assert.AreEqual(expectedSlipPlaneUpliftVan.RightGridXRight, actualSlipPlaneUpliftVan.RightGridXRight); - Assert.AreEqual(expectedSlipPlaneUpliftVan.RightGridZTop, actualSlipPlaneUpliftVan.RightGridZTop); - Assert.AreEqual(expectedSlipPlaneUpliftVan.RightGridZBottom, actualSlipPlaneUpliftVan.RightGridZBottom); - Assert.AreEqual(expectedSlipPlaneUpliftVan.RightGridXCount, actualSlipPlaneUpliftVan.RightGridXCount); - Assert.AreEqual(expectedSlipPlaneUpliftVan.RightGridZCount, actualSlipPlaneUpliftVan.RightGridZCount); + Assert.That(actualSlipPlaneUpliftVan.RightGridXLeft, Is.EqualTo(expectedSlipPlaneUpliftVan.RightGridXLeft)); + Assert.That(actualSlipPlaneUpliftVan.RightGridXRight, Is.EqualTo(expectedSlipPlaneUpliftVan.RightGridXRight)); + Assert.That(actualSlipPlaneUpliftVan.RightGridZTop, Is.EqualTo(expectedSlipPlaneUpliftVan.RightGridZTop)); + Assert.That(actualSlipPlaneUpliftVan.RightGridZBottom, Is.EqualTo(expectedSlipPlaneUpliftVan.RightGridZBottom)); + Assert.That(actualSlipPlaneUpliftVan.RightGridXCount, Is.EqualTo(expectedSlipPlaneUpliftVan.RightGridXCount)); + Assert.That(actualSlipPlaneUpliftVan.RightGridZCount, Is.EqualTo(expectedSlipPlaneUpliftVan.RightGridZCount)); if (!isAutoTangentLine) { - CollectionAssert.AreEqual(expectedSlipPlaneUpliftVan.TangentLineLevels, actualSlipPlaneUpliftVan.TangentLineLevels); + Assert.That(actualSlipPlaneUpliftVan.TangentLineLevels, Is.EqualTo(expectedSlipPlaneUpliftVan.TangentLineLevels).AsCollection); } } private static void CompareWaternet(Waternet expectedWaternet, Waternet actualWaternet) { - Assert.AreEqual(expectedWaternet.Name, actualWaternet.Name); + Assert.That(actualWaternet.Name, Is.EqualTo(expectedWaternet.Name)); CompareLine(expectedWaternet.PhreaticLine, actualWaternet.PhreaticLine); CompareWaternetHeadLines(expectedWaternet.HeadLineList, actualWaternet.HeadLineList); CompareWaternetLines(actualWaternet.WaternetLineList, expectedWaternet.WaternetLineList); @@ -273,7 +273,7 @@ IEnumerable expectedWaternetLines) { int expectedNrOfWaternetLines = actualWaternetLines.Count(); - Assert.AreEqual(expectedNrOfWaternetLines, actualWaternetLines.Count()); + Assert.That(actualWaternetLines.Count(), Is.EqualTo(expectedNrOfWaternetLines)); for (var i = 0; i < expectedNrOfWaternetLines; i++) { WaternetLine expectedWaternetLine = expectedWaternetLines.ElementAt(i); @@ -287,7 +287,7 @@ IEnumerable actualHeadLines) { int expectedNrOfHeadLines = expectedHeadLines.Count(); - Assert.AreEqual(expectedNrOfHeadLines, actualHeadLines.Count()); + Assert.That(actualHeadLines.Count(), Is.EqualTo(expectedNrOfHeadLines)); for (var i = 0; i < expectedNrOfHeadLines; i++) { @@ -300,12 +300,12 @@ private static void CompareLine(TLineType expectedHeadLine, TLineType actualHeadLine) where TLineType : GeometryPointString { - Assert.AreEqual(expectedHeadLine.Name, actualHeadLine.Name); + Assert.That(actualHeadLine.Name, Is.EqualTo(expectedHeadLine.Name)); List expectedCalcPoints = expectedHeadLine.CalcPoints; int expectedNrOfCalcPoints = expectedCalcPoints.Count; List actualCalcPoints = actualHeadLine.CalcPoints; - Assert.AreEqual(expectedNrOfCalcPoints, actualCalcPoints.Count); + Assert.That(actualCalcPoints.Count, Is.EqualTo(expectedNrOfCalcPoints)); for (var i = 0; i < expectedNrOfCalcPoints; i++) { Point2D expectedCoordinate = expectedCalcPoints[i]; @@ -331,7 +331,7 @@ "Owner" }; ComparisonResult result = compare.Compare(expectedCharacteristicPoints, actualCharacteristicPoints); - Assert.AreEqual(0, result.Differences.Count, "Differences found read/write kernel SurfaceLine"); + Assert.That(result.Differences.Count, Is.EqualTo(0), "Differences found read/write kernel SurfaceLine"); } private void CompareSoilProfile2D(SoilProfile2D expectedSoilProfile, SoilProfile2D actualSoilProfile) @@ -346,12 +346,12 @@ compare.Config.MembersToIgnore = SoilParametersToIgnore; compare.Config.MembersToIgnore.Add("Name"); ComparisonResult result = compare.Compare(expectedSoilProfile, actualSoilProfile); - Assert.AreEqual(0, result.Differences.Count, "Differences found read/write kernel SoilProfile2D"); + Assert.That(result.Differences.Count, Is.EqualTo(0), "Differences found read/write kernel SoilProfile2D"); } private void CompareSoilModel(SoilList expectedSoils, SoilList actualSoils) { - Assert.AreEqual(expectedSoils.Soils.Count, actualSoils.Soils.Count, "Soil Count does not match"); + Assert.That(actualSoils.Soils.Count, Is.EqualTo(expectedSoils.Soils.Count), "Soil Count does not match"); foreach (Soil expectedSoil in expectedSoils.Soils) { Soil actualSoil = actualSoils.Soils.SingleOrDefault(soil => soil.Name.Equals(expectedSoil.Name)); @@ -365,15 +365,15 @@ }; compare.Config.MembersToIgnore = SoilParametersToIgnore; ComparisonResult result = compare.Compare(expectedSoil, actualSoil); - Assert.AreEqual(0, result.Differences.Count, "Differences found read/write kernel SoilModel"); + Assert.That(result.Differences.Count, Is.EqualTo(0), "Differences found read/write kernel SoilModel"); } } private void CompareStabilityModel(FailureMechanismParametersMStab expectedStabilityModel, FailureMechanismParametersMStab actualStabilityModel) { - Assert.AreEqual(expectedStabilityModel.MStabParameters.SearchMethod, actualStabilityModel.MStabParameters.SearchMethod); - Assert.AreEqual(expectedStabilityModel.MStabParameters.Model, actualStabilityModel.MStabParameters.Model); - Assert.AreEqual(expectedStabilityModel.MStabParameters.GridPosition, actualStabilityModel.MStabParameters.GridPosition); + Assert.That(actualStabilityModel.MStabParameters.SearchMethod, Is.EqualTo(expectedStabilityModel.MStabParameters.SearchMethod)); + Assert.That(actualStabilityModel.MStabParameters.Model, Is.EqualTo(expectedStabilityModel.MStabParameters.Model)); + Assert.That(actualStabilityModel.MStabParameters.GridPosition, Is.EqualTo(expectedStabilityModel.MStabParameters.GridPosition)); } private DamProjectData CreateExampleDamProjectData() Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SigmaTauPointTests.cs =================================================================== diff -u -r4561 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SigmaTauPointTests.cs (.../SigmaTauPointTests.cs) (revision 4561) +++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SigmaTauPointTests.cs (.../SigmaTauPointTests.cs) (revision 4624) @@ -38,7 +38,7 @@ point.Sigma = expectedSigma; // Then - Assert.AreEqual(expectedSigma, point.Sigma); + Assert.That(point.Sigma, Is.EqualTo(expectedSigma)); } [Test] @@ -52,7 +52,7 @@ point.Tau = expectedTau; // Then - Assert.AreEqual(expectedTau, point.Tau); + Assert.That(point.Tau, Is.EqualTo(expectedTau)); } [Test] @@ -66,7 +66,7 @@ targetPoint.Assign(sourcePoint); // Then - Assert.AreEqual(sourcePoint.Sigma, targetPoint.Sigma); - Assert.AreEqual(sourcePoint.Tau, targetPoint.Tau); + Assert.That(targetPoint.Sigma, Is.EqualTo(sourcePoint.Sigma)); + Assert.That(targetPoint.Tau, Is.EqualTo(sourcePoint.Tau)); } } \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.Io.Tests/DamXmlSerializationTests.cs =================================================================== diff -u -r4540 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.Io.Tests/DamXmlSerializationTests.cs (.../DamXmlSerializationTests.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Io.Tests/DamXmlSerializationTests.cs (.../DamXmlSerializationTests.cs) (revision 4624) @@ -112,7 +112,7 @@ } }; ComparisonResult result = compare.Compare(expected, actual); - Assert.AreEqual(0, result.Differences.Count, "Differences found read/write Input object"); + Assert.That(result.Differences.Count, Is.EqualTo(0), "Differences found read/write Input object"); } private Output CreatePopulatedOutput() @@ -148,6 +148,6 @@ } }; ComparisonResult result = compare.Compare(expected, actual); - Assert.AreEqual(0, result.Differences.Count, "Differences found read/write Output object"); + Assert.That(result.Differences.Count, Is.EqualTo(0), "Differences found read/write Output object"); } } \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/PlLinesCreator/PlLinesCreatorTest.cs =================================================================== diff -u -r4540 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/PlLinesCreator/PlLinesCreatorTest.cs (.../PlLinesCreatorTest.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/PlLinesCreator/PlLinesCreatorTest.cs (.../PlLinesCreatorTest.cs) (revision 4624) @@ -62,33 +62,33 @@ plLineCreator.SurfaceLine = surfacelineSimpleDike; plLineCreator.WaterLevelPolder = plLineCreator.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z + 1.0; PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl1, 0.02); - Assert.AreEqual(4, plLine.Points.Count); - Assert.AreEqual(0.0, plLine.Points[0].X, cTolerance); - Assert.AreEqual(4.0, plLine.Points[0].Z, cTolerance); - Assert.AreEqual(3.0, plLine.Points[1].X, cTolerance); - Assert.AreEqual(4.0, plLine.Points[1].Z, cTolerance); - Assert.AreEqual(9.25, plLine.Points[2].X, cTolerance); - Assert.AreEqual(plLineCreator.WaterLevelPolder, plLine.Points[2].Z, cTolerance); - Assert.AreEqual(12, plLine.Points[3].X, cTolerance); - Assert.AreEqual(plLineCreator.WaterLevelPolder, plLine.Points[3].Z, cTolerance); + Assert.That(plLine.Points.Count, Is.EqualTo(4)); + Assert.That(plLine.Points[0].X, Is.EqualTo(0.0).Within(cTolerance)); + Assert.That(plLine.Points[0].Z, Is.EqualTo(4.0).Within(cTolerance)); + Assert.That(plLine.Points[1].X, Is.EqualTo(3.0).Within(cTolerance)); + Assert.That(plLine.Points[1].Z, Is.EqualTo(4.0).Within(cTolerance)); + Assert.That(plLine.Points[2].X, Is.EqualTo(9.25).Within(cTolerance)); + Assert.That(plLine.Points[2].Z, Is.EqualTo(plLineCreator.WaterLevelPolder).Within(cTolerance)); + Assert.That(plLine.Points[3].X, Is.EqualTo(12).Within(cTolerance)); + Assert.That(plLine.Points[3].Z, Is.EqualTo(plLineCreator.WaterLevelPolder).Within(cTolerance)); plLineCreator.ModelParametersForPlLines.PlLineCreationMethod = PlLineCreationMethod.ExpertKnowledgeRRD; plLineCreator.PlLineOffsetBelowDikeTopAtRiver = 0.5; // Default value plLineCreator.PlLineOffsetBelowDikeTopAtPolder = 1.5; // Default value plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl1, 0.02); - Assert.AreEqual(6, plLine.Points.Count); - Assert.AreEqual(0.0, plLine.Points[0].X, cTolerance); - Assert.AreEqual(4.0, plLine.Points[0].Z, cTolerance); - Assert.AreEqual(3.0, plLine.Points[1].X, cTolerance); - Assert.AreEqual(4.0, plLine.Points[1].Z, cTolerance); - Assert.AreEqual(4.0, plLine.Points[2].X, cTolerance); - Assert.AreEqual(3.5, plLine.Points[2].Z, cTolerance); - Assert.AreEqual(7.0, plLine.Points[3].X, cTolerance); - Assert.AreEqual(2.5, plLine.Points[3].Z, cTolerance); - Assert.AreEqual(9.25, plLine.Points[4].X, cTolerance); // this point and following points are raised to match polderlevel - Assert.AreEqual(plLineCreator.WaterLevelPolder, plLine.Points[4].Z, cTolerance); - Assert.AreEqual(12, plLine.Points[5].X, cTolerance); - Assert.AreEqual(plLineCreator.WaterLevelPolder, plLine.Points[5].Z, cTolerance); + Assert.That(plLine.Points.Count, Is.EqualTo(6)); + Assert.That(plLine.Points[0].X, Is.EqualTo(0.0).Within(cTolerance)); + Assert.That(plLine.Points[0].Z, Is.EqualTo(4.0).Within(cTolerance)); + Assert.That(plLine.Points[1].X, Is.EqualTo(3.0).Within(cTolerance)); + Assert.That(plLine.Points[1].Z, Is.EqualTo(4.0).Within(cTolerance)); + Assert.That(plLine.Points[2].X, Is.EqualTo(4.0).Within(cTolerance)); + Assert.That(plLine.Points[2].Z, Is.EqualTo(3.5).Within(cTolerance)); + Assert.That(plLine.Points[3].X, Is.EqualTo(7.0).Within(cTolerance)); + Assert.That(plLine.Points[3].Z, Is.EqualTo(2.5).Within(cTolerance)); + Assert.That(plLine.Points[4].X, Is.EqualTo(9.25).Within(cTolerance)); // this point and following points are raised to match polderlevel + Assert.That(plLine.Points[4].Z, Is.EqualTo(plLineCreator.WaterLevelPolder).Within(cTolerance)); + Assert.That(plLine.Points[5].X, Is.EqualTo(12).Within(cTolerance)); + Assert.That(plLine.Points[5].Z, Is.EqualTo(plLineCreator.WaterLevelPolder).Within(cTolerance)); } } @@ -114,21 +114,21 @@ plLineCreator.SurfaceLine = surfacelineDikeWithSlopingShoulder; plLineCreator.WaterLevelPolder = 2.75; // CharacteristicPointType.ShoulderTopInside.Z = 2.5; CharacteristicPointType.ShoulderBaseInside.Z = 3.0); PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl1, 0.02); - Assert.AreEqual(7, plLine.Points.Count); - Assert.AreEqual(0.0, plLine.Points[0].X, cTolerance); - Assert.AreEqual(4.0, plLine.Points[0].Z, cTolerance); - Assert.AreEqual(3.0, plLine.Points[1].X, cTolerance); - Assert.AreEqual(4.0, plLine.Points[1].Z, cTolerance); - Assert.AreEqual(4.0, plLine.Points[2].X, cTolerance); - Assert.AreEqual(3.5, plLine.Points[2].Z, cTolerance); - Assert.AreEqual(7.0, plLine.Points[3].X, cTolerance); - Assert.AreEqual(3.0, plLine.Points[3].Z, cTolerance); - Assert.AreEqual(9.0, plLine.Points[4].X, cTolerance); // This point has offset below surfacelevel of PlLineOffsetBelowShoulderBaseInside - Assert.AreEqual(2.9, plLine.Points[4].Z, cTolerance); - Assert.AreEqual(10.0, plLine.Points[5].X, cTolerance); // This point and following points are raised to match polderlevel - Assert.AreEqual(plLineCreator.WaterLevelPolder, plLine.Points[5].Z, cTolerance); - Assert.AreEqual(15, plLine.Points[6].X, cTolerance); - Assert.AreEqual(plLineCreator.WaterLevelPolder, plLine.Points[6].Z, cTolerance); + Assert.That(plLine.Points.Count, Is.EqualTo(7)); + Assert.That(plLine.Points[0].X, Is.EqualTo(0.0).Within(cTolerance)); + Assert.That(plLine.Points[0].Z, Is.EqualTo(4.0).Within(cTolerance)); + Assert.That(plLine.Points[1].X, Is.EqualTo(3.0).Within(cTolerance)); + Assert.That(plLine.Points[1].Z, Is.EqualTo(4.0).Within(cTolerance)); + Assert.That(plLine.Points[2].X, Is.EqualTo(4.0).Within(cTolerance)); + Assert.That(plLine.Points[2].Z, Is.EqualTo(3.5).Within(cTolerance)); + Assert.That(plLine.Points[3].X, Is.EqualTo(7.0).Within(cTolerance)); + Assert.That(plLine.Points[3].Z, Is.EqualTo(3.0).Within(cTolerance)); + Assert.That(plLine.Points[4].X, Is.EqualTo(9.0).Within(cTolerance)); // This point has offset below surfacelevel of PlLineOffsetBelowShoulderBaseInside + Assert.That(plLine.Points[4].Z, Is.EqualTo(2.9).Within(cTolerance)); + Assert.That(plLine.Points[5].X, Is.EqualTo(10.0).Within(cTolerance)); // This point and following points are raised to match polderlevel + Assert.That(plLine.Points[5].Z, Is.EqualTo(plLineCreator.WaterLevelPolder).Within(cTolerance)); + Assert.That(plLine.Points[6].X, Is.EqualTo(15).Within(cTolerance)); + Assert.That(plLine.Points[6].Z, Is.EqualTo(plLineCreator.WaterLevelPolder).Within(cTolerance)); } } @@ -155,51 +155,51 @@ plLineCreator.WaterLevelPolder = 3.25; // CharacteristicPointType.ShoulderBaseInside.Z = 3.0); Lower than PlLineOffsetBelowDikeTopAtPolder PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl1, 0.02); - Assert.AreEqual(6, plLine.Points.Count); - Assert.AreEqual(0.0, plLine.Points[0].X, cTolerance); - Assert.AreEqual(4.5, plLine.Points[0].Z, cTolerance); - Assert.AreEqual(3.5, plLine.Points[1].X, cTolerance); - Assert.AreEqual(4.5, plLine.Points[1].Z, cTolerance); - Assert.AreEqual(4.0, plLine.Points[2].X, cTolerance); - Assert.AreEqual(4.0, plLine.Points[2].Z, cTolerance); - Assert.AreEqual(7.0, plLine.Points[3].X, cTolerance); - Assert.AreEqual(3.5, plLine.Points[3].Z, cTolerance); - Assert.AreEqual(8.75, plLine.Points[4].X, cTolerance); // This point and following points are raised to match polderlevel - Assert.AreEqual(plLineCreator.WaterLevelPolder, plLine.Points[4].Z, cTolerance); - Assert.AreEqual(15, plLine.Points[5].X, cTolerance); - Assert.AreEqual(plLineCreator.WaterLevelPolder, plLine.Points[5].Z, cTolerance); + Assert.That(plLine.Points.Count, Is.EqualTo(6)); + Assert.That(plLine.Points[0].X, Is.EqualTo(0.0).Within(cTolerance)); + Assert.That(plLine.Points[0].Z, Is.EqualTo(4.5).Within(cTolerance)); + Assert.That(plLine.Points[1].X, Is.EqualTo(3.5).Within(cTolerance)); + Assert.That(plLine.Points[1].Z, Is.EqualTo(4.5).Within(cTolerance)); + Assert.That(plLine.Points[2].X, Is.EqualTo(4.0).Within(cTolerance)); + Assert.That(plLine.Points[2].Z, Is.EqualTo(4.0).Within(cTolerance)); + Assert.That(plLine.Points[3].X, Is.EqualTo(7.0).Within(cTolerance)); + Assert.That(plLine.Points[3].Z, Is.EqualTo(3.5).Within(cTolerance)); + Assert.That(plLine.Points[4].X, Is.EqualTo(8.75).Within(cTolerance)); // This point and following points are raised to match polderlevel + Assert.That(plLine.Points[4].Z, Is.EqualTo(plLineCreator.WaterLevelPolder).Within(cTolerance)); + Assert.That(plLine.Points[5].X, Is.EqualTo(15).Within(cTolerance)); + Assert.That(plLine.Points[5].Z, Is.EqualTo(plLineCreator.WaterLevelPolder).Within(cTolerance)); plLineCreator.WaterLevelPolder = 3.75; // CharacteristicPointType.ShoulderBaseInside.Z = 3.0); Higher than PlLineOffsetBelowDikeTopAtPolder plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl1, 0.02); - Assert.AreEqual(6, plLine.Points.Count); - Assert.AreEqual(0.0, plLine.Points[0].X, cTolerance); - Assert.AreEqual(4.5, plLine.Points[0].Z, cTolerance); - Assert.AreEqual(3.5, plLine.Points[1].X, cTolerance); - Assert.AreEqual(4.5, plLine.Points[1].Z, cTolerance); - Assert.AreEqual(4.0, plLine.Points[2].X, cTolerance); - Assert.AreEqual(4.0, plLine.Points[2].Z, cTolerance); - Assert.AreEqual(7.0, plLine.Points[3].X, cTolerance); // This point and following points are raised to match polderlevel - Assert.AreEqual(plLineCreator.WaterLevelPolder, plLine.Points[3].Z, cTolerance); - Assert.AreEqual(8.25, plLine.Points[4].X, cTolerance); - Assert.AreEqual(plLineCreator.WaterLevelPolder, plLine.Points[4].Z, cTolerance); - Assert.AreEqual(15, plLine.Points[5].X, cTolerance); - Assert.AreEqual(plLineCreator.WaterLevelPolder, plLine.Points[5].Z, cTolerance); + Assert.That(plLine.Points.Count, Is.EqualTo(6)); + Assert.That(plLine.Points[0].X, Is.EqualTo(0.0).Within(cTolerance)); + Assert.That(plLine.Points[0].Z, Is.EqualTo(4.5).Within(cTolerance)); + Assert.That(plLine.Points[1].X, Is.EqualTo(3.5).Within(cTolerance)); + Assert.That(plLine.Points[1].Z, Is.EqualTo(4.5).Within(cTolerance)); + Assert.That(plLine.Points[2].X, Is.EqualTo(4.0).Within(cTolerance)); + Assert.That(plLine.Points[2].Z, Is.EqualTo(4.0).Within(cTolerance)); + Assert.That(plLine.Points[3].X, Is.EqualTo(7.0).Within(cTolerance)); // This point and following points are raised to match polderlevel + Assert.That(plLine.Points[3].Z, Is.EqualTo(plLineCreator.WaterLevelPolder).Within(cTolerance)); + Assert.That(plLine.Points[4].X, Is.EqualTo(8.25).Within(cTolerance)); + Assert.That(plLine.Points[4].Z, Is.EqualTo(plLineCreator.WaterLevelPolder).Within(cTolerance)); + Assert.That(plLine.Points[5].X, Is.EqualTo(15).Within(cTolerance)); + Assert.That(plLine.Points[5].Z, Is.EqualTo(plLineCreator.WaterLevelPolder).Within(cTolerance)); plLineCreator.WaterLevelPolder = 4.25; // CharacteristicPointType.ShoulderBaseInside.Z = 3.0); Higher than PlLineOffsetBelowDikeTopAtRiver plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl1, 0.02); - Assert.AreEqual(6, plLine.Points.Count); - Assert.AreEqual(0.0, plLine.Points[0].X, cTolerance); - Assert.AreEqual(4.5, plLine.Points[0].Z, cTolerance); - Assert.AreEqual(3.5, plLine.Points[1].X, cTolerance); - Assert.AreEqual(4.5, plLine.Points[1].Z, cTolerance); - Assert.AreEqual(4.0, plLine.Points[2].X, cTolerance); // This point and following points are raised to match polderlevel - Assert.AreEqual(plLineCreator.WaterLevelPolder, plLine.Points[2].Z, cTolerance); - Assert.AreEqual(7.0, plLine.Points[3].X, cTolerance); - Assert.AreEqual(plLineCreator.WaterLevelPolder, plLine.Points[3].Z, cTolerance); - Assert.AreEqual(7.75, plLine.Points[4].X, cTolerance); - Assert.AreEqual(plLineCreator.WaterLevelPolder, plLine.Points[4].Z, cTolerance); - Assert.AreEqual(15, plLine.Points[5].X, cTolerance); - Assert.AreEqual(plLineCreator.WaterLevelPolder, plLine.Points[5].Z, cTolerance); + Assert.That(plLine.Points.Count, Is.EqualTo(6)); + Assert.That(plLine.Points[0].X, Is.EqualTo(0.0).Within(cTolerance)); + Assert.That(plLine.Points[0].Z, Is.EqualTo(4.5).Within(cTolerance)); + Assert.That(plLine.Points[1].X, Is.EqualTo(3.5).Within(cTolerance)); + Assert.That(plLine.Points[1].Z, Is.EqualTo(4.5).Within(cTolerance)); + Assert.That(plLine.Points[2].X, Is.EqualTo(4.0).Within(cTolerance)); // This point and following points are raised to match polderlevel + Assert.That(plLine.Points[2].Z, Is.EqualTo(plLineCreator.WaterLevelPolder).Within(cTolerance)); + Assert.That(plLine.Points[3].X, Is.EqualTo(7.0).Within(cTolerance)); + Assert.That(plLine.Points[3].Z, Is.EqualTo(plLineCreator.WaterLevelPolder).Within(cTolerance)); + Assert.That(plLine.Points[4].X, Is.EqualTo(7.75).Within(cTolerance)); + Assert.That(plLine.Points[4].Z, Is.EqualTo(plLineCreator.WaterLevelPolder).Within(cTolerance)); + Assert.That(plLine.Points[5].X, Is.EqualTo(15).Within(cTolerance)); + Assert.That(plLine.Points[5].Z, Is.EqualTo(plLineCreator.WaterLevelPolder).Within(cTolerance)); } } @@ -245,15 +245,15 @@ plLineCreator.SurfaceLine = surfacelineSimpleDike; plLineCreator.WaterLevelPolder = plLineCreator.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z - 1.0; PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl1, 0.02); - Assert.AreEqual(4, plLine.Points.Count); - Assert.AreEqual(0.0, plLine.Points[0].X, cTolerance); - Assert.AreEqual(4.0, plLine.Points[0].Z, cTolerance); - Assert.AreEqual(3.0, plLine.Points[1].X, cTolerance); - Assert.AreEqual(4.0, plLine.Points[1].Z, cTolerance); - Assert.AreEqual(10, plLine.Points[2].X, cTolerance); - Assert.AreEqual(0.9, plLine.Points[2].Z, cTolerance); - Assert.AreEqual(12, plLine.Points[3].X, cTolerance); - Assert.AreEqual(0.9, plLine.Points[3].Z, cTolerance); + Assert.That(plLine.Points.Count, Is.EqualTo(4)); + Assert.That(plLine.Points[0].X, Is.EqualTo(0.0).Within(cTolerance)); + Assert.That(plLine.Points[0].Z, Is.EqualTo(4.0).Within(cTolerance)); + Assert.That(plLine.Points[1].X, Is.EqualTo(3.0).Within(cTolerance)); + Assert.That(plLine.Points[1].Z, Is.EqualTo(4.0).Within(cTolerance)); + Assert.That(plLine.Points[2].X, Is.EqualTo(10).Within(cTolerance)); + Assert.That(plLine.Points[2].Z, Is.EqualTo(0.9).Within(cTolerance)); + Assert.That(plLine.Points[3].X, Is.EqualTo(12).Within(cTolerance)); + Assert.That(plLine.Points[3].Z, Is.EqualTo(0.9).Within(cTolerance)); } } @@ -282,15 +282,15 @@ plLineCreator.SurfaceLine.SortPoints(); plLineCreator.WaterLevelPolder = plLineCreator.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z - 1.0; PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl1, 0.02); - Assert.AreEqual(4, plLine.Points.Count); - Assert.AreEqual(0.0, plLine.Points[0].X, cTolerance); - Assert.AreEqual(4.0, plLine.Points[0].Z, cTolerance); - Assert.AreEqual(3.0, plLine.Points[1].X, cTolerance); - Assert.AreEqual(4.0, plLine.Points[1].Z, cTolerance); - Assert.AreEqual(10, plLine.Points[2].X, cTolerance); - Assert.AreEqual(0.9, plLine.Points[2].Z, cTolerance); - Assert.AreEqual(12, plLine.Points[3].X, cTolerance); - Assert.AreEqual(0.9, plLine.Points[3].Z, cTolerance); + Assert.That(plLine.Points.Count, Is.EqualTo(4)); + Assert.That(plLine.Points[0].X, Is.EqualTo(0.0).Within(cTolerance)); + Assert.That(plLine.Points[0].Z, Is.EqualTo(4.0).Within(cTolerance)); + Assert.That(plLine.Points[1].X, Is.EqualTo(3.0).Within(cTolerance)); + Assert.That(plLine.Points[1].Z, Is.EqualTo(4.0).Within(cTolerance)); + Assert.That(plLine.Points[2].X, Is.EqualTo(10).Within(cTolerance)); + Assert.That(plLine.Points[2].Z, Is.EqualTo(0.9).Within(cTolerance)); + Assert.That(plLine.Points[3].X, Is.EqualTo(12).Within(cTolerance)); + Assert.That(plLine.Points[3].Z, Is.EqualTo(0.9).Within(cTolerance)); } } @@ -316,17 +316,17 @@ plLineCreator.SurfaceLine = surfacelineSimpleDike; plLineCreator.WaterLevelPolder = plLineCreator.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z - 1.0; PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl1, 0.02); - Assert.AreEqual(5, plLine.Points.Count); - Assert.AreEqual(0.0, plLine.Points[0].X, cTolerance); - Assert.AreEqual(3.0, plLine.Points[0].Z, cTolerance); - Assert.AreEqual(2.0, plLine.Points[1].X, cTolerance); - Assert.AreEqual(3.0, plLine.Points[1].Z, cTolerance); - Assert.AreEqual(3.0, plLine.Points[2].X, cTolerance); - Assert.AreEqual(3.9, plLine.Points[2].Z, cTolerance); - Assert.AreEqual(10, plLine.Points[3].X, cTolerance); - Assert.AreEqual(0.9, plLine.Points[3].Z, cTolerance); - Assert.AreEqual(12, plLine.Points[4].X, cTolerance); - Assert.AreEqual(0.9, plLine.Points[4].Z, cTolerance); + Assert.That(plLine.Points.Count, Is.EqualTo(5)); + Assert.That(plLine.Points[0].X, Is.EqualTo(0.0).Within(cTolerance)); + Assert.That(plLine.Points[0].Z, Is.EqualTo(3.0).Within(cTolerance)); + Assert.That(plLine.Points[1].X, Is.EqualTo(2.0).Within(cTolerance)); + Assert.That(plLine.Points[1].Z, Is.EqualTo(3.0).Within(cTolerance)); + Assert.That(plLine.Points[2].X, Is.EqualTo(3.0).Within(cTolerance)); + Assert.That(plLine.Points[2].Z, Is.EqualTo(3.9).Within(cTolerance)); + Assert.That(plLine.Points[3].X, Is.EqualTo(10).Within(cTolerance)); + Assert.That(plLine.Points[3].Z, Is.EqualTo(0.9).Within(cTolerance)); + Assert.That(plLine.Points[4].X, Is.EqualTo(12).Within(cTolerance)); + Assert.That(plLine.Points[4].Z, Is.EqualTo(0.9).Within(cTolerance)); } } @@ -397,17 +397,17 @@ plLineCreator.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z - 1.0; PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl1, 0.02); - Assert.AreEqual(5, plLine.Points.Count); - Assert.AreEqual(0.0, plLine.Points[0].X, cTolerance); - Assert.AreEqual(3.0, plLine.Points[0].Z, cTolerance); - Assert.AreEqual(2.5, plLine.Points[1].X, cTolerance); - Assert.AreEqual(3.0, plLine.Points[1].Z, cTolerance); - Assert.AreEqual(3.0, plLine.Points[2].X, cTolerance); - Assert.AreEqual(3.9, plLine.Points[2].Z, cTolerance); - Assert.AreEqual(10, plLine.Points[3].X, cTolerance); - Assert.AreEqual(0.9, plLine.Points[3].Z, cTolerance); - Assert.AreEqual(12, plLine.Points[4].X, cTolerance); - Assert.AreEqual(0.9, plLine.Points[4].Z, cTolerance); + Assert.That(plLine.Points.Count, Is.EqualTo(5)); + Assert.That(plLine.Points[0].X, Is.EqualTo(0.0).Within(cTolerance)); + Assert.That(plLine.Points[0].Z, Is.EqualTo(3.0).Within(cTolerance)); + Assert.That(plLine.Points[1].X, Is.EqualTo(2.5).Within(cTolerance)); + Assert.That(plLine.Points[1].Z, Is.EqualTo(3.0).Within(cTolerance)); + Assert.That(plLine.Points[2].X, Is.EqualTo(3.0).Within(cTolerance)); + Assert.That(plLine.Points[2].Z, Is.EqualTo(3.9).Within(cTolerance)); + Assert.That(plLine.Points[3].X, Is.EqualTo(10).Within(cTolerance)); + Assert.That(plLine.Points[3].Z, Is.EqualTo(0.9).Within(cTolerance)); + Assert.That(plLine.Points[4].X, Is.EqualTo(12).Within(cTolerance)); + Assert.That(plLine.Points[4].Z, Is.EqualTo(0.9).Within(cTolerance)); } } @@ -474,19 +474,19 @@ plLineCreator.SurfaceLine = surfacelineSimpleDike; plLineCreator.WaterLevelPolder = plLineCreator.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z - 1.0; PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl1, 0.02); - Assert.AreEqual(6, plLine.Points.Count); - Assert.AreEqual(0.0, plLine.Points[0].X, cTolerance); - Assert.AreEqual(plLineCreator.WaterLevelRiverHigh, plLine.Points[0].Z, cTolerance); - Assert.AreEqual(3.0, plLine.Points[1].X, cTolerance); - Assert.AreEqual(plLineCreator.WaterLevelRiverHigh, plLine.Points[1].Z, cTolerance); - Assert.AreEqual(4.0, plLine.Points[2].X, cTolerance); - Assert.AreEqual(plLineCreator.WaterLevelRiverHigh - plLineCreator.PlLineOffsetBelowDikeTopAtRiver, plLine.Points[2].Z, cTolerance); - Assert.AreEqual(7.0, plLine.Points[3].X, cTolerance); - Assert.AreEqual(plLineCreator.WaterLevelRiverHigh - plLineCreator.PlLineOffsetBelowDikeTopAtPolder, plLine.Points[3].Z, cTolerance); - Assert.AreEqual(10.0, plLine.Points[4].X, cTolerance); - Assert.AreEqual(0.9, plLine.Points[4].Z, cTolerance); - Assert.AreEqual(12, plLine.Points[5].X, cTolerance); - Assert.AreEqual(0.9, plLine.Points[5].Z, cTolerance); + Assert.That(plLine.Points.Count, Is.EqualTo(6)); + Assert.That(plLine.Points[0].X, Is.EqualTo(0.0).Within(cTolerance)); + Assert.That(plLine.Points[0].Z, Is.EqualTo(plLineCreator.WaterLevelRiverHigh).Within(cTolerance)); + Assert.That(plLine.Points[1].X, Is.EqualTo(3.0).Within(cTolerance)); + Assert.That(plLine.Points[1].Z, Is.EqualTo(plLineCreator.WaterLevelRiverHigh).Within(cTolerance)); + Assert.That(plLine.Points[2].X, Is.EqualTo(4.0).Within(cTolerance)); + Assert.That(plLine.Points[2].Z, Is.EqualTo(plLineCreator.WaterLevelRiverHigh - plLineCreator.PlLineOffsetBelowDikeTopAtRiver).Within(cTolerance)); + Assert.That(plLine.Points[3].X, Is.EqualTo(7.0).Within(cTolerance)); + Assert.That(plLine.Points[3].Z, Is.EqualTo(plLineCreator.WaterLevelRiverHigh - plLineCreator.PlLineOffsetBelowDikeTopAtPolder).Within(cTolerance)); + Assert.That(plLine.Points[4].X, Is.EqualTo(10.0).Within(cTolerance)); + Assert.That(plLine.Points[4].Z, Is.EqualTo(0.9).Within(cTolerance)); + Assert.That(plLine.Points[5].X, Is.EqualTo(12).Within(cTolerance)); + Assert.That(plLine.Points[5].Z, Is.EqualTo(0.9).Within(cTolerance)); } } @@ -511,19 +511,19 @@ plLineCreator.WaterLevelRiverHigh = plLineCreator.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver).Z; plLineCreator.WaterLevelPolder = plLineCreator.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z - 1.0; PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl1, 0.02); - Assert.AreEqual(6, plLine.Points.Count); - Assert.AreEqual(0.0, plLine.Points[0].X, cTolerance); - Assert.AreEqual(plLineCreator.WaterLevelRiverHigh, plLine.Points[0].Z, cTolerance); - Assert.AreEqual(plLineCreator.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver).X, plLine.Points[1].X, cTolerance); - Assert.AreEqual(plLineCreator.WaterLevelRiverHigh, plLine.Points[1].Z, cTolerance); - Assert.AreEqual(4.0, plLine.Points[2].X, cTolerance); - Assert.AreEqual(plLineCreator.WaterLevelRiverHigh - plLineCreator.PlLineOffsetBelowDikeTopAtRiver, plLine.Points[2].Z, cTolerance); - Assert.AreEqual(7.0, plLine.Points[3].X, cTolerance); - Assert.AreEqual(plLineCreator.WaterLevelRiverHigh - plLineCreator.PlLineOffsetBelowDikeTopAtPolder, plLine.Points[3].Z, cTolerance); - Assert.AreEqual(10.0, plLine.Points[4].X, cTolerance); - Assert.AreEqual(0.9, plLine.Points[4].Z, cTolerance); - Assert.AreEqual(12, plLine.Points[5].X, cTolerance); - Assert.AreEqual(0.9, plLine.Points[5].Z, cTolerance); + Assert.That(plLine.Points.Count, Is.EqualTo(6)); + Assert.That(plLine.Points[0].X, Is.EqualTo(0.0).Within(cTolerance)); + Assert.That(plLine.Points[0].Z, Is.EqualTo(plLineCreator.WaterLevelRiverHigh).Within(cTolerance)); + Assert.That(plLine.Points[1].X, Is.EqualTo(plLineCreator.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver).X).Within(cTolerance)); + Assert.That(plLine.Points[1].Z, Is.EqualTo(plLineCreator.WaterLevelRiverHigh).Within(cTolerance)); + Assert.That(plLine.Points[2].X, Is.EqualTo(4.0).Within(cTolerance)); + Assert.That(plLine.Points[2].Z, Is.EqualTo(plLineCreator.WaterLevelRiverHigh - plLineCreator.PlLineOffsetBelowDikeTopAtRiver).Within(cTolerance)); + Assert.That(plLine.Points[3].X, Is.EqualTo(7.0).Within(cTolerance)); + Assert.That(plLine.Points[3].Z, Is.EqualTo(plLineCreator.WaterLevelRiverHigh - plLineCreator.PlLineOffsetBelowDikeTopAtPolder).Within(cTolerance)); + Assert.That(plLine.Points[4].X, Is.EqualTo(10.0).Within(cTolerance)); + Assert.That(plLine.Points[4].Z, Is.EqualTo(0.9).Within(cTolerance)); + Assert.That(plLine.Points[5].X, Is.EqualTo(12).Within(cTolerance)); + Assert.That(plLine.Points[5].Z, Is.EqualTo(0.9).Within(cTolerance)); } } @@ -550,17 +550,17 @@ plLineCreator.PlLineOffsetBelowDikeTopAtPolder = 3.0; plLineCreator.WaterLevelPolder = plLineCreator.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z - 1.0; PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl1, 0.02); - Assert.AreEqual(6, plLine.Points.Count); - Assert.AreEqual(0.0, plLine.Points[0].X, cTolerance); - Assert.AreEqual(2.5, plLine.Points[0].Z, cTolerance); - Assert.AreEqual(4, plLine.Points[2].X, cTolerance); - Assert.AreEqual(2.0, plLine.Points[2].Z, cTolerance); - Assert.AreEqual(7, plLine.Points[3].X, cTolerance); - Assert.AreEqual(plLineCreator.WaterLevelPolder, plLine.Points[3].Z, cTolerance); - Assert.AreEqual(10, plLine.Points[4].X, cTolerance); - Assert.AreEqual(plLineCreator.WaterLevelPolder, plLine.Points[4].Z, cTolerance); - Assert.AreEqual(12, plLine.Points[5].X, cTolerance); - Assert.AreEqual(plLineCreator.WaterLevelPolder, plLine.Points[5].Z, cTolerance); + Assert.That(plLine.Points.Count, Is.EqualTo(6)); + Assert.That(plLine.Points[0].X, Is.EqualTo(0.0).Within(cTolerance)); + Assert.That(plLine.Points[0].Z, Is.EqualTo(2.5).Within(cTolerance)); + Assert.That(plLine.Points[2].X, Is.EqualTo(4).Within(cTolerance)); + Assert.That(plLine.Points[2].Z, Is.EqualTo(2.0).Within(cTolerance)); + Assert.That(plLine.Points[3].X, Is.EqualTo(7).Within(cTolerance)); + Assert.That(plLine.Points[3].Z, Is.EqualTo(plLineCreator.WaterLevelPolder).Within(cTolerance)); + Assert.That(plLine.Points[4].X, Is.EqualTo(10).Within(cTolerance)); + Assert.That(plLine.Points[4].Z, Is.EqualTo(plLineCreator.WaterLevelPolder).Within(cTolerance)); + Assert.That(plLine.Points[5].X, Is.EqualTo(12).Within(cTolerance)); + Assert.That(plLine.Points[5].Z, Is.EqualTo(plLineCreator.WaterLevelPolder).Within(cTolerance)); } } @@ -608,19 +608,19 @@ plLineCreator.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z - 1.0; PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl1, 0.02); - Assert.AreEqual(7, plLine.Points.Count); - Assert.AreEqual(0.0, plLine.Points[0].X, cTolerance); - Assert.AreEqual(3.0, plLine.Points[0].Z, cTolerance); - Assert.AreEqual(4.0, plLine.Points[2].X, cTolerance); - Assert.AreEqual(2.5, plLine.Points[2].Z, cTolerance); - Assert.AreEqual(7.0, plLine.Points[3].X, cTolerance); - Assert.AreEqual(2.0, plLine.Points[3].Z, cTolerance); - Assert.AreEqual(8.0, plLine.Points[4].X, cTolerance); - Assert.AreEqual(1.8, plLine.Points[4].Z, cTolerance); - Assert.AreEqual(10.0, plLine.Points[5].X, cTolerance); - Assert.AreEqual(0.7, plLine.Points[5].Z, cTolerance); - Assert.AreEqual(12, plLine.Points[6].X, cTolerance); - Assert.AreEqual(0.7, plLine.Points[6].Z, cTolerance); + Assert.That(plLine.Points.Count, Is.EqualTo(7)); + Assert.That(plLine.Points[0].X, Is.EqualTo(0.0).Within(cTolerance)); + Assert.That(plLine.Points[0].Z, Is.EqualTo(3.0).Within(cTolerance)); + Assert.That(plLine.Points[2].X, Is.EqualTo(4.0).Within(cTolerance)); + Assert.That(plLine.Points[2].Z, Is.EqualTo(2.5).Within(cTolerance)); + Assert.That(plLine.Points[3].X, Is.EqualTo(7.0).Within(cTolerance)); + Assert.That(plLine.Points[3].Z, Is.EqualTo(2.0).Within(cTolerance)); + Assert.That(plLine.Points[4].X, Is.EqualTo(8.0).Within(cTolerance)); + Assert.That(plLine.Points[4].Z, Is.EqualTo(1.8).Within(cTolerance)); + Assert.That(plLine.Points[5].X, Is.EqualTo(10.0).Within(cTolerance)); + Assert.That(plLine.Points[5].Z, Is.EqualTo(0.7).Within(cTolerance)); + Assert.That(plLine.Points[6].X, Is.EqualTo(12).Within(cTolerance)); + Assert.That(plLine.Points[6].Z, Is.EqualTo(0.7).Within(cTolerance)); } } @@ -666,23 +666,23 @@ plLineCreator.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z - 1.0; PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl1, 0.02); - Assert.AreEqual(9, plLine.Points.Count); - Assert.AreEqual(0.0, plLine.Points[0].X, cTolerance); - Assert.AreEqual(3.0, plLine.Points[0].Z, cTolerance); - Assert.AreEqual(4.0, plLine.Points[2].X, cTolerance); - Assert.AreEqual(2.5, plLine.Points[2].Z, cTolerance); - Assert.AreEqual(7.0, plLine.Points[3].X, cTolerance); - Assert.AreEqual(2.0, plLine.Points[3].Z, cTolerance); - Assert.AreEqual(8.0, plLine.Points[4].X, cTolerance); - Assert.AreEqual(1.8, plLine.Points[4].Z, cTolerance); - Assert.AreEqual(10.0, plLine.Points[5].X, cTolerance); - Assert.AreEqual(0.7, plLine.Points[5].Z, cTolerance); - Assert.AreEqual(11, plLine.Points[6].X, cTolerance); - Assert.AreEqual(0.2, plLine.Points[6].Z, cTolerance); - Assert.AreEqual(12, plLine.Points[7].X, cTolerance); - Assert.AreEqual(0.1, plLine.Points[7].Z, cTolerance); - Assert.AreEqual(13, plLine.Points[8].X, cTolerance); - Assert.AreEqual(0.0, plLine.Points[8].Z, cTolerance); + Assert.That(plLine.Points.Count, Is.EqualTo(9)); + Assert.That(plLine.Points[0].X, Is.EqualTo(0.0).Within(cTolerance)); + Assert.That(plLine.Points[0].Z, Is.EqualTo(3.0).Within(cTolerance)); + Assert.That(plLine.Points[2].X, Is.EqualTo(4.0).Within(cTolerance)); + Assert.That(plLine.Points[2].Z, Is.EqualTo(2.5).Within(cTolerance)); + Assert.That(plLine.Points[3].X, Is.EqualTo(7.0).Within(cTolerance)); + Assert.That(plLine.Points[3].Z, Is.EqualTo(2.0).Within(cTolerance)); + Assert.That(plLine.Points[4].X, Is.EqualTo(8.0).Within(cTolerance)); + Assert.That(plLine.Points[4].Z, Is.EqualTo(1.8).Within(cTolerance)); + Assert.That(plLine.Points[5].X, Is.EqualTo(10.0).Within(cTolerance)); + Assert.That(plLine.Points[5].Z, Is.EqualTo(0.7).Within(cTolerance)); + Assert.That(plLine.Points[6].X, Is.EqualTo(11).Within(cTolerance)); + Assert.That(plLine.Points[6].Z, Is.EqualTo(0.2).Within(cTolerance)); + Assert.That(plLine.Points[7].X, Is.EqualTo(12).Within(cTolerance)); + Assert.That(plLine.Points[7].Z, Is.EqualTo(0.1).Within(cTolerance)); + Assert.That(plLine.Points[8].X, Is.EqualTo(13).Within(cTolerance)); + Assert.That(plLine.Points[8].Z, Is.EqualTo(0.0).Within(cTolerance)); } } @@ -729,23 +729,23 @@ plLineCreator.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z - 1.0; PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl1, 0.02); - Assert.AreEqual(9, plLine.Points.Count); - Assert.AreEqual(0.0, plLine.Points[0].X, cTolerance); - Assert.AreEqual(3.0, plLine.Points[0].Z, cTolerance); - Assert.AreEqual(4.0, plLine.Points[2].X, cTolerance); - Assert.AreEqual(2.5, plLine.Points[2].Z, cTolerance); - Assert.AreEqual(7.0, plLine.Points[3].X, cTolerance); - Assert.AreEqual(2.0, plLine.Points[3].Z, cTolerance); - Assert.AreEqual(8.0, plLine.Points[4].X, cTolerance); - Assert.AreEqual(1.8, plLine.Points[4].Z, cTolerance); - Assert.AreEqual(10.0, plLine.Points[5].X, cTolerance); - Assert.AreEqual(0.7, plLine.Points[5].Z, cTolerance); - Assert.AreEqual(11, plLine.Points[6].X, cTolerance); - Assert.AreEqual(0.2, plLine.Points[6].Z, cTolerance); - Assert.AreEqual(11.5, plLine.Points[7].X, cTolerance); - Assert.AreEqual(0.0, plLine.Points[7].Z, cTolerance); - Assert.AreEqual(15, plLine.Points[8].X, cTolerance); - Assert.AreEqual(0.0, plLine.Points[8].Z, cTolerance); + Assert.That(plLine.Points.Count, Is.EqualTo(9)); + Assert.That(plLine.Points[0].X, Is.EqualTo(0.0).Within(cTolerance)); + Assert.That(plLine.Points[0].Z, Is.EqualTo(3.0).Within(cTolerance)); + Assert.That(plLine.Points[2].X, Is.EqualTo(4.0).Within(cTolerance)); + Assert.That(plLine.Points[2].Z, Is.EqualTo(2.5).Within(cTolerance)); + Assert.That(plLine.Points[3].X, Is.EqualTo(7.0).Within(cTolerance)); + Assert.That(plLine.Points[3].Z, Is.EqualTo(2.0).Within(cTolerance)); + Assert.That(plLine.Points[4].X, Is.EqualTo(8.0).Within(cTolerance)); + Assert.That(plLine.Points[4].Z, Is.EqualTo(1.8).Within(cTolerance)); + Assert.That(plLine.Points[5].X, Is.EqualTo(10.0).Within(cTolerance)); + Assert.That(plLine.Points[5].Z, Is.EqualTo(0.7).Within(cTolerance)); + Assert.That(plLine.Points[6].X, Is.EqualTo(11).Within(cTolerance)); + Assert.That(plLine.Points[6].Z, Is.EqualTo(0.2).Within(cTolerance)); + Assert.That(plLine.Points[7].X, Is.EqualTo(11.5).Within(cTolerance)); + Assert.That(plLine.Points[7].Z, Is.EqualTo(0.0).Within(cTolerance)); + Assert.That(plLine.Points[8].X, Is.EqualTo(15).Within(cTolerance)); + Assert.That(plLine.Points[8].Z, Is.EqualTo(0.0).Within(cTolerance)); } } @@ -790,19 +790,19 @@ plLineCreator.WaterLevelPolder = plLineCreator.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z; PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl1, 0.02); - Assert.AreEqual(7, plLine.Points.Count); - Assert.AreEqual(0.0, plLine.Points[0].X, cTolerance); - Assert.AreEqual(3.0, plLine.Points[0].Z, cTolerance); - Assert.AreEqual(4.0, plLine.Points[2].X, cTolerance); - Assert.AreEqual(2.5, plLine.Points[2].Z, cTolerance); - Assert.AreEqual(7.0, plLine.Points[3].X, cTolerance); - Assert.AreEqual(2.0, plLine.Points[3].Z, cTolerance); - Assert.AreEqual(8.0, plLine.Points[4].X, cTolerance); - Assert.AreEqual(1.8, plLine.Points[4].Z, cTolerance); - Assert.AreEqual(10.0, plLine.Points[5].X, cTolerance); - Assert.AreEqual(1.0, plLine.Points[5].Z, cTolerance); - Assert.AreEqual(13, plLine.Points[6].X, cTolerance); - Assert.AreEqual(1.0, plLine.Points[6].Z, cTolerance); + Assert.That(plLine.Points.Count, Is.EqualTo(7)); + Assert.That(plLine.Points[0].X, Is.EqualTo(0.0).Within(cTolerance)); + Assert.That(plLine.Points[0].Z, Is.EqualTo(3.0).Within(cTolerance)); + Assert.That(plLine.Points[2].X, Is.EqualTo(4.0).Within(cTolerance)); + Assert.That(plLine.Points[2].Z, Is.EqualTo(2.5).Within(cTolerance)); + Assert.That(plLine.Points[3].X, Is.EqualTo(7.0).Within(cTolerance)); + Assert.That(plLine.Points[3].Z, Is.EqualTo(2.0).Within(cTolerance)); + Assert.That(plLine.Points[4].X, Is.EqualTo(8.0).Within(cTolerance)); + Assert.That(plLine.Points[4].Z, Is.EqualTo(1.8).Within(cTolerance)); + Assert.That(plLine.Points[5].X, Is.EqualTo(10.0).Within(cTolerance)); + Assert.That(plLine.Points[5].Z, Is.EqualTo(1.0).Within(cTolerance)); + Assert.That(plLine.Points[6].X, Is.EqualTo(13).Within(cTolerance)); + Assert.That(plLine.Points[6].Z, Is.EqualTo(1.0).Within(cTolerance)); } } @@ -827,19 +827,19 @@ plLineCreator.SurfaceLine = surfacelineSimpleDike; plLineCreator.WaterLevelPolder = plLineCreator.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z - 1.0; PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl1, 0.02); - Assert.AreEqual(6, plLine.Points.Count); - Assert.AreEqual(0.0, plLine.Points[0].X, cTolerance); - Assert.AreEqual(3.0, plLine.Points[0].Z, cTolerance); - Assert.AreEqual(2.0, plLine.Points[1].X, cTolerance); - Assert.AreEqual(3.0, plLine.Points[1].Z, cTolerance); - Assert.AreEqual(4, plLine.Points[2].X, cTolerance); - Assert.AreEqual(3.5, plLine.Points[2].Z, cTolerance); - Assert.AreEqual(7, plLine.Points[3].X, cTolerance); - Assert.AreEqual(2.5, plLine.Points[3].Z, cTolerance); - Assert.AreEqual(10, plLine.Points[4].X, cTolerance); - Assert.AreEqual(0.9, plLine.Points[4].Z, cTolerance); - Assert.AreEqual(12, plLine.Points[5].X, cTolerance); - Assert.AreEqual(0.9, plLine.Points[5].Z, cTolerance); + Assert.That(plLine.Points.Count, Is.EqualTo(6)); + Assert.That(plLine.Points[0].X, Is.EqualTo(0.0).Within(cTolerance)); + Assert.That(plLine.Points[0].Z, Is.EqualTo(3.0).Within(cTolerance)); + Assert.That(plLine.Points[1].X, Is.EqualTo(2.0).Within(cTolerance)); + Assert.That(plLine.Points[1].Z, Is.EqualTo(3.0).Within(cTolerance)); + Assert.That(plLine.Points[2].X, Is.EqualTo(4).Within(cTolerance)); + Assert.That(plLine.Points[2].Z, Is.EqualTo(3.5).Within(cTolerance)); + Assert.That(plLine.Points[3].X, Is.EqualTo(7).Within(cTolerance)); + Assert.That(plLine.Points[3].Z, Is.EqualTo(2.5).Within(cTolerance)); + Assert.That(plLine.Points[4].X, Is.EqualTo(10).Within(cTolerance)); + Assert.That(plLine.Points[4].Z, Is.EqualTo(0.9).Within(cTolerance)); + Assert.That(plLine.Points[5].X, Is.EqualTo(12).Within(cTolerance)); + Assert.That(plLine.Points[5].Z, Is.EqualTo(0.9).Within(cTolerance)); } } @@ -870,19 +870,19 @@ // Create Pl1 plLineCreator.WaterLevelPolder = plLineCreator.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z - 1.0; PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl1, 0.02); - Assert.AreEqual(6, plLine.Points.Count); - Assert.AreEqual(-2.0, plLine.Points[0].X, cTolerance); - Assert.AreEqual(2.1, plLine.Points[0].Z, cTolerance); - Assert.AreEqual(1.1, plLine.Points[1].X, cTolerance); - Assert.AreEqual(2.1, plLine.Points[1].Z, cTolerance); - Assert.AreEqual(4, plLine.Points[2].X, cTolerance); - Assert.AreEqual(3.5, plLine.Points[2].Z, cTolerance); - Assert.AreEqual(7, plLine.Points[3].X, cTolerance); - Assert.AreEqual(2.5, plLine.Points[3].Z, cTolerance); - Assert.AreEqual(10, plLine.Points[4].X, cTolerance); - Assert.AreEqual(0.9, plLine.Points[4].Z, cTolerance); - Assert.AreEqual(12, plLine.Points[5].X, cTolerance); - Assert.AreEqual(0.9, plLine.Points[5].Z, cTolerance); + Assert.That(plLine.Points.Count, Is.EqualTo(6)); + Assert.That(plLine.Points[0].X, Is.EqualTo(-2.0).Within(cTolerance)); + Assert.That(plLine.Points[0].Z, Is.EqualTo(2.1).Within(cTolerance)); + Assert.That(plLine.Points[1].X, Is.EqualTo(1.1).Within(cTolerance)); + Assert.That(plLine.Points[1].Z, Is.EqualTo(2.1).Within(cTolerance)); + Assert.That(plLine.Points[2].X, Is.EqualTo(4).Within(cTolerance)); + Assert.That(plLine.Points[2].Z, Is.EqualTo(3.5).Within(cTolerance)); + Assert.That(plLine.Points[3].X, Is.EqualTo(7).Within(cTolerance)); + Assert.That(plLine.Points[3].Z, Is.EqualTo(2.5).Within(cTolerance)); + Assert.That(plLine.Points[4].X, Is.EqualTo(10).Within(cTolerance)); + Assert.That(plLine.Points[4].Z, Is.EqualTo(0.9).Within(cTolerance)); + Assert.That(plLine.Points[5].X, Is.EqualTo(12).Within(cTolerance)); + Assert.That(plLine.Points[5].Z, Is.EqualTo(0.9).Within(cTolerance)); } } @@ -1022,7 +1022,7 @@ PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl2, 0.02); // No extra layer should have been added to profile - Assert.AreEqual(4, plLineCreator.SoilProfile.Layers.Count); + Assert.That(plLineCreator.SoilProfile.Layers.Count, Is.EqualTo(4)); Assert.IsFalse(plLine.Exists()); } @@ -1111,8 +1111,8 @@ PlLine plLine4 = plLines.Lines[PlLineType.Pl4]; Assert.IsTrue(plLine2.Exists()); Assert.IsTrue(plLine4.Exists()); - Assert.AreEqual(plLine4.Points.Count, plLine2.Points.Count); - Assert.AreEqual(4.0, plLine4.Points[0].Z); + Assert.That(plLine2.Points.Count, Is.EqualTo(plLine4.Points.Count)); + Assert.That(plLine4.Points[0].Z, Is.EqualTo(4.0)); for (var pointIndex = 0; pointIndex < plLine4.Points.Count; pointIndex++) { Assert.IsTrue(plLine2.Points[pointIndex].LocationEquals(plLine4.Points[pointIndex])); @@ -1151,8 +1151,8 @@ Assert.IsTrue(plLine.Points[0].LocationEquals(new PlLinePoint(1.0, cHeadPL2))); Assert.IsTrue(plLine.Points[1].LocationEquals(new PlLinePoint(21.0, cHeadPL2))); // Check if extra layer is added to soilprofile - Assert.AreEqual(orgLayerCount + 1, plLineCreator.SoilProfile.Layers.Count); - Assert.AreEqual(-2.0, plLineCreator.SoilProfile.Layers[orgLayerCount - 1].TopLevel, 0.01); + Assert.That(plLineCreator.SoilProfile.Layers.Count, Is.EqualTo(orgLayerCount + 1)); + Assert.That(plLineCreator.SoilProfile.Layers[orgLayerCount - 1].TopLevel, Is.EqualTo(-2.0).Within(0.01)); } } @@ -1461,18 +1461,18 @@ // PlLine in this situation is supposed to take the shape of the line with no corrections for uplift - Assert.AreEqual(4, plLine.Points.Count); + Assert.That(plLine.Points.Count, Is.EqualTo(4)); - Assert.AreEqual(0.0, plLine.Points[0].X, Tolerance); // start - Assert.AreEqual(4.0, plLine.Points[0].Z, Tolerance); // water level at river - Assert.AreEqual(10.0, plLine.Points[1].X, Tolerance); // entry point - Assert.AreEqual(4.0, plLine.Points[1].Z, Tolerance); // water level at river - Assert.AreEqual(50.5, plLine.Points[2].X, Tolerance); // dike toe polder - Assert.AreEqual(2.65, plLine.Points[2].Z, Tolerance); // head dike toe polder - Assert.AreEqual(75.0, plLine.Points[3].X, Tolerance); // dike toe polder - Assert.AreEqual(2.16, plLine.Points[3].Z, Tolerance); // head dike toe polder + Assert.That(plLine.Points[0].X, Is.EqualTo(0.0).Within(Tolerance)); // start + Assert.That(plLine.Points[0].Z, Is.EqualTo(4.0).Within(Tolerance)); // water level at river + Assert.That(plLine.Points[1].X, Is.EqualTo(10.0).Within(Tolerance)); // entry point + Assert.That(plLine.Points[1].Z, Is.EqualTo(4.0).Within(Tolerance)); // water level at river + Assert.That(plLine.Points[2].X, Is.EqualTo(50.5).Within(Tolerance)); // dike toe polder + Assert.That(plLine.Points[2].Z, Is.EqualTo(2.65).Within(Tolerance)); // head dike toe polder + Assert.That(plLine.Points[3].X, Is.EqualTo(75.0).Within(Tolerance)); // dike toe polder + Assert.That(plLine.Points[3].Z, Is.EqualTo(2.16).Within(Tolerance)); // head dike toe polder - Assert.AreEqual(2.65, plLine.ZFromX(plLineCreator.SurfaceLine.GetDikeToeInward().X), Tolerance); // headAtDikeToe + Assert.That(plLine.ZFromX(plLineCreator.SurfaceLine.GetDikeToeInward().X), Is.EqualTo(2.65).Within(Tolerance)); // headAtDikeToe } } @@ -1510,16 +1510,16 @@ // PlLine in this situation is supposed to burn down to the polder water level from the entry point - Assert.AreEqual(4, plLine.Points.Count); + Assert.That(plLine.Points.Count, Is.EqualTo(4)); - Assert.AreEqual(0.0, plLine.Points[0].X, Tolerance); // start - Assert.AreEqual(4.0, plLine.Points[0].Z, Tolerance); // water level at river - Assert.AreEqual(10.0, plLine.Points[1].X, Tolerance); // entry point - Assert.AreEqual(4.0, plLine.Points[1].Z, Tolerance); // water level at river - Assert.AreEqual(50.5, plLine.Points[2].X, Tolerance); // end - Assert.AreEqual(-0.5, plLine.Points[2].Z, Tolerance); // water level at polder - Assert.AreEqual(75.0, plLine.Points[3].X, Tolerance); // end - Assert.AreEqual(-0.5, plLine.Points[3].Z, Tolerance); // water level at polder + Assert.That(plLine.Points[0].X, Is.EqualTo(0.0).Within(Tolerance)); // start + Assert.That(plLine.Points[0].Z, Is.EqualTo(4.0).Within(Tolerance)); // water level at river + Assert.That(plLine.Points[1].X, Is.EqualTo(10.0).Within(Tolerance)); // entry point + Assert.That(plLine.Points[1].Z, Is.EqualTo(4.0).Within(Tolerance)); // water level at river + Assert.That(plLine.Points[2].X, Is.EqualTo(50.5).Within(Tolerance)); // end + Assert.That(plLine.Points[2].Z, Is.EqualTo(-0.5).Within(Tolerance)); // water level at polder + Assert.That(plLine.Points[3].X, Is.EqualTo(75.0).Within(Tolerance)); // end + Assert.That(plLine.Points[3].Z, Is.EqualTo(-0.5).Within(Tolerance)); // water level at polder } } @@ -1703,20 +1703,20 @@ plLineCreator.Gauges = gauges; PlLines plLines = plLineCreator.CreateAllPlLines(locations[0]); - Assert.AreEqual(4, plLines.Lines[PlLineType.Pl1].Points.Count); - Assert.AreEqual(0, plLines.Lines[PlLineType.Pl1].Points[0].X); - Assert.AreEqual(4, plLines.Lines[PlLineType.Pl1].Points[0].Z); + Assert.That(plLines.Lines[PlLineType.Pl1].Points.Count, Is.EqualTo(4)); + Assert.That(plLines.Lines[PlLineType.Pl1].Points[0].X, Is.EqualTo(0)); + Assert.That(plLines.Lines[PlLineType.Pl1].Points[0].Z, Is.EqualTo(4)); // The following point.x is the intersection point of PL1 with the dike - Assert.AreEqual(29.6, plLines.Lines[PlLineType.Pl1].Points[1].X); - Assert.AreEqual(4, plLines.Lines[PlLineType.Pl1].Points[1].Z); - Assert.AreEqual(45, plLines.Lines[PlLineType.Pl1].Points[2].X); - Assert.AreEqual(1, plLines.Lines[PlLineType.Pl1].Points[2].Z); - Assert.AreEqual(75, plLines.Lines[PlLineType.Pl1].Points[3].X); - Assert.AreEqual(1, plLines.Lines[PlLineType.Pl1].Points[3].Z); + Assert.That(plLines.Lines[PlLineType.Pl1].Points[1].X, Is.EqualTo(29.6)); + Assert.That(plLines.Lines[PlLineType.Pl1].Points[1].Z, Is.EqualTo(4)); + Assert.That(plLines.Lines[PlLineType.Pl1].Points[2].X, Is.EqualTo(45)); + Assert.That(plLines.Lines[PlLineType.Pl1].Points[2].Z, Is.EqualTo(1)); + Assert.That(plLines.Lines[PlLineType.Pl1].Points[3].X, Is.EqualTo(75)); + Assert.That(plLines.Lines[PlLineType.Pl1].Points[3].Z, Is.EqualTo(1)); - Assert.AreEqual(0, plLines.Lines[PlLineType.Pl2].Points.Count); - Assert.AreEqual(0, plLines.Lines[PlLineType.Pl3].Points.Count); - Assert.AreEqual(0, plLines.Lines[PlLineType.Pl4].Points.Count); + Assert.That(plLines.Lines[PlLineType.Pl2].Points.Count, Is.EqualTo(0)); + Assert.That(plLines.Lines[PlLineType.Pl3].Points.Count, Is.EqualTo(0)); + Assert.That(plLines.Lines[PlLineType.Pl4].Points.Count, Is.EqualTo(0)); } } @@ -1804,19 +1804,19 @@ plLineCreator.Gauges = gauges; PlLines plLines = plLineCreator.CreateAllPlLines(locations[0]); - Assert.AreEqual(4, plLines.Lines[PlLineType.Pl1].Points.Count); - Assert.AreEqual(0, plLines.Lines[PlLineType.Pl1].Points[0].X); - Assert.AreEqual(4, plLines.Lines[PlLineType.Pl1].Points[0].Z); - Assert.AreEqual(29.6, plLines.Lines[PlLineType.Pl1].Points[1].X); - Assert.AreEqual(4, plLines.Lines[PlLineType.Pl1].Points[1].Z); - Assert.AreEqual(45, plLines.Lines[PlLineType.Pl1].Points[2].X); - Assert.AreEqual(1, plLines.Lines[PlLineType.Pl1].Points[2].Z); - Assert.AreEqual(75, plLines.Lines[PlLineType.Pl1].Points[3].X); - Assert.AreEqual(1, plLines.Lines[PlLineType.Pl1].Points[3].Z); + Assert.That(plLines.Lines[PlLineType.Pl1].Points.Count, Is.EqualTo(4)); + Assert.That(plLines.Lines[PlLineType.Pl1].Points[0].X, Is.EqualTo(0)); + Assert.That(plLines.Lines[PlLineType.Pl1].Points[0].Z, Is.EqualTo(4)); + Assert.That(plLines.Lines[PlLineType.Pl1].Points[1].X, Is.EqualTo(29.6)); + Assert.That(plLines.Lines[PlLineType.Pl1].Points[1].Z, Is.EqualTo(4)); + Assert.That(plLines.Lines[PlLineType.Pl1].Points[2].X, Is.EqualTo(45)); + Assert.That(plLines.Lines[PlLineType.Pl1].Points[2].Z, Is.EqualTo(1)); + Assert.That(plLines.Lines[PlLineType.Pl1].Points[3].X, Is.EqualTo(75)); + Assert.That(plLines.Lines[PlLineType.Pl1].Points[3].Z, Is.EqualTo(1)); - Assert.AreEqual(0, plLines.Lines[PlLineType.Pl2].Points.Count); - Assert.AreEqual(0, plLines.Lines[PlLineType.Pl3].Points.Count); - Assert.AreEqual(0, plLines.Lines[PlLineType.Pl4].Points.Count); + Assert.That(plLines.Lines[PlLineType.Pl2].Points.Count, Is.EqualTo(0)); + Assert.That(plLines.Lines[PlLineType.Pl3].Points.Count, Is.EqualTo(0)); + Assert.That(plLines.Lines[PlLineType.Pl4].Points.Count, Is.EqualTo(0)); } } @@ -1904,71 +1904,71 @@ plLineCreator.Gauges = gauges; PlLines plLines = plLineCreator.CreateAllPlLines(locations[0]); - Assert.AreEqual(2, plLines.Lines[PlLineType.Pl1].Points.Count); - Assert.AreEqual(0, plLines.Lines[PlLineType.Pl1].Points[0].X); - Assert.AreEqual(6, plLines.Lines[PlLineType.Pl1].Points[0].Z); - Assert.AreEqual(75, plLines.Lines[PlLineType.Pl1].Points[1].X); - Assert.AreEqual(6, plLines.Lines[PlLineType.Pl1].Points[1].Z); + Assert.That(plLines.Lines[PlLineType.Pl1].Points.Count, Is.EqualTo(2)); + Assert.That(plLines.Lines[PlLineType.Pl1].Points[0].X, Is.EqualTo(0)); + Assert.That(plLines.Lines[PlLineType.Pl1].Points[0].Z, Is.EqualTo(6)); + Assert.That(plLines.Lines[PlLineType.Pl1].Points[1].X, Is.EqualTo(75)); + Assert.That(plLines.Lines[PlLineType.Pl1].Points[1].Z, Is.EqualTo(6)); - Assert.AreEqual(0, plLines.Lines[PlLineType.Pl2].Points.Count); - Assert.AreEqual(0, plLines.Lines[PlLineType.Pl3].Points.Count); - Assert.AreEqual(0, plLines.Lines[PlLineType.Pl4].Points.Count); + Assert.That(plLines.Lines[PlLineType.Pl2].Points.Count, Is.EqualTo(0)); + Assert.That(plLines.Lines[PlLineType.Pl3].Points.Count, Is.EqualTo(0)); + Assert.That(plLines.Lines[PlLineType.Pl4].Points.Count, Is.EqualTo(0)); } } private void CheckPl3For1DGeometryWithExpertKnowledgeRrd(PlLine plLine) { // PlLine is supposed to have adjusted points at both banks of the ditch - Assert.AreEqual(4, plLine.Points.Count); - Assert.AreEqual(0.0, plLine.Points[0].X, Tolerance); // start - Assert.AreEqual(4.0, plLine.Points[0].Z, Tolerance); // water level at river - Assert.AreEqual(10.0, plLine.Points[1].X, Tolerance); // entry point - Assert.AreEqual(4.0, plLine.Points[1].Z, Tolerance); // water level at river - Assert.AreEqual(59.5, plLine.Points[2].X, Tolerance); // ditch due to adjustment for uplift - Assert.AreEqual(1.637, plLine.Points[2].Z, Tolerance); // head ditch - Assert.AreEqual(75.0, plLine.Points[3].X, Tolerance); // end - Assert.AreEqual(1.3276, plLine.Points[3].Z, Tolerance); // headAtDikeEnd + Assert.That(plLine.Points.Count, Is.EqualTo(4)); + Assert.That(plLine.Points[0].X, Is.EqualTo(0.0).Within(Tolerance)); // start + Assert.That(plLine.Points[0].Z, Is.EqualTo(4.0).Within(Tolerance)); // water level at river + Assert.That(plLine.Points[1].X, Is.EqualTo(10.0).Within(Tolerance)); // entry point + Assert.That(plLine.Points[1].Z, Is.EqualTo(4.0).Within(Tolerance)); // water level at river + Assert.That(plLine.Points[2].X, Is.EqualTo(59.5).Within(Tolerance)); // ditch due to adjustment for uplift + Assert.That(plLine.Points[2].Z, Is.EqualTo(1.637).Within(Tolerance)); // head ditch + Assert.That(plLine.Points[3].X, Is.EqualTo(75.0).Within(Tolerance)); // end + Assert.That(plLine.Points[3].Z, Is.EqualTo(1.3276).Within(Tolerance)); // headAtDikeEnd } private void CheckPl3For1DGeometryWithExpertKnowledgeRrdWithHeadPl2Specified(PlLine plLine) { // PlLine is supposed to have adjusted points at both banks of the ditch - Assert.AreEqual(4, plLine.Points.Count); - Assert.AreEqual(0.0, plLine.Points[0].X, Tolerance); // start - Assert.AreEqual(4.0, plLine.Points[0].Z, Tolerance); // water level at river - Assert.AreEqual(10.0, plLine.Points[1].X, Tolerance); // entry point - Assert.AreEqual(4.0, plLine.Points[1].Z, Tolerance); // water level at river - Assert.AreEqual(50.5, plLine.Points[2].X, Tolerance); // ditch due to adjustment for uplift - Assert.AreEqual(1.3, plLine.Points[2].Z, Tolerance); // head ditch - Assert.AreEqual(75.0, plLine.Points[3].X, Tolerance); // end - Assert.AreEqual(0.81, plLine.Points[3].Z, Tolerance); // headAtDikeEnd + Assert.That(plLine.Points.Count, Is.EqualTo(4)); + Assert.That(plLine.Points[0].X, Is.EqualTo(0.0).Within(Tolerance)); // start + Assert.That(plLine.Points[0].Z, Is.EqualTo(4.0).Within(Tolerance)); // water level at river + Assert.That(plLine.Points[1].X, Is.EqualTo(10.0).Within(Tolerance)); // entry point + Assert.That(plLine.Points[1].Z, Is.EqualTo(4.0).Within(Tolerance)); // water level at river + Assert.That(plLine.Points[2].X, Is.EqualTo(50.5).Within(Tolerance)); // ditch due to adjustment for uplift + Assert.That(plLine.Points[2].Z, Is.EqualTo(1.3).Within(Tolerance)); // head ditch + Assert.That(plLine.Points[3].X, Is.EqualTo(75.0).Within(Tolerance)); // end + Assert.That(plLine.Points[3].Z, Is.EqualTo(0.81).Within(Tolerance)); // headAtDikeEnd } private void CheckPl3LowFor1DGeometryWithExpertKnowledgeRrd(PlLine plLine) { - Assert.AreEqual(4, plLine.Points.Count); - Assert.AreEqual(0.0, plLine.Points[0].X, Tolerance); // start - Assert.AreEqual(1.0, plLine.Points[0].Z, Tolerance); // water level at river - Assert.AreEqual(10.0, plLine.Points[1].X, Tolerance); // toe of dike - Assert.AreEqual(1.0, plLine.Points[1].Z, Tolerance); // water level at river - Assert.AreEqual(50.5, plLine.Points[2].X, Tolerance); // end - Assert.AreEqual(0.55, plLine.Points[2].Z, Tolerance); // headAtDikeEnd - Assert.AreEqual(75.0, plLine.Points[3].X, Tolerance); // end - Assert.AreEqual(0.06, plLine.Points[3].Z, Tolerance); // headAtDikeEnd + Assert.That(plLine.Points.Count, Is.EqualTo(4)); + Assert.That(plLine.Points[0].X, Is.EqualTo(0.0).Within(Tolerance)); // start + Assert.That(plLine.Points[0].Z, Is.EqualTo(1.0).Within(Tolerance)); // water level at river + Assert.That(plLine.Points[1].X, Is.EqualTo(10.0).Within(Tolerance)); // toe of dike + Assert.That(plLine.Points[1].Z, Is.EqualTo(1.0).Within(Tolerance)); // water level at river + Assert.That(plLine.Points[2].X, Is.EqualTo(50.5).Within(Tolerance)); // end + Assert.That(plLine.Points[2].Z, Is.EqualTo(0.55).Within(Tolerance)); // headAtDikeEnd + Assert.That(plLine.Points[3].X, Is.EqualTo(75.0).Within(Tolerance)); // end + Assert.That(plLine.Points[3].Z, Is.EqualTo(0.06).Within(Tolerance)); // headAtDikeEnd } private void CheckPl4LowFor1DGeometryWithExpertKnowledgeRrd(PlLine plLine) { // PlLine is supposed to have adjusted points at dike toe and end - Assert.AreEqual(4, plLine.Points.Count); - Assert.AreEqual(0.0, plLine.Points[0].X, Tolerance); // start - Assert.AreEqual(4.0, plLine.Points[0].Z, Tolerance); // water level at river - Assert.AreEqual(10.0, plLine.Points[1].X, Tolerance); // entry point - Assert.AreEqual(4.0, plLine.Points[1].Z, Tolerance); // water level at river - Assert.AreEqual(50.5, plLine.Points[2].X, Tolerance); // dike toe - Assert.AreEqual(2.2, plLine.Points[2].Z, Tolerance); // head dike toe - Assert.AreEqual(75.0, plLine.Points[3].X, Tolerance); // end - Assert.AreEqual(1.71, plLine.Points[3].Z, Tolerance); // head end + Assert.That(plLine.Points.Count, Is.EqualTo(4)); + Assert.That(plLine.Points[0].X, Is.EqualTo(0.0).Within(Tolerance)); // start + Assert.That(plLine.Points[0].Z, Is.EqualTo(4.0).Within(Tolerance)); // water level at river + Assert.That(plLine.Points[1].X, Is.EqualTo(10.0).Within(Tolerance)); // entry point + Assert.That(plLine.Points[1].Z, Is.EqualTo(4.0).Within(Tolerance)); // water level at river + Assert.That(plLine.Points[2].X, Is.EqualTo(50.5).Within(Tolerance)); // dike toe + Assert.That(plLine.Points[2].Z, Is.EqualTo(2.2).Within(Tolerance)); // head dike toe + Assert.That(plLine.Points[3].X, Is.EqualTo(75.0).Within(Tolerance)); // end + Assert.That(plLine.Points[3].Z, Is.EqualTo(1.71).Within(Tolerance)); // head end } ///// Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/GeometryLoopTests.cs =================================================================== diff -u -r4540 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/GeometryLoopTests.cs (.../GeometryLoopTests.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/GeometryLoopTests.cs (.../GeometryLoopTests.cs) (revision 4624) @@ -38,9 +38,9 @@ var loop = new GeometryLoop(); // assert - Assert.AreEqual(loop.Points.Count, loop.Count); - Assert.AreEqual(String.Empty, loop.Name); - CollectionAssert.IsEmpty(loop.Points); + Assert.That(loop.Count, Is.EqualTo(loop.Points.Count)); + Assert.That(loop.Name, Is.EqualTo(String.Empty)); + Assert.That(loop.Points, Is.Empty); //Assert.AreEqual(String.Empty, loop.PointsDescription); Assert.IsEmpty(loop.CurveList); @@ -349,7 +349,7 @@ } int pointCount = loop.CalcPoints.Count; - Assert.AreEqual(curveCount == 0 ? 0 : curveCount + 1, pointCount); + Assert.That(pointCount, Is.EqualTo(curveCount == 0 ? 0 : curveCount + 1)); // call TestDelegate call = () => loop.IsClockWise(); @@ -448,9 +448,9 @@ List points = loop.CalcPoints; // assert - Assert.AreEqual(2, points.Count); - Assert.AreSame(curve1.EndPoint, points[0]); - Assert.AreSame(curve1.HeadPoint, points[1]); + Assert.That(points.Count, Is.EqualTo(2)); + Assert.That(points[0], Is.SameAs(curve1.EndPoint)); + Assert.That(points[1], Is.SameAs(curve1.HeadPoint)); } [Test] @@ -480,14 +480,14 @@ List points = loop.CalcPoints; // assert - Assert.AreEqual(7, points.Count); - Assert.AreSame(curve1.HeadPoint, points[0]); - Assert.AreSame(curve1.EndPoint, points[1]); - Assert.AreSame(curve2.HeadPoint, points[2]); - Assert.AreSame(curve3.EndPoint, points[3]); - Assert.AreSame(curve4.HeadPoint, points[4]); - Assert.AreSame(curve5.EndPoint, points[5]); - Assert.AreSame(curve6.EndPoint, points[6]); + Assert.That(points.Count, Is.EqualTo(7)); + Assert.That(points[0], Is.SameAs(curve1.HeadPoint)); + Assert.That(points[1], Is.SameAs(curve1.EndPoint)); + Assert.That(points[2], Is.SameAs(curve2.HeadPoint)); + Assert.That(points[3], Is.SameAs(curve3.EndPoint)); + Assert.That(points[4], Is.SameAs(curve4.HeadPoint)); + Assert.That(points[5], Is.SameAs(curve5.EndPoint)); + Assert.That(points[6], Is.SameAs(curve6.EndPoint)); } [Test] @@ -521,15 +521,15 @@ List points = loop.CalcPoints; // assert - Assert.AreEqual(8, points.Count); - Assert.AreSame(curve1.HeadPoint, points[0]); - Assert.AreSame(curve1.EndPoint, points[1]); - Assert.AreSame(curve2.HeadPoint, points[2]); - Assert.AreSame(curve3.EndPoint, points[3]); - Assert.AreSame(curve4.HeadPoint, points[4]); - Assert.AreSame(curve5.EndPoint, points[5]); - Assert.AreSame(curve6.EndPoint, points[6]); - Assert.AreSame(curve9.HeadPoint, points[7]); + Assert.That(points.Count, Is.EqualTo(8)); + Assert.That(points[0], Is.SameAs(curve1.HeadPoint)); + Assert.That(points[1], Is.SameAs(curve1.EndPoint)); + Assert.That(points[2], Is.SameAs(curve2.HeadPoint)); + Assert.That(points[3], Is.SameAs(curve3.EndPoint)); + Assert.That(points[4], Is.SameAs(curve4.HeadPoint)); + Assert.That(points[5], Is.SameAs(curve5.EndPoint)); + Assert.That(points[6], Is.SameAs(curve6.EndPoint)); + Assert.That(points[7], Is.SameAs(curve9.HeadPoint)); } [Test] @@ -549,10 +549,10 @@ List points = loop.CalcPoints; // assert - Assert.AreEqual(3, points.Count); - Assert.AreSame(curve1.HeadPoint, points[0]); - Assert.AreSame(curve1.EndPoint, points[1]); - Assert.AreSame(curve2.HeadPoint, points[2]); + Assert.That(points.Count, Is.EqualTo(3)); + Assert.That(points[0], Is.SameAs(curve1.HeadPoint)); + Assert.That(points[1], Is.SameAs(curve1.EndPoint)); + Assert.That(points[2], Is.SameAs(curve2.HeadPoint)); } [Test] @@ -572,10 +572,10 @@ List points = loop.CalcPoints; // assert - Assert.AreEqual(3, points.Count); - Assert.AreSame(curve1.HeadPoint, points[0]); - Assert.AreSame(curve1.EndPoint, points[1]); - Assert.AreSame(curve2.EndPoint, points[2]); + Assert.That(points.Count, Is.EqualTo(3)); + Assert.That(points[0], Is.SameAs(curve1.HeadPoint)); + Assert.That(points[1], Is.SameAs(curve1.EndPoint)); + Assert.That(points[2], Is.SameAs(curve2.EndPoint)); } [Test] @@ -595,10 +595,10 @@ List points = loop.CalcPoints; // assert - Assert.AreEqual(3, points.Count); - Assert.AreSame(curve1.EndPoint, points[0]); - Assert.AreSame(curve1.HeadPoint, points[1]); - Assert.AreSame(curve2.HeadPoint, points[2]); + Assert.That(points.Count, Is.EqualTo(3)); + Assert.That(points[0], Is.SameAs(curve1.EndPoint)); + Assert.That(points[1], Is.SameAs(curve1.HeadPoint)); + Assert.That(points[2], Is.SameAs(curve2.HeadPoint)); } [Test] @@ -618,10 +618,10 @@ List points = loop.CalcPoints; // assert - Assert.AreEqual(3, points.Count); - Assert.AreSame(curve1.EndPoint, points[0]); - Assert.AreSame(curve1.HeadPoint, points[1]); - Assert.AreSame(curve2.EndPoint, points[2]); + Assert.That(points.Count, Is.EqualTo(3)); + Assert.That(points[0], Is.SameAs(curve1.EndPoint)); + Assert.That(points[1], Is.SameAs(curve1.HeadPoint)); + Assert.That(points[2], Is.SameAs(curve2.EndPoint)); } [Test] @@ -636,9 +636,9 @@ List points = loop.CalcPoints; // assert - Assert.AreEqual(2, points.Count); - Assert.AreSame(curve.HeadPoint, points[0]); - Assert.AreSame(curve.EndPoint, points[1]); + Assert.That(points.Count, Is.EqualTo(2)); + Assert.That(points[0], Is.SameAs(curve.HeadPoint)); + Assert.That(points[1], Is.SameAs(curve.EndPoint)); } [Test] Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs =================================================================== diff -u -r4540 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs (.../OperationalGrebbedijkTests.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs (.../OperationalGrebbedijkTests.cs) (revision 4624) @@ -74,12 +74,12 @@ Output output = GeneralHelper.RunAfterInputValidation(inputString, true, outputFileName); - Assert.AreEqual(2.321, output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry[0].Value, tolerance); - Assert.AreEqual(2.321, output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry[1].Value, tolerance); + Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry[0].Value, Is.EqualTo(2.321).Within(tolerance)); + Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry[1].Value, Is.EqualTo(2.321).Within(tolerance)); // Following values were 0.590 in the previous DamLive version, but that has to do with how the // reference level Su is handled in D-GeoStability 18.1 and D-GeoStability 15.1 - Assert.AreEqual(2.326, output.Results.OperationalOutputTimeSeries[1].Entries.TimeSerieEntry[0].Value, tolerance); - Assert.AreEqual(2.326, output.Results.OperationalOutputTimeSeries[1].Entries.TimeSerieEntry[1].Value, tolerance); + Assert.That(output.Results.OperationalOutputTimeSeries[1].Entries.TimeSerieEntry[0].Value, Is.EqualTo(2.326).Within(tolerance)); + Assert.That(output.Results.OperationalOutputTimeSeries[1].Entries.TimeSerieEntry[1].Value, Is.EqualTo(2.326).Within(tolerance)); } [TestCase(PipingModelType.Wti2017)] @@ -106,10 +106,10 @@ Output output = GeneralHelper.RunAfterInputValidation(engineInterface, false); - Assert.AreEqual(2, output.Results.CalculationMessages.Length); - Assert.AreEqual(MessageMessageType.Info, output.Results.CalculationMessages[0].MessageType); - Assert.AreEqual("There are 2 locations with sensor data", output.Results.CalculationMessages[0].Message1); - Assert.AreEqual(MessageMessageType.Error, output.Results.CalculationMessages[1].MessageType); - Assert.AreEqual("No segments with failure mechanism Piping present", output.Results.CalculationMessages[1].Message1); + Assert.That(output.Results.CalculationMessages.Length, Is.EqualTo(2)); + Assert.That(output.Results.CalculationMessages[0].MessageType, Is.EqualTo(MessageMessageType.Info)); + Assert.That(output.Results.CalculationMessages[0].Message1, Is.EqualTo("There are 2 locations with sensor data")); + Assert.That(output.Results.CalculationMessages[1].MessageType, Is.EqualTo(MessageMessageType.Error)); + Assert.That(output.Results.CalculationMessages[1].Message1, Is.EqualTo("No segments with failure mechanism Piping present")); } } \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs =================================================================== diff -u -r4562 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 4562) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 4624) @@ -39,15 +39,15 @@ [TestCase(InputDamProjectType.Operational, DamProjectType.Operational)] public void CanConvertToDamProjectType(InputDamProjectType inputDamProjectType, DamProjectType damProjectType) { - Assert.AreEqual(damProjectType, ConversionHelper.ConvertToDamProjectType(inputDamProjectType)); + Assert.That(ConversionHelper.ConvertToDamProjectType(inputDamProjectType), Is.EqualTo(damProjectType)); } [Test] [TestCase(DamProjectType.Design, InputDamProjectType.Design)] [TestCase(DamProjectType.Operational, InputDamProjectType.Operational)] public void CanConvertToInputDamProjectType(DamProjectType damProjectType, InputDamProjectType inputDamProjectType) { - Assert.AreEqual(inputDamProjectType, ConversionHelper.ConvertToInputDamProjectType(damProjectType)); + Assert.That(ConversionHelper.ConvertToInputDamProjectType(damProjectType), Is.EqualTo(inputDamProjectType)); } [Test] @@ -58,7 +58,7 @@ [TestCase(PlLineCreationMethod.Sensors, LocationWaternetOptionsPhreaticLineCreationMethod.Sensors)] public void CanConvertToPlLineCreationMethod(PlLineCreationMethod plLineCreationMethod, LocationWaternetOptionsPhreaticLineCreationMethod inputPhreaticLineCreationMethod) { - Assert.AreEqual(inputPhreaticLineCreationMethod, ConversionHelper.ConvertToInputPhreaticLineCreationMethod(plLineCreationMethod)); + Assert.That(ConversionHelper.ConvertToInputPhreaticLineCreationMethod(plLineCreationMethod), Is.EqualTo(inputPhreaticLineCreationMethod)); } [Test] @@ -69,7 +69,7 @@ [TestCase(LocationWaternetOptionsPhreaticLineCreationMethod.Sensors, PlLineCreationMethod.Sensors)] public void CanConvertToInputPlLineCreationMethod(LocationWaternetOptionsPhreaticLineCreationMethod inputPhreaticLineCreationMethod, PlLineCreationMethod plLineCreationMethod) { - Assert.AreEqual(plLineCreationMethod, ConversionHelper.ConvertToPhreaticLineCreationMethod(inputPhreaticLineCreationMethod)); + Assert.That(ConversionHelper.ConvertToPhreaticLineCreationMethod(inputPhreaticLineCreationMethod), Is.EqualTo(plLineCreationMethod)); } [Test] @@ -80,7 +80,7 @@ [TestCase(LocationWaternetOptionsIntrusionVerticalWaterPressure.Standard, IntrusionVerticalWaterPressureType.Standard)] public void CanConvertToIntrusionVerticalWaterPressureType(LocationWaternetOptionsIntrusionVerticalWaterPressure inputIntrusionVerticalWaterPressureType, IntrusionVerticalWaterPressureType intrusionVerticalWaterPressureType) { - Assert.AreEqual(intrusionVerticalWaterPressureType, ConversionHelper.ConvertToIntrusionVerticalWaterPressure(inputIntrusionVerticalWaterPressureType)); + Assert.That(ConversionHelper.ConvertToIntrusionVerticalWaterPressure(inputIntrusionVerticalWaterPressureType), Is.EqualTo(intrusionVerticalWaterPressureType)); } [Test] @@ -91,7 +91,7 @@ [TestCase(IntrusionVerticalWaterPressureType.Standard, LocationWaternetOptionsIntrusionVerticalWaterPressure.Standard)] public void CanConvertToInputIntrusionVerticalWaterPressureType(IntrusionVerticalWaterPressureType intrusionVerticalWaterPressureType, LocationWaternetOptionsIntrusionVerticalWaterPressure inputIntrusionVerticalWaterPressureType) { - Assert.AreEqual(inputIntrusionVerticalWaterPressureType, ConversionHelper.ConvertToInputIntrusionVerticalWaterPressure(intrusionVerticalWaterPressureType)); + Assert.That(ConversionHelper.ConvertToInputIntrusionVerticalWaterPressure(intrusionVerticalWaterPressureType), Is.EqualTo(inputIntrusionVerticalWaterPressureType)); } [Test] @@ -106,7 +106,7 @@ [TestCase(8, CalculationResult.UnexpectedError)] public void CanConvertToOutputCalculationResult(int result, CalculationResult calculationResult) { - Assert.AreEqual(result, ConversionHelper.ConvertToOutputCalculationResult(calculationResult)); + Assert.That(ConversionHelper.ConvertToOutputCalculationResult(calculationResult), Is.EqualTo(result)); } [Test] @@ -121,7 +121,7 @@ [TestCase(CalculationResult.UnexpectedError, 8)] public void CanConvertToCalculationResult(CalculationResult result, int calculationResult) { - Assert.AreEqual(result, ConversionHelper.ConvertToCalculationResult(calculationResult)); + Assert.That(ConversionHelper.ConvertToCalculationResult(calculationResult), Is.EqualTo(result)); } [Test] @@ -145,7 +145,7 @@ [TestCase(ConversionHelper.CpSurfaceLevelInside, CharacteristicPointType.SurfaceLevelInside)] public void CanConvertToCharacteristicPointType(int inputPointType, CharacteristicPointType characteristicPointType) { - Assert.AreEqual(characteristicPointType, ConversionHelper.ConvertToDamPointType(inputPointType)); + Assert.That(ConversionHelper.ConvertToDamPointType(inputPointType), Is.EqualTo(characteristicPointType)); } [Test] @@ -169,15 +169,15 @@ [TestCase(CharacteristicPointType.SurfaceLevelInside, ConversionHelper.CpSurfaceLevelInside)] public void CanConvertToInputPointType(CharacteristicPointType characteristicPointType, int inputPointType) { - Assert.AreEqual(inputPointType, ConversionHelper.ConvertToInputPointType(characteristicPointType)); + Assert.That(ConversionHelper.ConvertToInputPointType(characteristicPointType), Is.EqualTo(inputPointType)); } [Test] [TestCase(0, WaterpressureInterpolationModel.Automatic)] [TestCase(1, WaterpressureInterpolationModel.Hydrostatic)] public void CanConvertToWaterpressureInterpolationModel(int inputInterpolationModel, WaterpressureInterpolationModel interpolationModel) { - Assert.AreEqual(interpolationModel, ConversionHelper.ConvertToWaterpressureInterpolationModel(inputInterpolationModel)); + Assert.That(ConversionHelper.ConvertToWaterpressureInterpolationModel(inputInterpolationModel), Is.EqualTo(interpolationModel)); } [Test] @@ -186,7 +186,7 @@ [TestCase(SoilProfileType.ProfileTypeStiFile, 2)] public void CanConvertToInputSoilGeometryType(SoilProfileType soilProfileType, int inputSoilGeometryType) { - Assert.AreEqual(inputSoilGeometryType, ConversionHelper.ConvertToInputSoilGeometryType(soilProfileType)); + Assert.That(ConversionHelper.ConvertToInputSoilGeometryType(soilProfileType), Is.EqualTo(inputSoilGeometryType)); } [Test] @@ -195,7 +195,7 @@ [TestCase(2, SoilProfileType.ProfileTypeStiFile)] public void CanConvertToSoilGeometryType(int inputSoilGeometryType, SoilProfileType soilProfileType) { - Assert.AreEqual(soilProfileType, ConversionHelper.ConvertToSoilGeometryType(inputSoilGeometryType)); + Assert.That(ConversionHelper.ConvertToSoilGeometryType(inputSoilGeometryType), Is.EqualTo(soilProfileType)); } [Test] @@ -204,7 +204,7 @@ [TestCase(FailureMechanismSystemType.Piping, ConversionHelper.InputFailureMechanismPiping)] public void CanConvertToInputFailureMechanismSystemType(FailureMechanismSystemType failureMechanismSystemType, int inputFailureMechanismSystemType) { - Assert.AreEqual(inputFailureMechanismSystemType, ConversionHelper.ConvertToInputFailureMechanismSystemType(failureMechanismSystemType)); + Assert.That(ConversionHelper.ConvertToInputFailureMechanismSystemType(failureMechanismSystemType), Is.EqualTo(inputFailureMechanismSystemType)); } [Test] @@ -213,7 +213,7 @@ [TestCase(ConversionHelper.InputFailureMechanismPiping, FailureMechanismSystemType.Piping)] public void CanConvertToFailureMechanismSystemType(int inputFailureMechanismSystemType, FailureMechanismSystemType failureMechanismSystemType) { - Assert.AreEqual(failureMechanismSystemType, ConversionHelper.ConvertToFailureMechanismSystemType(inputFailureMechanismSystemType)); + Assert.That(ConversionHelper.ConvertToFailureMechanismSystemType(inputFailureMechanismSystemType), Is.EqualTo(failureMechanismSystemType)); } [Test] @@ -223,7 +223,7 @@ [TestCase(SegmentFailureMechanismType.Liquefaction, ConversionHelper.InputSegmentFailureMechanismLiquefaction)] public void CanConvertToInputFailureMechanismSystemType(SegmentFailureMechanismType failureMechanismSystemType, int inputFailureMechanismSystemType) { - Assert.AreEqual(inputFailureMechanismSystemType, ConversionHelper.ConvertToInputSegmentFailureMechanismSystemType(failureMechanismSystemType)); + Assert.That(ConversionHelper.ConvertToInputSegmentFailureMechanismSystemType(failureMechanismSystemType), Is.EqualTo(inputFailureMechanismSystemType)); } [Test] @@ -233,7 +233,7 @@ [TestCase(ConversionHelper.InputSegmentFailureMechanismLiquefaction, SegmentFailureMechanismType.Liquefaction)] public void CanConvertToFailureMechanismSystemType(int inputFailureMechanismSystemType, SegmentFailureMechanismType failureMechanismSystemType) { - Assert.AreEqual(failureMechanismSystemType, ConversionHelper.ConvertToSegmentFailureMechanismSystemType(inputFailureMechanismSystemType)); + Assert.That(ConversionHelper.ConvertToSegmentFailureMechanismSystemType(inputFailureMechanismSystemType), Is.EqualTo(failureMechanismSystemType)); } [Test] @@ -243,7 +243,7 @@ [TestCase(MStabModelType.UpliftVan, InputStabilityModelType.UpliftVan)] public void CanConvertToInputStabilityModelType(MStabModelType mStabModelType, InputStabilityModelType inputStabilityModelType) { - Assert.AreEqual(inputStabilityModelType, ConversionHelper.ConvertToInputStabilityModelType(mStabModelType)); + Assert.That(ConversionHelper.ConvertToInputStabilityModelType(mStabModelType), Is.EqualTo(inputStabilityModelType)); } [Test] @@ -253,31 +253,31 @@ [TestCase(InputStabilityModelType.UpliftVan, MStabModelType.UpliftVan)] public void CanConvertToMStabModelType(InputStabilityModelType inputStabilityModelType, MStabModelType mStabModelType) { - Assert.AreEqual(mStabModelType, ConversionHelper.ConvertToStabilityModelType(inputStabilityModelType)); + Assert.That(ConversionHelper.ConvertToStabilityModelType(inputStabilityModelType), Is.EqualTo(mStabModelType)); } [Test] [TestCase(AnalysisType.AdaptGeometry, InputAnalysisType.AdaptGeometry)] [TestCase(AnalysisType.NoAdaption, InputAnalysisType.NoAdaption)] public void CanConvertToInputAnalysisType(AnalysisType analysisType, InputAnalysisType inputAnalysisType) { - Assert.AreEqual(inputAnalysisType, ConversionHelper.ConvertToInputAnalysisType(analysisType)); + Assert.That(ConversionHelper.ConvertToInputAnalysisType(analysisType), Is.EqualTo(inputAnalysisType)); } [Test] [TestCase(InputAnalysisType.AdaptGeometry, AnalysisType.AdaptGeometry)] [TestCase(InputAnalysisType.NoAdaption, AnalysisType.NoAdaption)] public void CanConvertToAnalysisType(InputAnalysisType inputAnalysisType, AnalysisType analysisType) { - Assert.AreEqual(analysisType, ConversionHelper.ConvertToAnalysisType(inputAnalysisType)); + Assert.That(ConversionHelper.ConvertToAnalysisType(inputAnalysisType), Is.EqualTo(analysisType)); } [Test] [TestCase(MStabZonesType.NoZones, ConversionHelper.InputZoneTypeNoZones)] [TestCase(MStabZonesType.ForbiddenZone, ConversionHelper.InputZoneTypesForbiddenZones)] public void CanConvertToInputZoneType(MStabZonesType zoneType, int inputZoneType) { - Assert.AreEqual(inputZoneType, ConversionHelper.ConvertToInputZoneType(zoneType)); + Assert.That(ConversionHelper.ConvertToInputZoneType(zoneType), Is.EqualTo(inputZoneType)); } [Test] @@ -286,7 +286,7 @@ [TestCase(ConversionHelper.InputZoneTypesForbiddenZones, MStabZonesType.ForbiddenZone)] public void CanConvertToZoneType(int inputZoneType, MStabZonesType zoneType) { - Assert.AreEqual(zoneType, ConversionHelper.ConvertToZoneType(inputZoneType)); + Assert.That(ConversionHelper.ConvertToZoneType(inputZoneType), Is.EqualTo(zoneType)); } [Test] @@ -295,7 +295,7 @@ [TestCase(MStabSearchMethod.BeeSwarm, ConversionHelper.InputSearchMethodBeeSwarm)] public void CanConvertToInputSearchMethod(MStabSearchMethod searchMethod, int inputSearchMethod) { - Assert.AreEqual(inputSearchMethod, ConversionHelper.ConvertToInputSearchMethod(searchMethod)); + Assert.That(ConversionHelper.ConvertToInputSearchMethod(searchMethod), Is.EqualTo(inputSearchMethod)); } [Test] @@ -304,7 +304,7 @@ [TestCase(ConversionHelper.InputSearchMethodBeeSwarm, MStabSearchMethod.BeeSwarm)] public void CanConvertToSearchMethod(int inputSearchMethod, MStabSearchMethod searchMethod) { - Assert.AreEqual(searchMethod, ConversionHelper.ConvertToSearchMethod(inputSearchMethod)); + Assert.That(ConversionHelper.ConvertToSearchMethod(inputSearchMethod), Is.EqualTo(searchMethod)); } [Test] @@ -316,7 +316,7 @@ [TestCase(LogMessageType.Warning, MessageMessageType.Warning)] public void CanConvertToInputMessageType(LogMessageType logMessageType, MessageMessageType messageType) { - Assert.AreEqual(messageType, ConversionHelper.ConvertToInputMessageType(logMessageType)); + Assert.That(ConversionHelper.ConvertToInputMessageType(logMessageType), Is.EqualTo(messageType)); } [Test] @@ -325,7 +325,7 @@ [TestCase(MessageMessageType.Warning, LogMessageType.Warning)] public void CanConvertToMessageType(MessageMessageType messageType, LogMessageType logMessageType) { - Assert.AreEqual(logMessageType, ConversionHelper.ConvertToLogMessageType(messageType)); + Assert.That(ConversionHelper.ConvertToLogMessageType(messageType), Is.EqualTo(logMessageType)); } [Test] @@ -334,23 +334,23 @@ [TestCase(ShearStrengthModel.SigmaTauCurve, SoilShearStrengthModel.SigmaTauCurve)] public void CanConvertToSoilShearStrengthModel(ShearStrengthModel shearStrengthModel, SoilShearStrengthModel soilShearStrengthModel) { - Assert.AreEqual(soilShearStrengthModel, ConversionHelper.ConvertToSoilShearStrengthModel(shearStrengthModel)); + Assert.That(ConversionHelper.ConvertToSoilShearStrengthModel(shearStrengthModel), Is.EqualTo(soilShearStrengthModel)); } [Test] [TestCase(GridSizeDetermination.Automatic, ConversionHelper.InputGridTypeAutomatic)] [TestCase(GridSizeDetermination.Specified, ConversionHelper.InputGridTypeSpecified)] public void CanConvertToInputGridSizeDetermination(GridSizeDetermination gridDetermination, int inputGridDetermination) { - Assert.AreEqual(inputGridDetermination, ConversionHelper.ConvertToInputGridDetermination(gridDetermination)); + Assert.That(ConversionHelper.ConvertToInputGridDetermination(gridDetermination), Is.EqualTo(inputGridDetermination)); } [Test] [TestCase(ConversionHelper.InputGridTypeAutomatic, GridSizeDetermination.Automatic)] [TestCase(ConversionHelper.InputGridTypeSpecified, GridSizeDetermination.Specified)] public void CanConvertToGridSizeDetermination(int inputGridDetermination, GridSizeDetermination gridDetermination) { - Assert.AreEqual(gridDetermination, ConversionHelper.ConvertToGridDetermination(inputGridDetermination)); + Assert.That(ConversionHelper.ConvertToGridDetermination(inputGridDetermination), Is.EqualTo(gridDetermination)); } [Test] @@ -359,23 +359,23 @@ [TestCase(SoilShearStrengthModel.SigmaTauCurve, ShearStrengthModel.SigmaTauCurve)] public void CanConvertToShearStrengthModel(SoilShearStrengthModel soilShearStrengthModel, ShearStrengthModel shearStrengthModel) { - Assert.AreEqual(shearStrengthModel, ConversionHelper.ConvertToShearStrengthModel(soilShearStrengthModel)); + Assert.That(ConversionHelper.ConvertToShearStrengthModel(soilShearStrengthModel), Is.EqualTo(shearStrengthModel)); } [Test] [TestCase(TangentLinesDefinition.OnBoundaryLines, ConversionHelper.InputTangentLinesSpecified)] [TestCase(TangentLinesDefinition.Specified, ConversionHelper.InputTangentLinesOnBoundaryLines)] public void CanConvertToInputTangentLinesDefinition(TangentLinesDefinition tangentLineType, int inputTangentLineType) { - Assert.AreEqual(inputTangentLineType, ConversionHelper.ConvertToInputTangentLinesDefinition(tangentLineType)); + Assert.That(ConversionHelper.ConvertToInputTangentLinesDefinition(tangentLineType), Is.EqualTo(inputTangentLineType)); } [Test] [TestCase(ConversionHelper.InputGridTypeSpecified, TangentLinesDefinition.OnBoundaryLines)] [TestCase(ConversionHelper.InputGridTypeAutomatic, TangentLinesDefinition.Specified)] public void CanConvertToTangentLinesDefinition(int inputTangentLineType, TangentLinesDefinition tangentLineType) { - Assert.AreEqual(tangentLineType, ConversionHelper.ConvertToTangentLinesDefinition(inputTangentLineType)); + Assert.That(ConversionHelper.ConvertToTangentLinesDefinition(inputTangentLineType), Is.EqualTo(tangentLineType)); } [Test] @@ -384,7 +384,7 @@ [TestCase(DilatancyType.MinusPhi, SoilDilatancyType.MinusPhi)] public void CanConvertToSoilDilatancyType(DilatancyType dilatancyType, SoilDilatancyType soilDilatancyType) { - Assert.AreEqual(soilDilatancyType, ConversionHelper.ConvertToSoilDilatancyType(dilatancyType)); + Assert.That(ConversionHelper.ConvertToSoilDilatancyType(dilatancyType), Is.EqualTo(soilDilatancyType)); } [Test] @@ -393,23 +393,23 @@ [TestCase(SoilDilatancyType.MinusPhi, DilatancyType.MinusPhi)] public void CanConvertToDilatancyType(SoilDilatancyType soilDilatancyType, DilatancyType dilatancyType) { - Assert.AreEqual(dilatancyType, ConversionHelper.ConvertToDilatancyType(soilDilatancyType)); + Assert.That(ConversionHelper.ConvertToDilatancyType(soilDilatancyType), Is.EqualTo(dilatancyType)); } [Test] [TestCase(LocationDesignOptionsStabilityDesignMethod.SlopeAdaptionBeforeShoulderAdaption, StabilityDesignMethod.SlopeAdaptionBeforeShoulderAdaption)] [TestCase(LocationDesignOptionsStabilityDesignMethod.OptimizedSlopeAndShoulderAdaption, StabilityDesignMethod.OptimizedSlopeAndShoulderAdaption)] public void CanConvertToInputStabilityDesignMethod(LocationDesignOptionsStabilityDesignMethod inputStabilityDesignMethod, StabilityDesignMethod stabilityDesignMethod) { - Assert.AreEqual(stabilityDesignMethod, ConversionHelper.ConvertToDamStabilityDesignMethod(inputStabilityDesignMethod)); + Assert.That(ConversionHelper.ConvertToDamStabilityDesignMethod(inputStabilityDesignMethod), Is.EqualTo(stabilityDesignMethod)); } [Test] [TestCase(StabilityDesignMethod.SlopeAdaptionBeforeShoulderAdaption, LocationDesignOptionsStabilityDesignMethod.SlopeAdaptionBeforeShoulderAdaption)] [TestCase(StabilityDesignMethod.OptimizedSlopeAndShoulderAdaption, LocationDesignOptionsStabilityDesignMethod.OptimizedSlopeAndShoulderAdaption)] public void CanConvertToDamStabilityDesignMethod(StabilityDesignMethod stabilityDesignMethod, LocationDesignOptionsStabilityDesignMethod inputStabilityDesignMethod) { - Assert.AreEqual(inputStabilityDesignMethod, ConversionHelper.ConvertToInputStabilityDesignMethod(stabilityDesignMethod)); + Assert.That(ConversionHelper.ConvertToInputStabilityDesignMethod(stabilityDesignMethod), Is.EqualTo(inputStabilityDesignMethod)); } [Test] @@ -426,7 +426,7 @@ [TestCase(MStabModelType.UpliftVan, ConversionHelper.MStabModelTypeUpliftVan)] public void CanConvertToOutputMStabModelType(MStabModelType mStabModelType, int outputMStabModelType) { - Assert.AreEqual(outputMStabModelType, ConversionHelper.ConvertToOutputMStabModelType(mStabModelType)); + Assert.That(ConversionHelper.ConvertToOutputMStabModelType(mStabModelType), Is.EqualTo(outputMStabModelType)); } [Test] @@ -442,23 +442,23 @@ [TestCase(ConversionHelper.MStabModelTypeSpencerLow, MStabModelType.SpencerLow)] public void CanConvertToMStabModelType(int outputMStabModelType, MStabModelType mStabModelType) { - Assert.AreEqual(mStabModelType, ConversionHelper.ConvertToMStabModelType(outputMStabModelType)); + Assert.That(ConversionHelper.ConvertToMStabModelType(outputMStabModelType), Is.EqualTo(mStabModelType)); } [Test] [TestCase(PipingModelType.Bligh, InputPipingModelType.Bligh)] [TestCase(PipingModelType.Wti2017, InputPipingModelType.WtiSellmeijerRevised)] public void CanConvertToInputPipingModelType(PipingModelType pipingModelType, InputPipingModelType inputPipingModelType) { - Assert.AreEqual(inputPipingModelType, ConversionHelper.ConvertToInputPipingModelType(pipingModelType)); + Assert.That(ConversionHelper.ConvertToInputPipingModelType(pipingModelType), Is.EqualTo(inputPipingModelType)); } [Test] [TestCase(InputPipingModelType.Bligh, PipingModelType.Bligh)] [TestCase(InputPipingModelType.WtiSellmeijerRevised, PipingModelType.Wti2017)] public void CanConvertToPipingModelType(InputPipingModelType inputPipingModelType, PipingModelType pipingModelType) { - Assert.AreEqual(pipingModelType, ConversionHelper.ConvertToPipingModelType(inputPipingModelType)); + Assert.That(ConversionHelper.ConvertToPipingModelType(inputPipingModelType), Is.EqualTo(pipingModelType)); } [Test] @@ -469,7 +469,7 @@ public void CanConvertToOutputStabilityModelType(DesignResultStabilityDesignResultsStabilityModelType outputStabilityModelType, MStabModelType stabilityModelType) { - Assert.AreEqual(outputStabilityModelType, ConversionHelper.ConvertToOutputStabilityModelType(stabilityModelType)); + Assert.That(ConversionHelper.ConvertToOutputStabilityModelType(stabilityModelType), Is.EqualTo(outputStabilityModelType)); } [Test] @@ -480,7 +480,7 @@ public void CanConvertToStabilityModelType(MStabModelType stabilityModelType, DesignResultStabilityDesignResultsStabilityModelType outputStabilityModelType) { - Assert.AreEqual(stabilityModelType, ConversionHelper.ConvertToStabilityModelType(outputStabilityModelType)); + Assert.That(ConversionHelper.ConvertToStabilityModelType(outputStabilityModelType), Is.EqualTo(stabilityModelType)); } [Test] @@ -494,7 +494,7 @@ [TestCase(ConversionHelper.TimeStepUnitNonequidistant, TimeStepUnit.Nonequidistant)] public void CanConvertToTimeStepUnit(uint inputTimeStepUnit, TimeStepUnit timeStepUnit) { - Assert.AreEqual(timeStepUnit, ConversionHelper.ConvertToTimeStepUnit(inputTimeStepUnit)); + Assert.That(ConversionHelper.ConvertToTimeStepUnit(inputTimeStepUnit), Is.EqualTo(timeStepUnit)); } [Test] @@ -508,7 +508,7 @@ [TestCase(TimeStepUnit.Nonequidistant, ConversionHelper.TimeStepUnitNonequidistant)] public void CanConvertToInputTimeStepUnit(TimeStepUnit timeStepUnit, uint inputTimeStepUnit) { - Assert.AreEqual(inputTimeStepUnit, ConversionHelper.ConvertToInputTimeStepUnit(timeStepUnit)); + Assert.That(ConversionHelper.ConvertToInputTimeStepUnit(timeStepUnit), Is.EqualTo(inputTimeStepUnit)); } [TestCase(ConversionHelper.PlLineTypePl1, PlLineType.Pl1)] @@ -517,7 +517,7 @@ [TestCase(ConversionHelper.PlLineTypePl4, PlLineType.Pl4)] public void CanConvertToPlLineType(uint inputPlLineType, PlLineType plLineType) { - Assert.AreEqual(plLineType, ConversionHelper.ConvertToPlLineType(inputPlLineType)); + Assert.That(ConversionHelper.ConvertToPlLineType(inputPlLineType), Is.EqualTo(plLineType)); } [TestCase(PlLineType.Pl1, ConversionHelper.PlLineTypePl1)] @@ -526,39 +526,39 @@ [TestCase(PlLineType.Pl4, ConversionHelper.PlLineTypePl4)] public void CanConvertToInputPlLineType(PlLineType plLineType, uint inputPlLineType) { - Assert.AreEqual(inputPlLineType, ConversionHelper.ConvertToInputPlLineType(plLineType)); + Assert.That(ConversionHelper.ConvertToInputPlLineType(plLineType), Is.EqualTo(inputPlLineType)); } [TestCase(ConversionHelper.SensorTypePiezometricHead, SensorType.PiezometricHead)] [TestCase(ConversionHelper.SensorTypeWaterLevel, SensorType.WaterLevel)] [TestCase(ConversionHelper.SensorTypePolderLevel, SensorType.PolderLevel)] public void CanConvertToSensorType(uint inputSensorType, SensorType sensorType) { - Assert.AreEqual(sensorType, ConversionHelper.ConvertToSensorType(inputSensorType)); + Assert.That(ConversionHelper.ConvertToSensorType(inputSensorType), Is.EqualTo(sensorType)); } [TestCase(SensorType.PiezometricHead, ConversionHelper.SensorTypePiezometricHead)] [TestCase(SensorType.WaterLevel, ConversionHelper.SensorTypeWaterLevel)] [TestCase(SensorType.PolderLevel, ConversionHelper.SensorTypePolderLevel)] public void CanConvertToInputSensorType(SensorType sensorType, uint inputSensorType) { - Assert.AreEqual(inputSensorType, ConversionHelper.ConvertToInputSensorType(sensorType)); + Assert.That(ConversionHelper.ConvertToInputSensorType(sensorType), Is.EqualTo(inputSensorType)); } [TestCase(ConversionHelper.DataSourceTypeSensorsIgnore, DataSourceTypeSensors.Ignore)] [TestCase(ConversionHelper.DataSourceTypeSensorsLocationData, DataSourceTypeSensors.LocationData)] [TestCase(ConversionHelper.DataSourceTypeSensorsSensor, DataSourceTypeSensors.Sensor)] public void CanConvertToSensorType(uint inputdataSourceTypeSensors, DataSourceTypeSensors dataSourceTypeSensors) { - Assert.AreEqual(dataSourceTypeSensors, ConversionHelper.ConvertToDataSourceTypeSensors(inputdataSourceTypeSensors)); + Assert.That(ConversionHelper.ConvertToDataSourceTypeSensors(inputdataSourceTypeSensors), Is.EqualTo(dataSourceTypeSensors)); } [TestCase(DataSourceTypeSensors.Ignore, ConversionHelper.DataSourceTypeSensorsIgnore)] [TestCase(DataSourceTypeSensors.LocationData, ConversionHelper.DataSourceTypeSensorsLocationData)] [TestCase(DataSourceTypeSensors.Sensor, ConversionHelper.DataSourceTypeSensorsSensor)] public void CanConvertToInputSensorType(DataSourceTypeSensors dataSourceTypeSensors, uint inputdataSourceTypeSensors) { - Assert.AreEqual(inputdataSourceTypeSensors, ConversionHelper.ConvertToInputDataSourceTypeSensors(dataSourceTypeSensors)); + Assert.That(ConversionHelper.ConvertToInputDataSourceTypeSensors(dataSourceTypeSensors), Is.EqualTo(inputdataSourceTypeSensors)); } [TestCase(LocationWaternetOptionsDikeSoilScenario.ClayDikeOnClay, DikeSoilScenario.ClayDikeOnClay)] @@ -567,7 +567,7 @@ [TestCase(LocationWaternetOptionsDikeSoilScenario.SandDikeOnSand, DikeSoilScenario.SandDikeOnSand)] public void CanConvertToDikeSoilScenarioType(LocationWaternetOptionsDikeSoilScenario locationWaternetOptionsDikeSoilScenario, DikeSoilScenario dikeSoilScenario) { - Assert.AreEqual(dikeSoilScenario, ConversionHelper.ConvertToDikeSoilScenario(locationWaternetOptionsDikeSoilScenario)); + Assert.That(ConversionHelper.ConvertToDikeSoilScenario(locationWaternetOptionsDikeSoilScenario), Is.EqualTo(dikeSoilScenario)); } [TestCase(DikeSoilScenario.ClayDikeOnClay, LocationWaternetOptionsDikeSoilScenario.ClayDikeOnClay)] @@ -576,6 +576,6 @@ [TestCase(DikeSoilScenario.SandDikeOnSand, LocationWaternetOptionsDikeSoilScenario.SandDikeOnSand)] public void CanConvertToInputDikeSoilScenarioType(DikeSoilScenario dikeSoilScenario, LocationWaternetOptionsDikeSoilScenario locationWaternetOptionsDikeSoilScenario) { - Assert.AreEqual(locationWaternetOptionsDikeSoilScenario, ConversionHelper.ConvertToInputDikeSoilScenario(dikeSoilScenario)); + Assert.That(ConversionHelper.ConvertToInputDikeSoilScenario(dikeSoilScenario), Is.EqualTo(locationWaternetOptionsDikeSoilScenario)); } } \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Standard/ReferenceEqualityComparerTest.cs =================================================================== diff -u -r4540 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Standard/ReferenceEqualityComparerTest.cs (.../ReferenceEqualityComparerTest.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Standard/ReferenceEqualityComparerTest.cs (.../ReferenceEqualityComparerTest.cs) (revision 4624) @@ -83,9 +83,9 @@ int hashCode5 = comparer.GetHashCode(doubleValue5); // compare - Assert.AreEqual(hashCode2, hashCode3); - Assert.AreNotEqual(hashCode2, hashCode4); - Assert.AreEqual(hashCode2, hashCode5); + Assert.That(hashCode3, Is.EqualTo(hashCode2)); + Assert.That(hashCode4, Is.Not.EqualTo(hashCode2)); + Assert.That(hashCode5, Is.EqualTo(hashCode2)); // initialise geometry points var geometryPoint1 = new ObjectCopierTest.TestPoint @@ -112,8 +112,8 @@ hashCode4 = comparer.GetHashCode(geometryPoint4); // compare - Assert.AreNotEqual(hashCode1, hashCode2); - Assert.AreNotEqual(hashCode1, hashCode3); - Assert.AreEqual(hashCode1, hashCode4); + Assert.That(hashCode2, Is.Not.EqualTo(hashCode1)); + Assert.That(hashCode3, Is.Not.EqualTo(hashCode1)); + Assert.That(hashCode4, Is.EqualTo(hashCode1)); } } \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/UpliftCalculatorTest.cs =================================================================== diff -u -r4540 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/UpliftCalculatorTest.cs (.../UpliftCalculatorTest.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/UpliftCalculatorTest.cs (.../UpliftCalculatorTest.cs) (revision 4624) @@ -59,11 +59,11 @@ // Extra mass soil = 240 - 216 = 24 // Extra Height = Extra mass soil / (unit weight soil for raising) = 24 / 12 = 2.0 calculator.UnitWeightSoilEmbankment = null; - Assert.AreEqual(2.0, calculator.CalculateExtraHeight(10.0, 1.2), cTolerance); + Assert.That(calculator.CalculateExtraHeight(10.0, 1.2), Is.EqualTo(2.0).Within(cTolerance)); // Extra Height = Extra mass soil / (unit weight soil for raising) = 24 / 8 = 3.0 calculator.UnitWeightSoilEmbankment = 8.0; - Assert.AreEqual(3.0, calculator.CalculateExtraHeight(10.0, 1.2), cTolerance); + Assert.That(calculator.CalculateExtraHeight(10.0, 1.2), Is.EqualTo(3.0).Within(cTolerance)); } [Test] @@ -85,15 +85,15 @@ // UpliftFactor = 1.0 // Mass of Watervolume = mass of soil / uplift factor = 216 / 1.0 = 216 // Head = mass of watervolume / volumic weight water - top of layer = 216 / 10 - (-10) = 21.6 - (-10.0) = 11.6 m - Assert.AreEqual(11.6, calculator.CalculateHeadOfPlLine(1.0), cTolerance); + Assert.That(calculator.CalculateHeadOfPlLine(1.0), Is.EqualTo(11.6).Within(cTolerance)); double upliftFactor = calculator.CalculateUpliftFactor(11.6); - Assert.AreEqual(1.0, upliftFactor, cTolerance); + Assert.That(upliftFactor, Is.EqualTo(1.0).Within(cTolerance)); calculator.IsUseOvenDryUnitWeight = true; double head = calculator.CalculateHeadOfPlLine(1.0); double upliftFactorOvenDry = calculator.CalculateUpliftFactor(head); - Assert.AreEqual(1.0, upliftFactorOvenDry, cTolerance); + Assert.That(upliftFactorOvenDry, Is.EqualTo(1.0).Within(cTolerance)); } [Test] @@ -115,7 +115,7 @@ // Phreatic pressure // 20 m x 10 kN/m3 = 200 // UpliftFactor = 216/200 = 1.08 - Assert.AreEqual(1.08, calculator.CalculateUpliftFactor(10.0), cTolerance); + Assert.That(calculator.CalculateUpliftFactor(10.0), Is.EqualTo(1.08).Within(cTolerance)); } /// @@ -147,7 +147,7 @@ // Phreatic pressure // 20 m x 10 kN/m3 = 200 // UpliftFactor = 216/200 = 1.08 - Assert.AreEqual(1.08, calculator.CalculateUpliftFactor(10.0), cTolerance); + Assert.That(calculator.CalculateUpliftFactor(10.0), Is.EqualTo(1.08).Within(cTolerance)); } [Test] Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilProfile1DAquiferLayerCombinerTests.cs =================================================================== diff -u -r4540 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilProfile1DAquiferLayerCombinerTests.cs (.../SoilProfile1DAquiferLayerCombinerTests.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilProfile1DAquiferLayerCombinerTests.cs (.../SoilProfile1DAquiferLayerCombinerTests.cs) (revision 4624) @@ -35,13 +35,13 @@ var topLayerName = "L2"; SoilProfile1DAquiferLayerCombiner.AquiferLayerProperties aquiferLayer = SoilProfile1DAquiferLayerCombiner.CombineLayers(soilProfile1D, topLayerName); // D70 from layer L2 - Assert.AreEqual(0.0002, aquiferLayer.D70, diff); + Assert.That(aquiferLayer.D70, Is.EqualTo(0.0002).Within(diff)); // Height from L2 + all layers below it that are aquifer unless an aquitard is in between // so sum of L2 and L3: 3 + 2 = 5 - Assert.AreEqual(5.0, aquiferLayer.Height, diff); + Assert.That(aquiferLayer.Height, Is.EqualTo(5.0).Within(diff)); // PermeabilityKx is average of L2 and L3 based on height // (0.0001 * 3 + 0.0006 * 2) / (3 + 2) = 0.0003 - Assert.AreEqual(0.0003, aquiferLayer.PermeabilityKx, diff); + Assert.That(aquiferLayer.PermeabilityKx, Is.EqualTo(0.0003).Within(diff)); } [Test] Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Standard/ObjectCopierTest.cs =================================================================== diff -u -r4540 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Standard/ObjectCopierTest.cs (.../ObjectCopierTest.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Standard/ObjectCopierTest.cs (.../ObjectCopierTest.cs) (revision 4624) @@ -58,46 +58,46 @@ // check if copy is done correctly ComparisonResult result = compare.Compare(differentProperties, differentPropertiesCopy); - Assert.AreEqual(0, result.Differences.Count); + Assert.That(result.Differences.Count, Is.EqualTo(0)); // change double array differentPropertiesCopy.DoubleArray[0] = 99; result = compare.Compare(differentProperties, differentPropertiesCopy); - Assert.AreEqual(1, result.Differences.Count); - Assert.AreNotEqual(differentProperties.DoubleArray[0], differentPropertiesCopy.DoubleArray[0]); + Assert.That(result.Differences.Count, Is.EqualTo(1)); + Assert.That(differentPropertiesCopy.DoubleArray[0], Is.Not.EqualTo(differentProperties.DoubleArray[0])); // change integer array differentPropertiesCopy.IntArray[0] = 99; result = compare.Compare(differentProperties, differentPropertiesCopy); - Assert.AreEqual(2, result.Differences.Count); - Assert.AreNotEqual(differentProperties.IntArray[0], differentPropertiesCopy.IntArray[0]); + Assert.That(result.Differences.Count, Is.EqualTo(2)); + Assert.That(differentPropertiesCopy.IntArray[0], Is.Not.EqualTo(differentProperties.IntArray[0])); // change string array differentPropertiesCopy.StrArray[0] = "99"; result = compare.Compare(differentProperties, differentPropertiesCopy); - Assert.AreEqual(3, result.Differences.Count); - Assert.AreNotEqual(differentProperties.StrArray[0], differentPropertiesCopy.StrArray[0]); + Assert.That(result.Differences.Count, Is.EqualTo(3)); + Assert.That(differentPropertiesCopy.StrArray[0], Is.Not.EqualTo(differentProperties.StrArray[0])); // change boolean array differentPropertiesCopy.BoolArray[0] = false; differentPropertiesCopy.BoolArray[1] = false; result = compare.Compare(differentProperties, differentPropertiesCopy); - Assert.AreEqual(5, result.Differences.Count); - Assert.AreNotEqual(differentProperties.BoolArray[0], differentPropertiesCopy.BoolArray[0]); - Assert.AreNotEqual(differentProperties.BoolArray[1], differentPropertiesCopy.BoolArray[1]); + Assert.That(result.Differences.Count, Is.EqualTo(5)); + Assert.That(differentPropertiesCopy.BoolArray[0], Is.Not.EqualTo(differentProperties.BoolArray[0])); + Assert.That(differentPropertiesCopy.BoolArray[1], Is.Not.EqualTo(differentProperties.BoolArray[1])); // change geometryPoint array testPointDifferentObjectsCopy.TestPointArray[1].X = 99; testPointDifferentObjectsCopy.TestPointArray[1].Z = 99; result = compare.Compare(testPointDifferentObjects, testPointDifferentObjectsCopy); - Assert.AreEqual(2, result.Differences.Count); - Assert.AreNotEqual(testPointDifferentObjects.TestPointArray[1].X, testPointDifferentObjectsCopy.TestPointArray[1].X); - Assert.AreNotEqual(testPointDifferentObjects.TestPointArray[1].Z, testPointDifferentObjectsCopy.TestPointArray[1].Z); + Assert.That(result.Differences.Count, Is.EqualTo(2)); + Assert.That(testPointDifferentObjectsCopy.TestPointArray[1].X, Is.Not.EqualTo(testPointDifferentObjects.TestPointArray[1].X)); + Assert.That(testPointDifferentObjectsCopy.TestPointArray[1].Z, Is.Not.EqualTo(testPointDifferentObjects.TestPointArray[1].Z)); } /// @@ -126,46 +126,46 @@ // check if copy is done correctly ComparisonResult result = compare.Compare(differentProperties, differentPropertiesCopy); - Assert.AreEqual(0, result.Differences.Count); + Assert.That(result.Differences.Count, Is.EqualTo(0)); // change double list differentPropertiesCopy.DoubleList[0] = 99; result = compare.Compare(differentProperties, differentPropertiesCopy); - Assert.AreEqual(1, result.Differences.Count); - Assert.AreNotEqual(differentProperties.DoubleList[0], differentPropertiesCopy.DoubleList[0]); + Assert.That(result.Differences.Count, Is.EqualTo(1)); + Assert.That(differentPropertiesCopy.DoubleList[0], Is.Not.EqualTo(differentProperties.DoubleList[0])); // change integer list differentPropertiesCopy.IntList[0] = 99; result = compare.Compare(differentProperties, differentPropertiesCopy); - Assert.AreEqual(2, result.Differences.Count); - Assert.AreNotEqual(differentProperties.IntList[0], differentPropertiesCopy.IntList[0]); + Assert.That(result.Differences.Count, Is.EqualTo(2)); + Assert.That(differentPropertiesCopy.IntList[0], Is.Not.EqualTo(differentProperties.IntList[0])); // change string list differentPropertiesCopy.StrList[0] = "99"; result = compare.Compare(differentProperties, differentPropertiesCopy); - Assert.AreEqual(3, result.Differences.Count); - Assert.AreNotEqual(differentProperties.StrList[0], differentPropertiesCopy.StrList[0]); + Assert.That(result.Differences.Count, Is.EqualTo(3)); + Assert.That(differentPropertiesCopy.StrList[0], Is.Not.EqualTo(differentProperties.StrList[0])); // change boolean list differentPropertiesCopy.BoolList[0] = false; differentPropertiesCopy.BoolList[1] = false; result = compare.Compare(differentProperties, differentPropertiesCopy); - Assert.AreEqual(5, result.Differences.Count); - Assert.AreNotEqual(differentProperties.BoolList[0], differentPropertiesCopy.BoolList[0]); - Assert.AreNotEqual(differentProperties.BoolList[1], differentPropertiesCopy.BoolList[1]); + Assert.That(result.Differences.Count, Is.EqualTo(5)); + Assert.That(differentPropertiesCopy.BoolList[0], Is.Not.EqualTo(differentProperties.BoolList[0])); + Assert.That(differentPropertiesCopy.BoolList[1], Is.Not.EqualTo(differentProperties.BoolList[1])); // change geometryPoint list testPointDifferentObjectsCopy.TestPointList[1].X = 99; testPointDifferentObjectsCopy.TestPointList[1].Z = 99; result = compare.Compare(testPointDifferentObjects, testPointDifferentObjectsCopy); - Assert.AreEqual(2, result.Differences.Count); - Assert.AreNotEqual(testPointDifferentObjects.TestPointList[1].X, testPointDifferentObjectsCopy.TestPointList[1].X); - Assert.AreNotEqual(testPointDifferentObjects.TestPointList[1].Z, testPointDifferentObjectsCopy.TestPointList[1].Z); + Assert.That(result.Differences.Count, Is.EqualTo(2)); + Assert.That(testPointDifferentObjectsCopy.TestPointList[1].X, Is.Not.EqualTo(testPointDifferentObjects.TestPointList[1].X)); + Assert.That(testPointDifferentObjectsCopy.TestPointList[1].Z, Is.Not.EqualTo(testPointDifferentObjects.TestPointList[1].Z)); } /// @@ -194,46 +194,46 @@ // check if copy is done correctly ComparisonResult result = compare.Compare(differentProperties, differentPropertiesCopy); - Assert.AreEqual(0, result.Differences.Count); + Assert.That(result.Differences.Count, Is.EqualTo(0)); // change double dictionary differentPropertiesCopy.DoubleDictionary[0] = 99; result = compare.Compare(differentProperties, differentPropertiesCopy); - Assert.AreEqual(1, result.Differences.Count); - Assert.AreNotEqual(differentProperties.DoubleDictionary[0], differentPropertiesCopy.DoubleDictionary[0]); + Assert.That(result.Differences.Count, Is.EqualTo(1)); + Assert.That(differentPropertiesCopy.DoubleDictionary[0], Is.Not.EqualTo(differentProperties.DoubleDictionary[0])); // change integer dictionary differentPropertiesCopy.IntDictionary[0] = 99; result = compare.Compare(differentProperties, differentPropertiesCopy); - Assert.AreEqual(2, result.Differences.Count); - Assert.AreNotEqual(differentProperties.IntDictionary[0], differentPropertiesCopy.IntDictionary[0]); + Assert.That(result.Differences.Count, Is.EqualTo(2)); + Assert.That(differentPropertiesCopy.IntDictionary[0], Is.Not.EqualTo(differentProperties.IntDictionary[0])); // change string dictionary differentPropertiesCopy.StrDictionary["0"] = "99"; result = compare.Compare(differentProperties, differentPropertiesCopy); - Assert.AreEqual(3, result.Differences.Count); - Assert.AreNotEqual(differentProperties.StrDictionary["0"], differentPropertiesCopy.StrDictionary["0"]); + Assert.That(result.Differences.Count, Is.EqualTo(3)); + Assert.That(differentPropertiesCopy.StrDictionary["0"], Is.Not.EqualTo(differentProperties.StrDictionary["0"])); // change boolean dictionary differentPropertiesCopy.BoolDictionary[0] = false; differentPropertiesCopy.BoolDictionary[1] = false; result = compare.Compare(differentProperties, differentPropertiesCopy); - Assert.AreEqual(5, result.Differences.Count); - Assert.AreNotEqual(differentProperties.BoolDictionary[0], differentPropertiesCopy.BoolDictionary[0]); - Assert.AreNotEqual(differentProperties.BoolDictionary[1], differentPropertiesCopy.BoolDictionary[1]); + Assert.That(result.Differences.Count, Is.EqualTo(5)); + Assert.That(differentPropertiesCopy.BoolDictionary[0], Is.Not.EqualTo(differentProperties.BoolDictionary[0])); + Assert.That(differentPropertiesCopy.BoolDictionary[1], Is.Not.EqualTo(differentProperties.BoolDictionary[1])); // change geometryPoint dictionary testPointDifferentObjectsCopy.TestPointDictionary[1].X = 99; testPointDifferentObjectsCopy.TestPointDictionary[1].Z = 99; result = compare.Compare(testPointDifferentObjects, testPointDifferentObjectsCopy); - Assert.AreEqual(2, result.Differences.Count); - Assert.AreNotEqual(testPointDifferentObjects.TestPointDictionary[1].X, testPointDifferentObjectsCopy.TestPointDictionary[1].X); - Assert.AreNotEqual(testPointDifferentObjects.TestPointDictionary[1].Z, testPointDifferentObjectsCopy.TestPointDictionary[1].Z); + Assert.That(result.Differences.Count, Is.EqualTo(2)); + Assert.That(testPointDifferentObjectsCopy.TestPointDictionary[1].X, Is.Not.EqualTo(testPointDifferentObjects.TestPointDictionary[1].X)); + Assert.That(testPointDifferentObjectsCopy.TestPointDictionary[1].Z, Is.Not.EqualTo(testPointDifferentObjects.TestPointDictionary[1].Z)); } internal class TestPoint Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Standard/ArrayExtensionsTest.cs =================================================================== diff -u -r4540 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Standard/ArrayExtensionsTest.cs (.../ArrayExtensionsTest.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Standard/ArrayExtensionsTest.cs (.../ArrayExtensionsTest.cs) (revision 4624) @@ -54,7 +54,7 @@ //assert for (var i = 0; i < 5; i++) { - Assert.AreEqual(5, doubleArray[i]); + Assert.That(doubleArray[i], Is.EqualTo(5)); } // initialise geometryPoint Arrays @@ -75,6 +75,6 @@ ComparisonResult result = compare.Compare(geometryPointArray, geometryPointArray2); - Assert.AreEqual(0, result.Differences.Count); + Assert.That(result.Differences.Count, Is.EqualTo(0)); } } \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Sensors/SensorPLLineCreatorTest.cs =================================================================== diff -u -r4540 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Sensors/SensorPLLineCreatorTest.cs (.../SensorPLLineCreatorTest.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Sensors/SensorPLLineCreatorTest.cs (.../SensorPLLineCreatorTest.cs) (revision 4624) @@ -247,34 +247,34 @@ // Number of expected points in line int expectedCount = repository.Sensors.Count(s => s.PlLineMappings.Contains(PlLineType.Pl1)) + 2 + 4; // interection + end + 4 configured characteristic points - Assert.AreEqual(expectedCount, actual.Points.Count); + Assert.That(actual.Points.Count, Is.EqualTo(expectedCount)); // P1 PlLinePoint p1 = actual.Points.First(); Assert.IsNotNull(p1); double expectedZValueP1 = sensorValues[sensor1]; - Assert.AreEqual(expectedZValueP1, p1.Z); + Assert.That(p1.Z, Is.EqualTo(expectedZValueP1)); // P2 PlLinePoint p2 = actual.Points.FirstOrDefault(p => p.Name == sensor2.Name); Assert.IsNotNull(p2); - Assert.AreEqual(sensor2.RelativeLocation, p2.X); + Assert.That(p2.X, Is.EqualTo(sensor2.RelativeLocation)); double expectedZValueP2 = sensorValues[sensor2]; - Assert.AreEqual(expectedZValueP2, p2.Z); + Assert.That(p2.Z, Is.EqualTo(expectedZValueP2)); // P3 PlLinePoint p3 = actual.Points.FirstOrDefault(p => p.Name == sensor3.Name); Assert.IsNotNull(p3); - Assert.AreEqual(sensor3.RelativeLocation, p3.X); + Assert.That(p3.X, Is.EqualTo(sensor3.RelativeLocation)); double expectedZValueP3 = sensorValues[sensor3]; - Assert.AreEqual(expectedZValueP3, p3.Z); + Assert.That(p3.Z, Is.EqualTo(expectedZValueP3)); // P4 PlLinePoint p4 = actual.Points.FirstOrDefault(p => p.Name == sensor4.Name); Assert.IsNotNull(p4); - Assert.AreEqual(sensor4.RelativeLocation, p4.X); + Assert.That(p4.X, Is.EqualTo(sensor4.RelativeLocation)); double expectedZValueP4 = sensorValues[sensor4]; - Assert.AreEqual(expectedZValueP4, p4.Z); + Assert.That(p4.Z, Is.EqualTo(expectedZValueP4)); } [Test] @@ -389,7 +389,7 @@ // asserts PlLinePoint lastPoint = actual.Points.Last(); - Assert.AreEqual(expectedEndPoint, lastPoint.Z); + Assert.That(lastPoint.Z, Is.EqualTo(expectedEndPoint)); } [Test, Category(Categories.WorkInProgress), Ignore("This test is not yet implemented, uses sensors")] @@ -501,7 +501,7 @@ // asserts PlLinePoint lastPoint = actual.Points.Last(); - Assert.AreEqual(expectedValue, lastPoint.Z, "Incorrect last point of PL1: Test must be reviewed."); + Assert.That(lastPoint.Z, Is.EqualTo(expectedValue), "Incorrect last point of PL1: Test must be reviewed."); } [Test] @@ -530,7 +530,7 @@ var creator = new SensorPlLine1Creator(location.SensorLocation, new Dictionary()); double? actual = creator.GetDitchWaterLevelIntersectionAtXDikeSide(-2.5); const double expected = 12.5; - Assert.AreEqual(expected, actual); + Assert.That(actual, Is.EqualTo(expected)); } [Test] @@ -695,28 +695,28 @@ const int expectedNumberOfCharacteristicPoints = 2; int pl1SensorCount = repository.Sensors.Count(s => s.PlLineMappings.Contains(PlLineType.Pl1)) + expectedNumberOfCharacteristicPoints + 1; // plus one for the intersection point + one for point below toe of dike - Assert.AreEqual(pl1SensorCount, actual.Points.Count); + Assert.That(actual.Points.Count, Is.EqualTo(pl1SensorCount)); // P2 PlLinePoint p2 = actual.Points.FirstOrDefault(p => p.Name == sensor2.Name); Assert.IsNotNull(p2); - Assert.AreEqual(sensor2.RelativeLocation, p2.X); + Assert.That(p2.X, Is.EqualTo(sensor2.RelativeLocation)); double expectedZValueP2 = sensorValues[sensor2]; - Assert.AreEqual(expectedZValueP2, p2.Z); + Assert.That(p2.Z, Is.EqualTo(expectedZValueP2)); // P3 PlLinePoint p3 = actual.Points.FirstOrDefault(p => p.Name == sensor3.Name); Assert.IsNotNull(p3); - Assert.AreEqual(sensor3.RelativeLocation, p3.X); + Assert.That(p3.X, Is.EqualTo(sensor3.RelativeLocation)); double expectedZValueP3 = sensorValues[sensor3]; - Assert.AreEqual(expectedZValueP3, p3.Z); + Assert.That(p3.Z, Is.EqualTo(expectedZValueP3)); // P4 PlLinePoint p4 = actual.Points.FirstOrDefault(p => p.Name == sensor4.Name); Assert.IsNotNull(p4); - Assert.AreEqual(sensor4.RelativeLocation, p4.X); + Assert.That(p4.X, Is.EqualTo(sensor4.RelativeLocation)); double expectedZValueP4 = sensorValues[sensor4]; - Assert.AreEqual(expectedZValueP4, p4.Z); + Assert.That(p4.Z, Is.EqualTo(expectedZValueP4)); } [Test] @@ -838,28 +838,28 @@ // Number of expected points in line int pl1SensorCount = repository.Sensors.Count(s => s.PlLineMappings.Contains(PlLineType.Pl1)); - Assert.AreEqual(pl1SensorCount + 2 /* intersection points */, actual.Points.Count); + Assert.That(actual.Points.Count, Is.EqualTo(pl1SensorCount + 2)); // P2 PlLinePoint p2 = actual.Points.FirstOrDefault(p => p.Name == sensor2.Name); Assert.IsNotNull(p2); - Assert.AreEqual(sensor2.RelativeLocation, p2.X); + Assert.That(p2.X, Is.EqualTo(sensor2.RelativeLocation)); double expectedZValueP2 = sensorValues[sensor2]; - Assert.AreEqual(expectedZValueP2, p2.Z); + Assert.That(p2.Z, Is.EqualTo(expectedZValueP2)); // P3 PlLinePoint p3 = actual.Points.FirstOrDefault(p => p.Name == sensor3.Name); Assert.IsNotNull(p3); - Assert.AreEqual(sensor3.RelativeLocation, p3.X); + Assert.That(p3.X, Is.EqualTo(sensor3.RelativeLocation)); double expectedZValueP3 = sensorValues[sensor3]; - Assert.AreEqual(expectedZValueP3, p3.Z); + Assert.That(p3.Z, Is.EqualTo(expectedZValueP3)); // P4 PlLinePoint p4 = actual.Points.FirstOrDefault(p => p.Name == sensor4.Name); Assert.IsNotNull(p4); - Assert.AreEqual(sensor4.RelativeLocation, p4.X); + Assert.That(p4.X, Is.EqualTo(sensor4.RelativeLocation)); double expectedZValueP4 = sensorValues[sensor4]; - Assert.AreEqual(expectedZValueP4, p4.Z); + Assert.That(p4.Z, Is.EqualTo(expectedZValueP4)); } [Test] @@ -1005,12 +1005,12 @@ double zDitchPolderSide = actual.Points.Single(p => p.X == xDitchPolderSide).Z; Assert.IsTrue(actual.Points.Any(p => p.X == xDitchPolderSide)); - Assert.AreEqual(zDitchDikeSide, zDitchPolderSide); + Assert.That(zDitchPolderSide, Is.EqualTo(zDitchDikeSide)); PlLinePoint endPoint = actual.Points.Last(); // End point should be z of x intersection at dike side in ditch (horizontal) - Assert.AreEqual(endPoint.Z, zDitchDikeSide); + Assert.That(zDitchDikeSide, Is.EqualTo(endPoint.Z)); } [Test] @@ -1125,12 +1125,12 @@ //checks // start first segment - Assert.AreEqual(-0.0, actual.Points[0].X); - Assert.AreEqual(waterLevel, actual.Points[0].Z); + Assert.That(actual.Points[0].X, Is.EqualTo(-0.0)); + Assert.That(actual.Points[0].Z, Is.EqualTo(waterLevel)); // end of first segment (ends at DikeToeAtRiver) - Assert.AreEqual(xDikeToeAtRiver, actual.Points[1].X); - Assert.AreEqual(waterLevel, actual.Points[1].Z); + Assert.That(actual.Points[1].X, Is.EqualTo(xDikeToeAtRiver)); + Assert.That(actual.Points[1].Z, Is.EqualTo(waterLevel)); } } @@ -1246,12 +1246,12 @@ //checks // start first segment - Assert.AreEqual(-0.0, actual.Points[0].X); - Assert.AreEqual(waterLevel, actual.Points[0].Z); + Assert.That(actual.Points[0].X, Is.EqualTo(-0.0)); + Assert.That(actual.Points[0].Z, Is.EqualTo(waterLevel)); // end of first segment (ends at DikeToeAtRiver) - Assert.AreEqual(xDikeToeAtRiver, actual.Points[1].X); - Assert.AreEqual(waterLevel, actual.Points[1].Z); + Assert.That(actual.Points[1].X, Is.EqualTo(xDikeToeAtRiver)); + Assert.That(actual.Points[1].Z, Is.EqualTo(waterLevel)); } } Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs =================================================================== diff -u -r4616 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs (.../MultiCoreMacroStabilityTests.cs) (revision 4616) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs (.../MultiCoreMacroStabilityTests.cs) (revision 4624) @@ -56,10 +56,10 @@ Output output = GeneralHelper.RunAfterInputValidation(engineInterface, true, "Output.xml"); int errorCount = GeneralHelper.DetermineNumberOfCalculationErrors(engineInterface.DamProjectData.CalculationMessages); - Assert.AreEqual(0, errorCount, "There should be no errors during the calculation."); - Assert.AreEqual(output.Results.CalculationMessages.Length, engineInterface.DamProjectData.CalculationMessages.Count); + Assert.That(errorCount, Is.EqualTo(0), "There should be no errors during the calculation."); + Assert.That(engineInterface.DamProjectData.CalculationMessages.Count, Is.EqualTo(output.Results.CalculationMessages.Length)); Assert.IsTrue(engineInterface.DamProjectData.DamProjectType == DamProjectType.Operational); - Assert.AreEqual(8, output.Results.OperationalOutputTimeSeries.Length); + Assert.That(output.Results.OperationalOutputTimeSeries.Length, Is.EqualTo(8)); var numberOfResults = 0; var numberOfRealResults = 0; foreach (TimeSerie resultSerie in output.Results.OperationalOutputTimeSeries) @@ -75,8 +75,8 @@ } } - Assert.AreEqual(16, numberOfResults); - Assert.AreEqual(16, numberOfRealResults); + Assert.That(numberOfResults, Is.EqualTo(16)); + Assert.That(numberOfRealResults, Is.EqualTo(16)); } [Test, Category(Categories.MultiCore)] @@ -97,17 +97,17 @@ Output output = GeneralHelper.RunAfterInputValidation(engineInterface, true, "Output.xml"); int errorCount = GeneralHelper.DetermineNumberOfCalculationErrors(engineInterface.DamProjectData.CalculationMessages); - Assert.AreEqual(0, errorCount, "There should be no errors during the calculation."); - Assert.AreEqual(output.Results.CalculationMessages.Length, engineInterface.DamProjectData.CalculationMessages.Count); - Assert.AreEqual(8, output.Results.CalculationResults.Length); - Assert.AreEqual(1.409, output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, tolerance3Decimals); - Assert.AreEqual(1.331, output.Results.CalculationResults[1].StabilityDesignResults.SafetyFactor, tolerance3Decimals); - Assert.AreEqual(1.206, output.Results.CalculationResults[2].StabilityDesignResults.SafetyFactor, tolerance3Decimals); - Assert.AreEqual(1.475, output.Results.CalculationResults[3].StabilityDesignResults.SafetyFactor, tolerance3Decimals); - Assert.AreEqual(1.248, output.Results.CalculationResults[4].StabilityDesignResults.SafetyFactor, tolerance3Decimals); - Assert.AreEqual(1.223, output.Results.CalculationResults[5].StabilityDesignResults.SafetyFactor, tolerance3Decimals); - Assert.AreEqual(1.393, output.Results.CalculationResults[6].StabilityDesignResults.SafetyFactor, tolerance3Decimals); - Assert.AreEqual(1.373, output.Results.CalculationResults[7].StabilityDesignResults.SafetyFactor, tolerance3Decimals); + Assert.That(errorCount, Is.EqualTo(0), "There should be no errors during the calculation."); + Assert.That(engineInterface.DamProjectData.CalculationMessages.Count, Is.EqualTo(output.Results.CalculationMessages.Length)); + Assert.That(output.Results.CalculationResults.Length, Is.EqualTo(8)); + Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.409).Within(tolerance3Decimals)); + Assert.That(output.Results.CalculationResults[1].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.331).Within(tolerance3Decimals)); + Assert.That(output.Results.CalculationResults[2].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.206).Within(tolerance3Decimals)); + Assert.That(output.Results.CalculationResults[3].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.475).Within(tolerance3Decimals)); + Assert.That(output.Results.CalculationResults[4].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.248).Within(tolerance3Decimals)); + Assert.That(output.Results.CalculationResults[5].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.223).Within(tolerance3Decimals)); + Assert.That(output.Results.CalculationResults[6].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.393).Within(tolerance3Decimals)); + Assert.That(output.Results.CalculationResults[7].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.373).Within(tolerance3Decimals)); } [Test, Category(Categories.MultiCore)] @@ -133,7 +133,7 @@ List series = engineInterface.DamProjectData.OutputTimeSerieCollection.Series; int errorCount = GeneralHelper.DetermineNumberOfCalculationErrors(engineInterface.DamProjectData.CalculationMessages); - Assert.AreEqual(0, errorCount, "There should be no errors during the calculation."); + Assert.That(errorCount, Is.EqualTo(0), "There should be no errors during the calculation."); CheckLargeResultsSets.CheckResultsOperationalBeeSwarmMultiCoreWithXmlInputFile(series); } @@ -166,8 +166,8 @@ Output output = GeneralHelper.RunAfterInputValidation(engineInterface, true, "Results_Cores_" + maxCores + ".xml"); - Assert.AreEqual(18, output.Results.CalculationResults.Length); - Assert.AreEqual(24, output.Results.CalculationMessages.Length); + Assert.That(output.Results.CalculationResults.Length, Is.EqualTo(18)); + Assert.That(output.Results.CalculationMessages.Length, Is.EqualTo(24)); CheckLargeResultsSets.CheckResultsDesignBishopWithScenariosForHeadPl3CalculatesCorrect(output.Results.CalculationResults); } @@ -221,26 +221,26 @@ { // This test has to make sure that the results are the same as the single core version of this test // If the values change below, just change them. - Assert.AreEqual(9, output.Results.CalculationResults.Length); - Assert.AreEqual(1424, output.Results.CalculationMessages.Length); + Assert.That(output.Results.CalculationResults.Length, Is.EqualTo(9)); + Assert.That(output.Results.CalculationMessages.Length, Is.EqualTo(1424)); } else { // Note that all results are based on the single core version of this tests that can be found at: // DesignBishopOptimizedSlopeAndShoulderAdaptionWithScenariosForHeadPL3CalculatesCorrect in MacroStabilityInwardsTests - 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); if (justOneScenario) { - Assert.AreEqual(9, resultsFound); + Assert.That(resultsFound, Is.EqualTo(9)); } else { - Assert.AreEqual(18, resultsFound); + Assert.That(resultsFound, Is.EqualTo(18)); CheckLargeResultsSets.CheckBasicResultsBasedOnReferenceResultsFile( "TestFiles\\DesignBishopAdaptionWithScenariosForHeadPl3_Results.xml", outputFileName, output.Results.CalculationResults); @@ -281,8 +281,8 @@ // This test has to make sure that the results are the same as the single core version of this test // If the values change below, just change them. - Assert.AreEqual(2768, output.Results.CalculationMessages.Length); - Assert.AreEqual(646, output.Results.CalculationResults.Length); + Assert.That(output.Results.CalculationMessages.Length, Is.EqualTo(2768)); + Assert.That(output.Results.CalculationResults.Length, Is.EqualTo(646)); // This file is created in the Debug/Release folder while running this test. // If this file changes just replace it with the file that is created during the test. // The purpose of this test is just comparing the multicore test with the single core test. Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/DesignCalculatorTests.cs =================================================================== diff -u -r4540 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/DesignCalculatorTests.cs (.../DesignCalculatorTests.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/DesignCalculatorTests.cs (.../DesignCalculatorTests.cs) (revision 4624) @@ -45,9 +45,9 @@ Output output = GeneralHelper.RunAfterInputValidation(inputString, false); - Assert.AreEqual(1, output.Results.CalculationMessages.Length); - Assert.AreEqual(null, output.Results.CalculationResults); - Assert.AreEqual("No segments with failure mechanism Piping present", output.Results.CalculationMessages[0].Message1); + Assert.That(output.Results.CalculationMessages.Length, Is.EqualTo(1)); + Assert.That(output.Results.CalculationResults, Is.EqualTo(null)); + Assert.That(output.Results.CalculationMessages[0].Message1, Is.EqualTo("No segments with failure mechanism Piping present")); } [Test] @@ -64,9 +64,9 @@ Output output = GeneralHelper.RunAfterInputValidation(inputString, false); - Assert.AreEqual(1, output.Results.CalculationMessages.Length); - Assert.AreEqual(null, output.Results.CalculationResults); - Assert.AreEqual("Geen segmenten met faalmechanisme StabilityInside aanwezig", output.Results.CalculationMessages[0].Message1); + Assert.That(output.Results.CalculationMessages.Length, Is.EqualTo(1)); + Assert.That(output.Results.CalculationResults, Is.EqualTo(null)); + Assert.That(output.Results.CalculationMessages[0].Message1, Is.EqualTo("Geen segmenten met faalmechanisme StabilityInside aanwezig")); } [Test] @@ -81,7 +81,7 @@ Output output = GeneralHelper.RunAfterInputValidation(inputString, false); // As the data is not entirely correct for the new kernel, we expect 1 error. - Assert.AreEqual(1, output.Results.CalculationMessages.Length); + Assert.That(output.Results.CalculationMessages.Length, Is.EqualTo(1)); Assert.IsTrue(output.Results.CalculationMessages[0].Message1.Contains( "De berekening is mislukt met de volgende foutmelding"), output.Results.CalculationMessages[0].Message1); } Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs =================================================================== diff -u -r4540 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs (.../FillDamFromXmlInputTests.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs (.../FillDamFromXmlInputTests.cs) (revision 4624) @@ -77,10 +77,10 @@ { const string inputFileName = @"TestFiles\AquiferListInputFile.xml"; Input input = DamXmlSerialization.LoadInputFromXmlFile(inputFileName); - Assert.AreEqual(28, input.AquiferSoils.Length); + Assert.That(input.AquiferSoils.Length, Is.EqualTo(28)); DamProjectData actualDamProjectData = FillDamFromXmlInput.CreateDamProjectData(input); - Assert.AreEqual(11, actualDamProjectData.Dike.SoilList.AquiferDictionary.Count); - Assert.AreEqual(7, actualDamProjectData.CalculationMessages.Count); + Assert.That(actualDamProjectData.Dike.SoilList.AquiferDictionary.Count, Is.EqualTo(11)); + Assert.That(actualDamProjectData.CalculationMessages.Count, Is.EqualTo(7)); } [Test] @@ -142,7 +142,7 @@ private void CompareDamProjectData(DamProjectData actual, DamProjectData expected) { - Assert.AreEqual(FactoryForDamProjectData.ExpectedAnalysisType, DamProjectCalculationSpecification.SelectedAnalysisType); + Assert.That(DamProjectCalculationSpecification.SelectedAnalysisType, Is.EqualTo(FactoryForDamProjectData.ExpectedAnalysisType)); var compare = new CompareLogic { @@ -165,7 +165,7 @@ "Loops" }; // TODO i.m.o the serializing of the geometry should be improved, so these ignores are not needed anymore ComparisonResult result = compare.Compare(expected, actual); - Assert.AreEqual(0, result.Differences.Count, + Assert.That(result.Differences.Count, Is.EqualTo(0), "Differences found read/write Input object:" + result.DifferencesString); } } \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/DamPipingHelperTests.cs =================================================================== diff -u -r4540 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/DamPipingHelperTests.cs (.../DamPipingHelperTests.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/DamPipingHelperTests.cs (.../DamPipingHelperTests.cs) (revision 4624) @@ -35,13 +35,13 @@ var surfaceLevel = 5.0; // expected height = 5 - 3 = 2 double height = DamPipingHelper.DetermineHeightCoverLayer(topLevelAquifer, surfaceLevel); - Assert.AreEqual(2.0, height); + Assert.That(height, Is.EqualTo(2.0)); // Top of aquifer is above surface level topLevelAquifer = 3.0; surfaceLevel = 1.0; // expected height = 0 height = DamPipingHelper.DetermineHeightCoverLayer(topLevelAquifer, surfaceLevel); - Assert.AreEqual(0.0, height); + Assert.That(height, Is.EqualTo(0.0)); } } \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/DebuggingTest.cs =================================================================== diff -u -r4540 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/DebuggingTest.cs (.../DebuggingTest.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/DebuggingTest.cs (.../DebuggingTest.cs) (revision 4624) @@ -52,7 +52,7 @@ var engineInterface = new EngineInterface(inputString); GeneralHelper.RunAfterInputValidation(engineInterface, true, outputName); int errorCount = GeneralHelper.DetermineNumberOfCalculationErrors(engineInterface.DamProjectData.CalculationMessages); - Assert.AreEqual(0, errorCount, "There should be nor errors during the calculation."); + Assert.That(errorCount, Is.EqualTo(0), "There should be nor errors during the calculation."); } [Test, Ignore("This test is only used for debugging XML files generated by Dam UI")] @@ -70,6 +70,6 @@ GeneralHelper.RunAfterInputValidation(engineInterface, true, outputName); int errorCount = GeneralHelper.DetermineNumberOfCalculationErrors(engineInterface.DamProjectData.CalculationMessages); - Assert.AreEqual(0, errorCount, "There should be nor errors during the calculation."); + Assert.That(errorCount, Is.EqualTo(0), "There should be nor errors during the calculation."); } } \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SurfaceLine2Tests.cs =================================================================== diff -u -r4540 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SurfaceLine2Tests.cs (.../SurfaceLine2Tests.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SurfaceLine2Tests.cs (.../SurfaceLine2Tests.cs) (revision 4624) @@ -34,111 +34,111 @@ public void TestAddingCharacteristicPointsOnSameLocationDoesNotAddDoublePointsInGeometry() { SurfaceLine2 surfaceLine = FillSurfaceLine2(); - Assert.AreEqual(10, surfaceLine.CharacteristicPoints.Count); + Assert.That(surfaceLine.CharacteristicPoints.Count, Is.EqualTo(10)); ValidateSurfaceLine(surfaceLine); } [Test] public void TestDeepCloneWithoutGeometryMustContainPoint() { SurfaceLine2 surfaceLine = FillSurfaceLine2(); - Assert.AreEqual(10, surfaceLine.CharacteristicPoints.Count); - Assert.AreEqual(9, surfaceLine.Geometry.Points.Count); + Assert.That(surfaceLine.CharacteristicPoints.Count, Is.EqualTo(10)); + Assert.That(surfaceLine.Geometry.Points.Count, Is.EqualTo(9)); // Note: resetting GeometryMustContainPoint to false after filling the surface line will erase all Characteristic Points. // So the actual code should NEVER reset the GeometryMustContainPoint for filled surface lines. surfaceLine.CharacteristicPoints.GeometryMustContainPoint = false; - Assert.AreEqual(0, surfaceLine.CharacteristicPoints.Count); + Assert.That(surfaceLine.CharacteristicPoints.Count, Is.EqualTo(0)); SurfaceLine2 newSurfaceLine = surfaceLine.FullDeepClone(); surfaceLine.CharacteristicPoints.Clear(); surfaceLine.Geometry.CalcPoints.Clear(); surfaceLine.Geometry.SyncPoints(); - Assert.AreEqual(0, newSurfaceLine.CharacteristicPoints.Count); - Assert.AreEqual(9, newSurfaceLine.Geometry.Points.Count); + Assert.That(newSurfaceLine.CharacteristicPoints.Count, Is.EqualTo(0)); + Assert.That(newSurfaceLine.Geometry.Points.Count, Is.EqualTo(9)); } [Test] public void TestDeepCloneWithGeometryMustContainPoint() { SurfaceLine2 surfaceLine = FillSurfaceLine2(); - Assert.AreEqual(10, surfaceLine.CharacteristicPoints.Count); - Assert.AreEqual(9, surfaceLine.Geometry.Points.Count); + Assert.That(surfaceLine.CharacteristicPoints.Count, Is.EqualTo(10)); + Assert.That(surfaceLine.Geometry.Points.Count, Is.EqualTo(9)); // Note: resetting GeometryMustContainPoint to true after filling the surface line reset the Characteristic Points to be // equal to the amount of geometry points, keeping only one type, possibly making the surface line invalid. // So the actual code should NEVER reset the GeometryMustContainPoint for filled surface lines. surfaceLine.CharacteristicPoints.GeometryMustContainPoint = true; - Assert.AreEqual(9, surfaceLine.Geometry.Points.Count); - Assert.AreEqual(9, surfaceLine.CharacteristicPoints.Count); + Assert.That(surfaceLine.Geometry.Points.Count, Is.EqualTo(9)); + Assert.That(surfaceLine.CharacteristicPoints.Count, Is.EqualTo(9)); SurfaceLine2 newSurfaceLine = surfaceLine.FullDeepClone(); surfaceLine.CharacteristicPoints.Clear(); surfaceLine.Geometry.CalcPoints.Clear(); surfaceLine.Geometry.SyncPoints(); - Assert.AreEqual(9, newSurfaceLine.CharacteristicPoints.Count); - Assert.AreEqual(9, newSurfaceLine.Geometry.Points.Count); + Assert.That(newSurfaceLine.CharacteristicPoints.Count, Is.EqualTo(9)); + Assert.That(newSurfaceLine.Geometry.Points.Count, Is.EqualTo(9)); } [Test] public void TestDeepCloneWithoutSettingGeometryMustContainPoint() { SurfaceLine2 surfaceLine = FillSurfaceLine2(); - Assert.AreEqual(10, surfaceLine.CharacteristicPoints.Count); - Assert.AreEqual(9, surfaceLine.Geometry.Points.Count); + Assert.That(surfaceLine.CharacteristicPoints.Count, Is.EqualTo(10)); + Assert.That(surfaceLine.Geometry.Points.Count, Is.EqualTo(9)); SurfaceLine2 newSurfaceLine = surfaceLine.FullDeepClone(); surfaceLine.CharacteristicPoints.Clear(); surfaceLine.Geometry.CalcPoints.Clear(); surfaceLine.Geometry.SyncPoints(); - Assert.AreEqual(10, newSurfaceLine.CharacteristicPoints.Count); - Assert.AreEqual(9, newSurfaceLine.Geometry.Points.Count); + Assert.That(newSurfaceLine.CharacteristicPoints.Count, Is.EqualTo(10)); + Assert.That(newSurfaceLine.Geometry.Points.Count, Is.EqualTo(9)); var tolerance = 1e-8; surfaceLine = FillSurfaceLine2(); - Assert.AreEqual(surfaceLine.CharacteristicPoints[0].X, newSurfaceLine.CharacteristicPoints[0].X, tolerance); - Assert.AreEqual(surfaceLine.CharacteristicPoints[0].Z, newSurfaceLine.CharacteristicPoints[0].Z, tolerance); - Assert.AreEqual(surfaceLine.CharacteristicPoints[0].CharacteristicPointType, - newSurfaceLine.CharacteristicPoints[0].CharacteristicPointType); - Assert.AreEqual(surfaceLine.CharacteristicPoints[1].X, newSurfaceLine.CharacteristicPoints[1].X, tolerance); - Assert.AreEqual(surfaceLine.CharacteristicPoints[1].Z, newSurfaceLine.CharacteristicPoints[1].Z, tolerance); - Assert.AreEqual(surfaceLine.CharacteristicPoints[1].CharacteristicPointType, - newSurfaceLine.CharacteristicPoints[1].CharacteristicPointType); - Assert.AreEqual(surfaceLine.CharacteristicPoints[2].X, newSurfaceLine.CharacteristicPoints[2].X, tolerance); - Assert.AreEqual(surfaceLine.CharacteristicPoints[2].Z, newSurfaceLine.CharacteristicPoints[2].Z, tolerance); - Assert.AreEqual(surfaceLine.CharacteristicPoints[2].CharacteristicPointType, - newSurfaceLine.CharacteristicPoints[2].CharacteristicPointType); - Assert.AreEqual(surfaceLine.CharacteristicPoints[3].X, newSurfaceLine.CharacteristicPoints[3].X, tolerance); - Assert.AreEqual(surfaceLine.CharacteristicPoints[3].Z, newSurfaceLine.CharacteristicPoints[3].Z, tolerance); - Assert.AreEqual(surfaceLine.CharacteristicPoints[3].CharacteristicPointType, - newSurfaceLine.CharacteristicPoints[3].CharacteristicPointType); - Assert.AreEqual(surfaceLine.CharacteristicPoints[4].X, newSurfaceLine.CharacteristicPoints[4].X, tolerance); - Assert.AreEqual(surfaceLine.CharacteristicPoints[4].Z, newSurfaceLine.CharacteristicPoints[4].Z, tolerance); - Assert.AreEqual(surfaceLine.CharacteristicPoints[4].CharacteristicPointType, - newSurfaceLine.CharacteristicPoints[4].CharacteristicPointType); - Assert.AreEqual(surfaceLine.CharacteristicPoints[5].X, newSurfaceLine.CharacteristicPoints[5].X, tolerance); - Assert.AreEqual(surfaceLine.CharacteristicPoints[5].Z, newSurfaceLine.CharacteristicPoints[5].Z, tolerance); - Assert.AreEqual(surfaceLine.CharacteristicPoints[5].CharacteristicPointType, - newSurfaceLine.CharacteristicPoints[5].CharacteristicPointType); - Assert.AreEqual(surfaceLine.CharacteristicPoints[6].X, newSurfaceLine.CharacteristicPoints[6].X, tolerance); - Assert.AreEqual(surfaceLine.CharacteristicPoints[6].Z, newSurfaceLine.CharacteristicPoints[6].Z, tolerance); - Assert.AreEqual(surfaceLine.CharacteristicPoints[6].CharacteristicPointType, - newSurfaceLine.CharacteristicPoints[6].CharacteristicPointType); - Assert.AreEqual(surfaceLine.CharacteristicPoints[7].X, newSurfaceLine.CharacteristicPoints[7].X, tolerance); - Assert.AreEqual(surfaceLine.CharacteristicPoints[7].Z, newSurfaceLine.CharacteristicPoints[7].Z, tolerance); - Assert.AreEqual(surfaceLine.CharacteristicPoints[7].CharacteristicPointType, - newSurfaceLine.CharacteristicPoints[7].CharacteristicPointType); - Assert.AreEqual(surfaceLine.CharacteristicPoints[8].X, newSurfaceLine.CharacteristicPoints[8].X, tolerance); - Assert.AreEqual(surfaceLine.CharacteristicPoints[8].Z, newSurfaceLine.CharacteristicPoints[8].Z, tolerance); - Assert.AreEqual(surfaceLine.CharacteristicPoints[8].CharacteristicPointType, - newSurfaceLine.CharacteristicPoints[8].CharacteristicPointType); - Assert.AreEqual(surfaceLine.CharacteristicPoints[9].X, newSurfaceLine.CharacteristicPoints[9].X, tolerance); - Assert.AreEqual(surfaceLine.CharacteristicPoints[9].Z, newSurfaceLine.CharacteristicPoints[9].Z, tolerance); - Assert.AreEqual(surfaceLine.CharacteristicPoints[9].CharacteristicPointType, - newSurfaceLine.CharacteristicPoints[9].CharacteristicPointType); + Assert.That(newSurfaceLine.CharacteristicPoints[0].X, Is.EqualTo(surfaceLine.CharacteristicPoints[0].X).Within(tolerance)); + Assert.That(newSurfaceLine.CharacteristicPoints[0].Z, Is.EqualTo(surfaceLine.CharacteristicPoints[0].Z).Within(tolerance)); + Assert.That(newSurfaceLine.CharacteristicPoints[0].CharacteristicPointType, + Is.EqualTo(surfaceLine.CharacteristicPoints[0].CharacteristicPointType)); + Assert.That(newSurfaceLine.CharacteristicPoints[1].X, Is.EqualTo(surfaceLine.CharacteristicPoints[1].X).Within(tolerance)); + Assert.That(newSurfaceLine.CharacteristicPoints[1].Z, Is.EqualTo(surfaceLine.CharacteristicPoints[1].Z).Within(tolerance)); + Assert.That(newSurfaceLine.CharacteristicPoints[1].CharacteristicPointType, + Is.EqualTo(surfaceLine.CharacteristicPoints[1].CharacteristicPointType)); + Assert.That(newSurfaceLine.CharacteristicPoints[2].X, Is.EqualTo(surfaceLine.CharacteristicPoints[2].X).Within(tolerance)); + Assert.That(newSurfaceLine.CharacteristicPoints[2].Z, Is.EqualTo(surfaceLine.CharacteristicPoints[2].Z).Within(tolerance)); + Assert.That(newSurfaceLine.CharacteristicPoints[2].CharacteristicPointType, + Is.EqualTo(surfaceLine.CharacteristicPoints[2].CharacteristicPointType)); + Assert.That(newSurfaceLine.CharacteristicPoints[3].X, Is.EqualTo(surfaceLine.CharacteristicPoints[3].X).Within(tolerance)); + Assert.That(newSurfaceLine.CharacteristicPoints[3].Z, Is.EqualTo(surfaceLine.CharacteristicPoints[3].Z).Within(tolerance)); + Assert.That(newSurfaceLine.CharacteristicPoints[3].CharacteristicPointType, + Is.EqualTo(surfaceLine.CharacteristicPoints[3].CharacteristicPointType)); + Assert.That(newSurfaceLine.CharacteristicPoints[4].X, Is.EqualTo(surfaceLine.CharacteristicPoints[4].X).Within(tolerance)); + Assert.That(newSurfaceLine.CharacteristicPoints[4].Z, Is.EqualTo(surfaceLine.CharacteristicPoints[4].Z).Within(tolerance)); + Assert.That(newSurfaceLine.CharacteristicPoints[4].CharacteristicPointType, + Is.EqualTo(surfaceLine.CharacteristicPoints[4].CharacteristicPointType)); + Assert.That(newSurfaceLine.CharacteristicPoints[5].X, Is.EqualTo(surfaceLine.CharacteristicPoints[5].X).Within(tolerance)); + Assert.That(newSurfaceLine.CharacteristicPoints[5].Z, Is.EqualTo(surfaceLine.CharacteristicPoints[5].Z).Within(tolerance)); + Assert.That(newSurfaceLine.CharacteristicPoints[5].CharacteristicPointType, + Is.EqualTo(surfaceLine.CharacteristicPoints[5].CharacteristicPointType)); + Assert.That(newSurfaceLine.CharacteristicPoints[6].X, Is.EqualTo(surfaceLine.CharacteristicPoints[6].X).Within(tolerance)); + Assert.That(newSurfaceLine.CharacteristicPoints[6].Z, Is.EqualTo(surfaceLine.CharacteristicPoints[6].Z).Within(tolerance)); + Assert.That(newSurfaceLine.CharacteristicPoints[6].CharacteristicPointType, + Is.EqualTo(surfaceLine.CharacteristicPoints[6].CharacteristicPointType)); + Assert.That(newSurfaceLine.CharacteristicPoints[7].X, Is.EqualTo(surfaceLine.CharacteristicPoints[7].X).Within(tolerance)); + Assert.That(newSurfaceLine.CharacteristicPoints[7].Z, Is.EqualTo(surfaceLine.CharacteristicPoints[7].Z).Within(tolerance)); + Assert.That(newSurfaceLine.CharacteristicPoints[7].CharacteristicPointType, + Is.EqualTo(surfaceLine.CharacteristicPoints[7].CharacteristicPointType)); + Assert.That(newSurfaceLine.CharacteristicPoints[8].X, Is.EqualTo(surfaceLine.CharacteristicPoints[8].X).Within(tolerance)); + Assert.That(newSurfaceLine.CharacteristicPoints[8].Z, Is.EqualTo(surfaceLine.CharacteristicPoints[8].Z).Within(tolerance)); + Assert.That(newSurfaceLine.CharacteristicPoints[8].CharacteristicPointType, + Is.EqualTo(surfaceLine.CharacteristicPoints[8].CharacteristicPointType)); + Assert.That(newSurfaceLine.CharacteristicPoints[9].X, Is.EqualTo(surfaceLine.CharacteristicPoints[9].X).Within(tolerance)); + Assert.That(newSurfaceLine.CharacteristicPoints[9].Z, Is.EqualTo(surfaceLine.CharacteristicPoints[9].Z).Within(tolerance)); + Assert.That(newSurfaceLine.CharacteristicPoints[9].CharacteristicPointType, + Is.EqualTo(surfaceLine.CharacteristicPoints[9].CharacteristicPointType)); } private static void ValidateSurfaceLine(SurfaceLine2 surfaceLine) { var tolerance = 0.001; - Assert.AreEqual(2, surfaceLine.CharacteristicPoints.Count(cp => Math.Abs(cp.X - 13.0) < tolerance && Math.Abs(cp.Z - 5.4) < tolerance)); + Assert.That(surfaceLine.CharacteristicPoints.Count(cp => Math.Abs(cp.X - 13.0) < tolerance && Math.Abs(cp.Z - 5.4) < tolerance), Is.EqualTo(2)); // Because TrafficLoadOutside and DikeTopAtPolder are on the same location, 1 point less should be in the geometry - Assert.AreEqual(9, surfaceLine.Geometry.Points.Count); - Assert.AreEqual(1, surfaceLine.Geometry.Points.Count(cp => Math.Abs(cp.X - 13.0) < tolerance && Math.Abs(cp.Z - 5.4) < tolerance)); + Assert.That(surfaceLine.Geometry.Points.Count, Is.EqualTo(9)); + Assert.That(surfaceLine.Geometry.Points.Count(cp => Math.Abs(cp.X - 13.0) < tolerance && Math.Abs(cp.Z - 5.4) < tolerance), Is.EqualTo(1)); } private SurfaceLine2 FillSurfaceLine2() Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs =================================================================== diff -u -r4571 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs (.../MacroStabilityInwardsKernelWrapperTests.cs) (revision 4571) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs (.../MacroStabilityInwardsKernelWrapperTests.cs) (revision 4624) @@ -68,26 +68,26 @@ // Situation 1: no uplift. Expected PrepareResult.NotRelevant kernelInput.Location.ModelFactors.UpliftCriterionStability = 0.8; PrepareResult prepareResult = kernelWrapper.Prepare(kernelInput, 0, out _, out IKernelDataOutput kernelDataOutput); - Assert.AreEqual(PrepareResult.NotRelevant, prepareResult); + Assert.That(prepareResult, Is.EqualTo(PrepareResult.NotRelevant)); var damMacroStabilityOutput = (MacroStabilityOutput) kernelDataOutput; - Assert.AreEqual(CalculationResult.NoRun, damMacroStabilityOutput.CalculationResult); - Assert.AreEqual(false, damMacroStabilityOutput.UpliftSituation.IsUplift); + Assert.That(damMacroStabilityOutput.CalculationResult, Is.EqualTo(CalculationResult.NoRun)); + Assert.That(damMacroStabilityOutput.UpliftSituation.IsUplift, Is.EqualTo(false)); // Situation 2: there is uplift and prepare succeeds. Expected PrepareResult.Successful kernelInput.Location.ModelFactors.UpliftCriterionStability = 1.4; prepareResult = kernelWrapper.Prepare(kernelInput, 0, out _, out kernelDataOutput); - Assert.AreEqual(PrepareResult.Successful, prepareResult); + Assert.That(prepareResult, Is.EqualTo(PrepareResult.Successful)); damMacroStabilityOutput = (MacroStabilityOutput) kernelDataOutput; - Assert.AreEqual(CalculationResult.NoRun, damMacroStabilityOutput.CalculationResult); - Assert.AreEqual(true, damMacroStabilityOutput.UpliftSituation.IsUplift); + Assert.That(damMacroStabilityOutput.CalculationResult, Is.EqualTo(CalculationResult.NoRun)); + Assert.That(damMacroStabilityOutput.UpliftSituation.IsUplift, Is.EqualTo(true)); // Situation 3: prepare fails. Expected PrepareResult.Failed kernelInput.Location.ModelFactors.UpliftCriterionStability = 1.2; kernelInput.Location.SurfaceLine.CharacteristicPoints.Clear(); prepareResult = kernelWrapper.Prepare(kernelInput, 0, out _, out kernelDataOutput); - Assert.AreEqual(PrepareResult.Failed, prepareResult); + Assert.That(prepareResult, Is.EqualTo(PrepareResult.Failed)); damMacroStabilityOutput = (MacroStabilityOutput) kernelDataOutput; - Assert.AreEqual(CalculationResult.NoRun, damMacroStabilityOutput.CalculationResult); + Assert.That(damMacroStabilityOutput.CalculationResult, Is.EqualTo(CalculationResult.NoRun)); } [Test] @@ -112,7 +112,7 @@ }; int errorCount = kernelWrapper.Validate(macroStabilityInput, macroStabilityOutput, out List messages); Assert.IsTrue(errorCount > 0); - Assert.AreEqual(CalculationResult.InvalidInputData, macroStabilityOutput.CalculationResult); + Assert.That(macroStabilityOutput.CalculationResult, Is.EqualTo(CalculationResult.InvalidInputData)); // Validate the input when valid input is provided. Expected no messages. DamKernelInput kernelInput = CreateDamKernelInputForTest(); @@ -122,7 +122,7 @@ messages.Clear(); errorCount = kernelWrapper.Validate(kernelDataInput, kernelDataOutput, out messages); Assert.IsTrue(errorCount == 0); - Assert.AreEqual(CalculationResult.NoRun, ((MacroStabilityOutput) kernelDataOutput).CalculationResult); + Assert.That(((MacroStabilityOutput)kernelDataOutput).CalculationResult, Is.EqualTo(CalculationResult.NoRun)); } [Test] @@ -259,10 +259,10 @@ { case MStabModelType.Bishop: case MStabModelType.UpliftVan: - Assert.AreEqual(1, results.Count); + Assert.That(results.Count, Is.EqualTo(1)); break; case MStabModelType.BishopUpliftVan: - Assert.AreEqual(3, results.Count); + Assert.That(results.Count, Is.EqualTo(3)); break; } @@ -325,89 +325,89 @@ { DesignResult result = results[index]; - Assert.AreEqual(CalculationResult.Succeeded, result.CalculationResult); - Assert.AreEqual(true, ((UpliftSituation) result.StabilityDesignResults.UpliftSituation).IsUplift); + Assert.That(result.CalculationResult, Is.EqualTo(CalculationResult.Succeeded)); + Assert.That(((UpliftSituation)result.StabilityDesignResults.UpliftSituation).IsUplift, Is.EqualTo(true)); if (index == 0) { - Assert.AreEqual(Path.GetFileNameWithoutExtension(inputXmlForDamEngine), result.BaseFileName); - Assert.AreEqual(TestFolder + "@\testpath", result.CalculationSubDir); + Assert.That(result.BaseFileName, Is.EqualTo(Path.GetFileNameWithoutExtension(inputXmlForDamEngine))); + Assert.That(result.CalculationSubDir, Is.EqualTo(TestFolder + "@\testpath")); } - Assert.AreEqual(expectedNumberOfIterations[index], result.StabilityDesignResults.NumberOfIterations); - Assert.AreEqual(expectedSafetyFactor[index], result.StabilityDesignResults.SafetyFactor); - Assert.AreEqual(kernelInput.Location.SurfaceLine, result.StabilityDesignResults.RedesignedSurfaceLine); - Assert.AreEqual(kernelInput.SubSoilScenario.ToString(), result.ProfileName); - Assert.AreEqual(expectedStabilityModelType[index], result.StabilityDesignResults.StabilityModelType); - Assert.AreEqual(10, result.StabilityDesignResults.ActiveCenterPoint.X); - Assert.AreEqual(10, result.StabilityDesignResults.ActiveCenterPoint.Z); - Assert.AreEqual(8, result.StabilityDesignResults.ActiveCenterPointRadius); + Assert.That(result.StabilityDesignResults.NumberOfIterations, Is.EqualTo(expectedNumberOfIterations[index])); + Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(expectedSafetyFactor[index])); + Assert.That(result.StabilityDesignResults.RedesignedSurfaceLine, Is.EqualTo(kernelInput.Location.SurfaceLine)); + Assert.That(result.ProfileName, Is.EqualTo(kernelInput.SubSoilScenario.ToString())); + Assert.That(result.StabilityDesignResults.StabilityModelType, Is.EqualTo(expectedStabilityModelType[index])); + Assert.That(result.StabilityDesignResults.ActiveCenterPoint.X, Is.EqualTo(10)); + Assert.That(result.StabilityDesignResults.ActiveCenterPoint.Z, Is.EqualTo(10)); + Assert.That(result.StabilityDesignResults.ActiveCenterPointRadius, Is.EqualTo(8)); if (result.StabilityDesignResults.StabilityModelType != MStabModelType.Bishop) { - Assert.AreEqual(22, result.StabilityDesignResults.PassiveCenterPoint.X); - Assert.AreEqual(11, result.StabilityDesignResults.PassiveCenterPoint.Z); - Assert.AreEqual(7, result.StabilityDesignResults.PassiveCenterPointRadius); + Assert.That(result.StabilityDesignResults.PassiveCenterPoint.X, Is.EqualTo(22)); + Assert.That(result.StabilityDesignResults.PassiveCenterPoint.Z, Is.EqualTo(11)); + Assert.That(result.StabilityDesignResults.PassiveCenterPointRadius, Is.EqualTo(7)); } - Assert.AreEqual(9, result.StabilityDesignResults.ResultSlices[0].TopLeftPoint.X); - Assert.AreEqual(3, result.StabilityDesignResults.ResultSlices[0].TopLeftPoint.Z); - Assert.AreEqual(9.2, result.StabilityDesignResults.ResultSlices[0].TopRightPoint.X); - Assert.AreEqual(3.01, result.StabilityDesignResults.ResultSlices[0].TopRightPoint.Z); - Assert.AreEqual(9, result.StabilityDesignResults.ResultSlices[0].BottomLeftPoint.X); - Assert.AreEqual(-3, result.StabilityDesignResults.ResultSlices[0].BottomLeftPoint.Z); - Assert.AreEqual(9.2, result.StabilityDesignResults.ResultSlices[0].BottomRightPoint.X); - Assert.AreEqual(-3.1, result.StabilityDesignResults.ResultSlices[0].BottomRightPoint.Z); + Assert.That(result.StabilityDesignResults.ResultSlices[0].TopLeftPoint.X, Is.EqualTo(9)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].TopLeftPoint.Z, Is.EqualTo(3)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].TopRightPoint.X, Is.EqualTo(9.2)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].TopRightPoint.Z, Is.EqualTo(3.01)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].BottomLeftPoint.X, Is.EqualTo(9)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].BottomLeftPoint.Z, Is.EqualTo(-3)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].BottomRightPoint.X, Is.EqualTo(9.2)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].BottomRightPoint.Z, Is.EqualTo(-3.1)); - Assert.AreEqual("slice1", result.StabilityDesignResults.ResultSlices[0].Name); - Assert.AreEqual(0.2, result.StabilityDesignResults.ResultSlices[0].Width); - Assert.AreEqual(0.22, result.StabilityDesignResults.ResultSlices[0].ArcLength); - Assert.AreEqual(0, result.StabilityDesignResults.ResultSlices[0].TopAngle); - Assert.AreEqual(12.2, result.StabilityDesignResults.ResultSlices[0].BottomAngle); - Assert.AreEqual(14, result.StabilityDesignResults.ResultSlices[0].CohesionInput); - Assert.AreEqual(14.5, result.StabilityDesignResults.ResultSlices[0].Cohesion); - Assert.AreEqual(15.5, result.StabilityDesignResults.ResultSlices[0].CohesionCalculated); - Assert.AreEqual(30, result.StabilityDesignResults.ResultSlices[0].FrictionAngleInput); - Assert.AreEqual(30.5, result.StabilityDesignResults.ResultSlices[0].FrictionAngle); - Assert.AreEqual(22, result.StabilityDesignResults.ResultSlices[0].YieldStress); - Assert.AreEqual(23, result.StabilityDesignResults.ResultSlices[0].OCR); - Assert.AreEqual(24, result.StabilityDesignResults.ResultSlices[0].POP); - Assert.AreEqual(25, result.StabilityDesignResults.ResultSlices[0].DegreeOfConsolidationPorePressure); - Assert.AreEqual(26, result.StabilityDesignResults.ResultSlices[0].PorePressureDueToDegreeOfConsolidationLoad); - Assert.AreEqual(27, result.StabilityDesignResults.ResultSlices[0].DilatancyInput); - Assert.AreEqual(28, result.StabilityDesignResults.ResultSlices[0].Dilatancy); - Assert.AreEqual(29, result.StabilityDesignResults.ResultSlices[0].ExternalLoad); - Assert.AreEqual(30, result.StabilityDesignResults.ResultSlices[0].HydrostaticPorePressure); - Assert.AreEqual(31, result.StabilityDesignResults.ResultSlices[0].LeftForce); - Assert.AreEqual(32, result.StabilityDesignResults.ResultSlices[0].LeftForceAngle); - Assert.AreEqual(33, result.StabilityDesignResults.ResultSlices[0].LeftForceY); - Assert.AreEqual(34, result.StabilityDesignResults.ResultSlices[0].RightForce); - Assert.AreEqual(35, result.StabilityDesignResults.ResultSlices[0].RightForceAngle); - Assert.AreEqual(36, result.StabilityDesignResults.ResultSlices[0].RightForceY); - Assert.AreEqual(37, result.StabilityDesignResults.ResultSlices[0].LoadStress); - Assert.AreEqual(38, result.StabilityDesignResults.ResultSlices[0].NormalStress); - Assert.AreEqual(39, result.StabilityDesignResults.ResultSlices[0].PorePressure); - Assert.AreEqual(40, result.StabilityDesignResults.ResultSlices[0].HorizontalPorePressure); - Assert.AreEqual(41, result.StabilityDesignResults.ResultSlices[0].VerticalPorePressure); - Assert.AreEqual(42, result.StabilityDesignResults.ResultSlices[0].PiezometricPorePressure); - Assert.AreEqual(43, result.StabilityDesignResults.ResultSlices[0].EffectiveStress); - Assert.AreEqual(44, result.StabilityDesignResults.ResultSlices[0].ExcessPorePressure); - Assert.AreEqual(45, result.StabilityDesignResults.ResultSlices[0].ShearStress); - Assert.AreEqual(46, result.StabilityDesignResults.ResultSlices[0].SoilStress); - Assert.AreEqual(47, result.StabilityDesignResults.ResultSlices[0].TotalPorePressure); - Assert.AreEqual(48, result.StabilityDesignResults.ResultSlices[0].TotalStress); - Assert.AreEqual(49, result.StabilityDesignResults.ResultSlices[0].Weight); - Assert.AreEqual(50, result.StabilityDesignResults.ResultSlices[0].Su); - Assert.AreEqual(51, result.StabilityDesignResults.ResultSlices[0].HorizontalSoilQuakeStress); - Assert.AreEqual(52, result.StabilityDesignResults.ResultSlices[0].StrengthIncreaseExponent); - Assert.AreEqual(53, result.StabilityDesignResults.ResultSlices[0].UpliftFactor); - Assert.AreEqual(54, result.StabilityDesignResults.ResultSlices[0].VerticalSoilQuakeStress); - Assert.AreEqual(55, result.StabilityDesignResults.ResultSlices[0].WaterQuakeStress); - Assert.AreEqual(56, result.StabilityDesignResults.ResultSlices[0].UpliftReductionFactor); - Assert.AreEqual(57, result.StabilityDesignResults.ResultSlices[0].RatioCuPc); - Assert.AreEqual(58, result.StabilityDesignResults.ResultSlices[0].ResultantForce); - Assert.AreEqual(59, result.StabilityDesignResults.ResultSlices[0].ResultantMoment); - Assert.AreEqual(60, result.StabilityDesignResults.ResultSlices[0].ResultantAngle); + Assert.That(result.StabilityDesignResults.ResultSlices[0].Name, Is.EqualTo("slice1")); + Assert.That(result.StabilityDesignResults.ResultSlices[0].Width, Is.EqualTo(0.2)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].ArcLength, Is.EqualTo(0.22)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].TopAngle, Is.EqualTo(0)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].BottomAngle, Is.EqualTo(12.2)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].CohesionInput, Is.EqualTo(14)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].Cohesion, Is.EqualTo(14.5)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].CohesionCalculated, Is.EqualTo(15.5)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].FrictionAngleInput, Is.EqualTo(30)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].FrictionAngle, Is.EqualTo(30.5)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].YieldStress, Is.EqualTo(22)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].OCR, Is.EqualTo(23)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].POP, Is.EqualTo(24)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].DegreeOfConsolidationPorePressure, Is.EqualTo(25)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].PorePressureDueToDegreeOfConsolidationLoad, Is.EqualTo(26)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].DilatancyInput, Is.EqualTo(27)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].Dilatancy, Is.EqualTo(28)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].ExternalLoad, Is.EqualTo(29)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].HydrostaticPorePressure, Is.EqualTo(30)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].LeftForce, Is.EqualTo(31)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].LeftForceAngle, Is.EqualTo(32)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].LeftForceY, Is.EqualTo(33)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].RightForce, Is.EqualTo(34)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].RightForceAngle, Is.EqualTo(35)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].RightForceY, Is.EqualTo(36)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].LoadStress, Is.EqualTo(37)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].NormalStress, Is.EqualTo(38)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].PorePressure, Is.EqualTo(39)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].HorizontalPorePressure, Is.EqualTo(40)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].VerticalPorePressure, Is.EqualTo(41)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].PiezometricPorePressure, Is.EqualTo(42)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].EffectiveStress, Is.EqualTo(43)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].ExcessPorePressure, Is.EqualTo(44)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].ShearStress, Is.EqualTo(45)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].SoilStress, Is.EqualTo(46)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].TotalPorePressure, Is.EqualTo(47)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].TotalStress, Is.EqualTo(48)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].Weight, Is.EqualTo(49)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].Su, Is.EqualTo(50)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].HorizontalSoilQuakeStress, Is.EqualTo(51)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].StrengthIncreaseExponent, Is.EqualTo(52)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].UpliftFactor, Is.EqualTo(53)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].VerticalSoilQuakeStress, Is.EqualTo(54)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].WaterQuakeStress, Is.EqualTo(55)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].UpliftReductionFactor, Is.EqualTo(56)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].RatioCuPc, Is.EqualTo(57)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].ResultantForce, Is.EqualTo(58)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].ResultantMoment, Is.EqualTo(59)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].ResultantAngle, Is.EqualTo(60)); - Assert.AreEqual(ShearStrengthModel.CPhi, result.StabilityDesignResults.ResultSlices[0].ShearStrengthModel); + Assert.That(result.StabilityDesignResults.ResultSlices[0].ShearStrengthModel, Is.EqualTo(ShearStrengthModel.CPhi)); } } @@ -433,7 +433,7 @@ var macroStabilityOutput = (MacroStabilityOutput) kernelDataOutput; Assert.IsTrue(messages.Count > 0); // as there is no data at all, expect unexpected error - Assert.AreEqual(CalculationResult.UnexpectedError, macroStabilityOutput.CalculationResult); + Assert.That(macroStabilityOutput.CalculationResult, Is.EqualTo(CalculationResult.UnexpectedError)); } [Test] @@ -458,7 +458,7 @@ sd.UpliftVanTangentLinesDefinition = TangentLinesDefinition.Specified; PrepareResult prepareResult = kernelWrapper.Prepare(kernelInput, 0, out IKernelDataInput kernelDataInput, out IKernelDataOutput kernelDataOutput); - Assert.AreEqual(PrepareResult.Successful, prepareResult); + Assert.That(prepareResult, Is.EqualTo(PrepareResult.Successful)); // Validate the input int errorCount = kernelWrapper.Validate(kernelDataInput, kernelDataOutput, out List messages); @@ -468,8 +468,8 @@ // several failed attempted slip planes so there should be warnings. kernelWrapper.Execute(kernelDataInput, kernelDataOutput, out messages); var macroStabilityOutput = (MacroStabilityOutput) kernelDataOutput; - Assert.AreEqual(11, messages.Count); - Assert.AreEqual(CalculationResult.Succeeded, macroStabilityOutput.CalculationResult); + Assert.That(messages.Count, Is.EqualTo(11)); + Assert.That(macroStabilityOutput.CalculationResult, Is.EqualTo(CalculationResult.Succeeded)); Assert.IsTrue(messages[0].Message.Contains("A slice is beyond the geometry at x")); } @@ -494,7 +494,7 @@ // To ensure uplift occurs, set criterion to 1.4 kernelInput.Location.ModelFactors.UpliftCriterionStability = 1.4; PrepareResult prepareResult = kernelWrapper.Prepare(kernelInput, 0, out IKernelDataInput kernelDataInput, out IKernelDataOutput kernelDataOutput); - Assert.AreEqual(PrepareResult.Successful, prepareResult); + Assert.That(prepareResult, Is.EqualTo(PrepareResult.Successful)); // Validate the input int errorCount = kernelWrapper.Validate(kernelDataInput, kernelDataOutput, out List messages); @@ -503,10 +503,10 @@ // Run the dll kernelWrapper.Execute(kernelDataInput, kernelDataOutput, out messages); var macroStabilityOutput = (MacroStabilityOutput) kernelDataOutput; - Assert.AreEqual(2, messages.Count); - Assert.AreEqual(CalculationResult.Succeeded, macroStabilityOutput.CalculationResult); - Assert.AreEqual(1, macroStabilityOutput.StabilityOutputItems.Count); - Assert.AreEqual(1.5211, macroStabilityOutput.StabilityOutputItems[0].SafetyFactor, diff); // ToDo replace by actual value when calculation is done and output is parsed + Assert.That(messages.Count, Is.EqualTo(2)); + Assert.That(macroStabilityOutput.CalculationResult, Is.EqualTo(CalculationResult.Succeeded)); + Assert.That(macroStabilityOutput.StabilityOutputItems.Count, Is.EqualTo(1)); + Assert.That(macroStabilityOutput.StabilityOutputItems[0].SafetyFactor, Is.EqualTo(1.5211).Within(diff)); // ToDo replace by actual value when calculation is done and output is parsed // Fill the design results var designScenario = new DesignScenario @@ -517,47 +517,47 @@ Assert.IsTrue(results.Count > 0); foreach (DesignResult result in results) { - Assert.AreEqual("Loc(TestLocation)_Sce(1)_Pro(DefaultNameSoilProfile1D)", result.BaseFileName); - Assert.AreEqual("..\\Test\\Stability\\UpliftVan", result.CalculationSubDir); - Assert.AreEqual(CalculationResult.Succeeded, result.CalculationResult); + Assert.That(result.BaseFileName, Is.EqualTo("Loc(TestLocation)_Sce(1)_Pro(DefaultNameSoilProfile1D)")); + Assert.That(result.CalculationSubDir, Is.EqualTo("..\\Test\\Stability\\UpliftVan")); + Assert.That(result.CalculationResult, Is.EqualTo(CalculationResult.Succeeded)); Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.5211).Within(diff)); - Assert.AreEqual(50.5, result.StabilityDesignResults.ActiveCenterPoint.X, diff); - Assert.AreEqual(12, result.StabilityDesignResults.ActiveCenterPoint.Z, diff); - Assert.AreEqual(22, result.StabilityDesignResults.ActiveCenterPointRadius, diff); - Assert.AreEqual(50.5, result.StabilityDesignResults.PassiveCenterPoint.X); - Assert.AreEqual(2.2, result.StabilityDesignResults.PassiveCenterPoint.Z); - Assert.AreEqual(12.2, result.StabilityDesignResults.PassiveCenterPointRadius); - Assert.AreEqual(40, result.StabilityDesignResults.ResultSlices.Count); - Assert.AreEqual(ShearStrengthModel.CPhi, result.StabilityDesignResults.ResultSlices[0].ShearStrengthModel); - Assert.AreEqual(15.8180658, result.StabilityDesignResults.ResultSlices[0].EffectiveStress, diff); - Assert.AreEqual(31, result.StabilityDesignResults.ResultSlices[0].FrictionAngle, diff); - Assert.AreEqual(double.NaN, result.StabilityDesignResults.ResultSlices[0].OCR, diff); - Assert.AreEqual(8.8710528, result.StabilityDesignResults.ResultSlices[0].NormalStress, diff); - Assert.AreEqual(29.9769477, result.StabilityDesignResults.ResultSlices[0].TopLeftPoint.X, diff); - Assert.AreEqual(4.0750819, result.StabilityDesignResults.ResultSlices[0].TopLeftPoint.Z, diff); - Assert.AreEqual(0.6946544, result.StabilityDesignResults.ResultSlices[0].Width, diff); - Assert.AreEqual(10.9880897, result.StabilityDesignResults.ResultSlices[0].Weight, diff); + Assert.That(result.StabilityDesignResults.ActiveCenterPoint.X, Is.EqualTo(50.5).Within(diff)); + Assert.That(result.StabilityDesignResults.ActiveCenterPoint.Z, Is.EqualTo(12).Within(diff)); + Assert.That(result.StabilityDesignResults.ActiveCenterPointRadius, Is.EqualTo(22).Within(diff)); + Assert.That(result.StabilityDesignResults.PassiveCenterPoint.X, Is.EqualTo(50.5)); + Assert.That(result.StabilityDesignResults.PassiveCenterPoint.Z, Is.EqualTo(2.2)); + Assert.That(result.StabilityDesignResults.PassiveCenterPointRadius, Is.EqualTo(12.2)); + Assert.That(result.StabilityDesignResults.ResultSlices.Count, Is.EqualTo(40)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].ShearStrengthModel, Is.EqualTo(ShearStrengthModel.CPhi)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].EffectiveStress, Is.EqualTo(15.8180658).Within(diff)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].FrictionAngle, Is.EqualTo(31).Within(diff)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].OCR, Is.EqualTo(double.NaN).Within(diff)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].NormalStress, Is.EqualTo(8.8710528).Within(diff)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].TopLeftPoint.X, Is.EqualTo(29.9769477).Within(diff)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].TopLeftPoint.Z, Is.EqualTo(4.0750819).Within(diff)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].Width, Is.EqualTo(0.6946544).Within(diff)); + Assert.That(result.StabilityDesignResults.ResultSlices[0].Weight, Is.EqualTo(10.9880897).Within(diff)); var index = 21; - Assert.AreEqual(ShearStrengthModel.CPhi, result.StabilityDesignResults.ResultSlices[index].ShearStrengthModel); - Assert.AreEqual(116.6794325, result.StabilityDesignResults.ResultSlices[index].EffectiveStress, diff); - Assert.AreEqual(10, result.StabilityDesignResults.ResultSlices[index].FrictionAngle, diff); - Assert.AreEqual(double.NaN, result.StabilityDesignResults.ResultSlices[index].OCR, diff); - Assert.AreEqual(114.2973685, result.StabilityDesignResults.ResultSlices[index].NormalStress, diff); - Assert.AreEqual(46.8636363, result.StabilityDesignResults.ResultSlices[index].TopLeftPoint.X, diff); - Assert.AreEqual(1.8181818, result.StabilityDesignResults.ResultSlices[index].TopLeftPoint.Z, diff); - Assert.AreEqual(0.9090909, result.StabilityDesignResults.ResultSlices[index].Width, diff); - Assert.AreEqual(193.1479678, result.StabilityDesignResults.ResultSlices[index].Weight, diff); + Assert.That(result.StabilityDesignResults.ResultSlices[index].ShearStrengthModel, Is.EqualTo(ShearStrengthModel.CPhi)); + Assert.That(result.StabilityDesignResults.ResultSlices[index].EffectiveStress, Is.EqualTo(116.6794325).Within(diff)); + Assert.That(result.StabilityDesignResults.ResultSlices[index].FrictionAngle, Is.EqualTo(10).Within(diff)); + Assert.That(result.StabilityDesignResults.ResultSlices[index].OCR, Is.EqualTo(double.NaN).Within(diff)); + Assert.That(result.StabilityDesignResults.ResultSlices[index].NormalStress, Is.EqualTo(114.2973685).Within(diff)); + Assert.That(result.StabilityDesignResults.ResultSlices[index].TopLeftPoint.X, Is.EqualTo(46.8636363).Within(diff)); + Assert.That(result.StabilityDesignResults.ResultSlices[index].TopLeftPoint.Z, Is.EqualTo(1.8181818).Within(diff)); + Assert.That(result.StabilityDesignResults.ResultSlices[index].Width, Is.EqualTo(0.9090909).Within(diff)); + Assert.That(result.StabilityDesignResults.ResultSlices[index].Weight, Is.EqualTo(193.1479678).Within(diff)); index = result.StabilityDesignResults.ResultSlices.Count - 1; - Assert.AreEqual(ShearStrengthModel.CPhi, result.StabilityDesignResults.ResultSlices[index].ShearStrengthModel); - Assert.AreEqual(5.5185653, result.StabilityDesignResults.ResultSlices[index].EffectiveStress, diff); - Assert.AreEqual(31, result.StabilityDesignResults.ResultSlices[index].FrictionAngle, diff); - Assert.AreEqual(double.NaN, result.StabilityDesignResults.ResultSlices[index].OCR, diff); - Assert.AreEqual(7.2892231, result.StabilityDesignResults.ResultSlices[index].NormalStress, diff); - Assert.AreEqual(61.5363037, result.StabilityDesignResults.ResultSlices[index].TopLeftPoint.X, diff); - Assert.AreEqual(-1.9273925, result.StabilityDesignResults.ResultSlices[index].TopLeftPoint.Z, diff); - Assert.AreEqual(0.9636962, result.StabilityDesignResults.ResultSlices[index].Width, diff); - Assert.AreEqual(10.3883614, result.StabilityDesignResults.ResultSlices[index].Weight, diff); + Assert.That(result.StabilityDesignResults.ResultSlices[index].ShearStrengthModel, Is.EqualTo(ShearStrengthModel.CPhi)); + Assert.That(result.StabilityDesignResults.ResultSlices[index].EffectiveStress, Is.EqualTo(5.5185653).Within(diff)); + Assert.That(result.StabilityDesignResults.ResultSlices[index].FrictionAngle, Is.EqualTo(31).Within(diff)); + Assert.That(result.StabilityDesignResults.ResultSlices[index].OCR, Is.EqualTo(double.NaN).Within(diff)); + Assert.That(result.StabilityDesignResults.ResultSlices[index].NormalStress, Is.EqualTo(7.2892231).Within(diff)); + Assert.That(result.StabilityDesignResults.ResultSlices[index].TopLeftPoint.X, Is.EqualTo(61.5363037).Within(diff)); + Assert.That(result.StabilityDesignResults.ResultSlices[index].TopLeftPoint.Z, Is.EqualTo(-1.9273925).Within(diff)); + Assert.That(result.StabilityDesignResults.ResultSlices[index].Width, Is.EqualTo(0.9636962).Within(diff)); + Assert.That(result.StabilityDesignResults.ResultSlices[index].Weight, Is.EqualTo(10.3883614).Within(diff)); } } @@ -586,20 +586,20 @@ kernelInput.Location.ModelFactors.UpliftCriterionStability = 1.4; PrepareResult prepareResult = kernelWrapper.Prepare(kernelInput, 0, out IKernelDataInput kernelDataInput, out IKernelDataOutput kernelDataOutput); - Assert.AreEqual(PrepareResult.Successful, prepareResult); + Assert.That(prepareResult, Is.EqualTo(PrepareResult.Successful)); // Validate the input int errorCount = kernelWrapper.Validate(kernelDataInput, kernelDataOutput, out List messages); - Assert.AreEqual(0, errorCount); + Assert.That(errorCount, Is.EqualTo(0)); // Run the dll kernelWrapper.Execute(kernelDataInput, kernelDataOutput, out messages); var macroStabilityOutput = (MacroStabilityOutput) kernelDataOutput; - Assert.AreEqual(3, messages.Count); - Assert.AreEqual(CalculationResult.Succeeded, macroStabilityOutput.CalculationResult); - Assert.AreEqual(1, macroStabilityOutput.StabilityOutputItems.Count); + Assert.That(messages.Count, Is.EqualTo(3)); + Assert.That(macroStabilityOutput.CalculationResult, Is.EqualTo(CalculationResult.Succeeded)); + Assert.That(macroStabilityOutput.StabilityOutputItems.Count, Is.EqualTo(1)); // SafetyFactor as obtained when running the skx file with this input in the stability kernel directly = 1.9882432331086863 - Assert.AreEqual(1.99423, macroStabilityOutput.StabilityOutputItems[0].SafetyFactor, diff); + Assert.That(macroStabilityOutput.StabilityOutputItems[0].SafetyFactor, Is.EqualTo(1.99423).Within(diff)); // Fill the design results var designScenario = new DesignScenario @@ -630,7 +630,7 @@ Output output = GeneralHelper.RunAfterInputValidation(engineInterface); - Assert.AreEqual(1.638, output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, 0.001); + Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.638).Within(0.001)); } [Test] Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/SoilVolumeMassCalculatorEffectiveStressTest.cs =================================================================== diff -u -r4540 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/SoilVolumeMassCalculatorEffectiveStressTest.cs (.../SoilVolumeMassCalculatorEffectiveStressTest.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/SoilVolumeMassCalculatorEffectiveStressTest.cs (.../SoilVolumeMassCalculatorEffectiveStressTest.cs) (revision 4624) @@ -40,7 +40,7 @@ soilVolumeMassCalculator.VolumicWeightOfWater = 10; soilVolumeMassCalculator.SoilProfile = CreateTestProfile(); double result = soilVolumeMassCalculator.CalculateEffectiveStress(); - Assert.AreEqual(expectedResult, result, 0.001); + Assert.That(result, Is.EqualTo(expectedResult).Within(0.001)); } [Test] @@ -55,7 +55,7 @@ soilVolumeMassCalculator.VolumicWeightOfWater = 10; soilVolumeMassCalculator.SoilProfile = CreateTestProfile(); double result = soilVolumeMassCalculator.CalculateEffectiveStress(); - Assert.AreEqual(expectedResult, result, 0.001); + Assert.That(result, Is.EqualTo(expectedResult).Within(0.001)); } [Test] @@ -70,7 +70,7 @@ soilVolumeMassCalculator.VolumicWeightOfWater = 10; soilVolumeMassCalculator.SoilProfile = CreateTestProfile(); double result = soilVolumeMassCalculator.CalculateEffectiveStress(); - Assert.AreEqual(expectedResult, result, 0.001); + Assert.That(result, Is.EqualTo(expectedResult).Within(0.001)); } [Test] @@ -85,7 +85,7 @@ soilVolumeMassCalculator.VolumicWeightOfWater = 10; soilVolumeMassCalculator.SoilProfile = CreateTestProfile(); double result = soilVolumeMassCalculator.CalculateEffectiveStress(); - Assert.AreEqual(expectedResult, result, 0.001); + Assert.That(result, Is.EqualTo(expectedResult).Within(0.001)); } [Test] @@ -100,7 +100,7 @@ soilVolumeMassCalculator.VolumicWeightOfWater = 10; soilVolumeMassCalculator.SoilProfile = CreateTestProfile(); double result = soilVolumeMassCalculator.CalculateEffectiveStress(); - Assert.AreEqual(expectedResult, result, 0.001); + Assert.That(result, Is.EqualTo(expectedResult).Within(0.001)); } [Test] @@ -115,7 +115,7 @@ soilVolumeMassCalculator.VolumicWeightOfWater = 10; soilVolumeMassCalculator.SoilProfile = CreateTestProfile(); double result = soilVolumeMassCalculator.CalculateEffectiveStress(); - Assert.AreEqual(expectedResult, result, 0.001); + Assert.That(result, Is.EqualTo(expectedResult).Within(0.001)); } [Test] @@ -129,7 +129,7 @@ soilVolumeMassCalculator.VolumicWeightOfWater = 10; soilVolumeMassCalculator.SoilProfile = CreateTestProfile(); double result = soilVolumeMassCalculator.CalculateEffectiveStress(); - Assert.AreEqual(expectedResult, result, 0.001); + Assert.That(result, Is.EqualTo(expectedResult).Within(0.001)); } [Test] @@ -144,7 +144,7 @@ soilVolumeMassCalculator.VolumicWeightOfWater = 10; soilVolumeMassCalculator.SoilProfile = CreateTestProfile(); double result = soilVolumeMassCalculator.CalculateEffectiveStress(); - Assert.AreEqual(expectedResult, result, 0.001); + Assert.That(result, Is.EqualTo(expectedResult).Within(0.001)); } [Test] Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityOutwardsTests.cs =================================================================== diff -u -r4604 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityOutwardsTests.cs (.../MacroStabilityOutwardsTests.cs) (revision 4604) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityOutwardsTests.cs (.../MacroStabilityOutwardsTests.cs) (revision 4624) @@ -50,6 +50,6 @@ Output output = GeneralHelper.RunAfterInputValidation(inputString); - Assert.AreEqual(factorOfSafety, output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Tolerance); + Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Is.EqualTo(factorOfSafety).Within(Tolerance)); } } \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs =================================================================== diff -u -r4540 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs (.../WtiPipingSellmeijerRevisedTests.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs (.../WtiPipingSellmeijerRevisedTests.cs) (revision 4624) @@ -75,24 +75,24 @@ // The expected values below where calculated with DamEngine rev.2012, // Piping factor = 0.432 - Assert.AreEqual(0.432, output.Results.CalculationResults[0].PipingDesignResults.Wti2017FactorOverall, tolerance); + Assert.That(output.Results.CalculationResults[0].PipingDesignResults.Wti2017FactorOverall, Is.EqualTo(0.432).Within(tolerance)); // H critical = 1.983 - Assert.AreEqual(1.983, output.Results.CalculationResults[0].PipingDesignResults.Wti2017HcriticalOverall, tolerance); + Assert.That(output.Results.CalculationResults[0].PipingDesignResults.Wti2017HcriticalOverall, Is.EqualTo(1.983).Within(tolerance)); // Piping exit point = 35.0 - Assert.AreEqual(35.0, output.Results.CalculationResults[0].PipingDesignResults.ExitPointX, tolerance); + Assert.That(output.Results.CalculationResults[0].PipingDesignResults.ExitPointX, Is.EqualTo(35.0).Within(tolerance)); // Dike length = 25.00 Assert.That(redesignedSurfaceLine.GetDikeLength(), Is.EqualTo(25.00).Within(tolerance)); // Uplift = true - Assert.AreEqual(true, output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.IsUplift); + Assert.That(output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.IsUplift, Is.EqualTo(true)); // Uplift factor = 0.582 - Assert.AreEqual(0.582, output.Results.CalculationResults[0].PipingDesignResults.UpliftFactor, tolerance); + Assert.That(output.Results.CalculationResults[0].PipingDesignResults.UpliftFactor, Is.EqualTo(0.582).Within(tolerance)); // The adjusted PL3/PL4: 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] @@ -111,33 +111,33 @@ // The expected values below where calculated with DamEngine rev.2012, // uplift = true - Assert.AreEqual(true, output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.IsUplift); + Assert.That(output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.IsUplift, Is.EqualTo(true)); // shoulder height = 1.995 - Assert.AreEqual(1.995, redesignedSurfaceLine.DetermineShoulderHeight(), tolerance); + Assert.That(redesignedSurfaceLine.DetermineShoulderHeight(), Is.EqualTo(1.995).Within(tolerance)); // Note Bka: Answers here are 17 meter longer shoulder than Sellmeijer4Forces from which these tests are derived. // dike length = 66.986 + 17 Assert.That(redesignedSurfaceLine.GetDikeLength(), Is.EqualTo(83.986).Within(tolerance)); // ShoulderWidth = X_Kruin binnenberm - X_Insteek binnenberm = 65.01 + 17 - 29.01 = 53.0 - Assert.AreEqual(53.0, redesignedSurfaceLine.DetermineShoulderLength(), tolerance); + Assert.That(redesignedSurfaceLine.DetermineShoulderLength(), Is.EqualTo(53.0).Within(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(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)); // ExitPointX = X_Teen dijk binnenwaarts = 76.986 + 17 - Assert.AreEqual(93.986, output.Results.CalculationResults[0].PipingDesignResults.ExitPointX, tolerance); + Assert.That(output.Results.CalculationResults[0].PipingDesignResults.ExitPointX, Is.EqualTo(93.986).Within(tolerance)); // expected value = 1.280 - Assert.AreEqual(1.280, output.Results.CalculationResults[0].PipingDesignResults.Wti2017BackwardErosionFactor, tolerance); + Assert.That(output.Results.CalculationResults[0].PipingDesignResults.Wti2017BackwardErosionFactor, Is.EqualTo(1.280).Within(tolerance)); // expected value = 4.697 - Assert.AreEqual(4.697, output.Results.CalculationResults[0].PipingDesignResults.Wti2017BackwardErosionHcritical, tolerance); + Assert.That(output.Results.CalculationResults[0].PipingDesignResults.Wti2017BackwardErosionHcritical, Is.EqualTo(4.697).Within(tolerance)); // expected value = 0.582 - Assert.AreEqual(0.582, output.Results.CalculationResults[0].PipingDesignResults.UpliftFactor, tolerance); + Assert.That(output.Results.CalculationResults[0].PipingDesignResults.UpliftFactor, Is.EqualTo(0.582).Within(tolerance)); } [Test] @@ -157,26 +157,26 @@ // The expected values below where calculated with DamEngine rev.2012, // The following test are different from CanPerformWtiSellmeijerRevisedDesignWithAdaptionPipingVoorbeeld1() - Assert.AreEqual(4.5, redesignedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver).Z, tolerance); - Assert.AreEqual(4.5, redesignedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).Z, tolerance); + Assert.That(redesignedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver).Z, Is.EqualTo(4.5).Within(tolerance)); + Assert.That(redesignedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).Z, Is.EqualTo(4.5).Within(tolerance)); // Note Bka: Answers here are 17 meter longer shoulder than Sellmeijer4Forces from which these tests are derived. // ShoulderWidth = X_Kruin binnenberm - X_Insteek binnenberm = 65.01 - 32.01 = 33.0 + 17 = 50 - Assert.AreEqual(50.0, redesignedSurfaceLine.DetermineShoulderLength(), tolerance); + Assert.That(redesignedSurfaceLine.DetermineShoulderLength(), Is.EqualTo(50.0).Within(tolerance)); // The following test are the same as for CanPerformWtiSellmeijerRevisedDesignWithAdaptionPipingVoorbeeld1() - 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(83.986).Within(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.AreEqual(1.280, output.Results.CalculationResults[0].PipingDesignResults.Wti2017BackwardErosionFactor, tolerance); - Assert.AreEqual(4.697, output.Results.CalculationResults[0].PipingDesignResults.Wti2017BackwardErosionHcritical, tolerance); - Assert.AreEqual(0.582, output.Results.CalculationResults[0].PipingDesignResults.UpliftFactor, 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)); + Assert.That(output.Results.CalculationResults[0].PipingDesignResults.Wti2017BackwardErosionFactor, Is.EqualTo(1.280).Within(tolerance)); + Assert.That(output.Results.CalculationResults[0].PipingDesignResults.Wti2017BackwardErosionHcritical, Is.EqualTo(4.697).Within(tolerance)); + Assert.That(output.Results.CalculationResults[0].PipingDesignResults.UpliftFactor, Is.EqualTo(0.582).Within(tolerance)); } [Test] @@ -192,16 +192,16 @@ Output output = GeneralHelper.RunAfterInputValidation(inputString); // The expected values below where calculated with DamEngine rev.2016, - Assert.AreEqual(112, output.Results.CalculationResults.Length); + Assert.That(output.Results.CalculationResults.Length, Is.EqualTo(112)); // result 1: safety factor = 90.000 - Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[0].CalculationResult)); - Assert.AreEqual(90.000, output.Results.CalculationResults[0].PipingDesignResults.Wti2017FactorOverall, tolerance); + Assert.That(ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[0].CalculationResult), Is.EqualTo(CalculationResult.Succeeded)); + Assert.That(output.Results.CalculationResults[0].PipingDesignResults.Wti2017FactorOverall, Is.EqualTo(90.000).Within(tolerance)); // result 2: safety factor = 58.243 - Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[2].CalculationResult)); - Assert.AreEqual(58.241, output.Results.CalculationResults[2].PipingDesignResults.Wti2017FactorOverall, tolerance); + Assert.That(ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[2].CalculationResult), Is.EqualTo(CalculationResult.Succeeded)); + Assert.That(output.Results.CalculationResults[2].PipingDesignResults.Wti2017FactorOverall, Is.EqualTo(58.241).Within(tolerance)); // result 3: safety factor = 0 NB. In 18.1.3 it was 90, but now we use Uplift calculation from WBI, before from DAM - Assert.AreEqual(CalculationResult.RunFailed, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[111].CalculationResult)); - Assert.AreEqual(0.000, output.Results.CalculationResults[111].PipingDesignResults.Wti2017FactorOverall, tolerance); + Assert.That(ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[111].CalculationResult), Is.EqualTo(CalculationResult.RunFailed)); + Assert.That(output.Results.CalculationResults[111].PipingDesignResults.Wti2017FactorOverall, Is.EqualTo(0.000).Within(tolerance)); } [Test] @@ -220,7 +220,7 @@ output = RunTestProjectCores(calcDir, outputFileName, 4); string outputMultiCore = DamXmlSerialization.SaveOutputAsXmlString(output); - Assert.AreEqual(outputSingleCore, outputMultiCore); + Assert.That(outputMultiCore, Is.EqualTo(outputSingleCore)); } [Test] @@ -237,15 +237,15 @@ Output output = GeneralHelper.RunAfterInputValidation(inputString); - Assert.AreEqual(2, output.Results.CalculationResults.Length); + Assert.That(output.Results.CalculationResults.Length, Is.EqualTo(2)); // Expected an english message, but this can not be fixed with version 16.2 of the kernel, see MWDAM-1395 - Assert.AreEqual("De effectieve spanning mag niet negatief zijn.\r\n", output.Results.CalculationResults[1].PipingDesignResults.ResultMessage); - Assert.AreEqual(CalculationResult.RunFailed, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[1].CalculationResult)); - Assert.AreEqual("Location '100', subsoil scenario 'segment1_1D2', design scenario '1': " + + Assert.That(output.Results.CalculationResults[1].PipingDesignResults.ResultMessage, Is.EqualTo("De effectieve spanning mag niet negatief zijn.\r\n")); + Assert.That(ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[1].CalculationResult), Is.EqualTo(CalculationResult.RunFailed)); + Assert.That(output.Results.CalculationMessages[0].Message1, + Is.EqualTo("Location '100', subsoil scenario 'segment1_1D2', design scenario '1': " + "The calculation failed with error message " + "'The design was not successful. " + - "De effectieve spanning mag niet negatief zijn.\r\n'", - output.Results.CalculationMessages[0].Message1); + "De effectieve spanning mag niet negatief zijn.\r\n'")); } [Test] @@ -262,16 +262,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(26.006, output.Results.CalculationResults[0].PipingDesignResults.Wti2017FactorOverall, tolerance); - Assert.AreEqual(90.000, output.Results.CalculationResults[1].PipingDesignResults.Wti2017FactorOverall, tolerance); - Assert.AreEqual(90.000, output.Results.CalculationResults[2].PipingDesignResults.Wti2017FactorOverall, tolerance); - Assert.AreEqual(90.000, output.Results.CalculationResults[3].PipingDesignResults.Wti2017FactorOverall, tolerance); - Assert.AreEqual(9.316, output.Results.CalculationResults[4].PipingDesignResults.Wti2017FactorOverall, tolerance); - Assert.AreEqual(90.000, output.Results.CalculationResults[5].PipingDesignResults.Wti2017FactorOverall, 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.Wti2017FactorOverall, Is.EqualTo(26.006).Within(tolerance)); + Assert.That(output.Results.CalculationResults[1].PipingDesignResults.Wti2017FactorOverall, Is.EqualTo(90.000).Within(tolerance)); + Assert.That(output.Results.CalculationResults[2].PipingDesignResults.Wti2017FactorOverall, Is.EqualTo(90.000).Within(tolerance)); + Assert.That(output.Results.CalculationResults[3].PipingDesignResults.Wti2017FactorOverall, Is.EqualTo(90.000).Within(tolerance)); + Assert.That(output.Results.CalculationResults[4].PipingDesignResults.Wti2017FactorOverall, Is.EqualTo(9.316).Within(tolerance)); + Assert.That(output.Results.CalculationResults[5].PipingDesignResults.Wti2017FactorOverall, 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"));