Index: DamClients/DamUI/trunk/src/Dam/Tests/DamProjectTest/DamProjectTestMSoilbaseRead.mdb =================================================================== diff -u -r2929 -r2945 Binary files differ Index: DamClients/DamUI/trunk/src/Dam/Tests/DamProjectTest.cs =================================================================== diff -u -r2929 -r2945 --- DamClients/DamUI/trunk/src/Dam/Tests/DamProjectTest.cs (.../DamProjectTest.cs) (revision 2929) +++ DamClients/DamUI/trunk/src/Dam/Tests/DamProjectTest.cs (.../DamProjectTest.cs) (revision 2945) @@ -115,8 +115,10 @@ Assert.AreEqual(mapName2, damProject.DamProjectData.WaterBoard.Dikes[2].MapForSoilGeometries2D); } } - [Test] - public void GivenMSoilbaseDatabaseWhenReadingSoilsThenCorrectParametersAreRead() + [TestCase("Alg-zand (0-30)", 20.0, 22.0, 1.0, 0.7)] + [TestCase("HW-DUN", 15.8, 16.8, 0.0, 0.8)] + [TestCase("HW-OBO", 10.0, 12.0, 1.0, 0.9)] + public void GivenMSoilbaseDatabaseWhenReadingSoilsThenCorrectParametersAreRead(string soilName, double abovePhreaticLevel, double belowPhreaticLevel, double rRatio, double strengthIncreaseExponent) { const double tolerance = 0.005; // Given MSoilbase Database @@ -125,13 +127,17 @@ { // When Reading Soils geoDatabase.ReUseSoils = true; - var soilList = geoDatabase.ReadSoils(null); + var soilList = new SoilList(); + soilList = geoDatabase.ReadSoils(soilList.Soils); // Then Correct Parameters Are Read Assert.AreEqual(4, soilList.Soils.Count); // 3 real soils and 1 undetermined soil - Soil soil = soilList.GetSoilByName("HW-DUN"); - Assert.AreEqual(15.80, soil.AbovePhreaticLevel, tolerance); - Assert.AreEqual(16.80, soil.BelowPhreaticLevel, tolerance); + Soil soil = soilList.GetSoilByName(soilName); + Assert.AreEqual(abovePhreaticLevel, soil.AbovePhreaticLevel, tolerance); + Assert.AreEqual(belowPhreaticLevel, soil.BelowPhreaticLevel, tolerance); + Assert.AreEqual(rRatio, soil.RRatio, tolerance); + Assert.AreEqual(strengthIncreaseExponent, soil.StrengthIncreaseExponent, tolerance); + } }