Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs =================================================================== diff -u -r3221 -r3307 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 3221) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 3307) @@ -70,37 +70,36 @@ #region ModelType [Test] //[TestCase(StabilityModelOption.Bishop, MStabModelType.BishopWti)] - [TestCase(StabilityModelOptionType.UpliftVan, MStabModelType.UpliftVanWti)] + [TestCase(StabilityModelOptionType.UpliftVan, MStabModelType.UpliftVan)] public void CanConvertToMStabModelType(StabilityModelOptionType modelOption, MStabModelType mStabModelType) { Assert.AreEqual(mStabModelType, ConversionHelper.ConvertToMStabModelType(modelOption)); } [Test] [TestCase(StabilityModelOptionType.Bishop, MStabModelType.BishopWti)] - [TestCase(StabilityModelOptionType.UpliftVan, MStabModelType.UpliftVanWti)] + [TestCase(StabilityModelOptionType.UpliftVan, MStabModelType.UpliftVan)] public void CanConvertToMStabModelTypeFromOutput(StabilityModelOptionType modelOption, MStabModelType mStabModelType) { Assert.AreEqual(mStabModelType, ConversionHelper.ConvertToMStabModelTypeFromOutput(modelOption)); } [Test] - [TestCase(MStabModelType.UpliftVanWti, StabilityModelOptionType.UpliftVan)] + [TestCase(MStabModelType.UpliftVan, StabilityModelOptionType.UpliftVan)] public void CanConvertToModelOptions(MStabModelType mStabModelType, StabilityModelOptionType modelOption) { Assert.AreEqual(modelOption, ConversionHelper.ConvertToModelOptions(mStabModelType)); } [Test] - [TestCase(MStabModelType.UpliftVanWti, StabilityModelOptionType.UpliftVan)] + [TestCase(MStabModelType.UpliftVan, StabilityModelOptionType.UpliftVan)] public void CanConvertToModelOptionsOutput(MStabModelType mStabModelType, StabilityModelOptionType modelOption) { Assert.AreEqual(modelOption, ConversionHelper.ConvertToModelOptionsOutput(mStabModelType)); } [ExpectedException(typeof(ArgumentException))] [TestCase(MStabModelType.Bishop)] - [TestCase(MStabModelType.UpliftVan)] [TestCase(MStabModelType.UpliftSpencer)] [TestCase(MStabModelType.SpencerLow)] [TestCase(MStabModelType.SpencerHigh)] @@ -118,7 +117,6 @@ [ExpectedException(typeof(ArgumentException))] [TestCase(MStabModelType.Bishop)] - [TestCase(MStabModelType.UpliftVan)] [TestCase(MStabModelType.UpliftSpencer)] [TestCase(MStabModelType.SpencerLow)] [TestCase(MStabModelType.SpencerHigh)]