Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/FillDomainFromXmlCalculationParametersTests.cs =================================================================== diff -u -r5844 -r6263 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/FillDomainFromXmlCalculationParametersTests.cs (.../FillDomainFromXmlCalculationParametersTests.cs) (revision 5844) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/FillDomainFromXmlCalculationParametersTests.cs (.../FillDomainFromXmlCalculationParametersTests.cs) (revision 6263) @@ -25,6 +25,7 @@ using Deltares.DamLive.Data; using KellermanSoftware.CompareNetObjects; using NUnit.Framework; +using StabilitySearchMethod = Deltares.Dam.Data.StabilitySearchMethod; namespace Deltares.DamLive.Tests; @@ -34,10 +35,10 @@ [Test] [TestCase(FailureMechanismSystemType.Piping, PipingModelType.Bligh)] [TestCase(FailureMechanismSystemType.Piping, PipingModelType.Wti2017)] - [TestCase(FailureMechanismSystemType.StabilityOutside, PipingModelType.Bligh, MStabModelType.Bishop, MStabSearchMethod.Grid)] - [TestCase(FailureMechanismSystemType.StabilityInside, PipingModelType.Bligh, MStabModelType.UpliftVan, MStabSearchMethod.Grid)] - [TestCase(FailureMechanismSystemType.StabilityInside, PipingModelType.Bligh, MStabModelType.UpliftVan, MStabSearchMethod.BeeSwarm)] - public void CanWriteAndReadCalculationParametersDataToXml(FailureMechanismSystemType mechanismType, PipingModelType pipingModel = PipingModelType.Bligh, MStabModelType stabModel = MStabModelType.Bishop, MStabSearchMethod searchMethod = MStabSearchMethod.Grid) + [TestCase(FailureMechanismSystemType.StabilityOutside, PipingModelType.Bligh, StabilityModelType.Bishop, StabilitySearchMethod.Grid)] + [TestCase(FailureMechanismSystemType.StabilityInside, PipingModelType.Bligh, StabilityModelType.UpliftVan, StabilitySearchMethod.Grid)] + [TestCase(FailureMechanismSystemType.StabilityInside, PipingModelType.Bligh, StabilityModelType.UpliftVan, StabilitySearchMethod.BeeSwarm)] + public void CanWriteAndReadCalculationParametersDataToXml(FailureMechanismSystemType mechanismType, PipingModelType pipingModel = PipingModelType.Bligh, StabilityModelType stabModel = StabilityModelType.Bishop, StabilitySearchMethod searchMethod = StabilitySearchMethod.Grid) { const string filename = "CalculationParameters.xml"; CalculationParameters expectedData = CreateExampleCalculationParameters(mechanismType, pipingModel, stabModel, searchMethod); @@ -52,7 +53,7 @@ CompareCalculationParametersData(actualData, expectedData); } - private static CalculationParameters CreateExampleCalculationParameters(FailureMechanismSystemType mechanismType, PipingModelType pipingModel, MStabModelType stabModel, MStabSearchMethod searchMethod) + private static CalculationParameters CreateExampleCalculationParameters(FailureMechanismSystemType mechanismType, PipingModelType pipingModel, StabilityModelType stabModel, StabilitySearchMethod searchMethod) { var calculationModules = new CalculationModules {