Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamFailureMechanismeCalculationSpecification.cs =================================================================== diff -u -r3526 -r3613 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamFailureMechanismeCalculationSpecification.cs (.../DamFailureMechanismeCalculationSpecification.cs) (revision 3526) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamFailureMechanismeCalculationSpecification.cs (.../DamFailureMechanismeCalculationSpecification.cs) (revision 3613) @@ -40,7 +40,7 @@ private PipingModelType pipingModelType = PipingModelType.Sellmeijer4Forces; private Enum calculationModel; private FailureMechanismeParamatersMStab failureMechanismeParamatersMStab; - private static DamProjectType damProjectType; + private static DamProjectType damProjectType; private Boolean firstTime = true; public DamFailureMechanismeCalculationSpecification() @@ -199,24 +199,23 @@ switch (property) { case "CalculationModel": - return (ConfigurationManager.Instance.GetAvailableMechanismModels(DamProjectType, failureMechanismSystemType)); + return ConfigurationManager.Instance.GetAvailableMechanismModels(DamProjectType, failureMechanismSystemType); case "PipingModelType": - return (ConfigurationManager.Instance.GetAvailableMechanismModels(DamProjectType, FailureMechanismSystemType.Piping)); + return ConfigurationManager.Instance.GetAvailableMechanismModels(DamProjectType, FailureMechanismSystemType.Piping); case "FailureMechanismSystemType": - return (ConfigurationManager.Instance.GetAvailableFailureMechanisms(DamProjectType)); + return ConfigurationManager.Instance.GetAvailableFailureMechanisms(DamProjectType); case "StabilityKernelType": - return (ConfigurationManager.Instance.GetAvailableFailureMechanisms(DamProjectType)); + return ConfigurationManager.Instance.GetAvailableFailureMechanisms(DamProjectType); default: return null; } } public bool IsEnabled(string property) { if (Equals(nameof(CalculationModel), property) - && (FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside - || FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside)) + && FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside) { - return false; // Disable model selection when stability is active, as only UpliftVan is currently supported. + return false; // Disable model selection when stability outside is active, as only UpliftVan is currently supported. } return true; Index: DamClients/DamUI/trunk/src/Dam/Tests/DamFailureMechanismeCalculationSpecificationTest.cs =================================================================== diff -u -r3527 -r3613 --- DamClients/DamUI/trunk/src/Dam/Tests/DamFailureMechanismeCalculationSpecificationTest.cs (.../DamFailureMechanismeCalculationSpecificationTest.cs) (revision 3527) +++ DamClients/DamUI/trunk/src/Dam/Tests/DamFailureMechanismeCalculationSpecificationTest.cs (.../DamFailureMechanismeCalculationSpecificationTest.cs) (revision 3613) @@ -28,10 +28,10 @@ public class DamFailureMechanismeCalculationSpecificationTest { [Test] - [TestCase(FailureMechanismSystemType.StabilityInside)] - [TestCase(FailureMechanismSystemType.StabilityOutside)] + [TestCase(FailureMechanismSystemType.StabilityInside, true)] + [TestCase(FailureMechanismSystemType.StabilityOutside, false)] public void GivenSpecificationWithStabilityModel_WhenIsEnabledCalledWithCalculationModel_ThenReturnsFalse( - FailureMechanismSystemType failureMechanism) + FailureMechanismSystemType failureMechanism, bool expectedIsEnabled) { // Given var specification = new DamFailureMechanismeCalculationSpecification @@ -43,7 +43,7 @@ bool isEnabled = specification.IsEnabled(nameof(specification.CalculationModel)); // Then - Assert.That(isEnabled, Is.False); + Assert.That(isEnabled, Is.EqualTo(expectedIsEnabled)); } [Test]