Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs =================================================================== diff -u -r1156 -r1183 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 1156) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 1183) @@ -556,25 +556,25 @@ } [Test] - [TestCase(SoilType.Clay, LocationAssesmentRegionalOptionsDikeMaterialType.Clay)] - [TestCase(SoilType.Gravel, LocationAssesmentRegionalOptionsDikeMaterialType.Gravel)] - [TestCase(SoilType.Loam, LocationAssesmentRegionalOptionsDikeMaterialType.Loam)] - [TestCase(SoilType.Peat, LocationAssesmentRegionalOptionsDikeMaterialType.Peat)] - [TestCase(SoilType.Sand, LocationAssesmentRegionalOptionsDikeMaterialType.Sand)] - public void CanConvertToSoilType(LocationAssesmentRegionalOptionsDikeMaterialType dikeMaterialType, SoilType soilType) + [TestCase(ConversionHelper.SoilTypeClay, SoilType.Clay)] + [TestCase(ConversionHelper.SoilTypeGravel, SoilType.Gravel)] + [TestCase(ConversionHelper.SoilTypeLoam, SoilType.Loam)] + [TestCase(ConversionHelper.SoilTypePeat, SoilType.Peat)] + [TestCase(ConversionHelper.SoilTypeSand, SoilType.Sand)] + public void CanConvertToSoilType(int dikeSoilType, SoilType soilType) { - Assert.AreEqual(soilType, ConversionHelper.ConvertToSoilType(dikeMaterialType)); + Assert.AreEqual(soilType, ConversionHelper.ConvertToSoilType(dikeSoilType)); } [Test] - [TestCase(LocationAssesmentRegionalOptionsDikeMaterialType.Clay, SoilType.Clay)] - [TestCase(LocationAssesmentRegionalOptionsDikeMaterialType.Gravel, SoilType.Gravel)] - [TestCase(LocationAssesmentRegionalOptionsDikeMaterialType.Loam, SoilType.Loam)] - [TestCase(LocationAssesmentRegionalOptionsDikeMaterialType.Peat, SoilType.Peat)] - [TestCase(LocationAssesmentRegionalOptionsDikeMaterialType.Sand, SoilType.Sand)] - public void CanConvertToDikeMaterialType(SoilType soilType, LocationAssesmentRegionalOptionsDikeMaterialType dikeMaterialType) + [TestCase(SoilType.Clay, ConversionHelper.SoilTypeClay)] + [TestCase(SoilType.Gravel, ConversionHelper.SoilTypeGravel)] + [TestCase(SoilType.Loam, ConversionHelper.SoilTypeLoam)] + [TestCase(SoilType.Peat, ConversionHelper.SoilTypePeat)] + [TestCase(SoilType.Sand, ConversionHelper.SoilTypeSand)] + public void CanConvertToDikeMaterialType(SoilType soilType, int dikeSoilType) { - Assert.AreEqual(dikeMaterialType, ConversionHelper.ConvertToInputSoilType(soilType)); + Assert.AreEqual(dikeSoilType, ConversionHelper.ConvertToInputSoilType(soilType)); } } }