Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/NonAdoptableFailureMechanismResultView.cs =================================================================== diff -u -r1cb962c165ef2fba7bda085049ae4b5c147ce048 -r7fc3ad0bad20e1719edb1b88d346eec65e1ce1a7 --- Riskeer/Common/src/Riskeer.Common.Forms/Views/NonAdoptableFailureMechanismResultView.cs (.../NonAdoptableFailureMechanismResultView.cs) (revision 1cb962c165ef2fba7bda085049ae4b5c147ce048) +++ Riskeer/Common/src/Riskeer.Common.Forms/Views/NonAdoptableFailureMechanismResultView.cs (.../NonAdoptableFailureMechanismResultView.cs) (revision 7fc3ad0bad20e1719edb1b88d346eec65e1ce1a7) @@ -106,7 +106,7 @@ FailureMechanismSectionResultViewColumnBuilder.AddInitialFailureMechanismResultColumn( DataGridViewControl, - nameof(NonAdoptableFailureMechanismSectionResultRow.InitialFailureMechanismResult)); + nameof(NonAdoptableFailureMechanismSectionResultRow.InitialFailureMechanismResultType)); FailureMechanismSectionResultViewColumnBuilder.AddInitialFailureMechanismResultSectionProbabilityColumn( DataGridViewControl, Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/NonAdoptableFailureMechanismSectionResultRow.cs =================================================================== diff -u -ra4e41c4dc6606d153cf298ad2e80a4dc94314d83 -r7fc3ad0bad20e1719edb1b88d346eec65e1ce1a7 --- Riskeer/Common/src/Riskeer.Common.Forms/Views/NonAdoptableFailureMechanismSectionResultRow.cs (.../NonAdoptableFailureMechanismSectionResultRow.cs) (revision a4e41c4dc6606d153cf298ad2e80a4dc94314d83) +++ Riskeer/Common/src/Riskeer.Common.Forms/Views/NonAdoptableFailureMechanismSectionResultRow.cs (.../NonAdoptableFailureMechanismSectionResultRow.cs) (revision 7fc3ad0bad20e1719edb1b88d346eec65e1ce1a7) @@ -97,9 +97,9 @@ } /// - /// Gets or sets the initial failure mechanism result. + /// Gets or sets the initial failure mechanism result type. /// - public NonAdoptableInitialFailureMechanismResultType InitialFailureMechanismResult + public NonAdoptableInitialFailureMechanismResultType InitialFailureMechanismResultType { get => SectionResult.InitialFailureMechanismResultType; set @@ -187,7 +187,7 @@ try { AssemblyResult = FailureMechanismSectionAssemblyGroupFactory.AssembleSection( - assessmentSection, IsRelevant, InitialFailureMechanismResult, + assessmentSection, IsRelevant, InitialFailureMechanismResultType, InitialFailureMechanismResultSectionProbability, FurtherAnalysisNeeded, SectionResult.RefinedSectionProbability); } @@ -213,7 +213,7 @@ { ColumnStateHelper.SetColumnState(ColumnStateDefinitions[initialFailureMechanismResultIndex], !IsRelevant); - if (!IsRelevant || InitialFailureMechanismResult == NonAdoptableInitialFailureMechanismResultType.NoFailureProbability) + if (!IsRelevant || InitialFailureMechanismResultType == NonAdoptableInitialFailureMechanismResultType.NoFailureProbability) { ColumnStateHelper.DisableColumn(ColumnStateDefinitions[initialFailureMechanismResultSectionProbabilityIndex]); } Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/NonAdoptableFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -ra4e41c4dc6606d153cf298ad2e80a4dc94314d83 -r7fc3ad0bad20e1719edb1b88d346eec65e1ce1a7 --- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/NonAdoptableFailureMechanismSectionResultRowTest.cs (.../NonAdoptableFailureMechanismSectionResultRowTest.cs) (revision a4e41c4dc6606d153cf298ad2e80a4dc94314d83) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/NonAdoptableFailureMechanismSectionResultRowTest.cs (.../NonAdoptableFailureMechanismSectionResultRowTest.cs) (revision 7fc3ad0bad20e1719edb1b88d346eec65e1ce1a7) @@ -101,7 +101,7 @@ // Assert Assert.IsInstanceOf>(row); Assert.AreEqual(result.IsRelevant, row.IsRelevant); - Assert.AreEqual(result.InitialFailureMechanismResultType, row.InitialFailureMechanismResult); + Assert.AreEqual(result.InitialFailureMechanismResultType, row.InitialFailureMechanismResultType); Assert.AreEqual(result.ManualInitialFailureMechanismResultSectionProbability, row.InitialFailureMechanismResultSectionProbability); Assert.AreEqual(result.FurtherAnalysisNeeded, row.FurtherAnalysisNeeded); Assert.AreEqual(result.RefinedSectionProbability, row.RefinedSectionProbability); @@ -138,11 +138,11 @@ } [Test] - public void InitialFailureMechanismResult_SetNewValue_NotifyObserversAndPropertyChanged() + public void InitialFailureMechanismResultType_SetNewValue_NotifyObserversAndPropertyChanged() { const NonAdoptableInitialFailureMechanismResultType newValue = NonAdoptableInitialFailureMechanismResultType.NoFailureProbability; Property_SetNewValue_NotifyObserversAndPropertyChanged( - row => row.InitialFailureMechanismResult = newValue, + row => row.InitialFailureMechanismResultType = newValue, result => result.InitialFailureMechanismResultType, newValue); } @@ -331,7 +331,7 @@ // When calculator.ThrowExceptionOnCalculate = true; - row.InitialFailureMechanismResult = NonAdoptableInitialFailureMechanismResultType.NoFailureProbability; + row.InitialFailureMechanismResultType = NonAdoptableInitialFailureMechanismResultType.NoFailureProbability; // Then var expectedAssemblyResult = new DefaultFailureMechanismSectionAssemblyResult(); @@ -364,7 +364,7 @@ // When calculator.ThrowExceptionOnCalculate = true; - row.InitialFailureMechanismResult = NonAdoptableInitialFailureMechanismResultType.NoFailureProbability; + row.InitialFailureMechanismResultType = NonAdoptableInitialFailureMechanismResultType.NoFailureProbability; // Then const string expectedErrorText = "Message"; @@ -398,7 +398,7 @@ // When calculator.ThrowExceptionOnCalculate = false; - row.InitialFailureMechanismResult = NonAdoptableInitialFailureMechanismResultType.NoFailureProbability; + row.InitialFailureMechanismResultType = NonAdoptableInitialFailureMechanismResultType.NoFailureProbability; // Then Assert.AreEqual(string.Empty, columnStateDefinitions[ConstructionProperties.SectionProbabilityIndex].ErrorText); @@ -466,8 +466,8 @@ [Test] [TestCase(NonAdoptableInitialFailureMechanismResultType.Manual, true, false)] [TestCase(NonAdoptableInitialFailureMechanismResultType.NoFailureProbability, false, true)] - public void Constructor_WithInitialFailureMechanismResult_ExpectedColumnStates(NonAdoptableInitialFailureMechanismResultType initialFailureMechanismResultType, - bool isEnabled, bool isReadOnly) + public void Constructor_WithInitialFailureMechanismResultType_ExpectedColumnStates(NonAdoptableInitialFailureMechanismResultType initialFailureMechanismResultType, + bool isEnabled, bool isReadOnly) { // Setup FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); @@ -516,8 +516,8 @@ [Test] [TestCaseSource(typeof(AssemblyGroupColorTestHelper), nameof(AssemblyGroupColorTestHelper.FailureMechanismSectionAssemblyGroupColorCases))] - public void Constructor_WithAssemblyGroupsSet_ExpectedColumnStates(FailureMechanismSectionAssemblyGroup assemblyGroup, - Color expectedBackgroundColor) + public void Constructor_WithAssemblyGroupSet_ExpectedColumnStates(FailureMechanismSectionAssemblyGroup assemblyGroup, + Color expectedBackgroundColor) { // Setup FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();