Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs =================================================================== diff -u -r4201 -r4202 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 4201) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 4202) @@ -1251,7 +1251,6 @@ private static SoilList CreateSoilList(IEnumerable soilNames) { - var random = new Random(21); var soilList = new SoilList { AquiferDictionary = new Dictionary() @@ -1264,9 +1263,6 @@ Name = soilName }; soilList.Add(soilToBeAdded); - - var isAquifer = Convert.ToBoolean(random.Next(0, 2)); - soilList.AquiferDictionary.Add(soilToBeAdded, isAquifer); } return soilList; Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/StiImporter/SoilProfile2DImporterTest.cs =================================================================== diff -u -r4070 -r4202 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/StiImporter/SoilProfile2DImporterTest.cs (.../SoilProfile2DImporterTest.cs) (revision 4070) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/StiImporter/SoilProfile2DImporterTest.cs (.../SoilProfile2DImporterTest.cs) (revision 4202) @@ -105,7 +105,7 @@ "Soft Clay", "Muck" }, soilProfileOne.Surfaces.Select(s => s.Name)); - AssertSoilLayerProperties(availableSoils, soilProfileOne.Surfaces); + AssertSoilLayerProperties(soilProfileOne.Surfaces); SoilProfile2D soilProfileTwo = soilProfiles.ElementAt(1); Assert.That(soilProfileTwo.Name, Is.EqualTo(profileTwoName)); @@ -116,7 +116,7 @@ "Peat", "Soft Clay" }, soilProfileTwo.Surfaces.Select(s => s.Name)); // Check only whether all the surfaces are present as the order differs on different machines. - AssertSoilLayerProperties(availableSoils, soilProfileTwo.Surfaces); + AssertSoilLayerProperties(soilProfileTwo.Surfaces); } [Test] @@ -151,7 +151,7 @@ "Soft Clay", "Muck" }, soilProfileOne.Surfaces.Select(s => s.Name)); - AssertSoilLayerProperties(availableSoils, soilProfileOne.Surfaces); + AssertSoilLayerProperties(soilProfileOne.Surfaces); SoilProfile2D soilProfileTwo = soilProfiles.ElementAt(1); Assert.That(soilProfileTwo.Name, Is.EqualTo(profileTwoFileName)); @@ -162,7 +162,7 @@ "Peat", "Soft Clay" }, soilProfileTwo.Surfaces.Select(s => s.Name)); // Check only whether all the surfaces are present as the order differs on different machines. - AssertSoilLayerProperties(availableSoils, soilProfileTwo.Surfaces); + AssertSoilLayerProperties(soilProfileTwo.Surfaces); } [Test] @@ -229,20 +229,16 @@ return segment; } - private static void AssertSoilLayerProperties(SoilList soils, IEnumerable soilLayers) + private static void AssertSoilLayerProperties(IEnumerable soilLayers) { foreach (SoilLayer2D soilLayer in soilLayers) { - Soil soil = soils.Soils.Single(s => string.Equals(s.Name, soilLayer.Name)); - bool expectedIsAquifer = soils.AquiferDictionary[soil]; - Assert.That(soilLayer.IsAquifer, Is.EqualTo(expectedIsAquifer)); Assert.That(soilLayer.WaterpressureInterpolationModel, Is.EqualTo(GeotechnicsWaterPressureInterpolationModel.Hydrostatic)); } } private static SoilList CreateSoilList(IEnumerable soilNames) { - var random = new Random(21); var soilList = new SoilList { AquiferDictionary = new Dictionary() @@ -255,9 +251,6 @@ Name = soilName }; soilList.Add(soilToBeAdded); - - var isAquifer = Convert.ToBoolean(random.Next(0, 2)); - soilList.AquiferDictionary.Add(soilToBeAdded, isAquifer); } return soilList;