Index: dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs =================================================================== diff -u -r578 -r580 --- dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 578) +++ dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 580) @@ -183,37 +183,39 @@ } [Test] - [TestCase(SoilProfileType.ProfileType1D, SegmentSoilGeometryProbabilitySoilGeometryType.SoilGeometry1D)] - [TestCase(SoilProfileType.ProfileType2D, SegmentSoilGeometryProbabilitySoilGeometryType.SoilGeometry2D)] - public void CanConvertToInputSoilGeometryType(SoilProfileType soilProfileType, SegmentSoilGeometryProbabilitySoilGeometryType inputSoilGeometryType) + [TestCase(SoilProfileType.ProfileType1D, 0)] + [TestCase(SoilProfileType.ProfileType2D, 1)] + [TestCase(SoilProfileType.ProfileTypeStiFile, 2)] + public void CanConvertToInputSoilGeometryType(SoilProfileType soilProfileType, int inputSoilGeometryType) { Assert.AreEqual(inputSoilGeometryType, ConversionHelper.ConvertToInputSoilGeometryType(soilProfileType)); } [Test] - [TestCase(SegmentSoilGeometryProbabilitySoilGeometryType.SoilGeometry1D, SoilProfileType.ProfileType1D)] - [TestCase(SegmentSoilGeometryProbabilitySoilGeometryType.SoilGeometry2D, SoilProfileType.ProfileType2D)] - public void CanConvertToSoilGeometryType(SegmentSoilGeometryProbabilitySoilGeometryType inputSoilGeometryType, SoilProfileType soilProfileType) + [TestCase(0, SoilProfileType.ProfileType1D)] + [TestCase(1, SoilProfileType.ProfileType2D)] + [TestCase(2, SoilProfileType.ProfileTypeStiFile)] + public void CanConvertToSoilGeometryType(int inputSoilGeometryType, SoilProfileType soilProfileType) { Assert.AreEqual(soilProfileType, ConversionHelper.ConvertToSoilGeometryType(inputSoilGeometryType)); } [Test] - [TestCase(SegmentSoilGeometryProbabilityFailureMechanismSystemType.StabilityInside, FailureMechanismSystemType.StabilityInside)] - [TestCase(SegmentSoilGeometryProbabilityFailureMechanismSystemType.StabilityOutside, FailureMechanismSystemType.StabilityOutside)] - [TestCase(SegmentSoilGeometryProbabilityFailureMechanismSystemType.Piping, FailureMechanismSystemType.Piping)] - [TestCase(SegmentSoilGeometryProbabilityFailureMechanismSystemType.HorizontalBalance, FailureMechanismSystemType.HorizontalBalance)] - public void CanConvertToInputFailureMechanismSystemType(FailureMechanismSystemType failureMechanismSystemType, SegmentSoilGeometryProbabilityFailureMechanismSystemType inputFailureMechanismSystemType) + [TestCase(0, FailureMechanismSystemType.StabilityInside)] + [TestCase(1, FailureMechanismSystemType.StabilityOutside)] + [TestCase(2, FailureMechanismSystemType.Piping)] + [TestCase(3, FailureMechanismSystemType.HorizontalBalance)] + public void CanConvertToInputFailureMechanismSystemType(FailureMechanismSystemType failureMechanismSystemType, int inputFailureMechanismSystemType) { Assert.AreEqual(inputFailureMechanismSystemType, ConversionHelper.ConvertToInputFailureMechanismSystemType(failureMechanismSystemType)); } [Test] - [TestCase(FailureMechanismSystemType.StabilityInside, SegmentSoilGeometryProbabilityFailureMechanismSystemType.StabilityInside)] - [TestCase(FailureMechanismSystemType.StabilityOutside, SegmentSoilGeometryProbabilityFailureMechanismSystemType.StabilityOutside)] - [TestCase(FailureMechanismSystemType.Piping, SegmentSoilGeometryProbabilityFailureMechanismSystemType.Piping)] - [TestCase(FailureMechanismSystemType.HorizontalBalance, SegmentSoilGeometryProbabilityFailureMechanismSystemType.HorizontalBalance)] - public void CanConvertToFailureMechanismSystemType(SegmentSoilGeometryProbabilityFailureMechanismSystemType inputFailureMechanismSystemType, FailureMechanismSystemType failureMechanismSystemType) + [TestCase(FailureMechanismSystemType.StabilityInside, 0)] + [TestCase(FailureMechanismSystemType.StabilityOutside, 1)] + [TestCase(FailureMechanismSystemType.Piping, 2)] + [TestCase(FailureMechanismSystemType.HorizontalBalance, 3)] + public void CanConvertToFailureMechanismSystemType(int inputFailureMechanismSystemType, FailureMechanismSystemType failureMechanismSystemType) { Assert.AreEqual(inputFailureMechanismSystemType, ConversionHelper.ConvertToInputFailureMechanismSystemType(failureMechanismSystemType)); }