Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismResultView.cs =================================================================== diff -u -r6d38d27e97da2e73aa78f0e8d9345efb325c4ee4 -rae2d859efeb30d77cf03b19170d84d8d175d9979 --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismResultView.cs (.../MacroStabilityInwardsFailureMechanismResultView.cs) (revision 6d38d27e97da2e73aa78f0e8d9345efb325c4ee4) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismResultView.cs (.../MacroStabilityInwardsFailureMechanismResultView.cs) (revision ae2d859efeb30d77cf03b19170d84d8d175d9979) @@ -134,10 +134,6 @@ DataGridViewControl, nameof(AdoptableWithProfileProbabilityFailureMechanismSectionResultRow.InitialFailureMechanismResultType)); - FailureMechanismSectionResultViewColumnBuilder.AddInitialFailureMechanismResultProfileProbabilityColumn( - DataGridViewControl, - nameof(AdoptableWithProfileProbabilityFailureMechanismSectionResultRow.InitialFailureMechanismResultProfileProbability)); - FailureMechanismSectionResultViewColumnBuilder.AddInitialFailureMechanismResultSectionProbabilityColumn( DataGridViewControl, nameof(AdoptableWithProfileProbabilityFailureMechanismSectionResultRow.InitialFailureMechanismResultSectionProbability)); @@ -150,26 +146,14 @@ DataGridViewControl, nameof(AdoptableWithProfileProbabilityFailureMechanismSectionResultRow.ProbabilityRefinementType)); - FailureMechanismSectionResultViewColumnBuilder.AddRefinedProfileProbabilityColumn( - DataGridViewControl, - nameof(AdoptableWithProfileProbabilityFailureMechanismSectionResultRow.RefinedProfileProbability)); - FailureMechanismSectionResultViewColumnBuilder.AddRefinedSectionProbabilityColumn( DataGridViewControl, nameof(AdoptableWithProfileProbabilityFailureMechanismSectionResultRow.RefinedSectionProbability)); - FailureMechanismSectionResultViewColumnBuilder.AddAssemblyProfileProbabilityColumn( - DataGridViewControl, - nameof(AdoptableWithProfileProbabilityFailureMechanismSectionResultRow.ProfileProbability)); - FailureMechanismSectionResultViewColumnBuilder.AddAssemblySectionProbabilityColumn( DataGridViewControl, nameof(AdoptableWithProfileProbabilityFailureMechanismSectionResultRow.SectionProbability)); - FailureMechanismSectionResultViewColumnBuilder.AddAssemblySectionNColumn( - DataGridViewControl, - nameof(AdoptableWithProfileProbabilityFailureMechanismSectionResultRow.SectionN)); - FailureMechanismSectionResultViewColumnBuilder.AddAssemblyGroupColumn( DataGridViewControl, nameof(AdoptableWithProfileProbabilityFailureMechanismSectionResultRow.AssemblyGroup)); Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismResultViewTest.cs =================================================================== diff -u -rb30fd888fe34994586ea1d32cd640794de789be2 -rae2d859efeb30d77cf03b19170d84d8d175d9979 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismResultViewTest.cs (.../MacroStabilityInwardsFailureMechanismResultViewTest.cs) (revision b30fd888fe34994586ea1d32cd640794de789be2) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismResultViewTest.cs (.../MacroStabilityInwardsFailureMechanismResultViewTest.cs) (revision ae2d859efeb30d77cf03b19170d84d8d175d9979) @@ -48,17 +48,13 @@ private const int nameColumnIndex = 0; private const int isRelevantIndex = 1; private const int initialFailureMechanismResultTypeIndex = 2; - private const int initialFailureMechanismResultProfileProbabilityIndex = 3; - private const int initialFailureMechanismResultSectionProbabilityIndex = 4; - private const int furtherAnalysisTypeIndex = 5; - private const int probabilityRefinementTypeIndex = 6; - private const int refinedProfileProbabilityIndex = 7; - private const int refinedSectionProbabilityIndex = 8; - private const int profileProbabilityIndex = 9; - private const int sectionProbabilityIndex = 10; - private const int sectionNIndex = 11; - private const int assemblyGroupIndex = 12; - private const int columnCount = 13; + private const int initialFailureMechanismResultSectionProbabilityIndex = 3; + private const int furtherAnalysisTypeIndex = 4; + private const int probabilityRefinementTypeIndex = 5; + private const int refinedSectionProbabilityIndex = 6; + private const int sectionProbabilityIndex = 7; + private const int assemblyGroupIndex = 8; + private const int columnCount = 9; private Form testForm; [SetUp] @@ -112,43 +108,31 @@ Assert.IsInstanceOf(dataGridView.Columns[nameColumnIndex]); Assert.IsInstanceOf(dataGridView.Columns[isRelevantIndex]); Assert.IsInstanceOf(dataGridView.Columns[initialFailureMechanismResultTypeIndex]); - Assert.IsInstanceOf(dataGridView.Columns[initialFailureMechanismResultProfileProbabilityIndex]); Assert.IsInstanceOf(dataGridView.Columns[initialFailureMechanismResultSectionProbabilityIndex]); Assert.IsInstanceOf(dataGridView.Columns[furtherAnalysisTypeIndex]); Assert.IsInstanceOf(dataGridView.Columns[probabilityRefinementTypeIndex]); - Assert.IsInstanceOf(dataGridView.Columns[refinedProfileProbabilityIndex]); Assert.IsInstanceOf(dataGridView.Columns[refinedSectionProbabilityIndex]); - Assert.IsInstanceOf(dataGridView.Columns[profileProbabilityIndex]); Assert.IsInstanceOf(dataGridView.Columns[sectionProbabilityIndex]); - Assert.IsInstanceOf(dataGridView.Columns[sectionNIndex]); Assert.IsInstanceOf(dataGridView.Columns[assemblyGroupIndex]); Assert.AreEqual("Vaknaam", dataGridView.Columns[nameColumnIndex].HeaderText); Assert.AreEqual("Is relevant", dataGridView.Columns[isRelevantIndex].HeaderText); Assert.AreEqual("Resultaat initieel mechanisme", dataGridView.Columns[initialFailureMechanismResultTypeIndex].HeaderText); - Assert.AreEqual("Faalkans initieel\r\nmechanisme per doorsnede\r\n[1/jaar]", dataGridView.Columns[initialFailureMechanismResultProfileProbabilityIndex].HeaderText); Assert.AreEqual("Faalkans initieel\r\nmechanisme per vak\r\n[1/jaar]", dataGridView.Columns[initialFailureMechanismResultSectionProbabilityIndex].HeaderText); Assert.AreEqual("Vervolganalyse", dataGridView.Columns[furtherAnalysisTypeIndex].HeaderText); Assert.AreEqual("Aanscherpen faalkans", dataGridView.Columns[probabilityRefinementTypeIndex].HeaderText); - Assert.AreEqual("Aangescherpte\r\nfaalkans per doorsnede\r\n[1/jaar]", dataGridView.Columns[refinedProfileProbabilityIndex].HeaderText); Assert.AreEqual("Aangescherpte\r\nfaalkans per vak\r\n[1/jaar]", dataGridView.Columns[refinedSectionProbabilityIndex].HeaderText); - Assert.AreEqual("Rekenwaarde\r\nfaalkans per doorsnede\r\n[1/jaar]", dataGridView.Columns[profileProbabilityIndex].HeaderText); Assert.AreEqual("Rekenwaarde\r\nfaalkans per vak\r\n[1/jaar]", dataGridView.Columns[sectionProbabilityIndex].HeaderText); - Assert.AreEqual("Rekenwaarde Nvak*\r\n[-]", dataGridView.Columns[sectionNIndex].HeaderText); Assert.AreEqual("Duidingsklasse", dataGridView.Columns[assemblyGroupIndex].HeaderText); Assert.IsTrue(dataGridView.Columns[nameColumnIndex].ReadOnly); Assert.IsFalse(dataGridView.Columns[isRelevantIndex].ReadOnly); Assert.IsFalse(dataGridView.Columns[initialFailureMechanismResultTypeIndex].ReadOnly); - Assert.IsFalse(dataGridView.Columns[initialFailureMechanismResultProfileProbabilityIndex].ReadOnly); Assert.IsFalse(dataGridView.Columns[initialFailureMechanismResultSectionProbabilityIndex].ReadOnly); Assert.IsFalse(dataGridView.Columns[furtherAnalysisTypeIndex].ReadOnly); Assert.IsFalse(dataGridView.Columns[probabilityRefinementTypeIndex].ReadOnly); - Assert.IsFalse(dataGridView.Columns[refinedProfileProbabilityIndex].ReadOnly); Assert.IsFalse(dataGridView.Columns[refinedSectionProbabilityIndex].ReadOnly); - Assert.IsTrue(dataGridView.Columns[profileProbabilityIndex].ReadOnly); Assert.IsTrue(dataGridView.Columns[sectionProbabilityIndex].ReadOnly); - Assert.IsTrue(dataGridView.Columns[sectionNIndex].ReadOnly); Assert.IsTrue(dataGridView.Columns[assemblyGroupIndex].ReadOnly); } } @@ -187,16 +171,12 @@ Assert.AreEqual("Section 1", cells[nameColumnIndex].FormattedValue); Assert.AreEqual(true, cells[isRelevantIndex].Value); Assert.AreEqual(AdoptableInitialFailureMechanismResultType.Adopt, cells[initialFailureMechanismResultTypeIndex].Value); - Assert.AreEqual(probability, cells[initialFailureMechanismResultProfileProbabilityIndex].Value); Assert.AreEqual(probability * failureMechanism.MacroStabilityInwardsProbabilityAssessmentInput.GetN(section.Length), cells[initialFailureMechanismResultSectionProbabilityIndex].Value); Assert.AreEqual(FailureMechanismSectionResultFurtherAnalysisType.NotNecessary, cells[furtherAnalysisTypeIndex].Value); Assert.AreEqual(ProbabilityRefinementType.Section, cells[probabilityRefinementTypeIndex].Value); - Assert.AreEqual("", cells[refinedProfileProbabilityIndex].FormattedValue); Assert.AreEqual("-", cells[refinedSectionProbabilityIndex].FormattedValue); - Assert.AreEqual("1/100", cells[profileProbabilityIndex].FormattedValue); Assert.AreEqual("1/10", cells[sectionProbabilityIndex].FormattedValue); - Assert.AreEqual("10,00", cells[sectionNIndex].FormattedValue); Assert.AreEqual("+I", cells[assemblyGroupIndex].FormattedValue); } }