Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/PlLinesToWaternetConverterTests.cs =================================================================== diff -u -r4988 -r4989 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/PlLinesToWaternetConverterTests.cs (.../PlLinesToWaternetConverterTests.cs) (revision 4988) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/PlLinesToWaternetConverterTests.cs (.../PlLinesToWaternetConverterTests.cs) (revision 4989) @@ -172,44 +172,59 @@ if (pressureType != IntrusionVerticalWaterPressureType.FullHydroStatic) { - // expected: waternet line connected to pl3 has level -6.111 - Assert.That(waternetLinePl3.HeadLine.Name, Is.EqualTo("Head line 3 (PL 3)")); - Assert.That(waternetLinePl3.Points, Has.Count.EqualTo(2)); - Assert.That(waternetLinePl3.Points[0].Z, Is.EqualTo(-6.111).Within(precision3Decimals)); + Assert.Multiple(() => + { + // expected: waternet line connected to pl3 has level -6.111 + Assert.That(waternetLinePl3.HeadLine.Name, Is.EqualTo("Head line 3 (PL 3)")); + Assert.That(waternetLinePl3.Points, Has.Count.EqualTo(2)); + }); + Assert.Multiple(() => + { + Assert.That(waternetLinePl3.Points[0].Z, Is.EqualTo(-6.111).Within(precision3Decimals)); - // expected: highest waternet line connected to pl4 has level between -2.111 and -3.373 - Assert.That(waternetLinePl4Top.HeadLine.Name, Is.EqualTo("Head line 4 (PL 4)")); - Assert.That(waternetLinePl4Top.Points, Has.Count.EqualTo(5)); - Assert.That(waternetLinePl4Top.Points[0].X, Is.EqualTo(0).Within(precision3Decimals)); - Assert.That(waternetLinePl4Top.Points[0].Z, Is.EqualTo(-2.111).Within(precision3Decimals)); - Assert.That(waternetLinePl4Top.Points[1].X, Is.EqualTo(100).Within(precision3Decimals)); - Assert.That(waternetLinePl4Top.Points[1].Z, Is.EqualTo(-2.111).Within(precision3Decimals)); - Assert.That(waternetLinePl4Top.Points[2].X, Is.EqualTo(100).Within(precision3Decimals)); - Assert.That(waternetLinePl4Top.Points[2].Z, Is.EqualTo(-3.373).Within(precision3Decimals)); - Assert.That(waternetLinePl4Top.Points[3].X, Is.EqualTo(0).Within(precision3Decimals)); - Assert.That(waternetLinePl4Top.Points[3].Z, Is.EqualTo(-3.373).Within(precision3Decimals)); - Assert.That(waternetLinePl4Top.Points[4].X, Is.EqualTo(0).Within(precision3Decimals)); - Assert.That(waternetLinePl4Top.Points[4].Z, Is.EqualTo(-2.111).Within(precision3Decimals)); + // expected: highest waternet line connected to pl4 has level between -2.111 and -3.373 + Assert.That(waternetLinePl4Top.HeadLine.Name, Is.EqualTo("Head line 4 (PL 4)")); + Assert.That(waternetLinePl4Top.Points, Has.Count.EqualTo(5)); + }); + Assert.Multiple(() => + { + Assert.That(waternetLinePl4Top.Points[0].X, Is.EqualTo(0).Within(precision3Decimals)); + Assert.That(waternetLinePl4Top.Points[0].Z, Is.EqualTo(-2.111).Within(precision3Decimals)); + Assert.That(waternetLinePl4Top.Points[1].X, Is.EqualTo(100).Within(precision3Decimals)); + Assert.That(waternetLinePl4Top.Points[1].Z, Is.EqualTo(-2.111).Within(precision3Decimals)); + Assert.That(waternetLinePl4Top.Points[2].X, Is.EqualTo(100).Within(precision3Decimals)); + Assert.That(waternetLinePl4Top.Points[2].Z, Is.EqualTo(-3.373).Within(precision3Decimals)); + Assert.That(waternetLinePl4Top.Points[3].X, Is.EqualTo(0).Within(precision3Decimals)); + Assert.That(waternetLinePl4Top.Points[3].Z, Is.EqualTo(-3.373).Within(precision3Decimals)); + Assert.That(waternetLinePl4Top.Points[4].X, Is.EqualTo(0).Within(precision3Decimals)); + Assert.That(waternetLinePl4Top.Points[4].Z, Is.EqualTo(-2.111).Within(precision3Decimals)); - // expected: lowest waternet line 4 connected to pl4 has level between -4.151 and -5.373 - Assert.That(waternetLinePl4Bottom.HeadLine.Name, Is.EqualTo("Head line 4 (PL 4)")); - Assert.That(waternetLinePl4Bottom.Points, Has.Count.EqualTo(5)); - Assert.That(waternetLinePl4Bottom.Points[0].X, Is.EqualTo(0).Within(precision3Decimals)); - Assert.That(waternetLinePl4Bottom.Points[0].Z, Is.EqualTo(-4.151).Within(precision3Decimals)); - Assert.That(waternetLinePl4Bottom.Points[1].X, Is.EqualTo(100).Within(precision3Decimals)); - Assert.That(waternetLinePl4Bottom.Points[1].Z, Is.EqualTo(-4.151).Within(precision3Decimals)); - Assert.That(waternetLinePl4Bottom.Points[2].X, Is.EqualTo(100).Within(precision3Decimals)); - Assert.That(waternetLinePl4Bottom.Points[2].Z, Is.EqualTo(-5.373).Within(precision3Decimals)); - Assert.That(waternetLinePl4Bottom.Points[3].X, Is.EqualTo(0).Within(precision3Decimals)); - Assert.That(waternetLinePl4Bottom.Points[3].Z, Is.EqualTo(-5.373).Within(precision3Decimals)); - Assert.That(waternetLinePl4Bottom.Points[4].X, Is.EqualTo(0).Within(precision3Decimals)); - Assert.That(waternetLinePl4Bottom.Points[4].Z, Is.EqualTo(-4.151).Within(precision3Decimals)); + // expected: lowest waternet line 4 connected to pl4 has level between -4.151 and -5.373 + Assert.That(waternetLinePl4Bottom.HeadLine.Name, Is.EqualTo("Head line 4 (PL 4)")); + Assert.That(waternetLinePl4Bottom.Points, Has.Count.EqualTo(5)); + }); + Assert.Multiple(() => + { + Assert.That(waternetLinePl4Bottom.Points[0].X, Is.EqualTo(0).Within(precision3Decimals)); + Assert.That(waternetLinePl4Bottom.Points[0].Z, Is.EqualTo(-4.151).Within(precision3Decimals)); + Assert.That(waternetLinePl4Bottom.Points[1].X, Is.EqualTo(100).Within(precision3Decimals)); + Assert.That(waternetLinePl4Bottom.Points[1].Z, Is.EqualTo(-4.151).Within(precision3Decimals)); + Assert.That(waternetLinePl4Bottom.Points[2].X, Is.EqualTo(100).Within(precision3Decimals)); + Assert.That(waternetLinePl4Bottom.Points[2].Z, Is.EqualTo(-5.373).Within(precision3Decimals)); + Assert.That(waternetLinePl4Bottom.Points[3].X, Is.EqualTo(0).Within(precision3Decimals)); + Assert.That(waternetLinePl4Bottom.Points[3].Z, Is.EqualTo(-5.373).Within(precision3Decimals)); + Assert.That(waternetLinePl4Bottom.Points[4].X, Is.EqualTo(0).Within(precision3Decimals)); + Assert.That(waternetLinePl4Bottom.Points[4].Z, Is.EqualTo(-4.151).Within(precision3Decimals)); + }); } else { - Assert.That(waternetLinePl3, Is.Null); - Assert.That(waternetLinePl4Top, Is.Null); - Assert.That(waternetLinePl4Bottom, Is.Null); + Assert.Multiple(() => + { + Assert.That(waternetLinePl3, Is.Null); + Assert.That(waternetLinePl4Top, Is.Null); + Assert.That(waternetLinePl4Bottom, Is.Null); + }); } } @@ -1152,8 +1167,11 @@ // Assert AssertGeometry(plLines.Lines[PlLineType.Pl1].Points, waternet.PhreaticLine.Points); - Assert.That(waternet.HeadLineList, Has.Count.EqualTo(0)); - Assert.That(waternet.WaternetLineList, Has.Count.EqualTo(1)); + Assert.Multiple(() => + { + Assert.That(waternet.HeadLineList, Has.Count.EqualTo(0)); + Assert.That(waternet.WaternetLineList, Has.Count.EqualTo(1)); + }); Assert.That(waternet.WaternetLineList[0].HeadLine.Name, Is.SameAs(waternet.PhreaticLine.Name)); }