Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsSoilLayer2DCreateExtensionsTest.cs =================================================================== diff -u -r8ff26e0d7885f432a6e470e8d68ce325bdc6a9bc -rfe26eb5e452792f9c2ebd62a737a35642210d2f3 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsSoilLayer2DCreateExtensionsTest.cs (.../MacroStabilityInwardsSoilLayer2DCreateExtensionsTest.cs) (revision 8ff26e0d7885f432a6e470e8d68ce325bdc6a9bc) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsSoilLayer2DCreateExtensionsTest.cs (.../MacroStabilityInwardsSoilLayer2DCreateExtensionsTest.cs) (revision fe26eb5e452792f9c2ebd62a737a35642210d2f3) @@ -21,6 +21,7 @@ using System; using System.Drawing; +using System.Linq; using Application.Ringtoets.Storage.Create.MacroStabilityInwards; using Application.Ringtoets.Storage.DbContext; using Application.Ringtoets.Storage.Serializers; @@ -116,28 +117,13 @@ AssertHoles(soilLayer, entity); } - private static void AssertHoles(MacroStabilityInwardsSoilLayer2D soilLayer, MacroStabilityInwardsSoilLayerTwoDEntity entity) - { - string expectedHolesXml = new RingXmlSerializer().ToXml(soilLayer.Holes); - Assert.AreEqual(expectedHolesXml, entity.HolesXml); - } - - private static void AssertOuterRing(Ring outerRing, MacroStabilityInwardsSoilLayerTwoDEntity entity) - { - string expectedOuterRingXml = new Point2DXmlSerializer().ToXml(outerRing.Points); - Assert.AreEqual(expectedOuterRingXml, entity.OuterRingXml); - } - [Test] public void Create_WithNaNProperties_ReturnsEntityWithPropertiesSetToNull() { // Setup var random = new Random(31); - var soilLayer = new MacroStabilityInwardsSoilLayer2D(CreateRandomRing(random), new[] + var soilLayer = new MacroStabilityInwardsSoilLayer2D(CreateRandomRing(random), Enumerable.Empty()) { - CreateRandomRing(random) - }) - { Properties = { AbovePhreaticLevelMean = double.NaN, @@ -207,6 +193,18 @@ TestHelper.AssertAreEqualButNotSame(materialName, entity.MaterialName); } + private static void AssertHoles(MacroStabilityInwardsSoilLayer2D soilLayer, MacroStabilityInwardsSoilLayerTwoDEntity entity) + { + string expectedHolesXml = new RingXmlSerializer().ToXml(soilLayer.Holes); + Assert.AreEqual(expectedHolesXml, entity.HolesXml); + } + + private static void AssertOuterRing(Ring outerRing, MacroStabilityInwardsSoilLayerTwoDEntity entity) + { + string expectedOuterRingXml = new Point2DXmlSerializer().ToXml(outerRing.Points); + Assert.AreEqual(expectedOuterRingXml, entity.OuterRingXml); + } + private static Ring CreateRandomRing(Random random) { return new Ring(new[]