Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Builders/FailureMechanismSectionResultColumnBuilder.cs =================================================================== diff -u -r6febcb0e30caa9ad7323b424b5765a3813e6bcea -r51c1451ff07b24092e65c6d47b902c7ec494ca2c --- Ringtoets/Common/src/Ringtoets.Common.Forms/Builders/FailureMechanismSectionResultColumnBuilder.cs (.../FailureMechanismSectionResultColumnBuilder.cs) (revision 6febcb0e30caa9ad7323b424b5765a3813e6bcea) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Builders/FailureMechanismSectionResultColumnBuilder.cs (.../FailureMechanismSectionResultColumnBuilder.cs) (revision 51c1451ff07b24092e65c6d47b902c7ec494ca2c) @@ -206,16 +206,16 @@ #endregion - #region Assessment Assembly + #region Assembly Category Group /// /// Adds a column to the showing the simple - /// assessment assembly group. + /// assembly category group. /// /// The to add the column to. /// The data property name of the column. /// Thrown when any parameter is null. - public static void AddSimpleAssessmentAssemblyColumn(DataGridViewControl dataGridViewControl, string dataPropertyName) + public static void AddSimpleAssemblyCategoryGroupColumn(DataGridViewControl dataGridViewControl, string dataPropertyName) { if (dataGridViewControl == null) { @@ -234,7 +234,7 @@ /// /// Adds a column to the showing the detailed - /// assessment assembly group. + /// assembly category group. /// /// The to add the column to. /// The data property name of the column. @@ -258,12 +258,12 @@ /// /// Adds a column to the showing the tailor made - /// assessment assembly group. + /// assembly category group. /// /// The to add the column to. /// The data property name of the column. /// Thrown when any parameter is null. - public static void AddTailorMadeAssessmentAssemblyColumn(DataGridViewControl dataGridViewControl, string dataPropertyName) + public static void AddTailorMadeAssemblyCategoryGroupColumn(DataGridViewControl dataGridViewControl, string dataPropertyName) { if (dataGridViewControl == null) { @@ -281,13 +281,13 @@ } /// - /// Adds a column to the showing the - /// combined assessment assembly group. + /// Adds a column to the showing the combined + /// assembly category group. /// /// The to add the column to. /// The data property name of the column. /// Thrown when any parameter is null. - public static void AddCombinedAssessmentAssemblyColumn(DataGridViewControl dataGridViewControl, string dataPropertyName) + public static void AddCombinedAssemblyCategoryGroupColumn(DataGridViewControl dataGridViewControl, string dataPropertyName) { if (dataGridViewControl == null) { Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Builders/FailureMechanismSectionResultColumnBuilderTest.cs =================================================================== diff -u -r6febcb0e30caa9ad7323b424b5765a3813e6bcea -r51c1451ff07b24092e65c6d47b902c7ec494ca2c --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Builders/FailureMechanismSectionResultColumnBuilderTest.cs (.../FailureMechanismSectionResultColumnBuilderTest.cs) (revision 6febcb0e30caa9ad7323b424b5765a3813e6bcea) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Builders/FailureMechanismSectionResultColumnBuilderTest.cs (.../FailureMechanismSectionResultColumnBuilderTest.cs) (revision 51c1451ff07b24092e65c6d47b902c7ec494ca2c) @@ -386,29 +386,29 @@ #region Assessment Assembly [Test] - public void AddSimpleAssessmentAssemblyColumn_DataGridViewControlNull_ThrowsArgumentNullException() + public void AddSimpleAssemblyCategoryGroupColumn_DataGridViewControlNull_ThrowsArgumentNullException() { // Call - TestDelegate test = () => FailureMechanismSectionResultColumnBuilder.AddSimpleAssessmentAssemblyColumn(null, "property"); + TestDelegate test = () => FailureMechanismSectionResultColumnBuilder.AddSimpleAssemblyCategoryGroupColumn(null, "property"); // Assert var exception = Assert.Throws(test); Assert.AreEqual("dataGridViewControl", exception.ParamName); } [Test] - public void AddSimpleAssessmentAssemblyColumn_DataPropertyNameNull_ThrowsArgumentNullException() + public void AddSimpleAssemblyCategoryGroupColumn_DataPropertyNameNull_ThrowsArgumentNullException() { // Call - TestDelegate test = () => FailureMechanismSectionResultColumnBuilder.AddSimpleAssessmentAssemblyColumn(new DataGridViewControl(), null); + TestDelegate test = () => FailureMechanismSectionResultColumnBuilder.AddSimpleAssemblyCategoryGroupColumn(new DataGridViewControl(), null); // Assert var exception = Assert.Throws(test); Assert.AreEqual("dataPropertyName", exception.ParamName); } [Test] - public void AddSimpleAssessmentAssemblyColumn_WithParameters_AddsColumnToDataGridViewControl() + public void AddSimpleAssemblyCategoryGroupColumn_WithParameters_AddsColumnToDataGridViewControl() { // Setup using (var form = new Form()) @@ -422,7 +422,7 @@ Assert.AreEqual(0, dataGridView.ColumnCount); // Call - FailureMechanismSectionResultColumnBuilder.AddSimpleAssessmentAssemblyColumn(control, dataPropertyName); + FailureMechanismSectionResultColumnBuilder.AddSimpleAssemblyCategoryGroupColumn(control, dataPropertyName); // Assert Assert.AreEqual(1, dataGridView.ColumnCount); @@ -434,7 +434,7 @@ } [Test] - public void AddDetailedAssessmentAssemblyColumn_DataGridViewControlNull_ThrowsArgumentNullException() + public void AddDetailedAssemblyCategoryGroupColumn_DataGridViewControlNull_ThrowsArgumentNullException() { // Call TestDelegate test = () => FailureMechanismSectionResultColumnBuilder.AddDetailedAssessmentAssemblyColumn(null, "property"); @@ -445,7 +445,7 @@ } [Test] - public void AddDetailedAssessmentAssemblyColumn_DataPropertyNameNull_ThrowsArgumentNullException() + public void AddDetailedAssemblyCategoryGroupColumn_DataPropertyNameNull_ThrowsArgumentNullException() { // Call TestDelegate test = () => FailureMechanismSectionResultColumnBuilder.AddDetailedAssessmentAssemblyColumn(new DataGridViewControl(), null); @@ -456,7 +456,7 @@ } [Test] - public void AddDetailedAssessmentAssemblyColumn_WithParameters_AddsColumnToDataGridViewControl() + public void AddDetailedAssemblyCategoryGroupColumn_WithParameters_AddsColumnToDataGridViewControl() { // Setup using (var form = new Form()) @@ -482,29 +482,29 @@ } [Test] - public void AddTailorMadeAssessmentAssemblyColumn_DataGridViewControlNull_ThrowsArgumentNullException() + public void AddTailorMadeAssemblyCategoryGroupColumn_DataGridViewControlNull_ThrowsArgumentNullException() { // Call - TestDelegate test = () => FailureMechanismSectionResultColumnBuilder.AddTailorMadeAssessmentAssemblyColumn(null, "property"); + TestDelegate test = () => FailureMechanismSectionResultColumnBuilder.AddTailorMadeAssemblyCategoryGroupColumn(null, "property"); // Assert var exception = Assert.Throws(test); Assert.AreEqual("dataGridViewControl", exception.ParamName); } [Test] - public void AddTailorMadeAssessmentAssemblyColumn_DataPropertyNameNull_ThrowsArgumentNullException() + public void AddTailorMadeAssemblyCategoryGroupColumn_DataPropertyNameNull_ThrowsArgumentNullException() { // Call - TestDelegate test = () => FailureMechanismSectionResultColumnBuilder.AddTailorMadeAssessmentAssemblyColumn(new DataGridViewControl(), null); + TestDelegate test = () => FailureMechanismSectionResultColumnBuilder.AddTailorMadeAssemblyCategoryGroupColumn(new DataGridViewControl(), null); // Assert var exception = Assert.Throws(test); Assert.AreEqual("dataPropertyName", exception.ParamName); } [Test] - public void AddTailorMadeAssessmentAssemblyColumn_WithParameters_AddsColumnToDataGridViewControl() + public void AddTailorMadeAssemblyCategoryGroupColumn_WithParameters_AddsColumnToDataGridViewControl() { // Setup using (var form = new Form()) @@ -518,7 +518,7 @@ Assert.AreEqual(0, dataGridView.ColumnCount); // Call - FailureMechanismSectionResultColumnBuilder.AddTailorMadeAssessmentAssemblyColumn(control, dataPropertyName); + FailureMechanismSectionResultColumnBuilder.AddTailorMadeAssemblyCategoryGroupColumn(control, dataPropertyName); // Assert Assert.AreEqual(1, dataGridView.ColumnCount); @@ -530,29 +530,29 @@ } [Test] - public void AddCombinedAssessmentAssemblyColumn_DataGridViewControlNull_ThrowsArgumentNullException() + public void AddCombinedAssemblyCategoryGroupColumn_DataGridViewControlNull_ThrowsArgumentNullException() { // Call - TestDelegate test = () => FailureMechanismSectionResultColumnBuilder.AddCombinedAssessmentAssemblyColumn(null, "property"); + TestDelegate test = () => FailureMechanismSectionResultColumnBuilder.AddCombinedAssemblyCategoryGroupColumn(null, "property"); // Assert var exception = Assert.Throws(test); Assert.AreEqual("dataGridViewControl", exception.ParamName); } [Test] - public void AddCombinedAssessmentAssemblyColumn_DataPropertyNameNull_ThrowsArgumentNullException() + public void AddCombinedAssemblyCategoryGroupColumn_DataPropertyNameNull_ThrowsArgumentNullException() { // Call - TestDelegate test = () => FailureMechanismSectionResultColumnBuilder.AddCombinedAssessmentAssemblyColumn(new DataGridViewControl(), null); + TestDelegate test = () => FailureMechanismSectionResultColumnBuilder.AddCombinedAssemblyCategoryGroupColumn(new DataGridViewControl(), null); // Assert var exception = Assert.Throws(test); Assert.AreEqual("dataPropertyName", exception.ParamName); } [Test] - public void AddCombinedAssessmentAssemblyColumn_WithParameters_AddsColumnToDataGridViewControl() + public void AddCombinedAssemblyCategoryGroupColumn_WithParameters_AddsColumnToDataGridViewControl() { // Setup using (var form = new Form()) @@ -566,7 +566,7 @@ Assert.AreEqual(0, dataGridView.ColumnCount); // Call - FailureMechanismSectionResultColumnBuilder.AddCombinedAssessmentAssemblyColumn(control, dataPropertyName); + FailureMechanismSectionResultColumnBuilder.AddCombinedAssemblyCategoryGroupColumn(control, dataPropertyName); // Assert Assert.AreEqual(1, dataGridView.ColumnCount); Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MacroStabilityOutwardsResultView.cs =================================================================== diff -u -raa1f5e937d3b306af894425c975187a8de09512d -r51c1451ff07b24092e65c6d47b902c7ec494ca2c --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MacroStabilityOutwardsResultView.cs (.../MacroStabilityOutwardsResultView.cs) (revision aa1f5e937d3b306af894425c975187a8de09512d) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MacroStabilityOutwardsResultView.cs (.../MacroStabilityOutwardsResultView.cs) (revision 51c1451ff07b24092e65c6d47b902c7ec494ca2c) @@ -106,19 +106,19 @@ DataGridViewControl, nameof(MacroStabilityOutwardsSectionResultRow.TailorMadeAssessmentProbability)); - FailureMechanismSectionResultColumnBuilder.AddSimpleAssessmentAssemblyColumn( + FailureMechanismSectionResultColumnBuilder.AddSimpleAssemblyCategoryGroupColumn( DataGridViewControl, nameof(MacroStabilityOutwardsSectionResultRow.SimpleAssemblyCategoryGroup)); FailureMechanismSectionResultColumnBuilder.AddDetailedAssessmentAssemblyColumn( DataGridViewControl, nameof(MacroStabilityOutwardsSectionResultRow.DetailedAssemblyCategoryGroup)); - FailureMechanismSectionResultColumnBuilder.AddTailorMadeAssessmentAssemblyColumn( + FailureMechanismSectionResultColumnBuilder.AddTailorMadeAssemblyCategoryGroupColumn( DataGridViewControl, nameof(MacroStabilityOutwardsSectionResultRow.TailorMadeAssemblyCategoryGroup)); - FailureMechanismSectionResultColumnBuilder.AddCombinedAssessmentAssemblyColumn( + FailureMechanismSectionResultColumnBuilder.AddCombinedAssemblyCategoryGroupColumn( DataGridViewControl, nameof(MacroStabilityOutwardsSectionResultRow.CombinedAssemblyCategoryGroup));