Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/FileImporters/ClosingStructuresFailureMechanismSectionResultUpdateStrategyTest.cs =================================================================== diff -u -r8f0bae62debe2a50e9151a7b10f76b6b2a1aba6c -r6b3753a9bfc048980b06342b163783b28c2d8a24 --- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/FileImporters/ClosingStructuresFailureMechanismSectionResultUpdateStrategyTest.cs (.../ClosingStructuresFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 8f0bae62debe2a50e9151a7b10f76b6b2a1aba6c) +++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/FileImporters/ClosingStructuresFailureMechanismSectionResultUpdateStrategyTest.cs (.../ClosingStructuresFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 6b3753a9bfc048980b06342b163783b28c2d8a24) @@ -75,7 +75,7 @@ return new AdoptableFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { IsRelevant = true, - InitialFailureMechanismResult = InitialFailureMechanismResultType.Manual, + InitialFailureMechanismResult = AdoptableInitialFailureMechanismResultType.Manual, ManualInitialFailureMechanismResultSectionProbability = random.NextDouble(), FurtherAnalysisNeeded = true, RefinedSectionProbability = random.NextDouble() Index: Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/FailureMechanismSectionAssemblyGroupFactory.cs =================================================================== diff -u -rab47f86cd7c7b00f8ebf38bbbe3f657c3afaf456 -r6b3753a9bfc048980b06342b163783b28c2d8a24 --- Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/FailureMechanismSectionAssemblyGroupFactory.cs (.../FailureMechanismSectionAssemblyGroupFactory.cs) (revision ab47f86cd7c7b00f8ebf38bbbe3f657c3afaf456) +++ Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/FailureMechanismSectionAssemblyGroupFactory.cs (.../FailureMechanismSectionAssemblyGroupFactory.cs) (revision 6b3753a9bfc048980b06342b163783b28c2d8a24) @@ -42,7 +42,7 @@ /// /// The the section belongs to. /// The indicator whether the section is relevant. - /// The of the section. + /// The of the section. /// The initial probability for the section. /// The indicator whether the section needs further analysis. /// The refined probability for the section. @@ -51,19 +51,19 @@ /// Thrown when the section could not be successfully assembled. public static FailureMechanismSectionAssemblyResult AssembleSection( IAssessmentSection assessmentSection, - bool isRelevant, InitialFailureMechanismResultType initialFailureMechanismResultType, + bool isRelevant, AdoptableInitialFailureMechanismResultType initialFailureMechanismResultType, double initialSectionProbability, bool furtherAnalysisNeeded, double refinedSectionProbability) { if (assessmentSection == null) { throw new ArgumentNullException(nameof(assessmentSection)); } - if (!Enum.IsDefined(typeof(InitialFailureMechanismResultType), initialFailureMechanismResultType)) + if (!Enum.IsDefined(typeof(AdoptableInitialFailureMechanismResultType), initialFailureMechanismResultType)) { throw new InvalidEnumArgumentException(nameof(initialFailureMechanismResultType), (int) initialFailureMechanismResultType, - typeof(InitialFailureMechanismResultType)); + typeof(AdoptableInitialFailureMechanismResultType)); } FailureMechanismSectionAssemblyInput input = CreateInput( @@ -79,7 +79,7 @@ /// /// The the section belongs to. /// The indicator whether the section is relevant. - /// The of the section. + /// The of the section. /// The initial probability for the profile. /// The initial probability for the section. /// The indicator whether the section needs further analysis. @@ -94,7 +94,7 @@ /// Thrown when the section could not be successfully assembled. public static FailureMechanismSectionAssemblyResult AssembleSection( IAssessmentSection assessmentSection, - bool isRelevant, InitialFailureMechanismResultType initialFailureMechanismResultType, + bool isRelevant, AdoptableInitialFailureMechanismResultType initialFailureMechanismResultType, double initialProfileProbability, double initialSectionProbability, bool furtherAnalysisNeeded, double refinedProfileProbability, double refinedSectionProbability, @@ -110,11 +110,11 @@ throw new ArgumentNullException(nameof(getNFunc)); } - if (!Enum.IsDefined(typeof(InitialFailureMechanismResultType), initialFailureMechanismResultType)) + if (!Enum.IsDefined(typeof(AdoptableInitialFailureMechanismResultType), initialFailureMechanismResultType)) { throw new InvalidEnumArgumentException(nameof(initialFailureMechanismResultType), (int) initialFailureMechanismResultType, - typeof(InitialFailureMechanismResultType)); + typeof(AdoptableInitialFailureMechanismResultType)); } if (!Enum.IsDefined(typeof(ProbabilityRefinementType), probabilityRefinementType)) @@ -148,7 +148,7 @@ } private static FailureMechanismSectionAssemblyInput CreateInput(IAssessmentSection assessmentSection, - bool isRelevant, InitialFailureMechanismResultType initialFailureMechanismResultType, + bool isRelevant, AdoptableInitialFailureMechanismResultType initialFailureMechanismResultType, double initialProfileProbability, double initialSectionProbability, bool furtherAnalysisNeeded, double refinedProfileProbability, double refinedSectionProbability, @@ -172,13 +172,13 @@ } private static FailureMechanismSectionAssemblyInput CreateInput(IAssessmentSection assessmentSection, - bool isRelevant, InitialFailureMechanismResultType initialFailureMechanismResultType, + bool isRelevant, AdoptableInitialFailureMechanismResultType initialFailureMechanismResultType, double initialProfileProbability, double initialSectionProbability, bool furtherAnalysisNeeded, double refinedProfileProbability, double refinedSectionProbability) { FailureMechanismContribution failureMechanismContribution = assessmentSection.FailureMechanismContribution; - bool hasProbabilitySpecified = initialFailureMechanismResultType != InitialFailureMechanismResultType.NoFailureProbability; + bool hasProbabilitySpecified = initialFailureMechanismResultType != AdoptableInitialFailureMechanismResultType.NoFailureProbability; return new FailureMechanismSectionAssemblyInput( failureMechanismContribution.LowerLimitNorm, failureMechanismContribution.SignalingNorm, Index: Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/AdoptableFailureMechanismSectionResult.cs =================================================================== diff -u -re696050dcb37fb80db692f88a8263640e61cd335 -r6b3753a9bfc048980b06342b163783b28c2d8a24 --- Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/AdoptableFailureMechanismSectionResult.cs (.../AdoptableFailureMechanismSectionResult.cs) (revision e696050dcb37fb80db692f88a8263640e61cd335) +++ Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/AdoptableFailureMechanismSectionResult.cs (.../AdoptableFailureMechanismSectionResult.cs) (revision 6b3753a9bfc048980b06342b163783b28c2d8a24) @@ -22,7 +22,8 @@ namespace Riskeer.Common.Data.FailureMechanism { /// - /// Class that holds the information of the result of the and is adoptable. + /// Class that holds the information of the result of the + /// with an . /// public class AdoptableFailureMechanismSectionResult : FailureMechanismSectionResult { @@ -32,12 +33,12 @@ /// public AdoptableFailureMechanismSectionResult(FailureMechanismSection section) : base(section) { - InitialFailureMechanismResult = InitialFailureMechanismResultType.Adopt; + InitialFailureMechanismResult = AdoptableInitialFailureMechanismResultType.Adopt; } /// - /// Gets or sets the initial failure mechanism result. + /// Gets or sets the adoptable initial failure mechanism result. /// - public InitialFailureMechanismResultType InitialFailureMechanismResult { get; set; } + public AdoptableInitialFailureMechanismResultType InitialFailureMechanismResult { get; set; } } } \ No newline at end of file Index: Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/AdoptableInitialFailureMechanismResultType.cs =================================================================== diff -u --- Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/AdoptableInitialFailureMechanismResultType.cs (revision 0) +++ Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/AdoptableInitialFailureMechanismResultType.cs (revision 6b3753a9bfc048980b06342b163783b28c2d8a24) @@ -0,0 +1,50 @@ +// Copyright (C) Stichting Deltares 2021. All rights reserved. +// +// This file is part of Riskeer. +// +// Riskeer is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using Core.Common.Util.Attributes; +using Riskeer.Common.Data.Properties; + +namespace Riskeer.Common.Data.FailureMechanism +{ + /// + /// Specifies the types of the adoptable initial failure mechanism result. + /// + public enum AdoptableInitialFailureMechanismResultType + { + /// + /// Adopt the result from the failure mechanism. + /// + [ResourcesDisplayName(typeof(Resources), nameof(Resources.InitialFailureMechanismResultType_Adopt_DisplayName))] + Adopt = 1, + + /// + /// Manually fill in the result. + /// + [ResourcesDisplayName(typeof(Resources), nameof(Resources.InitialFailureMechanismResultType_Manual_DisplayName))] + Manual = 2, + + /// + /// There is no failure probability for this result. + /// + [ResourcesDisplayName(typeof(Resources), nameof(Resources.InitialFailureMechanismResultType_NoFailureProbability_DisplayName))] + NoFailureProbability = 3 + } +} \ No newline at end of file Fisheye: Tag 6b3753a9bfc048980b06342b163783b28c2d8a24 refers to a dead (removed) revision in file `Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/InitialFailureMechanismResultType.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Common/src/Riskeer.Common.Forms/Builders/FailureMechanismSectionResultViewColumnBuilder.cs =================================================================== diff -u -rfb43f46aefd38ff9938a4939a0cd329f0053a130 -r6b3753a9bfc048980b06342b163783b28c2d8a24 --- Riskeer/Common/src/Riskeer.Common.Forms/Builders/FailureMechanismSectionResultViewColumnBuilder.cs (.../FailureMechanismSectionResultViewColumnBuilder.cs) (revision fb43f46aefd38ff9938a4939a0cd329f0053a130) +++ Riskeer/Common/src/Riskeer.Common.Forms/Builders/FailureMechanismSectionResultViewColumnBuilder.cs (.../FailureMechanismSectionResultViewColumnBuilder.cs) (revision 6b3753a9bfc048980b06342b163783b28c2d8a24) @@ -96,7 +96,7 @@ /// /// Adds a column to the showing a - /// . + /// . /// /// The to add the column to. /// The data property name of the column. @@ -113,14 +113,14 @@ throw new ArgumentNullException(nameof(dataPropertyName)); } - IEnumerable> dataSource = CreateEnumDisplayWrappers(); + IEnumerable> dataSource = CreateEnumDisplayWrappers(); dataGridViewControl.AddComboBoxColumn( dataPropertyName, Resources.FailureMechanismResultView_InitialFailureMechanismResultType_DisplayName, dataSource, - nameof(EnumDisplayWrapper.Value), - nameof(EnumDisplayWrapper.DisplayName)); + nameof(EnumDisplayWrapper.Value), + nameof(EnumDisplayWrapper.DisplayName)); } /// Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/AdoptableFailureMechanismSectionResultRow.cs =================================================================== diff -u -red4f25fd91db395c473db1973fcce187fe436035 -r6b3753a9bfc048980b06342b163783b28c2d8a24 --- Riskeer/Common/src/Riskeer.Common.Forms/Views/AdoptableFailureMechanismSectionResultRow.cs (.../AdoptableFailureMechanismSectionResultRow.cs) (revision ed4f25fd91db395c473db1973fcce187fe436035) +++ Riskeer/Common/src/Riskeer.Common.Forms/Views/AdoptableFailureMechanismSectionResultRow.cs (.../AdoptableFailureMechanismSectionResultRow.cs) (revision 6b3753a9bfc048980b06342b163783b28c2d8a24) @@ -119,7 +119,7 @@ /// /// Gets or sets the initial failure mechanism result. /// - public InitialFailureMechanismResultType InitialFailureMechanismResult + public AdoptableInitialFailureMechanismResultType InitialFailureMechanismResult { get => SectionResult.InitialFailureMechanismResult; set @@ -136,7 +136,7 @@ [TypeConverter(typeof(NoProbabilityValueDoubleConverter))] public double InitialFailureMechanismResultSectionProbability { - get => SectionResult.InitialFailureMechanismResult == InitialFailureMechanismResultType.Adopt + get => SectionResult.InitialFailureMechanismResult == AdoptableInitialFailureMechanismResultType.Adopt ? calculateInitialFailureMechanismResultProbabilityFunc() : SectionResult.ManualInitialFailureMechanismResultSectionProbability; set @@ -194,7 +194,7 @@ private void UpdateInitialFailureMechanismResultErrors() { - if (SectionResult.IsRelevant && SectionResult.InitialFailureMechanismResult == InitialFailureMechanismResultType.Adopt) + if (SectionResult.IsRelevant && SectionResult.InitialFailureMechanismResult == AdoptableInitialFailureMechanismResultType.Adopt) { ColumnStateDefinitions[initialFailureMechanismResultSectionProbabilityIndex].ErrorText = initialFailureMechanismResultErrorProvider.GetProbabilityValidationError( calculateInitialFailureMechanismResultProbabilityFunc); @@ -245,14 +245,14 @@ { ColumnStateHelper.SetColumnState(ColumnStateDefinitions[initialFailureMechanismResultIndex], !IsRelevant); - if (!IsRelevant || InitialFailureMechanismResult == InitialFailureMechanismResultType.NoFailureProbability) + if (!IsRelevant || InitialFailureMechanismResult == AdoptableInitialFailureMechanismResultType.NoFailureProbability) { ColumnStateHelper.DisableColumn(ColumnStateDefinitions[initialFailureMechanismResultSectionProbabilityIndex]); } else { ColumnStateHelper.EnableColumn(ColumnStateDefinitions[initialFailureMechanismResultSectionProbabilityIndex], - InitialFailureMechanismResult == InitialFailureMechanismResultType.Adopt); + InitialFailureMechanismResult == AdoptableInitialFailureMechanismResultType.Adopt); } ColumnStateHelper.SetColumnState(ColumnStateDefinitions[furtherAnalysisNeededIndex], !IsRelevant); Index: Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/FailureMechanismSectionAssemblyGroupFactoryTest.cs =================================================================== diff -u -rab47f86cd7c7b00f8ebf38bbbe3f657c3afaf456 -r6b3753a9bfc048980b06342b163783b28c2d8a24 --- Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/FailureMechanismSectionAssemblyGroupFactoryTest.cs (.../FailureMechanismSectionAssemblyGroupFactoryTest.cs) (revision ab47f86cd7c7b00f8ebf38bbbe3f657c3afaf456) +++ Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/FailureMechanismSectionAssemblyGroupFactoryTest.cs (.../FailureMechanismSectionAssemblyGroupFactoryTest.cs) (revision 6b3753a9bfc048980b06342b163783b28c2d8a24) @@ -49,7 +49,7 @@ // Call void Call() => FailureMechanismSectionAssemblyGroupFactory.AssembleSection( - null, random.NextBoolean(), random.NextEnumValue(), + null, random.NextBoolean(), random.NextEnumValue(), random.NextDouble(), random.NextBoolean(), random.NextDouble()); // Assert @@ -63,23 +63,23 @@ // Setup var random = new Random(21); - const InitialFailureMechanismResultType initialFailureMechanismResultType = (InitialFailureMechanismResultType) 99; + const AdoptableInitialFailureMechanismResultType initialFailureMechanismResultType = (AdoptableInitialFailureMechanismResultType) 99; // Call void Call() => FailureMechanismSectionAssemblyGroupFactory.AssembleSection( new AssessmentSectionStub(), random.NextBoolean(), initialFailureMechanismResultType, random.NextDouble(), random.NextBoolean(), random.NextDouble()); // Assert - var expectedMessage = $"The value of argument 'initialFailureMechanismResultType' ({initialFailureMechanismResultType}) is invalid for Enum type '{nameof(InitialFailureMechanismResultType)}'."; + var expectedMessage = $"The value of argument 'initialFailureMechanismResultType' ({initialFailureMechanismResultType}) is invalid for Enum type '{nameof(AdoptableInitialFailureMechanismResultType)}'."; TestHelper.AssertThrowsArgumentExceptionAndTestMessage(Call, expectedMessage); } [Test] - [TestCase(InitialFailureMechanismResultType.Adopt, true)] - [TestCase(InitialFailureMechanismResultType.Manual, true)] - [TestCase(InitialFailureMechanismResultType.NoFailureProbability, false)] - public void AssembleSectionWithoutProfileProbability_WithInput_SetsInputOnCalculator(InitialFailureMechanismResultType initialFailureMechanismResultType, + [TestCase(AdoptableInitialFailureMechanismResultType.Adopt, true)] + [TestCase(AdoptableInitialFailureMechanismResultType.Manual, true)] + [TestCase(AdoptableInitialFailureMechanismResultType.NoFailureProbability, false)] + public void AssembleSectionWithoutProfileProbability_WithInput_SetsInputOnCalculator(AdoptableInitialFailureMechanismResultType initialFailureMechanismResultType, bool expectedHasProbabilitySpecified) { // Setup @@ -130,7 +130,7 @@ // Call FailureMechanismSectionAssemblyResult output = FailureMechanismSectionAssemblyGroupFactory.AssembleSection( - new AssessmentSectionStub(), random.NextBoolean(), random.NextEnumValue(), + new AssessmentSectionStub(), random.NextBoolean(), random.NextEnumValue(), random.NextDouble(), random.NextBoolean(), random.NextDouble()); // Assert @@ -155,7 +155,7 @@ // Call void Call() => FailureMechanismSectionAssemblyGroupFactory.AssembleSection( - new AssessmentSectionStub(), random.NextBoolean(), random.NextEnumValue(), + new AssessmentSectionStub(), random.NextBoolean(), random.NextEnumValue(), random.NextDouble(), random.NextBoolean(), random.NextDouble()); // Assert @@ -178,7 +178,7 @@ // Call void Call() => FailureMechanismSectionAssemblyGroupFactory.AssembleSection( - null, random.NextBoolean(), random.NextEnumValue(), random.NextDouble(), + null, random.NextBoolean(), random.NextEnumValue(), random.NextDouble(), random.NextDouble(), random.NextBoolean(), random.NextDouble(), random.NextDouble(), random.NextEnumValue(), () => double.NaN); @@ -195,7 +195,7 @@ // Call void Call() => FailureMechanismSectionAssemblyGroupFactory.AssembleSection( - new AssessmentSectionStub(), random.NextBoolean(), random.NextEnumValue(), + new AssessmentSectionStub(), random.NextBoolean(), random.NextEnumValue(), random.NextDouble(), random.NextDouble(), random.NextBoolean(), random.NextDouble(), random.NextDouble(), random.NextEnumValue(), null); @@ -210,7 +210,7 @@ // Setup var random = new Random(21); - const InitialFailureMechanismResultType initialFailureMechanismResultType = (InitialFailureMechanismResultType) 99; + const AdoptableInitialFailureMechanismResultType initialFailureMechanismResultType = (AdoptableInitialFailureMechanismResultType) 99; // Call void Call() => FailureMechanismSectionAssemblyGroupFactory.AssembleSection( @@ -219,7 +219,7 @@ random.NextEnumValue(), () => double.NaN); // Assert - var expectedMessage = $"The value of argument 'initialFailureMechanismResultType' ({initialFailureMechanismResultType}) is invalid for Enum type '{nameof(InitialFailureMechanismResultType)}'."; + var expectedMessage = $"The value of argument 'initialFailureMechanismResultType' ({initialFailureMechanismResultType}) is invalid for Enum type '{nameof(AdoptableInitialFailureMechanismResultType)}'."; TestHelper.AssertThrowsArgumentExceptionAndTestMessage(Call, expectedMessage); } @@ -233,7 +233,7 @@ // Call void Call() => FailureMechanismSectionAssemblyGroupFactory.AssembleSection( - new AssessmentSectionStub(), random.NextBoolean(), random.NextEnumValue(), + new AssessmentSectionStub(), random.NextBoolean(), random.NextEnumValue(), random.NextDouble(), random.NextDouble(), random.NextBoolean(), random.NextDouble(), random.NextDouble(), probabilityRefinementType, () => double.NaN); @@ -243,10 +243,10 @@ } [Test] - [TestCase(InitialFailureMechanismResultType.Adopt, true)] - [TestCase(InitialFailureMechanismResultType.Manual, true)] - [TestCase(InitialFailureMechanismResultType.NoFailureProbability, false)] - public void AssembleSectionWithProfileProbability_WithInput_SetsInputOnCalculator(InitialFailureMechanismResultType initialFailureMechanismResultType, + [TestCase(AdoptableInitialFailureMechanismResultType.Adopt, true)] + [TestCase(AdoptableInitialFailureMechanismResultType.Manual, true)] + [TestCase(AdoptableInitialFailureMechanismResultType.NoFailureProbability, false)] + public void AssembleSectionWithProfileProbability_WithInput_SetsInputOnCalculator(AdoptableInitialFailureMechanismResultType initialFailureMechanismResultType, bool expectedHasProbabilitySpecified) { // Setup @@ -306,7 +306,7 @@ // Call FailureMechanismSectionAssemblyGroupFactory.AssembleSection( - new AssessmentSectionStub(), random.NextBoolean(), random.NextEnumValue(), + new AssessmentSectionStub(), random.NextBoolean(), random.NextEnumValue(), random.NextDouble(), random.NextDouble(), random.NextBoolean(), refinedProfileProbability, refinedSectionProbability, probabilityRefinementType, () => 2.0); @@ -331,7 +331,7 @@ // Call FailureMechanismSectionAssemblyResult output = FailureMechanismSectionAssemblyGroupFactory.AssembleSection( - new AssessmentSectionStub(), random.NextBoolean(), random.NextEnumValue(), + new AssessmentSectionStub(), random.NextBoolean(), random.NextEnumValue(), random.NextDouble(), random.NextDouble(), random.NextBoolean(), random.NextDouble(), random.NextDouble(), random.NextEnumValue(), () => 1.0); @@ -357,7 +357,7 @@ // Call void Call() => FailureMechanismSectionAssemblyGroupFactory.AssembleSection( - new AssessmentSectionStub(), random.NextBoolean(), random.NextEnumValue(), + new AssessmentSectionStub(), random.NextBoolean(), random.NextEnumValue(), random.NextDouble(), random.NextDouble(), random.NextBoolean(), random.NextDouble(), random.NextDouble(), random.NextEnumValue(), () => double.NaN); Index: Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/AdoptableFailureMechanismSectionResultTest.cs =================================================================== diff -u -r49a17710fc5054fd4d733ede54a1b671d3fe35f0 -r6b3753a9bfc048980b06342b163783b28c2d8a24 --- Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/AdoptableFailureMechanismSectionResultTest.cs (.../AdoptableFailureMechanismSectionResultTest.cs) (revision 49a17710fc5054fd4d733ede54a1b671d3fe35f0) +++ Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/AdoptableFailureMechanismSectionResultTest.cs (.../AdoptableFailureMechanismSectionResultTest.cs) (revision 6b3753a9bfc048980b06342b163783b28c2d8a24) @@ -40,7 +40,7 @@ // Assert Assert.IsInstanceOf(sectionResult); Assert.AreSame(section, sectionResult.Section); - Assert.AreEqual(InitialFailureMechanismResultType.Adopt, sectionResult.InitialFailureMechanismResult); + Assert.AreEqual(AdoptableInitialFailureMechanismResultType.Adopt, sectionResult.InitialFailureMechanismResult); } } } \ No newline at end of file Index: Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/AdoptableInitialFailureMechanismResultTypeTest.cs =================================================================== diff -u --- Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/AdoptableInitialFailureMechanismResultTypeTest.cs (revision 0) +++ Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/AdoptableInitialFailureMechanismResultTypeTest.cs (revision 6b3753a9bfc048980b06342b163783b28c2d8a24) @@ -0,0 +1,60 @@ +// Copyright (C) Stichting Deltares 2021. All rights reserved. +// +// This file is part of Riskeer. +// +// Riskeer is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System.Collections.Generic; +using Core.Common.TestUtil; +using NUnit.Framework; +using Riskeer.Common.Data.FailureMechanism; + +namespace Riskeer.Common.Data.Test.FailureMechanism +{ + [TestFixture] + public class AdoptableInitialFailureMechanismResultTypeTest : EnumWithResourcesDisplayNameTestFixture + { + protected override IDictionary ExpectedValueForEnumValues => + new Dictionary + { + { + AdoptableInitialFailureMechanismResultType.Adopt, 1 + }, + { + AdoptableInitialFailureMechanismResultType.Manual, 2 + }, + { + AdoptableInitialFailureMechanismResultType.NoFailureProbability, 3 + } + }; + + protected override IDictionary ExpectedDisplayNameForEnumValues => + new Dictionary + { + { + AdoptableInitialFailureMechanismResultType.Adopt, "Overnemen" + }, + { + AdoptableInitialFailureMechanismResultType.Manual, "Handmatig invullen" + }, + { + AdoptableInitialFailureMechanismResultType.NoFailureProbability, "Geen faalkans" + } + }; + } +} \ No newline at end of file Fisheye: Tag 6b3753a9bfc048980b06342b163783b28c2d8a24 refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/InitialFailureMechanismResultTypeTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Builders/FailureMechanismSectionResultViewColumnBuilderTest.cs =================================================================== diff -u -rfb43f46aefd38ff9938a4939a0cd329f0053a130 -r6b3753a9bfc048980b06342b163783b28c2d8a24 --- Riskeer/Common/test/Riskeer.Common.Forms.Test/Builders/FailureMechanismSectionResultViewColumnBuilderTest.cs (.../FailureMechanismSectionResultViewColumnBuilderTest.cs) (revision fb43f46aefd38ff9938a4939a0cd329f0053a130) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Builders/FailureMechanismSectionResultViewColumnBuilderTest.cs (.../FailureMechanismSectionResultViewColumnBuilderTest.cs) (revision 6b3753a9bfc048980b06342b163783b28c2d8a24) @@ -216,8 +216,8 @@ Assert.AreEqual("Value", columnData.ValueMember); Assert.AreEqual("DisplayName", columnData.DisplayMember); - IEnumerable> expectedDataSource = CreateExpectedEnumDisplayWrappers(); - AssertEnumDisplayWrappersAreEqual(expectedDataSource, (EnumDisplayWrapper[]) columnData.DataSource); + IEnumerable> expectedDataSource = CreateExpectedEnumDisplayWrappers(); + AssertEnumDisplayWrappersAreEqual(expectedDataSource, (EnumDisplayWrapper[]) columnData.DataSource); } } Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/AdoptableFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -red4f25fd91db395c473db1973fcce187fe436035 -r6b3753a9bfc048980b06342b163783b28c2d8a24 --- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/AdoptableFailureMechanismSectionResultRowTest.cs (.../AdoptableFailureMechanismSectionResultRowTest.cs) (revision ed4f25fd91db395c473db1973fcce187fe436035) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/AdoptableFailureMechanismSectionResultRowTest.cs (.../AdoptableFailureMechanismSectionResultRowTest.cs) (revision 6b3753a9bfc048980b06342b163783b28c2d8a24) @@ -184,9 +184,9 @@ } [Test] - [TestCase(InitialFailureMechanismResultType.Manual)] - [TestCase(InitialFailureMechanismResultType.NoFailureProbability)] - public void GivenRowWithInitialFailureMechanismResultAdopt_WhenValueChanged_ThenInitialProbabilitiesChanged(InitialFailureMechanismResultType newValue) + [TestCase(AdoptableInitialFailureMechanismResultType.Manual)] + [TestCase(AdoptableInitialFailureMechanismResultType.NoFailureProbability)] + public void GivenRowWithInitialFailureMechanismResultAdopt_WhenValueChanged_ThenInitialProbabilitiesChanged(AdoptableInitialFailureMechanismResultType newValue) { // Given var mocks = new MockRepository(); @@ -246,11 +246,11 @@ } [Test] - [TestCase(false, InitialFailureMechanismResultType.Adopt)] - [TestCase(true, InitialFailureMechanismResultType.Manual)] - [TestCase(true, InitialFailureMechanismResultType.NoFailureProbability)] + [TestCase(false, AdoptableInitialFailureMechanismResultType.Adopt)] + [TestCase(true, AdoptableInitialFailureMechanismResultType.Manual)] + [TestCase(true, AdoptableInitialFailureMechanismResultType.NoFailureProbability)] public void GivenRowWithIsRelevantAndInitialFailureMechanismResult_WhenErrorProviderReturnsError_ThenShowNoError( - bool isRelevant, InitialFailureMechanismResultType initialFailureMechanismResultType) + bool isRelevant, AdoptableInitialFailureMechanismResultType initialFailureMechanismResultType) { // Given var mocks = new MockRepository(); @@ -296,7 +296,7 @@ [Test] public void InitialFailureMechanismResult_SetNewValue_NotifyObserversAndPropertyChanged() { - const InitialFailureMechanismResultType newValue = InitialFailureMechanismResultType.NoFailureProbability; + const AdoptableInitialFailureMechanismResultType newValue = AdoptableInitialFailureMechanismResultType.NoFailureProbability; Property_SetNewValue_NotifyObserversAndPropertyChanged( row => row.InitialFailureMechanismResult = newValue, result => result.InitialFailureMechanismResult, @@ -477,7 +477,7 @@ // When calculator.ThrowExceptionOnCalculate = true; - row.InitialFailureMechanismResult = InitialFailureMechanismResultType.Manual; + row.InitialFailureMechanismResult = AdoptableInitialFailureMechanismResultType.Manual; // Then AssertFailureMechanismSectionAssemblyResult(new DefaultFailureMechanismSectionAssemblyResult(), row.AssemblyResult); @@ -512,7 +512,7 @@ // When calculator.ThrowExceptionOnCalculate = true; - row.InitialFailureMechanismResult = InitialFailureMechanismResultType.Manual; + row.InitialFailureMechanismResult = AdoptableInitialFailureMechanismResultType.Manual; // Then const string expectedErrorText = "Message"; @@ -553,7 +553,7 @@ // When calculator.ThrowExceptionOnCalculate = false; - row.InitialFailureMechanismResult = InitialFailureMechanismResultType.Manual; + row.InitialFailureMechanismResult = AdoptableInitialFailureMechanismResultType.Manual; // Then Assert.AreEqual(string.Empty, columnStateDefinitions[ConstructionProperties.SectionProbabilityIndex].ErrorText); @@ -618,7 +618,7 @@ { IsRelevant = isRelevant, FurtherAnalysisNeeded = true, - InitialFailureMechanismResult = InitialFailureMechanismResultType.Manual + InitialFailureMechanismResult = AdoptableInitialFailureMechanismResultType.Manual }; using (new AssemblyToolCalculatorFactoryConfig()) @@ -644,10 +644,10 @@ } [Test] - [TestCase(InitialFailureMechanismResultType.Adopt, true, true)] - [TestCase(InitialFailureMechanismResultType.Manual, true, false)] - [TestCase(InitialFailureMechanismResultType.NoFailureProbability, false, true)] - public void Constructor_WithInitialFailureMechanismResult_ExpectedColumnStates(InitialFailureMechanismResultType initialFailureMechanismResultType, + [TestCase(AdoptableInitialFailureMechanismResultType.Adopt, true, true)] + [TestCase(AdoptableInitialFailureMechanismResultType.Manual, true, false)] + [TestCase(AdoptableInitialFailureMechanismResultType.NoFailureProbability, false, true)] + public void Constructor_WithInitialFailureMechanismResult_ExpectedColumnStates(AdoptableInitialFailureMechanismResultType initialFailureMechanismResultType, bool isEnabled, bool isReadOnly) { // Setup Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/StructuresFailureMechanismResultViewTest.cs =================================================================== diff -u -rc3cfe44623f9cce54dcd8575c576334dd1a3d250 -r6b3753a9bfc048980b06342b163783b28c2d8a24 --- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/StructuresFailureMechanismResultViewTest.cs (.../StructuresFailureMechanismResultViewTest.cs) (revision c3cfe44623f9cce54dcd8575c576334dd1a3d250) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/StructuresFailureMechanismResultViewTest.cs (.../StructuresFailureMechanismResultViewTest.cs) (revision 6b3753a9bfc048980b06342b163783b28c2d8a24) @@ -205,7 +205,7 @@ Assert.AreEqual(columnCount, cells.Count); Assert.AreEqual("Section 1", cells[nameColumnIndex].FormattedValue); Assert.AreEqual(true, cells[isRelevantIndex].Value); - Assert.AreEqual(InitialFailureMechanismResultType.Adopt, cells[initialFailureMechanismResultIndex].Value); + Assert.AreEqual(AdoptableInitialFailureMechanismResultType.Adopt, cells[initialFailureMechanismResultIndex].Value); Assert.AreEqual(probability, cells[initialFailureMechanismResultSectionProbabilityIndex].Value); Assert.AreEqual(false, cells[furtherAnalysisNeededIndex].FormattedValue); Assert.AreEqual("-", cells[refinedSectionProbabilityIndex].FormattedValue); Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/FileImporters/HeightStructuresFailureMechanismSectionResultUpdateStrategyTest.cs =================================================================== diff -u -r48c011c497f9aa495c6b1c747254cb690eae5cf8 -r6b3753a9bfc048980b06342b163783b28c2d8a24 --- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/FileImporters/HeightStructuresFailureMechanismSectionResultUpdateStrategyTest.cs (.../HeightStructuresFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 48c011c497f9aa495c6b1c747254cb690eae5cf8) +++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/FileImporters/HeightStructuresFailureMechanismSectionResultUpdateStrategyTest.cs (.../HeightStructuresFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 6b3753a9bfc048980b06342b163783b28c2d8a24) @@ -75,7 +75,7 @@ return new AdoptableFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { IsRelevant = true, - InitialFailureMechanismResult = InitialFailureMechanismResultType.Manual, + InitialFailureMechanismResult = AdoptableInitialFailureMechanismResultType.Manual, ManualInitialFailureMechanismResultSectionProbability = random.NextDouble(), FurtherAnalysisNeeded = true, RefinedSectionProbability = random.NextDouble() Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismSectionResultRow.cs =================================================================== diff -u -rfa86bbf0bb793a9d09e3bf9b6e173942bc65fe21 -r6b3753a9bfc048980b06342b163783b28c2d8a24 --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismSectionResultRow.cs (.../MacroStabilityInwardsFailureMechanismSectionResultRow.cs) (revision fa86bbf0bb793a9d09e3bf9b6e173942bc65fe21) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismSectionResultRow.cs (.../MacroStabilityInwardsFailureMechanismSectionResultRow.cs) (revision 6b3753a9bfc048980b06342b163783b28c2d8a24) @@ -143,7 +143,7 @@ /// /// Gets or sets the initial failure mechanism result. /// - public InitialFailureMechanismResultType InitialFailureMechanismResult + public AdoptableInitialFailureMechanismResultType InitialFailureMechanismResult { get => SectionResult.InitialFailureMechanismResult; set @@ -160,7 +160,7 @@ [TypeConverter(typeof(NoProbabilityValueDoubleConverter))] public double InitialFailureMechanismResultProfileProbability { - get => SectionResult.InitialFailureMechanismResult == InitialFailureMechanismResultType.Adopt + get => SectionResult.InitialFailureMechanismResult == AdoptableInitialFailureMechanismResultType.Adopt ? SectionResult.GetInitialFailureMechanismResultProbability(calculationScenarios, failureMechanism.GeneralInput.ModelFactor) : SectionResult.ManualInitialFailureMechanismResultProfileProbability; set @@ -177,7 +177,7 @@ [TypeConverter(typeof(NoProbabilityValueDoubleConverter))] public double InitialFailureMechanismResultSectionProbability { - get => SectionResult.InitialFailureMechanismResult == InitialFailureMechanismResultType.Adopt + get => SectionResult.InitialFailureMechanismResult == AdoptableInitialFailureMechanismResultType.Adopt ? SectionResult.GetInitialFailureMechanismResultProbability(calculationScenarios, failureMechanism.GeneralInput.ModelFactor) * failureMechanism.MacroStabilityInwardsProbabilityAssessmentInput.GetN(SectionResult.Section.Length) : SectionResult.ManualInitialFailureMechanismResultSectionProbability; @@ -280,7 +280,7 @@ private void UpdateInitialFailureMechanismResultErrors() { - if (SectionResult.IsRelevant && SectionResult.InitialFailureMechanismResult == InitialFailureMechanismResultType.Adopt) + if (SectionResult.IsRelevant && SectionResult.InitialFailureMechanismResult == AdoptableInitialFailureMechanismResultType.Adopt) { string errorText = initialFailureMechanismResultErrorProvider.GetProbabilityValidationError( () => SectionResult.GetInitialFailureMechanismResultProbability(calculationScenarios, failureMechanism.GeneralInput.ModelFactor)); @@ -345,14 +345,14 @@ { ColumnStateHelper.SetColumnState(ColumnStateDefinitions[initialFailureMechanismResultIndex], !IsRelevant); - if (!IsRelevant || InitialFailureMechanismResult == InitialFailureMechanismResultType.NoFailureProbability) + if (!IsRelevant || InitialFailureMechanismResult == AdoptableInitialFailureMechanismResultType.NoFailureProbability) { ColumnStateHelper.DisableColumn(ColumnStateDefinitions[initialFailureMechanismResultProfileProbabilityIndex]); ColumnStateHelper.DisableColumn(ColumnStateDefinitions[initialFailureMechanismResultSectionProbabilityIndex]); } else { - bool initialFailureMechanismResultAdopt = InitialFailureMechanismResult == InitialFailureMechanismResultType.Adopt; + bool initialFailureMechanismResultAdopt = InitialFailureMechanismResult == AdoptableInitialFailureMechanismResultType.Adopt; ColumnStateHelper.EnableColumn(ColumnStateDefinitions[initialFailureMechanismResultProfileProbabilityIndex], initialFailureMechanismResultAdopt); ColumnStateHelper.EnableColumn(ColumnStateDefinitions[initialFailureMechanismResultSectionProbabilityIndex], initialFailureMechanismResultAdopt); } Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismResultViewTest.cs =================================================================== diff -u -rc3cfe44623f9cce54dcd8575c576334dd1a3d250 -r6b3753a9bfc048980b06342b163783b28c2d8a24 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismResultViewTest.cs (.../MacroStabilityInwardsFailureMechanismResultViewTest.cs) (revision c3cfe44623f9cce54dcd8575c576334dd1a3d250) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismResultViewTest.cs (.../MacroStabilityInwardsFailureMechanismResultViewTest.cs) (revision 6b3753a9bfc048980b06342b163783b28c2d8a24) @@ -198,7 +198,7 @@ Assert.AreEqual(columnCount, cells.Count); Assert.AreEqual("Section 1", cells[nameColumnIndex].FormattedValue); Assert.AreEqual(true, cells[isRelevantIndex].Value); - Assert.AreEqual(InitialFailureMechanismResultType.Adopt, cells[initialFailureMechanismResultIndex].Value); + Assert.AreEqual(AdoptableInitialFailureMechanismResultType.Adopt, cells[initialFailureMechanismResultIndex].Value); Assert.AreEqual(probability, cells[initialFailureMechanismResultProfileProbabilityIndex].Value); Assert.AreEqual(probability * failureMechanism.MacroStabilityInwardsProbabilityAssessmentInput.GetN(section.Length), cells[initialFailureMechanismResultSectionProbabilityIndex].Value); Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -rfa86bbf0bb793a9d09e3bf9b6e173942bc65fe21 -r6b3753a9bfc048980b06342b163783b28c2d8a24 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismSectionResultRowTest.cs (.../MacroStabilityInwardsFailureMechanismSectionResultRowTest.cs) (revision fa86bbf0bb793a9d09e3bf9b6e173942bc65fe21) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismSectionResultRowTest.cs (.../MacroStabilityInwardsFailureMechanismSectionResultRowTest.cs) (revision 6b3753a9bfc048980b06342b163783b28c2d8a24) @@ -245,9 +245,9 @@ } [Test] - [TestCase(InitialFailureMechanismResultType.Manual)] - [TestCase(InitialFailureMechanismResultType.NoFailureProbability)] - public void GivenRowWithInitialFailureMechanismResultAdopt_WhenValueChanged_ThenInitialProbabilitiesChanged(InitialFailureMechanismResultType newValue) + [TestCase(AdoptableInitialFailureMechanismResultType.Manual)] + [TestCase(AdoptableInitialFailureMechanismResultType.NoFailureProbability)] + public void GivenRowWithInitialFailureMechanismResultAdopt_WhenValueChanged_ThenInitialProbabilitiesChanged(AdoptableInitialFailureMechanismResultType newValue) { // Given var mocks = new MockRepository(); @@ -362,11 +362,11 @@ } [Test] - [TestCase(false, InitialFailureMechanismResultType.Adopt)] - [TestCase(true, InitialFailureMechanismResultType.Manual)] - [TestCase(true, InitialFailureMechanismResultType.NoFailureProbability)] + [TestCase(false, AdoptableInitialFailureMechanismResultType.Adopt)] + [TestCase(true, AdoptableInitialFailureMechanismResultType.Manual)] + [TestCase(true, AdoptableInitialFailureMechanismResultType.NoFailureProbability)] public void GivenRowWithIsRelevantAndInitialFailureMechanismResult_WhenErrorProviderReturnsError_ThenShowNoError( - bool isRelevant, InitialFailureMechanismResultType initialFailureMechanismResultType) + bool isRelevant, AdoptableInitialFailureMechanismResultType initialFailureMechanismResultType) { // Given var mocks = new MockRepository(); @@ -414,7 +414,7 @@ [Test] public void InitialFailureMechanismResult_SetNewValue_NotifyObserversAndPropertyChanged() { - const InitialFailureMechanismResultType newValue = InitialFailureMechanismResultType.NoFailureProbability; + const AdoptableInitialFailureMechanismResultType newValue = AdoptableInitialFailureMechanismResultType.NoFailureProbability; Property_SetNewValue_NotifyObserversAndPropertyChanged( row => row.InitialFailureMechanismResult = newValue, result => result.InitialFailureMechanismResult, @@ -647,7 +647,7 @@ // When calculator.ThrowExceptionOnCalculate = true; - row.InitialFailureMechanismResult = InitialFailureMechanismResultType.Manual; + row.InitialFailureMechanismResult = AdoptableInitialFailureMechanismResultType.Manual; // Then AssertFailureMechanismSectionAssemblyResult(new DefaultFailureMechanismSectionAssemblyResult(), row.AssemblyResult); @@ -685,7 +685,7 @@ // When calculator.ThrowExceptionOnCalculate = true; - row.InitialFailureMechanismResult = InitialFailureMechanismResultType.Manual; + row.InitialFailureMechanismResult = AdoptableInitialFailureMechanismResultType.Manual; // Then const string expectedErrorText = "Message"; @@ -731,7 +731,7 @@ // When calculator.ThrowExceptionOnCalculate = false; - row.InitialFailureMechanismResult = InitialFailureMechanismResultType.Manual; + row.InitialFailureMechanismResult = AdoptableInitialFailureMechanismResultType.Manual; // Then Assert.AreEqual(string.Empty, columnStateDefinitions[ConstructionProperties.ProfileProbabilityIndex].ErrorText); @@ -803,7 +803,7 @@ { IsRelevant = isRelevant, FurtherAnalysisNeeded = true, - InitialFailureMechanismResult = InitialFailureMechanismResultType.Manual, + InitialFailureMechanismResult = AdoptableInitialFailureMechanismResultType.Manual, ProbabilityRefinementType = ProbabilityRefinementType.Both }; @@ -837,10 +837,10 @@ } [Test] - [TestCase(InitialFailureMechanismResultType.Adopt, true, true)] - [TestCase(InitialFailureMechanismResultType.Manual, true, false)] - [TestCase(InitialFailureMechanismResultType.NoFailureProbability, false, true)] - public void Constructor_WithInitialFailureMechanismResult_ExpectedColumnStates(InitialFailureMechanismResultType initialFailureMechanismResultType, + [TestCase(AdoptableInitialFailureMechanismResultType.Adopt, true, true)] + [TestCase(AdoptableInitialFailureMechanismResultType.Manual, true, false)] + [TestCase(AdoptableInitialFailureMechanismResultType.NoFailureProbability, false, true)] + public void Constructor_WithInitialFailureMechanismResult_ExpectedColumnStates(AdoptableInitialFailureMechanismResultType initialFailureMechanismResultType, bool isEnabled, bool isReadOnly) { // Setup Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsFailureMechanismSectionResultUpdateStrategyTest.cs =================================================================== diff -u -r8aaabe04890e3e8ba68b4f6d667188f269fb4f32 -r6b3753a9bfc048980b06342b163783b28c2d8a24 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsFailureMechanismSectionResultUpdateStrategyTest.cs (.../MacroStabilityInwardsFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 8aaabe04890e3e8ba68b4f6d667188f269fb4f32) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsFailureMechanismSectionResultUpdateStrategyTest.cs (.../MacroStabilityInwardsFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 6b3753a9bfc048980b06342b163783b28c2d8a24) @@ -75,7 +75,7 @@ return new MacroStabilityInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { IsRelevant = true, - InitialFailureMechanismResult = InitialFailureMechanismResultType.Manual, + InitialFailureMechanismResult = AdoptableInitialFailureMechanismResultType.Manual, ManualInitialFailureMechanismResultSectionProbability = random.NextDouble(), ManualInitialFailureMechanismResultProfileProbability = random.NextDouble(), FurtherAnalysisNeeded = true, Index: Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingFailureMechanismSectionResultRow.cs =================================================================== diff -u -r26a31ade853688c62aa90aad3d3cb1ee0881fcfb -r6b3753a9bfc048980b06342b163783b28c2d8a24 --- Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingFailureMechanismSectionResultRow.cs (.../PipingFailureMechanismSectionResultRow.cs) (revision 26a31ade853688c62aa90aad3d3cb1ee0881fcfb) +++ Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingFailureMechanismSectionResultRow.cs (.../PipingFailureMechanismSectionResultRow.cs) (revision 6b3753a9bfc048980b06342b163783b28c2d8a24) @@ -142,7 +142,7 @@ /// /// Gets or sets the initial failure mechanism result. /// - public InitialFailureMechanismResultType InitialFailureMechanismResult + public AdoptableInitialFailureMechanismResultType InitialFailureMechanismResult { get => SectionResult.InitialFailureMechanismResult; set @@ -159,7 +159,7 @@ [TypeConverter(typeof(NoProbabilityValueDoubleConverter))] public double InitialFailureMechanismResultProfileProbability { - get => SectionResult.InitialFailureMechanismResult == InitialFailureMechanismResultType.Adopt + get => SectionResult.InitialFailureMechanismResult == AdoptableInitialFailureMechanismResultType.Adopt ? calculateProbabilityStrategy.CalculateProfileProbability() : SectionResult.ManualInitialFailureMechanismResultProfileProbability; set @@ -176,7 +176,7 @@ [TypeConverter(typeof(NoProbabilityValueDoubleConverter))] public double InitialFailureMechanismResultSectionProbability { - get => SectionResult.InitialFailureMechanismResult == InitialFailureMechanismResultType.Adopt + get => SectionResult.InitialFailureMechanismResult == AdoptableInitialFailureMechanismResultType.Adopt ? calculateProbabilityStrategy.CalculateSectionProbability() : SectionResult.ManualInitialFailureMechanismResultSectionProbability; set @@ -278,7 +278,7 @@ private void UpdateInitialFailureMechanismResultErrors() { - if (SectionResult.IsRelevant && SectionResult.InitialFailureMechanismResult == InitialFailureMechanismResultType.Adopt) + if (SectionResult.IsRelevant && SectionResult.InitialFailureMechanismResult == AdoptableInitialFailureMechanismResultType.Adopt) { ColumnStateDefinitions[initialFailureMechanismResultProfileProbabilityIndex].ErrorText = initialFailureMechanismResultErrorProvider.GetProbabilityValidationError( calculateProbabilityStrategy.CalculateProfileProbability); @@ -342,14 +342,14 @@ { ColumnStateHelper.SetColumnState(ColumnStateDefinitions[initialFailureMechanismResultIndex], !IsRelevant); - if (!IsRelevant || InitialFailureMechanismResult == InitialFailureMechanismResultType.NoFailureProbability) + if (!IsRelevant || InitialFailureMechanismResult == AdoptableInitialFailureMechanismResultType.NoFailureProbability) { ColumnStateHelper.DisableColumn(ColumnStateDefinitions[initialFailureMechanismResultProfileProbabilityIndex]); ColumnStateHelper.DisableColumn(ColumnStateDefinitions[initialFailureMechanismResultSectionProbabilityIndex]); } else { - bool initialFailureMechanismResultAdopt = InitialFailureMechanismResult == InitialFailureMechanismResultType.Adopt; + bool initialFailureMechanismResultAdopt = InitialFailureMechanismResult == AdoptableInitialFailureMechanismResultType.Adopt; ColumnStateHelper.EnableColumn(ColumnStateDefinitions[initialFailureMechanismResultProfileProbabilityIndex], initialFailureMechanismResultAdopt); ColumnStateHelper.EnableColumn(ColumnStateDefinitions[initialFailureMechanismResultSectionProbabilityIndex], initialFailureMechanismResultAdopt); } Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs =================================================================== diff -u -rc3cfe44623f9cce54dcd8575c576334dd1a3d250 -r6b3753a9bfc048980b06342b163783b28c2d8a24 --- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs (.../PipingFailureMechanismResultViewTest.cs) (revision c3cfe44623f9cce54dcd8575c576334dd1a3d250) +++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs (.../PipingFailureMechanismResultViewTest.cs) (revision 6b3753a9bfc048980b06342b163783b28c2d8a24) @@ -213,7 +213,7 @@ Assert.AreEqual(columnCount, cells.Count); Assert.AreEqual("Section 1", cells[nameColumnIndex].FormattedValue); Assert.AreEqual(true, cells[isRelevantIndex].Value); - Assert.AreEqual(InitialFailureMechanismResultType.Adopt, cells[initialFailureMechanismResultIndex].Value); + Assert.AreEqual(AdoptableInitialFailureMechanismResultType.Adopt, cells[initialFailureMechanismResultIndex].Value); Assert.AreEqual(probability, cells[initialFailureMechanismResultProfileProbabilityIndex].FormattedValue); Assert.AreEqual(probability, cells[initialFailureMechanismResultSectionProbabilityIndex].FormattedValue); Assert.AreEqual(false, cells[furtherAnalysisNeededIndex].FormattedValue); Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -r601fe81e44789cd94aca8638e6ba219d4bd74ef0 -r6b3753a9bfc048980b06342b163783b28c2d8a24 --- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismSectionResultRowTest.cs (.../PipingFailureMechanismSectionResultRowTest.cs) (revision 601fe81e44789cd94aca8638e6ba219d4bd74ef0) +++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismSectionResultRowTest.cs (.../PipingFailureMechanismSectionResultRowTest.cs) (revision 6b3753a9bfc048980b06342b163783b28c2d8a24) @@ -243,9 +243,9 @@ } [Test] - [TestCase(InitialFailureMechanismResultType.Manual)] - [TestCase(InitialFailureMechanismResultType.NoFailureProbability)] - public void GivenRowWithInitialFailureMechanismResultAdopt_WhenValueChanged_ThenInitialProbabilitiesChanged(InitialFailureMechanismResultType newValue) + [TestCase(AdoptableInitialFailureMechanismResultType.Manual)] + [TestCase(AdoptableInitialFailureMechanismResultType.NoFailureProbability)] + public void GivenRowWithInitialFailureMechanismResultAdopt_WhenValueChanged_ThenInitialProbabilitiesChanged(AdoptableInitialFailureMechanismResultType newValue) { // Given const double profileProbability = 0.1; @@ -348,11 +348,11 @@ } [Test] - [TestCase(false, InitialFailureMechanismResultType.Adopt)] - [TestCase(true, InitialFailureMechanismResultType.Manual)] - [TestCase(true, InitialFailureMechanismResultType.NoFailureProbability)] + [TestCase(false, AdoptableInitialFailureMechanismResultType.Adopt)] + [TestCase(true, AdoptableInitialFailureMechanismResultType.Manual)] + [TestCase(true, AdoptableInitialFailureMechanismResultType.NoFailureProbability)] public void GivenRowWithIsRelevantAndInitialFailureMechanismResult_WhenErrorProviderReturnsError_ThenShowNoError( - bool isRelevant, InitialFailureMechanismResultType initialFailureMechanismResultType) + bool isRelevant, AdoptableInitialFailureMechanismResultType initialFailureMechanismResultType) { // Given var mocks = new MockRepository(); @@ -399,7 +399,7 @@ [Test] public void InitialFailureMechanismResult_SetNewValue_NotifyObserversAndPropertyChanged() { - const InitialFailureMechanismResultType newValue = InitialFailureMechanismResultType.NoFailureProbability; + const AdoptableInitialFailureMechanismResultType newValue = AdoptableInitialFailureMechanismResultType.NoFailureProbability; Property_SetNewValue_NotifyObserversAndPropertyChanged( row => row.InitialFailureMechanismResult = newValue, result => result.InitialFailureMechanismResult, @@ -628,7 +628,7 @@ // When calculator.ThrowExceptionOnCalculate = true; - row.InitialFailureMechanismResult = InitialFailureMechanismResultType.Manual; + row.InitialFailureMechanismResult = AdoptableInitialFailureMechanismResultType.Manual; // Then AssertFailureMechanismSectionAssemblyResult(new DefaultFailureMechanismSectionAssemblyResult(), row.AssemblyResult); @@ -665,7 +665,7 @@ // When calculator.ThrowExceptionOnCalculate = true; - row.InitialFailureMechanismResult = InitialFailureMechanismResultType.Manual; + row.InitialFailureMechanismResult = AdoptableInitialFailureMechanismResultType.Manual; // Then const string expectedErrorText = "Message"; @@ -710,7 +710,7 @@ // When calculator.ThrowExceptionOnCalculate = false; - row.InitialFailureMechanismResult = InitialFailureMechanismResultType.Manual; + row.InitialFailureMechanismResult = AdoptableInitialFailureMechanismResultType.Manual; // Then Assert.AreEqual(string.Empty, columnStateDefinitions[ConstructionProperties.ProfileProbabilityIndex].ErrorText); @@ -782,7 +782,7 @@ { IsRelevant = isRelevant, FurtherAnalysisNeeded = true, - InitialFailureMechanismResult = InitialFailureMechanismResultType.Manual, + InitialFailureMechanismResult = AdoptableInitialFailureMechanismResultType.Manual, ProbabilityRefinementType = ProbabilityRefinementType.Both }; @@ -814,10 +814,10 @@ } [Test] - [TestCase(InitialFailureMechanismResultType.Adopt, true, true)] - [TestCase(InitialFailureMechanismResultType.Manual, true, false)] - [TestCase(InitialFailureMechanismResultType.NoFailureProbability, false, true)] - public void Constructor_WithInitialFailureMechanismResult_ExpectedColumnStates(InitialFailureMechanismResultType initialFailureMechanismResultType, + [TestCase(AdoptableInitialFailureMechanismResultType.Adopt, true, true)] + [TestCase(AdoptableInitialFailureMechanismResultType.Manual, true, false)] + [TestCase(AdoptableInitialFailureMechanismResultType.NoFailureProbability, false, true)] + public void Constructor_WithInitialFailureMechanismResult_ExpectedColumnStates(AdoptableInitialFailureMechanismResultType initialFailureMechanismResultType, bool isEnabled, bool isReadOnly) { // Setup Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/FileImporter/PipingFailureMechanismSectionResultUpdateStrategyTest.cs =================================================================== diff -u -r56c9ad888a22dc3b6695bf3928177aaf15754786 -r6b3753a9bfc048980b06342b163783b28c2d8a24 --- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/FileImporter/PipingFailureMechanismSectionResultUpdateStrategyTest.cs (.../PipingFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 56c9ad888a22dc3b6695bf3928177aaf15754786) +++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/FileImporter/PipingFailureMechanismSectionResultUpdateStrategyTest.cs (.../PipingFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 6b3753a9bfc048980b06342b163783b28c2d8a24) @@ -75,7 +75,7 @@ return new PipingFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { IsRelevant = true, - InitialFailureMechanismResult = InitialFailureMechanismResultType.Manual, + InitialFailureMechanismResult = AdoptableInitialFailureMechanismResultType.Manual, ManualInitialFailureMechanismResultSectionProbability = random.NextDouble(), ManualInitialFailureMechanismResultProfileProbability = random.NextDouble(), FurtherAnalysisNeeded = true, Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/MacroStabilityInwards/MacroStabilityInwardsSectionResultEntityReadExtensions.cs =================================================================== diff -u -r42444785d5af2f87c4097525208463f69c4ba47a -r6b3753a9bfc048980b06342b163783b28c2d8a24 --- Riskeer/Storage/src/Riskeer.Storage.Core/Read/MacroStabilityInwards/MacroStabilityInwardsSectionResultEntityReadExtensions.cs (.../MacroStabilityInwardsSectionResultEntityReadExtensions.cs) (revision 42444785d5af2f87c4097525208463f69c4ba47a) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/MacroStabilityInwards/MacroStabilityInwardsSectionResultEntityReadExtensions.cs (.../MacroStabilityInwardsSectionResultEntityReadExtensions.cs) (revision 6b3753a9bfc048980b06342b163783b28c2d8a24) @@ -53,7 +53,7 @@ } sectionResult.IsRelevant = Convert.ToBoolean(entity.IsRelevant); - sectionResult.InitialFailureMechanismResult = (InitialFailureMechanismResultType) entity.InitialFailureMechanismResultType; + sectionResult.InitialFailureMechanismResult = (AdoptableInitialFailureMechanismResultType) entity.InitialFailureMechanismResultType; sectionResult.ManualInitialFailureMechanismResultProfileProbability = entity.ManualInitialFailureMechanismResultProfileProbability.ToNullAsNaN(); sectionResult.ManualInitialFailureMechanismResultSectionProbability = entity.ManualInitialFailureMechanismResultSectionProbability.ToNullAsNaN(); sectionResult.FurtherAnalysisNeeded = Convert.ToBoolean(entity.FurtherAnalysisNeeded); Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/Piping/PipingSectionResultEntityReadExtensions.cs =================================================================== diff -u -r7855b4fb2168ada5e7c0a32e8eaa55063f268044 -r6b3753a9bfc048980b06342b163783b28c2d8a24 --- Riskeer/Storage/src/Riskeer.Storage.Core/Read/Piping/PipingSectionResultEntityReadExtensions.cs (.../PipingSectionResultEntityReadExtensions.cs) (revision 7855b4fb2168ada5e7c0a32e8eaa55063f268044) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/Piping/PipingSectionResultEntityReadExtensions.cs (.../PipingSectionResultEntityReadExtensions.cs) (revision 6b3753a9bfc048980b06342b163783b28c2d8a24) @@ -53,7 +53,7 @@ } sectionResult.IsRelevant = Convert.ToBoolean(entity.IsRelevant); - sectionResult.InitialFailureMechanismResult = (InitialFailureMechanismResultType) entity.InitialFailureMechanismResultType; + sectionResult.InitialFailureMechanismResult = (AdoptableInitialFailureMechanismResultType) entity.InitialFailureMechanismResultType; sectionResult.ManualInitialFailureMechanismResultProfileProbability = entity.ManualInitialFailureMechanismResultProfileProbability.ToNullAsNaN(); sectionResult.ManualInitialFailureMechanismResultSectionProbability = entity.ManualInitialFailureMechanismResultSectionProbability.ToNullAsNaN(); sectionResult.FurtherAnalysisNeeded = Convert.ToBoolean(entity.FurtherAnalysisNeeded); Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/StructuresSectionResultEntityReadExtensions.cs =================================================================== diff -u -r5f692ba886dae614fc0cad92e92f7a0184b13cfe -r6b3753a9bfc048980b06342b163783b28c2d8a24 --- Riskeer/Storage/src/Riskeer.Storage.Core/Read/StructuresSectionResultEntityReadExtensions.cs (.../StructuresSectionResultEntityReadExtensions.cs) (revision 5f692ba886dae614fc0cad92e92f7a0184b13cfe) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/StructuresSectionResultEntityReadExtensions.cs (.../StructuresSectionResultEntityReadExtensions.cs) (revision 6b3753a9bfc048980b06342b163783b28c2d8a24) @@ -53,7 +53,7 @@ } sectionResult.IsRelevant = Convert.ToBoolean(entity.IsRelevant); - sectionResult.InitialFailureMechanismResult = (InitialFailureMechanismResultType) entity.InitialFailureMechanismResultType; + sectionResult.InitialFailureMechanismResult = (AdoptableInitialFailureMechanismResultType) entity.InitialFailureMechanismResultType; sectionResult.ManualInitialFailureMechanismResultSectionProbability = entity.ManualInitialFailureMechanismResultSectionProbability.ToNullAsNaN(); sectionResult.FurtherAnalysisNeeded = Convert.ToBoolean(entity.FurtherAnalysisNeeded); sectionResult.RefinedSectionProbability = entity.RefinedSectionProbability.ToNullAsNaN(); Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/MacroStabilityInwards/MacroStabilityInwardsFailureMechanismSectionResultCreateExtensionsTest.cs =================================================================== diff -u -r8d91441da9bd7c75465a6ff326a88e226777a10f -r6b3753a9bfc048980b06342b163783b28c2d8a24 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/MacroStabilityInwards/MacroStabilityInwardsFailureMechanismSectionResultCreateExtensionsTest.cs (.../MacroStabilityInwardsFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 8d91441da9bd7c75465a6ff326a88e226777a10f) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/MacroStabilityInwards/MacroStabilityInwardsFailureMechanismSectionResultCreateExtensionsTest.cs (.../MacroStabilityInwardsFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 6b3753a9bfc048980b06342b163783b28c2d8a24) @@ -50,7 +50,7 @@ // Setup var random = new Random(21); bool isRelevant = random.NextBoolean(); - var initialFailureMechanismResultType = random.NextEnumValue(); + var initialFailureMechanismResultType = random.NextEnumValue(); double manualProfileProbability = random.NextDouble(); double manualSectionProbability = random.NextDouble(); bool furtherAnalysisNeeded = random.NextBoolean(); Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/Piping/PipingFailureMechanismSectionResultCreateExtensionsTest.cs =================================================================== diff -u -r8d91441da9bd7c75465a6ff326a88e226777a10f -r6b3753a9bfc048980b06342b163783b28c2d8a24 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/Piping/PipingFailureMechanismSectionResultCreateExtensionsTest.cs (.../PipingFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 8d91441da9bd7c75465a6ff326a88e226777a10f) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/Piping/PipingFailureMechanismSectionResultCreateExtensionsTest.cs (.../PipingFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 6b3753a9bfc048980b06342b163783b28c2d8a24) @@ -50,7 +50,7 @@ // Setup var random = new Random(21); bool isRelevant = random.NextBoolean(); - var initialFailureMechanismResultType = random.NextEnumValue(); + var initialFailureMechanismResultType = random.NextEnumValue(); double manualProfileProbability = random.NextDouble(); double manualSectionProbability = random.NextDouble(); bool furtherAnalysisNeeded = random.NextBoolean(); Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/StructuresFailureMechanismSectionResultCreateExtensionsTest.cs =================================================================== diff -u -r5f692ba886dae614fc0cad92e92f7a0184b13cfe -r6b3753a9bfc048980b06342b163783b28c2d8a24 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/StructuresFailureMechanismSectionResultCreateExtensionsTest.cs (.../StructuresFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 5f692ba886dae614fc0cad92e92f7a0184b13cfe) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/StructuresFailureMechanismSectionResultCreateExtensionsTest.cs (.../StructuresFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 6b3753a9bfc048980b06342b163783b28c2d8a24) @@ -49,7 +49,7 @@ // Setup var random = new Random(21); bool isRelevant = random.NextBoolean(); - var initialFailureMechanismResultType = random.NextEnumValue(); + var initialFailureMechanismResultType = random.NextEnumValue(); double manualSectionProbability = random.NextDouble(); bool furtherAnalysisNeeded = random.NextBoolean(); double refinedSectionProbability = random.NextDouble(); Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/MacroStabilityInwards/MacroStabilityInwardsSectionResultEntityReadExtensionsTest.cs =================================================================== diff -u -r8d91441da9bd7c75465a6ff326a88e226777a10f -r6b3753a9bfc048980b06342b163783b28c2d8a24 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/MacroStabilityInwards/MacroStabilityInwardsSectionResultEntityReadExtensionsTest.cs (.../MacroStabilityInwardsSectionResultEntityReadExtensionsTest.cs) (revision 8d91441da9bd7c75465a6ff326a88e226777a10f) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/MacroStabilityInwards/MacroStabilityInwardsSectionResultEntityReadExtensionsTest.cs (.../MacroStabilityInwardsSectionResultEntityReadExtensionsTest.cs) (revision 6b3753a9bfc048980b06342b163783b28c2d8a24) @@ -67,7 +67,7 @@ // Setup var random = new Random(21); bool isRelevant = random.NextBoolean(); - var initialFailureMechanismResultType = random.NextEnumValue(); + var initialFailureMechanismResultType = random.NextEnumValue(); double manualProfileProbability = random.NextDouble(); double manualSectionProbability = random.NextDouble(); bool furtherAnalysisNeeded = random.NextBoolean(); Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/Piping/PipingSectionResultEntityReadExtensionsTest.cs =================================================================== diff -u -r8d91441da9bd7c75465a6ff326a88e226777a10f -r6b3753a9bfc048980b06342b163783b28c2d8a24 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/Piping/PipingSectionResultEntityReadExtensionsTest.cs (.../PipingSectionResultEntityReadExtensionsTest.cs) (revision 8d91441da9bd7c75465a6ff326a88e226777a10f) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/Piping/PipingSectionResultEntityReadExtensionsTest.cs (.../PipingSectionResultEntityReadExtensionsTest.cs) (revision 6b3753a9bfc048980b06342b163783b28c2d8a24) @@ -65,7 +65,7 @@ // Setup var random = new Random(21); bool isRelevant = random.NextBoolean(); - var initialFailureMechanismResultType = random.NextEnumValue(); + var initialFailureMechanismResultType = random.NextEnumValue(); double manualProfileProbability = random.NextDouble(); double manualSectionProbability = random.NextDouble(); bool furtherAnalysisNeeded = random.NextBoolean(); Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/StructuresSectionResultEntityReadExtensionsTest.cs =================================================================== diff -u -r5f692ba886dae614fc0cad92e92f7a0184b13cfe -r6b3753a9bfc048980b06342b163783b28c2d8a24 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/StructuresSectionResultEntityReadExtensionsTest.cs (.../StructuresSectionResultEntityReadExtensionsTest.cs) (revision 5f692ba886dae614fc0cad92e92f7a0184b13cfe) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/StructuresSectionResultEntityReadExtensionsTest.cs (.../StructuresSectionResultEntityReadExtensionsTest.cs) (revision 6b3753a9bfc048980b06342b163783b28c2d8a24) @@ -64,7 +64,7 @@ // Setup var random = new Random(21); bool isRelevant = random.NextBoolean(); - var initialFailureMechanismResultType = random.NextEnumValue(); + var initialFailureMechanismResultType = random.NextEnumValue(); double manualSectionProbability = random.NextDouble(); bool furtherAnalysisNeeded = random.NextBoolean(); double refinedSectionProbability = random.NextDouble(); Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs =================================================================== diff -u -r48ffe95c3ecd43a09fbdea6a23711b49073504af -r6b3753a9bfc048980b06342b163783b28c2d8a24 --- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs (.../RiskeerProjectTestHelper.cs) (revision 48ffe95c3ecd43a09fbdea6a23711b49073504af) +++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs (.../RiskeerProjectTestHelper.cs) (revision 6b3753a9bfc048980b06342b163783b28c2d8a24) @@ -1016,7 +1016,7 @@ foreach (AdoptableFailureMechanismSectionResult sectionResult in sectionResults) { sectionResult.IsRelevant = random.NextBoolean(); - sectionResult.InitialFailureMechanismResult = random.NextEnumValue(); + sectionResult.InitialFailureMechanismResult = random.NextEnumValue(); sectionResult.ManualInitialFailureMechanismResultSectionProbability = random.NextDouble(); sectionResult.FurtherAnalysisNeeded = random.NextBoolean(); sectionResult.RefinedSectionProbability = random.NextDouble(); @@ -1272,7 +1272,7 @@ foreach (PipingFailureMechanismSectionResult sectionResult in sectionResults) { sectionResult.IsRelevant = random.NextBoolean(); - sectionResult.InitialFailureMechanismResult = random.NextEnumValue(); + sectionResult.InitialFailureMechanismResult = random.NextEnumValue(); sectionResult.ManualInitialFailureMechanismResultProfileProbability = random.NextDouble(); sectionResult.ManualInitialFailureMechanismResultSectionProbability = random.NextDouble(); sectionResult.FurtherAnalysisNeeded = random.NextBoolean(); @@ -1796,7 +1796,7 @@ foreach (MacroStabilityInwardsFailureMechanismSectionResult sectionResult in sectionResults) { sectionResult.IsRelevant = random.NextBoolean(); - sectionResult.InitialFailureMechanismResult = random.NextEnumValue(); + sectionResult.InitialFailureMechanismResult = random.NextEnumValue(); sectionResult.ManualInitialFailureMechanismResultProfileProbability = random.NextDouble(); sectionResult.ManualInitialFailureMechanismResultSectionProbability = random.NextDouble(); sectionResult.FurtherAnalysisNeeded = random.NextBoolean();