Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs =================================================================== diff -u -r5662 -r5793 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 5662) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 5793) @@ -289,7 +289,6 @@ [Test] [TestCase(MStabSearchMethod.Grid, ConversionHelper.InputSearchMethodGrid)] - [TestCase(MStabSearchMethod.GeneticAlgorithm, ConversionHelper.InputSearchMethodGenetic)] [TestCase(MStabSearchMethod.BeeSwarm, ConversionHelper.InputSearchMethodBeeSwarm)] public void CanConvertToInputSearchMethod(MStabSearchMethod searchMethod, int inputSearchMethod) { @@ -298,7 +297,6 @@ [Test] [TestCase(ConversionHelper.InputSearchMethodGrid, MStabSearchMethod.Grid)] - [TestCase(ConversionHelper.InputSearchMethodGenetic, MStabSearchMethod.GeneticAlgorithm)] [TestCase(ConversionHelper.InputSearchMethodBeeSwarm, MStabSearchMethod.BeeSwarm)] public void CanConvertToSearchMethod(int inputSearchMethod, MStabSearchMethod searchMethod) { @@ -412,15 +410,8 @@ [Test] [TestCase(MStabModelType.Bishop, ConversionHelper.MStabModelTypeBishop)] - [TestCase(MStabModelType.Spencer, ConversionHelper.MStabModelTypeSpencer)] - [TestCase(MStabModelType.Fellenius, ConversionHelper.MStabModelTypeFellenius)] [TestCase(MStabModelType.UpliftVan, ConversionHelper.MStabModelTypeUpliftVan)] - [TestCase(MStabModelType.UpliftSpencer, ConversionHelper.MStabModelTypeUpliftSpencer)] - [TestCase(MStabModelType.BishopRandomField, ConversionHelper.MStabModelTypeBishopRandomField)] - [TestCase(MStabModelType.HorizontalBalance, ConversionHelper.MStabModelTypeHorizontalBalance)] [TestCase(MStabModelType.BishopUpliftVan, ConversionHelper.MStabModelTypeBishopUpliftVan)] - [TestCase(MStabModelType.SpencerHigh, ConversionHelper.MStabModelTypeSpencerHigh)] - [TestCase(MStabModelType.SpencerLow, ConversionHelper.MStabModelTypeSpencerLow)] [TestCase(MStabModelType.UpliftVan, ConversionHelper.MStabModelTypeUpliftVan)] public void CanConvertToOutputMStabModelType(MStabModelType mStabModelType, int outputMStabModelType) { @@ -429,15 +420,8 @@ [Test] [TestCase(ConversionHelper.MStabModelTypeBishop, MStabModelType.Bishop)] - [TestCase(ConversionHelper.MStabModelTypeSpencer, MStabModelType.Spencer)] - [TestCase(ConversionHelper.MStabModelTypeFellenius, MStabModelType.Fellenius)] [TestCase(ConversionHelper.MStabModelTypeUpliftVan, MStabModelType.UpliftVan)] - [TestCase(ConversionHelper.MStabModelTypeUpliftSpencer, MStabModelType.UpliftSpencer)] - [TestCase(ConversionHelper.MStabModelTypeBishopRandomField, MStabModelType.BishopRandomField)] - [TestCase(ConversionHelper.MStabModelTypeHorizontalBalance, MStabModelType.HorizontalBalance)] [TestCase(ConversionHelper.MStabModelTypeBishopUpliftVan, MStabModelType.BishopUpliftVan)] - [TestCase(ConversionHelper.MStabModelTypeSpencerHigh, MStabModelType.SpencerHigh)] - [TestCase(ConversionHelper.MStabModelTypeSpencerLow, MStabModelType.SpencerLow)] public void CanConvertToMStabModelType(int outputMStabModelType, MStabModelType mStabModelType) { Assert.That(ConversionHelper.ConvertToMStabModelType(outputMStabModelType), Is.EqualTo(mStabModelType));