Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs =================================================================== diff -u -r2017 -r2018 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs (.../MacroStabilityIoTests.cs) (revision 2017) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs (.../MacroStabilityIoTests.cs) (revision 2018) @@ -33,6 +33,7 @@ using Deltares.MacroStability.Geometry; using Deltares.MacroStability.Standard; using KellermanSoftware.CompareNetObjects; +using CharacteristicPointSet = Deltares.MacroStability.Geometry.CharacteristicPointSet; using Soil = Deltares.MacroStability.Geometry.Soil; using SoilProfile2D = Deltares.DamEngine.Data.Geotechnics.SoilProfile2D; using SurfaceLine2 = Deltares.DamEngine.Data.Geotechnics.SurfaceLine2; @@ -44,8 +45,18 @@ { private const string WtiFilesMap = @"KernelWrappers\MacroStabilityCommon\TestFiles"; + private static readonly List SoilParametersToIgnore = new List() + { + "StrengthIncreaseExponent", + "RRatio", + "RheologicalCoefficient", + "BondStressCurve", + "UseSoilType" + }; + [TestCase("Benchmark 1-01b.wti")] [TestCase("Benchmark 2-04a.wti")] + [TestCase("bm3-10c.wti")] public void GivenWtiFileWhenDeserializingAndSerializingThenTheStringsAreEqual(string fileNameIn) { // Given WTI file @@ -112,6 +123,7 @@ [TestCase("Benchmark 1-01b.wti")] [TestCase("Benchmark 2-04a.wti")] + [TestCase("bm3-10c.wti")] public void GivenWtiFileWhenFillingToDamEngineDataAndWritingBackToKernelDataThenTheKernelModelsAreEqual(string fileNameIn) { // Given Wti file @@ -142,19 +154,24 @@ CompareStabilityModel(expectedKernelModel.StabilityModel, actualKernelModel.StabilityModel); CompareSoilModel(expectedKernelModel.StabilityModel.SoilModel, actualKernelModel.StabilityModel.SoilModel); CompareSoilProfile2D(expectedKernelModel.StabilityModel.SoilProfile, actualKernelModel.StabilityModel.SoilProfile); + CompareSoilSurfaceLine(expectedKernelModel.PreprocessingModel.LastStage.SurfaceLine.CharacteristicPoints, + actualKernelModel.PreprocessingModel.LastStage.SurfaceLine.CharacteristicPoints); } - private void CompareSoilProfile2D(MacroStability.Geometry.SoilProfile2D expectedSoilProfile, MacroStability.Geometry.SoilProfile2D actualSoilProfile) + private void CompareSoilSurfaceLine(CharacteristicPointSet expectedCharacteristicPoints, CharacteristicPointSet actualCharacteristicPoints) { var compare = new CompareLogic { Config = { MaxDifferences = 100 } }; - compare.Config.MembersToIgnore = new List + compare.Config.MembersToIgnore = new List() { - "StrengthIncreaseExponent", - "RRatio", - "RheologicalCoefficient", - "BondStressCurve", - "UseSoilType" - }; + "Owner" + }; var result = compare.Compare(expectedCharacteristicPoints, actualCharacteristicPoints); + Assert.AreEqual(0, result.Differences.Count, "Differences found read/write kernel SurfaceLine"); + } + + private void CompareSoilProfile2D(MacroStability.Geometry.SoilProfile2D expectedSoilProfile, MacroStability.Geometry.SoilProfile2D actualSoilProfile) + { + var compare = new CompareLogic { Config = { MaxDifferences = 100 } }; + compare.Config.MembersToIgnore = SoilParametersToIgnore; var result = compare.Compare(expectedSoilProfile, actualSoilProfile); Assert.AreEqual(0, result.Differences.Count, "Differences found read/write kernel SoilProfile2D"); } @@ -168,16 +185,9 @@ var actualSoil = actualSoilModel.Soils.First(soil => soil.Name.Equals(expectedSoil.Name)); Assert.IsNotNull(actualSoil, string.Format("Soil {0} not found", expectedSoil.Name)); var compare = new CompareLogic { Config = { MaxDifferences = 100 } }; - compare.Config.MembersToIgnore = new List - { - "StrengthIncreaseExponent", - "RRatio", - "RheologicalCoefficient", - "BondStressCurve", - "UseSoilType" - }; + compare.Config.MembersToIgnore = SoilParametersToIgnore; var result = compare.Compare(expectedSoil, actualSoil); - Assert.AreEqual(0, result.Differences.Count, "Differences found read/write kernel SoilProfile"); + Assert.AreEqual(0, result.Differences.Count, "Differences found read/write kernel SoilModel"); } }