Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MacroStabilityOutwardsResultView.cs =================================================================== diff -u -r998ccbf3ee6675def96f9650896beb02e52a22a5 -r17ccd811c490ba2b7a8599f364ef60fbdd7e64c0 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MacroStabilityOutwardsResultView.cs (.../MacroStabilityOutwardsResultView.cs) (revision 998ccbf3ee6675def96f9650896beb02e52a22a5) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MacroStabilityOutwardsResultView.cs (.../MacroStabilityOutwardsResultView.cs) (revision 17ccd811c490ba2b7a8599f364ef60fbdd7e64c0) @@ -111,6 +111,10 @@ FailureMechanismSectionResultColumnBuilder.AddTailorMadeAssessmentAssemblyColumn( DataGridViewControl, nameof(MacroStabilityOutwardsSectionResultRow.TailorMadeAssemblyCategoryGroup)); + + FailureMechanismSectionResultColumnBuilder.AddCombinedAssessmentAssemblyColumn( + DataGridViewControl, + nameof(MacroStabilityOutwardsSectionResultRow.CombinedAssemblyCategoryGroup)); } private static IEnumerable> CreateFormattingRules() Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacrostabilityOutwardsResultViewTest.cs =================================================================== diff -u -r998ccbf3ee6675def96f9650896beb02e52a22a5 -r17ccd811c490ba2b7a8599f364ef60fbdd7e64c0 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacrostabilityOutwardsResultViewTest.cs (.../MacrostabilityOutwardsResultViewTest.cs) (revision 998ccbf3ee6675def96f9650896beb02e52a22a5) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacrostabilityOutwardsResultViewTest.cs (.../MacrostabilityOutwardsResultViewTest.cs) (revision 17ccd811c490ba2b7a8599f364ef60fbdd7e64c0) @@ -51,7 +51,8 @@ private const int simpleAssemblyCategoryGroupIndex = 6; private const int detailedAssemblyCategoryGroupIndex = 7; private const int tailorMadeAssemblyCategoryGroupIndex = 8; - private const int columnCount = 9; + private const int combinedAssemblyCategoryGroupIndex = 9; + private const int columnCount = 10; [Test] public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException() @@ -119,6 +120,7 @@ Assert.IsInstanceOf(dataGridView.Columns[simpleAssemblyCategoryGroupIndex]); Assert.IsInstanceOf(dataGridView.Columns[detailedAssemblyCategoryGroupIndex]); Assert.IsInstanceOf(dataGridView.Columns[tailorMadeAssemblyCategoryGroupIndex]); + Assert.IsInstanceOf(dataGridView.Columns[combinedAssemblyCategoryGroupIndex]); Assert.AreEqual("Vak", dataGridView.Columns[nameColumnIndex].HeaderText); Assert.AreEqual("Eenvoudige toets", dataGridView.Columns[simpleAssessmentIndex].HeaderText); @@ -129,6 +131,7 @@ Assert.AreEqual("Assemblageresultaat\r\neenvoudige toets", dataGridView.Columns[simpleAssemblyCategoryGroupIndex].HeaderText); Assert.AreEqual("Assemblageresultaat\r\ngedetailleerde toets per vak", dataGridView.Columns[detailedAssemblyCategoryGroupIndex].HeaderText); Assert.AreEqual("Assemblageresultaat\r\ntoets op maat", dataGridView.Columns[tailorMadeAssemblyCategoryGroupIndex].HeaderText); + Assert.AreEqual("Assemblageresultaat\r\ngecombineerd", dataGridView.Columns[combinedAssemblyCategoryGroupIndex].HeaderText); Assert.AreEqual(DataGridViewAutoSizeColumnsMode.AllCells, dataGridView.AutoSizeColumnsMode); Assert.AreEqual(DataGridViewContentAlignment.MiddleCenter, dataGridView.ColumnHeadersDefaultCellStyle.Alignment); @@ -190,6 +193,7 @@ Assert.AreEqual(rowObject.SimpleAssemblyCategoryGroup, cells[simpleAssemblyCategoryGroupIndex].Value); Assert.AreEqual(rowObject.DetailedAssemblyCategoryGroup, cells[detailedAssemblyCategoryGroupIndex].Value); Assert.AreEqual(rowObject.TailorMadeAssemblyCategoryGroup, cells[tailorMadeAssemblyCategoryGroupIndex].Value); + Assert.AreEqual(rowObject.CombinedAssemblyCategoryGroup, cells[combinedAssemblyCategoryGroupIndex].Value); mocks.VerifyAll(); } }