Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/XmlSoilProfile2DConverterTest.cs =================================================================== diff -u -r4539 -r6246 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/XmlSoilProfile2DConverterTest.cs (.../XmlSoilProfile2DConverterTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/XmlSoilProfile2DConverterTest.cs (.../XmlSoilProfile2DConverterTest.cs) (revision 6246) @@ -67,13 +67,15 @@ /// ------------------------------------------------------------- /// [Test] - public void Convert_WithValidArgument_ReturnsExpectedSoilProfile2D() + [TestCase(true, false)] + [TestCase(false, true)] + public void Convert_WithValidArgument_ReturnsExpectedSoilProfile2D(bool isLayerOneAquifer, bool isLayerTwoAquifer) { // Setup var layerOne = new SoilLayer2D { Name = "LayerOne", - IsAquifer = true, + IsAquifer = isLayerOneAquifer, GeometrySurface = new GeometrySurface(), WaterpressureInterpolationModel = WaterpressureInterpolationModel.Automatic }; @@ -85,7 +87,7 @@ var layerTwo = new SoilLayer2D { Name = "LayerTwo", - IsAquifer = false, + IsAquifer = isLayerTwoAquifer, GeometrySurface = new GeometrySurface(), WaterpressureInterpolationModel = WaterpressureInterpolationModel.Hydrostatic }; @@ -107,13 +109,16 @@ }; soilProfile.Surfaces.Add(layerOne); soilProfile.Surfaces.Add(layerTwo); - + // Call XMLSoilProfile2D convertedProfile = XmlSoilProfile2DConverter.Convert(soilProfile); - // Assert - Assert.That(convertedProfile.Name, Is.SameAs(soilProfile.Name)); - Assert.That(convertedProfile.PreconsolidationStresses, Is.Empty); // Don't do anything with preconsolidation stresses yet + Assert.Multiple(() => + { + // Assert + Assert.That(convertedProfile.Name, Is.SameAs(soilProfile.Name)); + Assert.That(convertedProfile.PreconsolidationStresses, Is.Empty); // Don't do anything with preconsolidation stresses yet + }); int nrOfExpectedSoilLayers = soilProfile.Surfaces.Count; Assert.That(convertedProfile.Layers2D, Has.Length.EqualTo(nrOfExpectedSoilLayers));