Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs =================================================================== diff -u -r1977 -r2032 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 1977) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 2032) @@ -204,7 +204,6 @@ [TestCase(FailureMechanismSystemType.StabilityOutside, 1)] [TestCase(FailureMechanismSystemType.Piping, 2)] [TestCase(FailureMechanismSystemType.HorizontalBalance, 3)] - [TestCase(FailureMechanismSystemType.WtiStabilityInside, 4)] public void CanConvertToInputFailureMechanismSystemType(FailureMechanismSystemType failureMechanismSystemType, int inputFailureMechanismSystemType) { Assert.AreEqual(inputFailureMechanismSystemType, ConversionHelper.ConvertToInputFailureMechanismSystemType(failureMechanismSystemType)); @@ -215,13 +214,32 @@ [TestCase(1, FailureMechanismSystemType.StabilityOutside)] [TestCase(2, FailureMechanismSystemType.Piping)] [TestCase(3, FailureMechanismSystemType.HorizontalBalance)] - [TestCase(4, FailureMechanismSystemType.WtiStabilityInside)] public void CanConvertToFailureMechanismSystemType(int inputFailureMechanismSystemType, FailureMechanismSystemType failureMechanismSystemType) { Assert.AreEqual(failureMechanismSystemType, ConversionHelper.ConvertToFailureMechanismSystemType(inputFailureMechanismSystemType)); } [Test] + [TestCase(MStabModelType.Bishop, InputStabilityModelType.Bishop)] + [TestCase(MStabModelType.UpliftVan, InputStabilityModelType.UpliftVan)] + [TestCase(MStabModelType.BishopUpliftVan, InputStabilityModelType.BishopUpliftVan)] + [TestCase(MStabModelType.UpliftVanWti, InputStabilityModelType.UpliftVanWti)] + public void CanConvertToInputStabilityModelType(MStabModelType mStabModelType, InputStabilityModelType inputStabilityModelType) + { + Assert.AreEqual(inputStabilityModelType, ConversionHelper.ConvertToInputStabilityModelType(mStabModelType)); + } + + [Test] + [TestCase(InputStabilityModelType.Bishop, MStabModelType.Bishop)] + [TestCase(InputStabilityModelType.UpliftVan, MStabModelType.UpliftVan)] + [TestCase(InputStabilityModelType.BishopUpliftVan, MStabModelType.BishopUpliftVan)] + [TestCase(InputStabilityModelType.UpliftVanWti, MStabModelType.UpliftVanWti)] + public void CanConvertToMStabModelType(InputStabilityModelType inputStabilityModelType, MStabModelType mStabModelType) + { + Assert.AreEqual(mStabModelType, ConversionHelper.ConvertToStabilityModelType(inputStabilityModelType)); + } + + [Test] [TestCase(AnalysisType.AdaptGeometry, InputAnalysisType.AdaptGeometry)] [TestCase(AnalysisType.NoAdaption, InputAnalysisType.NoAdaption)] public void CanConvertToInputAnalysisType(AnalysisType analysisType, InputAnalysisType inputAnalysisType) @@ -464,6 +482,7 @@ [TestCase(MStabModelType.BishopUpliftVan, ConversionHelper.MStabModelTypeBishopUpliftVan)] [TestCase(MStabModelType.SpencerHigh, ConversionHelper.MStabModelTypeSpencerHigh)] [TestCase(MStabModelType.SpencerLow, ConversionHelper.MStabModelTypeSpencerLow)] + [TestCase(MStabModelType.UpliftVanWti, ConversionHelper.MStabModelTypeUpliftVanWti)] public void CanConvertToOutputMStabModelType(MStabModelType mStabModelType, int outputMStabModelType) { Assert.AreEqual(outputMStabModelType, ConversionHelper.ConvertToOutputMStabModelType(mStabModelType)); @@ -480,6 +499,7 @@ [TestCase(ConversionHelper.MStabModelTypeBishopUpliftVan, MStabModelType.BishopUpliftVan)] [TestCase(ConversionHelper.MStabModelTypeSpencerHigh, MStabModelType.SpencerHigh)] [TestCase(ConversionHelper.MStabModelTypeSpencerLow, MStabModelType.SpencerLow)] + [TestCase(ConversionHelper.MStabModelTypeUpliftVanWti, MStabModelType.UpliftVanWti)] public void CanConvertToMStabModelType(int outputMStabModelType, MStabModelType mStabModelType) { Assert.AreEqual(mStabModelType, ConversionHelper.ConvertToMStabModelType(outputMStabModelType)); @@ -601,6 +621,7 @@ [TestCase(DesignResultStabilityDesignResultsStabilityModelType.Bishop, MStabModelType.Bishop)] [TestCase(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, MStabModelType.UpliftVan)] [TestCase(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, MStabModelType.BishopUpliftVan)] + [TestCase(DesignResultStabilityDesignResultsStabilityModelType.UpliftVanWti, MStabModelType.UpliftVanWti)] public void CanConvertToOutputStabilityModelType(DesignResultStabilityDesignResultsStabilityModelType outputStabilityModelType, MStabModelType stabilityModelType) { @@ -611,6 +632,7 @@ [TestCase(MStabModelType.Bishop, DesignResultStabilityDesignResultsStabilityModelType.Bishop)] [TestCase(MStabModelType.UpliftVan, DesignResultStabilityDesignResultsStabilityModelType.UpliftVan)] [TestCase(MStabModelType.BishopUpliftVan, DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan)] + [TestCase(MStabModelType.UpliftVanWti, DesignResultStabilityDesignResultsStabilityModelType.UpliftVanWti)] public void CanConvertToStabilityModelType(MStabModelType stabilityModelType, DesignResultStabilityDesignResultsStabilityModelType outputStabilityModelType) {