Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs =================================================================== diff -u -r0e809897e28ca8673b98ec8abb68b42939a3a647 -rde60841b8ffece957b147fc7a35a93d2c1918f5f --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs (.../MacroStabilityInwardsCalculationService.cs) (revision 0e809897e28ca8673b98ec8abb68b42939a3a647) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs (.../MacroStabilityInwardsCalculationService.cs) (revision de60841b8ffece957b147fc7a35a93d2c1918f5f) @@ -184,6 +184,7 @@ AssessmentLevel = inputParameters.AssessmentLevel, SurfaceLine = inputParameters.SurfaceLine, SoilProfile = inputParameters.SoilProfileUnderSurfaceLine, + UpliftVanSoilProfile = UpliftVanSoilProfileConverter.Convert(inputParameters.SoilProfileUnderSurfaceLine), DikeSoilScenario = inputParameters.DikeSoilScenario, WaterLevelRiverAverage = inputParameters.WaterLevelRiverAverage, WaterLevelPolder = inputParameters.WaterLevelPolder, Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Converters/UpliftVanSoilProfileConverterTest.cs =================================================================== diff -u -r3b20cfd37a7802163d500bbbe37d562a38ab3989 -rde60841b8ffece957b147fc7a35a93d2c1918f5f --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Converters/UpliftVanSoilProfileConverterTest.cs (.../UpliftVanSoilProfileConverterTest.cs) (revision 3b20cfd37a7802163d500bbbe37d562a38ab3989) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Converters/UpliftVanSoilProfileConverterTest.cs (.../UpliftVanSoilProfileConverterTest.cs) (revision de60841b8ffece957b147fc7a35a93d2c1918f5f) @@ -26,11 +26,11 @@ using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; -using Ringtoets.MacroStabilityInwards.Data; using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan.Input; using Ringtoets.MacroStabilityInwards.Primitives; using Ringtoets.MacroStabilityInwards.Primitives.MacroStabilityInwardsSoilUnderSurfaceLine; using Ringtoets.MacroStabilityInwards.Service.Converters; +using Ringtoets.MacroStabilityInwards.Service.TestUtil; namespace Ringtoets.MacroStabilityInwards.Service.Test.Converters { @@ -95,14 +95,7 @@ UpliftVanSoilProfile upliftVanSoilProfile = UpliftVanSoilProfileConverter.Convert(profile); // Assert - MacroStabilityInwardsSoilLayerUnderSurfaceLine[] expectedLayers = profile.Layers.ToArray(); - UpliftVanSoilLayer[] actualLayers = upliftVanSoilProfile.Layers.ToArray(); - - MacroStabilityInwardsPreconsolidationStressUnderSurfaceLine[] expectedPreconsolidationStresses = profile.PreconsolidationStresses.ToArray(); - UpliftVanPreconsolidationStress[] actualPreconsolidationStresses = upliftVanSoilProfile.PreconsolidationStresses.ToArray(); - - AssertLayers(expectedLayers, actualLayers); - AssertPreconsolidationStresses(expectedPreconsolidationStresses, actualPreconsolidationStresses); + UpliftVanSoilProfileHelper.AssertSoilProfile(profile, upliftVanSoilProfile); } [Test] @@ -156,42 +149,6 @@ Assert.AreEqual(expectedShearStrengthModel, upliftVanSoilProfile.Layers.First().ShearStrengthModel); } - private static void AssertPreconsolidationStresses(MacroStabilityInwardsPreconsolidationStressUnderSurfaceLine[] expectedPreconsolidationStresses, - UpliftVanPreconsolidationStress[] actualPreconsolidationStresses) - { - Assert.AreEqual(expectedPreconsolidationStresses.Length, actualPreconsolidationStresses.Length); - for (var i = 0; i < expectedPreconsolidationStresses.Length; i++) - { - Assert.AreEqual(MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetPreconsolidationStress(expectedPreconsolidationStresses[i]).GetDesignValue(), actualPreconsolidationStresses[i].Stress); - Assert.AreEqual(expectedPreconsolidationStresses[i].XCoordinate, actualPreconsolidationStresses[i].Coordinate.X); - Assert.AreEqual(expectedPreconsolidationStresses[i].ZCoordinate, actualPreconsolidationStresses[i].Coordinate.Y); - } - } - - private static void AssertLayers(MacroStabilityInwardsSoilLayerUnderSurfaceLine[] expectedLayers, UpliftVanSoilLayer[] actualLayers) - { - Assert.AreEqual(expectedLayers.Length, actualLayers.Length); - - for (var i = 0; i < expectedLayers.Length; i++) - { - Assert.AreEqual(expectedLayers[i].OuterRing, actualLayers[i].OuterRing); - CollectionAssert.AreEqual(expectedLayers[i].Holes, actualLayers[i].Holes); - - MacroStabilityInwardsSoilLayerPropertiesUnderSurfaceLine expectedProperties = expectedLayers[i].Properties; - Assert.AreEqual(expectedProperties.MaterialName, actualLayers[i].MaterialName); - Assert.AreEqual(expectedProperties.UsePop, actualLayers[i].UsePop); - Assert.AreEqual(expectedProperties.IsAquifer, actualLayers[i].IsAquifer); - - Assert.AreEqual(MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetAbovePhreaticLevel(expectedProperties).GetDesignValue(), actualLayers[i].AbovePhreaticLevel); - Assert.AreEqual(MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetBelowPhreaticLevel(expectedProperties).GetDesignValue(), actualLayers[i].BelowPhreaticLevel); - Assert.AreEqual(MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetCohesion(expectedProperties).GetDesignValue(), actualLayers[i].Cohesion); - Assert.AreEqual(MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetFrictionAngle(expectedProperties).GetDesignValue(), actualLayers[i].FrictionAngle); - Assert.AreEqual(MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetStrengthIncreaseExponent(expectedProperties).GetDesignValue(), actualLayers[i].StrengthIncreaseExponent); - Assert.AreEqual(MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetShearStrengthRatio(expectedProperties).GetDesignValue(), actualLayers[i].ShearStrengthRatio); - Assert.AreEqual(MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetPop(expectedProperties).GetDesignValue(), actualLayers[i].Pop); - } - } - private static Point2D[] CreateRing(int seed) { var random = new Random(seed); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs =================================================================== diff -u -r8cf507b4db04c91cd5bc5ed243616f093a3016da -rde60841b8ffece957b147fc7a35a93d2c1918f5f --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs (.../MacroStabilityInwardsCalculationServiceTest.cs) (revision 8cf507b4db04c91cd5bc5ed243616f093a3016da) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs (.../MacroStabilityInwardsCalculationServiceTest.cs) (revision de60841b8ffece957b147fc7a35a93d2c1918f5f) @@ -32,9 +32,9 @@ using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators; using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan.Input; using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan.Output; -using Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil; using Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Calculators; using Ringtoets.MacroStabilityInwards.Primitives; +using Ringtoets.MacroStabilityInwards.Service.TestUtil; namespace Ringtoets.MacroStabilityInwards.Service.Test { @@ -349,6 +349,7 @@ { UpliftVanCalculatorInput actualInput = factory.LastCreatedUpliftVanCalculator.Input; Assert.AreSame(originalInput.SoilProfileUnderSurfaceLine, actualInput.SoilProfile); + UpliftVanSoilProfileHelper.AssertSoilProfile(originalInput.SoilProfileUnderSurfaceLine, actualInput.UpliftVanSoilProfile); Assert.AreSame(originalInput.SurfaceLine, actualInput.SurfaceLine); Assert.AreEqual(originalInput.AssessmentLevel, actualInput.AssessmentLevel); Assert.AreEqual(originalInput.DikeSoilScenario, actualInput.DikeSoilScenario); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Ringtoets.MacroStabilityInwards.Service.Test.csproj =================================================================== diff -u -r3b20cfd37a7802163d500bbbe37d562a38ab3989 -rde60841b8ffece957b147fc7a35a93d2c1918f5f --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Ringtoets.MacroStabilityInwards.Service.Test.csproj (.../Ringtoets.MacroStabilityInwards.Service.Test.csproj) (revision 3b20cfd37a7802163d500bbbe37d562a38ab3989) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Ringtoets.MacroStabilityInwards.Service.Test.csproj (.../Ringtoets.MacroStabilityInwards.Service.Test.csproj) (revision de60841b8ffece957b147fc7a35a93d2c1918f5f) @@ -120,6 +120,10 @@ {1DF4EE8D-0EF5-4FCC-A40E-CB8B82080FDF} Ringtoets.MacroStabilityInwards.Primitives.TestUtil + + {F966AE28-DE6B-497A-8449-37EC607E9F69} + Ringtoets.MacroStabilityInwards.Service.TestUtil + Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.TestUtil/Ringtoets.MacroStabilityInwards.Service.TestUtil.csproj =================================================================== diff -u -radfc775e4b990fb99dcf901f70d8187a01fd4c59 -rde60841b8ffece957b147fc7a35a93d2c1918f5f --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.TestUtil/Ringtoets.MacroStabilityInwards.Service.TestUtil.csproj (.../Ringtoets.MacroStabilityInwards.Service.TestUtil.csproj) (revision adfc775e4b990fb99dcf901f70d8187a01fd4c59) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.TestUtil/Ringtoets.MacroStabilityInwards.Service.TestUtil.csproj (.../Ringtoets.MacroStabilityInwards.Service.TestUtil.csproj) (revision de60841b8ffece957b147fc7a35a93d2c1918f5f) @@ -38,6 +38,10 @@ pdbonly + + ..\..\..\..\packages\NUnit.3.8.1\lib\net40\nunit.framework.dll + True + @@ -47,12 +51,36 @@ Properties\GlobalAssembly.cs + Copying.licenseheader + + + + {3bbfd65b-b277-4e50-ae6d-bd24c3434609} + Core.Common.Base + + + {d4200f43-3f72-4f42-af0a-8ced416a38ec} + Ringtoets.Common.Data + + + {83D6B73E-91D5-46B0-9218-955DA1F75F7C} + Ringtoets.MacroStabilityInwards.Data + + + {3c0d3b38-a9f7-4b22-9705-513da26ae2cc} + Ringtoets.MacroStabilityInwards.KernelWrapper + + + {E9B39743-2DC9-4922-9E0F-6BA3E0E54189} + Ringtoets.MacroStabilityInwards.Primitives + + + + + + \ No newline at end of file