Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs =================================================================== diff -u -r2947 -r2948 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs (.../MacroStabilityIoTests.cs) (revision 2947) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs (.../MacroStabilityIoTests.cs) (revision 2948) @@ -134,33 +134,58 @@ return upliftVanCalculationGrid; } - private Data.Geometry.Waternet CreateExampleWaternet() + private static Waternet CreateExampleWaternet() { - var waterNet = new Data.Geometry.Waternet() + var waterNet = new Waternet { IsGenerated = false, UnitWeight = 9.81, Name = "Test Waternet", }; - var phreaticLine = new Data.Geometry.PhreaticLine() + + var random = new Random(21); + var phreaticLine = new PhreaticLine { Name = "Test Phreatic line" }; waterNet.PhreaticLine = phreaticLine; - var headLine = new HeadLine() + SetGeometry(phreaticLine, random.Next()); + + // Head line + const int nrOfHeadLines = 10; + for (int i = 0; i < nrOfHeadLines; i++) { - Name = "Test Head line" - }; - waterNet.HeadLineList.Add(headLine); - var waternetLine = new Data.Geometry.WaternetLine() + var headLine = new HeadLine + { + Name = $"Test Head line{i}" + }; + SetGeometry(headLine, random.Next()); + waterNet.HeadLineList.Add(headLine); + } + + // Waternet line + for (int i = 0; i < nrOfHeadLines; i++) { - Name = "Test waternet line", - HeadLine = headLine - }; - waterNet.WaternetLineList.Add(waternetLine); + var waternetLine = new WaternetLine + { + Name = $"Test Waternet line {i}", + HeadLine = waterNet.HeadLineList[i] + }; + SetGeometry(waternetLine, random.Next()); + waterNet.WaternetLineList.Add(waternetLine); + } + return waterNet; } + private static void SetGeometry(GeometryPointString geometry, int seed) + { + var random = new Random(seed); + for (int i = 0; i < 10; i++) + { + geometry.CalcPoints.Add(new Point2D(random.NextDouble(), random.NextDouble())); + } + } private void CompareTrafficLoad(TrafficLoad expectedTrafficLoad, TrafficLoad actualTrafficLoad) { @@ -202,11 +227,7 @@ { Assert.AreEqual(expectedWaternet.Name, actualWaternet.Name); CompareLine(expectedWaternet.PhreaticLine, actualWaternet.PhreaticLine); - - // Head Lines CompareWaternetHeadLines(expectedWaternet.HeadLineList, actualWaternet.HeadLineList); - - // Waternet lines CompareWaternetLines(actualWaternet.WaternetLineList, expectedWaternet.WaternetLineList); }