Index: Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/ArbitraryProbabilityFailureMechanismSectionResult.cs =================================================================== diff -u -r01ff726dbaa67b9e0c19390f21121ac8e6f7c277 -rf5a2d607a5b8053b232c1f3ad572a0acba6a4e3a --- Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/ArbitraryProbabilityFailureMechanismSectionResult.cs (.../ArbitraryProbabilityFailureMechanismSectionResult.cs) (revision 01ff726dbaa67b9e0c19390f21121ac8e6f7c277) +++ Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/ArbitraryProbabilityFailureMechanismSectionResult.cs (.../ArbitraryProbabilityFailureMechanismSectionResult.cs) (revision f5a2d607a5b8053b232c1f3ad572a0acba6a4e3a) @@ -63,11 +63,6 @@ } /// - /// Gets or sets the value of assessment layer two b. - /// - public RoundedDouble AssessmentLayerTwoB { get; set; } - - /// /// Gets or sets the value of assessment layer three. /// public RoundedDouble AssessmentLayerThree { get; set; } Index: Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/NumericFailureMechanismSectionResult.cs =================================================================== diff -u -re442812a69b3e800977c4dde61d6f64e989ef20c -rf5a2d607a5b8053b232c1f3ad572a0acba6a4e3a --- Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/NumericFailureMechanismSectionResult.cs (.../NumericFailureMechanismSectionResult.cs) (revision e442812a69b3e800977c4dde61d6f64e989ef20c) +++ Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/NumericFailureMechanismSectionResult.cs (.../NumericFailureMechanismSectionResult.cs) (revision f5a2d607a5b8053b232c1f3ad572a0acba6a4e3a) @@ -41,11 +41,6 @@ public RoundedDouble AssessmentLayerTwoA { get; set; } /// - /// Gets or sets the value of assessment layer two b. - /// - public RoundedDouble AssessmentLayerTwoB { get; set; } - - /// /// Gets or sets the value of assessment layer three. /// public RoundedDouble AssessmentLayerThree { get; set; } Index: Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/SimpleFailureMechanismSectionResult.cs =================================================================== diff -u -re442812a69b3e800977c4dde61d6f64e989ef20c -rf5a2d607a5b8053b232c1f3ad572a0acba6a4e3a --- Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/SimpleFailureMechanismSectionResult.cs (.../SimpleFailureMechanismSectionResult.cs) (revision e442812a69b3e800977c4dde61d6f64e989ef20c) +++ Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/SimpleFailureMechanismSectionResult.cs (.../SimpleFailureMechanismSectionResult.cs) (revision f5a2d607a5b8053b232c1f3ad572a0acba6a4e3a) @@ -42,11 +42,6 @@ public AssessmentLayerTwoAResult AssessmentLayerTwoA { get; set; } /// - /// Gets or sets the value of assessment layer two b. - /// - public RoundedDouble AssessmentLayerTwoB { get; set; } - - /// /// Gets or sets the value of assessment layer three. /// public RoundedDouble AssessmentLayerThree { get; set; } Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/ArbitraryProbabilityFailureMechanismSectionResultRow.cs =================================================================== diff -u -re442812a69b3e800977c4dde61d6f64e989ef20c -rf5a2d607a5b8053b232c1f3ad572a0acba6a4e3a --- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/ArbitraryProbabilityFailureMechanismSectionResultRow.cs (.../ArbitraryProbabilityFailureMechanismSectionResultRow.cs) (revision e442812a69b3e800977c4dde61d6f64e989ef20c) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/ArbitraryProbabilityFailureMechanismSectionResultRow.cs (.../ArbitraryProbabilityFailureMechanismSectionResultRow.cs) (revision f5a2d607a5b8053b232c1f3ad572a0acba6a4e3a) @@ -114,21 +114,6 @@ } /// - /// Gets or sets the value representing the result of the layer 2b assessment. - /// - public RoundedDouble AssessmentLayerTwoB - { - get - { - return SectionResult.AssessmentLayerTwoB; - } - set - { - SectionResult.AssessmentLayerTwoB = value; - } - } - - /// /// Gets or sets the value representing the result of the layer 3 assessment. /// public RoundedDouble AssessmentLayerThree Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.cs =================================================================== diff -u -ra048dc4662f1eb83e4e8cd127790473f01470263 -rf5a2d607a5b8053b232c1f3ad572a0acba6a4e3a --- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.cs (.../FailureMechanismResultView.cs) (revision a048dc4662f1eb83e4e8cd127790473f01470263) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.cs (.../FailureMechanismResultView.cs) (revision f5a2d607a5b8053b232c1f3ad572a0acba6a4e3a) @@ -123,11 +123,7 @@ /// . /// /// An of . - protected virtual void AddDataGridColumns() - { - DataGridViewControl.AddTextBoxColumn("Name", Resources.FailureMechanismResultView_InitializeDataGridView_Section_name, true); - DataGridViewControl.AddCheckBoxColumn("AssessmentLayerOne", Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one); - } + protected abstract void AddDataGridColumns(); /// /// Updates the data source of the data grid view with the current known failure mechanism section results. Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/NumericFailureMechanismSectionResultRow.cs =================================================================== diff -u -rb9d20365707e77623054f96f0c8b544e86658e67 -rf5a2d607a5b8053b232c1f3ad572a0acba6a4e3a --- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/NumericFailureMechanismSectionResultRow.cs (.../NumericFailureMechanismSectionResultRow.cs) (revision b9d20365707e77623054f96f0c8b544e86658e67) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/NumericFailureMechanismSectionResultRow.cs (.../NumericFailureMechanismSectionResultRow.cs) (revision f5a2d607a5b8053b232c1f3ad572a0acba6a4e3a) @@ -90,21 +90,6 @@ } /// - /// Gets or sets the value representing the result of the layer 2b assessment. - /// - public RoundedDouble AssessmentLayerTwoB - { - get - { - return SectionResult.AssessmentLayerTwoB; - } - set - { - SectionResult.AssessmentLayerTwoB = value; - } - } - - /// /// Gets or sets the value representing the result of the layer 3 assessment. /// public RoundedDouble AssessmentLayerThree Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/SimpleFailureMechanismSectionResultRow.cs =================================================================== diff -u -r219f8633c1b5b24f9e9aec3e903734fa94775f0e -rf5a2d607a5b8053b232c1f3ad572a0acba6a4e3a --- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/SimpleFailureMechanismSectionResultRow.cs (.../SimpleFailureMechanismSectionResultRow.cs) (revision 219f8633c1b5b24f9e9aec3e903734fa94775f0e) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/SimpleFailureMechanismSectionResultRow.cs (.../SimpleFailureMechanismSectionResultRow.cs) (revision f5a2d607a5b8053b232c1f3ad572a0acba6a4e3a) @@ -90,21 +90,6 @@ } /// - /// Gets or sets the value representing the result of the layer 2b assessment. - /// - public RoundedDouble AssessmentLayerTwoB - { - get - { - return SectionResult.AssessmentLayerTwoB; - } - set - { - SectionResult.AssessmentLayerTwoB = value; - } - } - - /// /// Gets or sets the value representing the result of the layer 3 assessment. /// public RoundedDouble AssessmentLayerThree Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/FailureMechanism/ArbitraryProbabilityFailureMechanismSectionResultTest.cs =================================================================== diff -u -r01ff726dbaa67b9e0c19390f21121ac8e6f7c277 -rf5a2d607a5b8053b232c1f3ad572a0acba6a4e3a --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/FailureMechanism/ArbitraryProbabilityFailureMechanismSectionResultTest.cs (.../ArbitraryProbabilityFailureMechanismSectionResultTest.cs) (revision 01ff726dbaa67b9e0c19390f21121ac8e6f7c277) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/FailureMechanism/ArbitraryProbabilityFailureMechanismSectionResultTest.cs (.../ArbitraryProbabilityFailureMechanismSectionResultTest.cs) (revision f5a2d607a5b8053b232c1f3ad572a0acba6a4e3a) @@ -55,7 +55,6 @@ Assert.AreSame(section, result.Section); Assert.IsFalse(result.AssessmentLayerOne); Assert.AreEqual(1, result.AssessmentLayerTwoA.Value); - Assert.AreEqual(0, result.AssessmentLayerTwoB.Value); Assert.AreEqual(0, result.AssessmentLayerThree.Value); } Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/FailureMechanism/NumericFailureMechanismSectionResultTest.cs =================================================================== diff -u -rb9d20365707e77623054f96f0c8b544e86658e67 -rf5a2d607a5b8053b232c1f3ad572a0acba6a4e3a --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/FailureMechanism/NumericFailureMechanismSectionResultTest.cs (.../NumericFailureMechanismSectionResultTest.cs) (revision b9d20365707e77623054f96f0c8b544e86658e67) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/FailureMechanism/NumericFailureMechanismSectionResultTest.cs (.../NumericFailureMechanismSectionResultTest.cs) (revision f5a2d607a5b8053b232c1f3ad572a0acba6a4e3a) @@ -54,7 +54,6 @@ Assert.AreSame(section, result.Section); Assert.IsFalse(result.AssessmentLayerOne); Assert.AreEqual(0, result.AssessmentLayerTwoA.Value); - Assert.AreEqual(0, result.AssessmentLayerTwoB.Value); Assert.AreEqual(0, result.AssessmentLayerThree.Value); } } Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/FailureMechanism/SimpleFailureMechanismSectionResultTest.cs =================================================================== diff -u -r2fca3f7ae1037eaa9c355b64d7cd0c390143ea8f -rf5a2d607a5b8053b232c1f3ad572a0acba6a4e3a --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/FailureMechanism/SimpleFailureMechanismSectionResultTest.cs (.../SimpleFailureMechanismSectionResultTest.cs) (revision 2fca3f7ae1037eaa9c355b64d7cd0c390143ea8f) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/FailureMechanism/SimpleFailureMechanismSectionResultTest.cs (.../SimpleFailureMechanismSectionResultTest.cs) (revision f5a2d607a5b8053b232c1f3ad572a0acba6a4e3a) @@ -57,7 +57,6 @@ Assert.AreSame(section, result.Section); Assert.IsFalse(result.AssessmentLayerOne); Assert.AreEqual((AssessmentLayerTwoAResult)0, result.AssessmentLayerTwoA); - Assert.AreEqual(0, result.AssessmentLayerTwoB.Value); Assert.AreEqual(0, result.AssessmentLayerThree.Value); } } Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/ArbitraryProbabilityFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -rb9d20365707e77623054f96f0c8b544e86658e67 -rf5a2d607a5b8053b232c1f3ad572a0acba6a4e3a --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/ArbitraryProbabilityFailureMechanismSectionResultRowTest.cs (.../ArbitraryProbabilityFailureMechanismSectionResultRowTest.cs) (revision b9d20365707e77623054f96f0c8b544e86658e67) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/ArbitraryProbabilityFailureMechanismSectionResultRowTest.cs (.../ArbitraryProbabilityFailureMechanismSectionResultRowTest.cs) (revision f5a2d607a5b8053b232c1f3ad572a0acba6a4e3a) @@ -71,7 +71,6 @@ row.AssessmentLayerTwoA ); - Assert.AreEqual(result.AssessmentLayerTwoB, row.AssessmentLayerTwoB); Assert.AreEqual(result.AssessmentLayerThree, row.AssessmentLayerThree); } @@ -206,23 +205,6 @@ } [Test] - public void AssessmentLayerTwoB_AlwaysOnChange_ResultPropertyChanged() - { - // Setup - var random = new Random(21); - var newValue = random.NextDouble(); - var section = CreateSection(); - var result = new ArbitraryProbabilityFailureMechanismSectionResult(section); - var row = new ArbitraryProbabilityFailureMechanismSectionResultRow(result); - - // Call - row.AssessmentLayerTwoB = (RoundedDouble)newValue; - - // Assert - Assert.AreEqual(newValue, result.AssessmentLayerTwoB, row.AssessmentLayerTwoB.GetAccuracy()); - } - - [Test] public void AssessmentLayerThree_AlwaysOnChange_ResultPropertyChanged() { // Setup Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs =================================================================== diff -u -r6bca3fa9bf6f8c20a14c6b7374b436323627c31d -rf5a2d607a5b8053b232c1f3ad572a0acba6a4e3a --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs (.../FailureMechanismResultViewTest.cs) (revision 6bca3fa9bf6f8c20a14c6b7374b436323627c31d) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs (.../FailureMechanismResultViewTest.cs) (revision f5a2d607a5b8053b232c1f3ad572a0acba6a4e3a) @@ -71,56 +71,11 @@ // Assert var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; - Assert.AreEqual(2, dataGridView.ColumnCount); - - Assert.IsInstanceOf(dataGridView.Columns[nameColumnIndex]); - Assert.AreEqual(Resources.FailureMechanismResultView_InitializeDataGridView_Section_name, dataGridView.Columns[nameColumnIndex].HeaderText); - Assert.IsTrue(dataGridView.Columns[nameColumnIndex].ReadOnly); - - Assert.IsInstanceOf(dataGridView.Columns[assessmentLayerOneIndex]); - Assert.AreEqual(Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one, dataGridView.Columns[assessmentLayerOneIndex].HeaderText); - - Assert.AreEqual(DataGridViewAutoSizeColumnsMode.AllCells, dataGridView.AutoSizeColumnsMode); - Assert.AreEqual(DataGridViewContentAlignment.MiddleCenter, dataGridView.ColumnHeadersDefaultCellStyle.Alignment); + Assert.AreEqual(0, dataGridView.ColumnCount); } } [Test] - public void Data_DataAlreadySetNewDataSet_DataSetAndDataGridViewUpdated() - { - // Setup - using (var view = ShowFullyConfiguredFailureMechanismResultsView()) - { - var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; - - var points = new[] - { - new Point2D(1, 2), - new Point2D(3, 4) - }; - - var section = new FailureMechanismSection("test", points); - var sectionResult = new TestFailureMechanismSectionResult(section); - var testData = new List - { - sectionResult - }; - - // Precondition - Assert.AreEqual(2, dataGridView.RowCount); - - // Call - view.Data = testData; - - // Assert - Assert.AreSame(testData, view.Data); - - Assert.AreEqual(testData.Count, dataGridView.RowCount); - Assert.AreEqual(sectionResult.Section.Name, dataGridView.Rows[0].Cells[0].Value); - } - } - - [Test] public void Data_SetOtherThanFailureMechanismSectionResultListData_DataNullAndDataGridViewEmtpy() { // Setup @@ -139,30 +94,6 @@ } } - [Test] - public void FailureMechanismResultsView_AllDataSet_DataGridViewCorrectlyInitialized() - { - // Setup & Call - using (ShowFullyConfiguredFailureMechanismResultsView()) - { - var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; - - // Assert - var rows = dataGridView.Rows; - Assert.AreEqual(2, rows.Count); - - var cells = rows[0].Cells; - Assert.AreEqual(2, cells.Count); - Assert.AreEqual("Section 1", cells[nameColumnIndex].FormattedValue); - Assert.AreEqual(false, cells[assessmentLayerOneIndex].FormattedValue); - - cells = rows[1].Cells; - Assert.AreEqual(2, cells.Count); - Assert.AreEqual("Section 2", cells[nameColumnIndex].FormattedValue); - Assert.AreEqual(false, cells[assessmentLayerOneIndex].FormattedValue); - } - } - private const int nameColumnIndex = 0; private const int assessmentLayerOneIndex = 1; @@ -200,6 +131,9 @@ } public class TestFailureMechanismResultView : FailureMechanismResultView { + protected override void AddDataGridColumns() + { + } protected override object CreateFailureMechanismSectionResultRow(FailureMechanismSectionResult sectionResult) { Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/NumericFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -rb9d20365707e77623054f96f0c8b544e86658e67 -rf5a2d607a5b8053b232c1f3ad572a0acba6a4e3a --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/NumericFailureMechanismSectionResultRowTest.cs (.../NumericFailureMechanismSectionResultRowTest.cs) (revision b9d20365707e77623054f96f0c8b544e86658e67) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/NumericFailureMechanismSectionResultRowTest.cs (.../NumericFailureMechanismSectionResultRowTest.cs) (revision f5a2d607a5b8053b232c1f3ad572a0acba6a4e3a) @@ -58,7 +58,6 @@ Assert.AreEqual(section.Name, row.Name); Assert.AreEqual(result.AssessmentLayerOne, row.AssessmentLayerOne); Assert.AreEqual(result.AssessmentLayerTwoA, row.AssessmentLayerTwoA); - Assert.AreEqual(result.AssessmentLayerTwoB, row.AssessmentLayerTwoB); Assert.AreEqual(result.AssessmentLayerThree, row.AssessmentLayerThree); } @@ -105,23 +104,6 @@ } [Test] - public void AssessmentLayerTwoB_AlwaysOnChange_ResultPropertyChanged() - { - // Setup - var random = new Random(21); - var newValue = random.NextDouble(); - var section = CreateSection(); - var result = new NumericFailureMechanismSectionResult(section); - var row = new NumericFailureMechanismSectionResultRow(result); - - // Call - row.AssessmentLayerTwoB = (RoundedDouble)newValue; - - // Assert - Assert.AreEqual(newValue, result.AssessmentLayerTwoB, row.AssessmentLayerTwoB.GetAccuracy()); - } - - [Test] public void AssessmentLayerThree_AlwaysOnChange_ResultPropertyChanged() { // Setup Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/SimpleFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -r2fca3f7ae1037eaa9c355b64d7cd0c390143ea8f -rf5a2d607a5b8053b232c1f3ad572a0acba6a4e3a --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/SimpleFailureMechanismSectionResultRowTest.cs (.../SimpleFailureMechanismSectionResultRowTest.cs) (revision 2fca3f7ae1037eaa9c355b64d7cd0c390143ea8f) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/SimpleFailureMechanismSectionResultRowTest.cs (.../SimpleFailureMechanismSectionResultRowTest.cs) (revision f5a2d607a5b8053b232c1f3ad572a0acba6a4e3a) @@ -58,7 +58,6 @@ Assert.AreEqual(section.Name, row.Name); Assert.AreEqual(result.AssessmentLayerOne, row.AssessmentLayerOne); Assert.AreEqual(result.AssessmentLayerTwoA, row.AssessmentLayerTwoA); - Assert.AreEqual(result.AssessmentLayerTwoB, row.AssessmentLayerTwoB); Assert.AreEqual(result.AssessmentLayerThree, row.AssessmentLayerThree); } @@ -103,25 +102,7 @@ Assert.AreEqual(newValue, result.AssessmentLayerTwoA); } - [Test] - public void AssessmentLayerTwoB_AlwaysOnChange_ResultPropertyChanged() - { - // Setup - var random = new Random(21); - var newValue = random.NextDouble(); - var section = CreateSection(); - var result = new SimpleFailureMechanismSectionResult(section); - var row = new SimpleFailureMechanismSectionResultRow(result); - - // Call - row.AssessmentLayerTwoB = (RoundedDouble)newValue; - - // Assert - Assert.AreEqual(newValue, result.AssessmentLayerTwoB, row.AssessmentLayerTwoB.GetAccuracy()); - } - - [Test] public void AssessmentLayerThree_AlwaysOnChange_ResultPropertyChanged() { // Setup Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismSectionResult.cs =================================================================== diff -u -r4d2271ee60b40225ccfeb4a8eadc40c7e0fae357 -rf5a2d607a5b8053b232c1f3ad572a0acba6a4e3a --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismSectionResult.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResult.cs) (revision 4d2271ee60b40225ccfeb4a8eadc40c7e0fae357) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismSectionResult.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResult.cs) (revision f5a2d607a5b8053b232c1f3ad572a0acba6a4e3a) @@ -53,11 +53,6 @@ } /// - /// Gets or sets the value of assessment layer two b. - /// - public RoundedDouble AssessmentLayerTwoB { get; set; } - - /// /// Gets or sets the value of assessment layer three. /// public RoundedDouble AssessmentLayerThree { get; set; } Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismResultView.cs =================================================================== diff -u -refa2c5f47b7da0400bc66295bcda54139b185f82 -rf5a2d607a5b8053b232c1f3ad572a0acba6a4e3a --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismResultView.cs (.../GrassCoverErosionInwardsFailureMechanismResultView.cs) (revision efa2c5f47b7da0400bc66295bcda54139b185f82) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismResultView.cs (.../GrassCoverErosionInwardsFailureMechanismResultView.cs) (revision f5a2d607a5b8053b232c1f3ad572a0acba6a4e3a) @@ -84,19 +84,22 @@ protected override void AddDataGridColumns() { - base.AddDataGridColumns(); - DataGridViewControl.AddTextBoxColumn( - TypeUtils.GetMemberName(sr => sr.AssessmentLayerTwoA), - RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a, + TypeUtils.GetMemberName(sr => sr.Name), + RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Section_name, true ); + DataGridViewControl.AddCheckBoxColumn( + TypeUtils.GetMemberName(sr => sr.AssessmentLayerOne), + RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one + ); DataGridViewControl.AddTextBoxColumn( - TypeUtils.GetMemberName(sr => sr.AssessmentLayerTwoB), - RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_b + TypeUtils.GetMemberName(sr => sr.AssessmentLayerTwoA), + RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a, + true ); DataGridViewControl.AddTextBoxColumn( - TypeUtils.GetMemberName(sr => sr.AssessmentLayerThree), + TypeUtils.GetMemberName(sr => sr.AssessmentLayerThree), RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three ); } Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRow.cs =================================================================== diff -u -r4d2271ee60b40225ccfeb4a8eadc40c7e0fae357 -rf5a2d607a5b8053b232c1f3ad572a0acba6a4e3a --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRow.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRow.cs) (revision 4d2271ee60b40225ccfeb4a8eadc40c7e0fae357) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRow.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRow.cs) (revision f5a2d607a5b8053b232c1f3ad572a0acba6a4e3a) @@ -88,21 +88,6 @@ } /// - /// Gets or sets the value representing the result of the layer 2b assessment. - /// - public RoundedDouble AssessmentLayerTwoB - { - get - { - return sectionResult.AssessmentLayerTwoB; - } - set - { - sectionResult.AssessmentLayerTwoB = value; - } - } - - /// /// Gets or sets the value representing the result of the layer 3 assessment. /// public RoundedDouble AssessmentLayerThree Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs =================================================================== diff -u -r2fca3f7ae1037eaa9c355b64d7cd0c390143ea8f -rf5a2d607a5b8053b232c1f3ad572a0acba6a4e3a --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs) (revision 2fca3f7ae1037eaa9c355b64d7cd0c390143ea8f) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs) (revision f5a2d607a5b8053b232c1f3ad572a0acba6a4e3a) @@ -54,7 +54,6 @@ Assert.AreSame(section, result.Section); Assert.IsFalse(result.AssessmentLayerOne); Assert.AreEqual(0, result.AssessmentLayerTwoA.Value); - Assert.AreEqual(0, result.AssessmentLayerTwoB.Value); Assert.AreEqual(0, result.AssessmentLayerThree.Value); } } Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs =================================================================== diff -u -r4d2271ee60b40225ccfeb4a8eadc40c7e0fae357 -rf5a2d607a5b8053b232c1f3ad572a0acba6a4e3a --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionInwardsFailureMechanismResultViewTest.cs) (revision 4d2271ee60b40225ccfeb4a8eadc40c7e0fae357) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionInwardsFailureMechanismResultViewTest.cs) (revision f5a2d607a5b8053b232c1f3ad572a0acba6a4e3a) @@ -76,7 +76,7 @@ // Assert var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject; - Assert.AreEqual(5, dataGridView.ColumnCount); + Assert.AreEqual(4, dataGridView.ColumnCount); Assert.IsTrue(dataGridView.Columns[assessmentLayerTwoAIndex].ReadOnly); foreach (var column in dataGridView.Columns.OfType()) @@ -157,19 +157,17 @@ Assert.AreEqual(2, rows.Count); var cells = rows[0].Cells; - Assert.AreEqual(5, cells.Count); + Assert.AreEqual(4, cells.Count); Assert.AreEqual("Section 1", cells[nameColumnIndex].FormattedValue); Assert.IsFalse((bool)cells[assessmentLayerOneIndex].FormattedValue); Assert.AreEqual(string.Format("{0}", 0), cells[assessmentLayerTwoAIndex].FormattedValue); - Assert.AreEqual(string.Format("{0}", 0), cells[assessmentLayerTwoBIndex].FormattedValue); Assert.AreEqual(string.Format("{0}", 0), cells[assessmentLayerThreeIndex].FormattedValue); cells = rows[1].Cells; - Assert.AreEqual(5, cells.Count); + Assert.AreEqual(4, cells.Count); Assert.AreEqual("Section 2", cells[nameColumnIndex].FormattedValue); Assert.IsFalse((bool)cells[assessmentLayerOneIndex].FormattedValue); Assert.AreEqual(string.Format("{0}", 0), cells[assessmentLayerTwoAIndex].FormattedValue); - Assert.AreEqual(string.Format("{0}", 0), cells[assessmentLayerTwoBIndex].FormattedValue); Assert.AreEqual(string.Format("{0}", 0), cells[assessmentLayerThreeIndex].FormattedValue); } } @@ -191,52 +189,41 @@ var rows = dataGridView.Rows; var cells = rows[0].Cells; - Assert.AreEqual(5, cells.Count); + Assert.AreEqual(4, cells.Count); Assert.AreEqual("Section 1", cells[nameColumnIndex].FormattedValue); var cellAssessmentLayerTwoA = cells[assessmentLayerTwoAIndex]; - var cellAssessmentLayerTwoB = cells[assessmentLayerTwoBIndex]; var cellAssessmentLayerThree = cells[assessmentLayerThreeIndex]; Assert.AreEqual(checkBoxSelected, (bool)cells[assessmentLayerOneIndex].FormattedValue); Assert.AreEqual(string.Format("{0}", 0), cellAssessmentLayerTwoA.FormattedValue); - Assert.AreEqual(string.Format("{0}", 0), cellAssessmentLayerTwoB.FormattedValue); Assert.AreEqual(string.Format("{0}", 0), cellAssessmentLayerThree.FormattedValue); var cellAssessmentLayerTwoABackColor = cellAssessmentLayerTwoA.Style.BackColor; var cellAssessmentLayerTwoAForeColor = cellAssessmentLayerTwoA.Style.ForeColor; - var cellAssessmentLayerTwoBBackColor = cellAssessmentLayerTwoB.Style.BackColor; - var cellAssessmentLayerTwoBForeColor = cellAssessmentLayerTwoB.Style.ForeColor; var cellAssessmentLayerThreeBackColor = cellAssessmentLayerThree.Style.BackColor; var cellAssessmentLayerThreeForeColor = cellAssessmentLayerThree.Style.ForeColor; if (checkBoxSelected) { Assert.AreEqual(Color.FromKnownColor(KnownColor.DarkGray), cellAssessmentLayerTwoABackColor); Assert.AreEqual(Color.FromKnownColor(KnownColor.GrayText), cellAssessmentLayerTwoAForeColor); - Assert.AreEqual(Color.FromKnownColor(KnownColor.DarkGray), cellAssessmentLayerTwoBBackColor); - Assert.AreEqual(Color.FromKnownColor(KnownColor.GrayText), cellAssessmentLayerTwoBForeColor); Assert.AreEqual(Color.FromKnownColor(KnownColor.DarkGray), cellAssessmentLayerThreeBackColor); Assert.AreEqual(Color.FromKnownColor(KnownColor.GrayText), cellAssessmentLayerThreeForeColor); } else { Assert.AreEqual(Color.FromKnownColor(KnownColor.White), cellAssessmentLayerTwoABackColor); Assert.AreEqual(Color.FromKnownColor(KnownColor.ControlText), cellAssessmentLayerTwoAForeColor); - Assert.AreEqual(Color.FromKnownColor(KnownColor.White), cellAssessmentLayerTwoBBackColor); - Assert.AreEqual(Color.FromKnownColor(KnownColor.ControlText), cellAssessmentLayerTwoBForeColor); Assert.AreEqual(Color.FromKnownColor(KnownColor.White), cellAssessmentLayerThreeBackColor); Assert.AreEqual(Color.FromKnownColor(KnownColor.ControlText), cellAssessmentLayerThreeForeColor); } - Assert.AreEqual(checkBoxSelected, cellAssessmentLayerTwoB.ReadOnly); Assert.AreEqual(checkBoxSelected, cellAssessmentLayerThree.ReadOnly); } } [Test] - [TestCase("test", assessmentLayerTwoBIndex)] [TestCase("test", assessmentLayerThreeIndex)] - [TestCase(";/[].,~!@#$%^&*()_-+={}|?", assessmentLayerTwoBIndex)] [TestCase(";/[].,~!@#$%^&*()_-+={}|?", assessmentLayerThreeIndex)] public void FailureMechanismResultView_EditValueInvalid_ShowsErrorTooltip(string newValue, int cellIndex) { @@ -254,10 +241,6 @@ } [Test] - [TestCase("1", assessmentLayerTwoBIndex, "AssessmentLayerTwoB")] - [TestCase("1e-6", assessmentLayerTwoBIndex, "AssessmentLayerTwoB")] - [TestCase("1e+6", assessmentLayerTwoBIndex, "AssessmentLayerTwoB")] - [TestCase("14.3", assessmentLayerTwoBIndex, "AssessmentLayerTwoB")] [TestCase("1", assessmentLayerThreeIndex, "AssessmentLayerThree")] [TestCase("1e-6", assessmentLayerThreeIndex, "AssessmentLayerThree")] [TestCase("1e+6", assessmentLayerThreeIndex, "AssessmentLayerThree")] @@ -314,8 +297,7 @@ private const int nameColumnIndex = 0; private const int assessmentLayerOneIndex = 1; private const int assessmentLayerTwoAIndex = 2; - private const int assessmentLayerTwoBIndex = 3; - private const int assessmentLayerThreeIndex = 4; + private const int assessmentLayerThreeIndex = 3; private GrassCoverErosionInwardsFailureMechanismResultView ShowFullyConfiguredFailureMechanismResultsView() { Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -rea99af5c043eadf5c2ba83b82a847ae009181191 -rf5a2d607a5b8053b232c1f3ad572a0acba6a4e3a --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs) (revision ea99af5c043eadf5c2ba83b82a847ae009181191) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs) (revision f5a2d607a5b8053b232c1f3ad572a0acba6a4e3a) @@ -59,7 +59,6 @@ Assert.AreEqual(section.Name, row.Name); Assert.AreEqual(result.AssessmentLayerOne, row.AssessmentLayerOne); Assert.AreEqual(result.AssessmentLayerTwoA, row.AssessmentLayerTwoA); - Assert.AreEqual(result.AssessmentLayerTwoB, row.AssessmentLayerTwoB); Assert.AreEqual(result.AssessmentLayerThree, row.AssessmentLayerThree); } @@ -89,23 +88,6 @@ } [Test] - public void AssessmentLayerTwoB_AlwaysOnChange_ResultPropertyChanged() - { - // Setup - var random = new Random(21); - var newValue = random.NextDouble(); - var section = CreateSection(); - var result = new GrassCoverErosionInwardsFailureMechanismSectionResult(section); - var row = new GrassCoverErosionInwardsFailureMechanismSectionResultRow(result); - - // Call - row.AssessmentLayerTwoB = (RoundedDouble)newValue; - - // Assert - Assert.AreEqual(newValue, result.AssessmentLayerTwoB, row.AssessmentLayerTwoB.GetAccuracy()); - } - - [Test] public void AssessmentLayerThree_AlwaysOnChange_ResultPropertyChanged() { // Setup Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismSectionResult.cs =================================================================== diff -u -r4d2271ee60b40225ccfeb4a8eadc40c7e0fae357 -rf5a2d607a5b8053b232c1f3ad572a0acba6a4e3a --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismSectionResult.cs (.../HeightStructuresFailureMechanismSectionResult.cs) (revision 4d2271ee60b40225ccfeb4a8eadc40c7e0fae357) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismSectionResult.cs (.../HeightStructuresFailureMechanismSectionResult.cs) (revision f5a2d607a5b8053b232c1f3ad572a0acba6a4e3a) @@ -52,11 +52,6 @@ } /// - /// Gets or sets the value of assessment layer two b. - /// - public RoundedDouble AssessmentLayerTwoB { get; set; } - - /// /// Gets or sets the value of assessment layer three. /// public RoundedDouble AssessmentLayerThree { get; set; } Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismResultView.cs =================================================================== diff -u -refa2c5f47b7da0400bc66295bcda54139b185f82 -rf5a2d607a5b8053b232c1f3ad572a0acba6a4e3a --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismResultView.cs (.../HeightStructuresFailureMechanismResultView.cs) (revision efa2c5f47b7da0400bc66295bcda54139b185f82) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismResultView.cs (.../HeightStructuresFailureMechanismResultView.cs) (revision f5a2d607a5b8053b232c1f3ad572a0acba6a4e3a) @@ -83,17 +83,24 @@ protected override void AddDataGridColumns() { - base.AddDataGridColumns(); - - DataGridViewControl.AddTextBoxColumn(TypeUtils.GetMemberName(sr => sr.AssessmentLayerTwoA), - RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a, - true); - - DataGridViewControl.AddTextBoxColumn(TypeUtils.GetMemberName(sr => sr.AssessmentLayerTwoB), - RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_b); - - DataGridViewControl.AddTextBoxColumn(TypeUtils.GetMemberName(sr => sr.AssessmentLayerThree), - RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three); + DataGridViewControl.AddTextBoxColumn( + TypeUtils.GetMemberName(sr => sr.Name), + RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Section_name, + true + ); + DataGridViewControl.AddCheckBoxColumn( + TypeUtils.GetMemberName(sr => sr.AssessmentLayerOne), + RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one + ); + DataGridViewControl.AddTextBoxColumn( + TypeUtils.GetMemberName(sr => sr.AssessmentLayerTwoA), + RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a, + true + ); + DataGridViewControl.AddTextBoxColumn( + TypeUtils.GetMemberName(sr => sr.AssessmentLayerThree), + RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three + ); } protected override object CreateFailureMechanismSectionResultRow(HeightStructuresFailureMechanismSectionResult sectionResult) Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismSectionResultRow.cs =================================================================== diff -u -r028fa7ac2f1cc6bec17d9db071064febd4f6261b -rf5a2d607a5b8053b232c1f3ad572a0acba6a4e3a --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismSectionResultRow.cs (.../HeightStructuresFailureMechanismSectionResultRow.cs) (revision 028fa7ac2f1cc6bec17d9db071064febd4f6261b) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismSectionResultRow.cs (.../HeightStructuresFailureMechanismSectionResultRow.cs) (revision f5a2d607a5b8053b232c1f3ad572a0acba6a4e3a) @@ -86,21 +86,6 @@ } /// - /// Gets or sets the assessment layer two b of the . - /// - public RoundedDouble AssessmentLayerTwoB - { - get - { - return sectionResult.AssessmentLayerTwoB; - } - set - { - sectionResult.AssessmentLayerTwoB = value; - } - } - - /// /// Gets or sets the assessment layer three of the . /// public RoundedDouble AssessmentLayerThree Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismSectionResultTest.cs =================================================================== diff -u -r4d2271ee60b40225ccfeb4a8eadc40c7e0fae357 -rf5a2d607a5b8053b232c1f3ad572a0acba6a4e3a --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismSectionResultTest.cs (.../HeightStructuresFailureMechanismSectionResultTest.cs) (revision 4d2271ee60b40225ccfeb4a8eadc40c7e0fae357) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismSectionResultTest.cs (.../HeightStructuresFailureMechanismSectionResultTest.cs) (revision f5a2d607a5b8053b232c1f3ad572a0acba6a4e3a) @@ -44,7 +44,6 @@ Assert.AreSame(section, sectionResult.Section); Assert.IsFalse(sectionResult.AssessmentLayerOne); Assert.AreEqual(0, sectionResult.AssessmentLayerTwoA.Value); - Assert.AreEqual(0, sectionResult.AssessmentLayerTwoB.Value); Assert.AreEqual(0, sectionResult.AssessmentLayerThree.Value); } @@ -78,24 +77,6 @@ [Test] [TestCase(2.3)] [TestCase(24.6)] - public void AssessmentLayerTwoB_Always_ReturnsSetValue(double newValue) - { - // Setup - FailureMechanismSection section = CreateSection(); - var failureMechanismSectionResult = new HeightStructuresFailureMechanismSectionResult(section); - - RoundedDouble assessmentLayerTwoB = (RoundedDouble)newValue; - - // Call - failureMechanismSectionResult.AssessmentLayerTwoB = assessmentLayerTwoB; - - // Assert - Assert.AreEqual(assessmentLayerTwoB, failureMechanismSectionResult.AssessmentLayerTwoB); - } - - [Test] - [TestCase(2.3)] - [TestCase(24.6)] public void AssessmentLayerThree_Always_ReturnsSetValue(double newValue) { // Setup Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs =================================================================== diff -u -r4d2271ee60b40225ccfeb4a8eadc40c7e0fae357 -rf5a2d607a5b8053b232c1f3ad572a0acba6a4e3a --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs (.../HeightStructuresFailureMechanismResultViewTest.cs) (revision 4d2271ee60b40225ccfeb4a8eadc40c7e0fae357) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs (.../HeightStructuresFailureMechanismResultViewTest.cs) (revision f5a2d607a5b8053b232c1f3ad572a0acba6a4e3a) @@ -74,7 +74,7 @@ // Assert var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject; - Assert.AreEqual(5, dataGridView.ColumnCount); + Assert.AreEqual(4, dataGridView.ColumnCount); Assert.IsTrue(dataGridView.Columns[assessmentLayerTwoAIndex].ReadOnly); foreach (var column in dataGridView.Columns.OfType()) @@ -155,19 +155,17 @@ Assert.AreEqual(2, rows.Count); var cells = rows[0].Cells; - Assert.AreEqual(5, cells.Count); + Assert.AreEqual(4, cells.Count); Assert.AreEqual("Section 1", cells[nameColumnIndex].FormattedValue); Assert.IsFalse((bool)cells[assessmentLayerOneIndex].FormattedValue); Assert.AreEqual(string.Format("{0}", 0), cells[assessmentLayerTwoAIndex].FormattedValue); - Assert.AreEqual(string.Format("{0}", 0), cells[assessmentLayerTwoBIndex].FormattedValue); Assert.AreEqual(string.Format("{0}", 0), cells[assessmentLayerThreeIndex].FormattedValue); cells = rows[1].Cells; - Assert.AreEqual(5, cells.Count); + Assert.AreEqual(4, cells.Count); Assert.AreEqual("Section 2", cells[nameColumnIndex].FormattedValue); Assert.IsFalse((bool)cells[assessmentLayerOneIndex].FormattedValue); Assert.AreEqual(string.Format("{0}", 0), cells[assessmentLayerTwoAIndex].FormattedValue); - Assert.AreEqual(string.Format("{0}", 0), cells[assessmentLayerTwoBIndex].FormattedValue); Assert.AreEqual(string.Format("{0}", 0), cells[assessmentLayerThreeIndex].FormattedValue); } } @@ -189,52 +187,41 @@ var rows = dataGridView.Rows; var cells = rows[0].Cells; - Assert.AreEqual(5, cells.Count); + Assert.AreEqual(4, cells.Count); Assert.AreEqual("Section 1", cells[nameColumnIndex].FormattedValue); var cellAssessmentLayerTwoA = cells[assessmentLayerTwoAIndex]; - var cellAssessmentLayerTwoB = cells[assessmentLayerTwoBIndex]; var cellAssessmentLayerThree = cells[assessmentLayerThreeIndex]; Assert.AreEqual(checkBoxSelected, (bool)cells[assessmentLayerOneIndex].FormattedValue); Assert.AreEqual(string.Format("{0}", 0), cellAssessmentLayerTwoA.FormattedValue); - Assert.AreEqual(string.Format("{0}", 0), cellAssessmentLayerTwoB.FormattedValue); Assert.AreEqual(string.Format("{0}", 0), cellAssessmentLayerThree.FormattedValue); var cellAssessmentLayerTwoABackColor = cellAssessmentLayerTwoA.Style.BackColor; var cellAssessmentLayerTwoAForeColor = cellAssessmentLayerTwoA.Style.ForeColor; - var cellAssessmentLayerTwoBBackColor = cellAssessmentLayerTwoB.Style.BackColor; - var cellAssessmentLayerTwoBForeColor = cellAssessmentLayerTwoB.Style.ForeColor; var cellAssessmentLayerThreeBackColor = cellAssessmentLayerThree.Style.BackColor; var cellAssessmentLayerThreeForeColor = cellAssessmentLayerThree.Style.ForeColor; if (checkBoxSelected) { Assert.AreEqual(Color.FromKnownColor(KnownColor.DarkGray), cellAssessmentLayerTwoABackColor); Assert.AreEqual(Color.FromKnownColor(KnownColor.GrayText), cellAssessmentLayerTwoAForeColor); - Assert.AreEqual(Color.FromKnownColor(KnownColor.DarkGray), cellAssessmentLayerTwoBBackColor); - Assert.AreEqual(Color.FromKnownColor(KnownColor.GrayText), cellAssessmentLayerTwoBForeColor); Assert.AreEqual(Color.FromKnownColor(KnownColor.DarkGray), cellAssessmentLayerThreeBackColor); Assert.AreEqual(Color.FromKnownColor(KnownColor.GrayText), cellAssessmentLayerThreeForeColor); } else { Assert.AreEqual(Color.FromKnownColor(KnownColor.White), cellAssessmentLayerTwoABackColor); Assert.AreEqual(Color.FromKnownColor(KnownColor.ControlText), cellAssessmentLayerTwoAForeColor); - Assert.AreEqual(Color.FromKnownColor(KnownColor.White), cellAssessmentLayerTwoBBackColor); - Assert.AreEqual(Color.FromKnownColor(KnownColor.ControlText), cellAssessmentLayerTwoBForeColor); Assert.AreEqual(Color.FromKnownColor(KnownColor.White), cellAssessmentLayerThreeBackColor); Assert.AreEqual(Color.FromKnownColor(KnownColor.ControlText), cellAssessmentLayerThreeForeColor); } - Assert.AreEqual(checkBoxSelected, cellAssessmentLayerTwoB.ReadOnly); Assert.AreEqual(checkBoxSelected, cellAssessmentLayerThree.ReadOnly); } } [Test] - [TestCase("test", assessmentLayerTwoBIndex)] [TestCase("test", assessmentLayerThreeIndex)] - [TestCase(";/[].,~!@#$%^&*()_-+={}|?", assessmentLayerTwoBIndex)] [TestCase(";/[].,~!@#$%^&*()_-+={}|?", assessmentLayerThreeIndex)] public void FailureMechanismResultView_EditValueInvalid_ShowsErrorTooltip(string newValue, int cellIndex) { @@ -252,10 +239,6 @@ } [Test] - [TestCase("1", assessmentLayerTwoBIndex, "AssessmentLayerTwoB")] - [TestCase("1e-6", assessmentLayerTwoBIndex, "AssessmentLayerTwoB")] - [TestCase("1e+6", assessmentLayerTwoBIndex, "AssessmentLayerTwoB")] - [TestCase("14.3", assessmentLayerTwoBIndex, "AssessmentLayerTwoB")] [TestCase("1", assessmentLayerThreeIndex, "AssessmentLayerThree")] [TestCase("1e-6", assessmentLayerThreeIndex, "AssessmentLayerThree")] [TestCase("1e+6", assessmentLayerThreeIndex, "AssessmentLayerThree")] @@ -312,8 +295,7 @@ private const int nameColumnIndex = 0; private const int assessmentLayerOneIndex = 1; private const int assessmentLayerTwoAIndex = 2; - private const int assessmentLayerTwoBIndex = 3; - private const int assessmentLayerThreeIndex = 4; + private const int assessmentLayerThreeIndex = 3; private HeightStructuresFailureMechanismResultView ShowFullyConfiguredFailureMechanismResultsView() { Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -r8f257d2094036e69e5da32dce96b5195f59508ea -rf5a2d607a5b8053b232c1f3ad572a0acba6a4e3a --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismSectionResultRowTest.cs (.../HeightStructuresFailureMechanismSectionResultRowTest.cs) (revision 8f257d2094036e69e5da32dce96b5195f59508ea) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismSectionResultRowTest.cs (.../HeightStructuresFailureMechanismSectionResultRowTest.cs) (revision f5a2d607a5b8053b232c1f3ad572a0acba6a4e3a) @@ -59,7 +59,6 @@ Assert.AreEqual(section.Name, row.Name); Assert.AreEqual(result.AssessmentLayerOne, row.AssessmentLayerOne); Assert.AreEqual(result.AssessmentLayerTwoA, row.AssessmentLayerTwoA); - Assert.AreEqual(result.AssessmentLayerTwoB, row.AssessmentLayerTwoB); Assert.AreEqual(result.AssessmentLayerThree, row.AssessmentLayerThree); } @@ -89,23 +88,6 @@ } [Test] - public void AssessmentLayerTwoB_AlwaysOnChange_ResultPropertyChanged() - { - // Setup - var random = new Random(21); - var newValue = random.NextDouble(); - var section = CreateSection(); - var result = new HeightStructuresFailureMechanismSectionResult(section); - var row = new HeightStructuresFailureMechanismSectionResultRow(result); - - // Call - row.AssessmentLayerTwoB = (RoundedDouble)newValue; - - // Assert - Assert.AreEqual(newValue, result.AssessmentLayerTwoB, row.AssessmentLayerTwoB.GetAccuracy()); - } - - [Test] public void AssessmentLayerThree_AlwaysOnChange_ResultPropertyChanged() { // Setup Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/ArbitraryProbabilityFailureMechanismResultView.cs =================================================================== diff -u -refa2c5f47b7da0400bc66295bcda54139b185f82 -rf5a2d607a5b8053b232c1f3ad572a0acba6a4e3a --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/ArbitraryProbabilityFailureMechanismResultView.cs (.../ArbitraryProbabilityFailureMechanismResultView.cs) (revision efa2c5f47b7da0400bc66295bcda54139b185f82) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/ArbitraryProbabilityFailureMechanismResultView.cs (.../ArbitraryProbabilityFailureMechanismResultView.cs) (revision f5a2d607a5b8053b232c1f3ad572a0acba6a4e3a) @@ -43,18 +43,21 @@ protected override void AddDataGridColumns() { - base.AddDataGridColumns(); - DataGridViewControl.AddTextBoxColumn( - TypeUtils.GetMemberName(sr => sr.AssessmentLayerTwoA), - RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a + TypeUtils.GetMemberName(sr => sr.Name), + RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Section_name, + true ); + DataGridViewControl.AddCheckBoxColumn( + TypeUtils.GetMemberName(sr => sr.AssessmentLayerOne), + RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one + ); DataGridViewControl.AddTextBoxColumn( - TypeUtils.GetMemberName(sr => sr.AssessmentLayerTwoB), - RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_b + TypeUtils.GetMemberName(sr => sr.AssessmentLayerTwoA), + RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a ); DataGridViewControl.AddTextBoxColumn( - TypeUtils.GetMemberName(sr => sr.AssessmentLayerThree), + TypeUtils.GetMemberName(sr => sr.AssessmentLayerThree), RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three ); } Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/NumericFailureMechanismResultView.cs =================================================================== diff -u -refa2c5f47b7da0400bc66295bcda54139b185f82 -rf5a2d607a5b8053b232c1f3ad572a0acba6a4e3a --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/NumericFailureMechanismResultView.cs (.../NumericFailureMechanismResultView.cs) (revision efa2c5f47b7da0400bc66295bcda54139b185f82) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/NumericFailureMechanismResultView.cs (.../NumericFailureMechanismResultView.cs) (revision f5a2d607a5b8053b232c1f3ad572a0acba6a4e3a) @@ -43,17 +43,20 @@ protected override void AddDataGridColumns() { - base.AddDataGridColumns(); - DataGridViewControl.AddTextBoxColumn( + TypeUtils.GetMemberName(sr => sr.Name), + RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Section_name, + true + ); + DataGridViewControl.AddCheckBoxColumn( + TypeUtils.GetMemberName(sr => sr.AssessmentLayerOne), + RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one + ); + DataGridViewControl.AddTextBoxColumn( TypeUtils.GetMemberName(sr => sr.AssessmentLayerTwoA), RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a ); DataGridViewControl.AddTextBoxColumn( - TypeUtils.GetMemberName(sr => sr.AssessmentLayerTwoB), - RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_b - ); - DataGridViewControl.AddTextBoxColumn( TypeUtils.GetMemberName(sr => sr.AssessmentLayerThree), RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three ); Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SimpleFailureMechanismResultView.cs =================================================================== diff -u -ra0275c8e9e0a8c07ac4f118a9314352441e9e0d6 -rf5a2d607a5b8053b232c1f3ad572a0acba6a4e3a --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SimpleFailureMechanismResultView.cs (.../SimpleFailureMechanismResultView.cs) (revision a0275c8e9e0a8c07ac4f118a9314352441e9e0d6) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SimpleFailureMechanismResultView.cs (.../SimpleFailureMechanismResultView.cs) (revision f5a2d607a5b8053b232c1f3ad572a0acba6a4e3a) @@ -62,26 +62,27 @@ protected override void AddDataGridColumns() { - base.AddDataGridColumns(); - - var dataSource = Enum.GetValues(typeof(AssessmentLayerTwoAResult)) + var twoAResultDataSource = Enum.GetValues(typeof(AssessmentLayerTwoAResult)) .OfType() .Select(el => new EnumDisplayWrapper(el)) .ToList(); - + DataGridViewControl.AddTextBoxColumn( + TypeUtils.GetMemberName(sr => sr.Name), + RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Section_name, + true + ); + DataGridViewControl.AddCheckBoxColumn( + TypeUtils.GetMemberName(sr => sr.AssessmentLayerOne), + RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one + ); DataGridViewControl.AddComboBoxColumn( - TypeUtils.GetMemberName(sr => sr.AssessmentLayerTwoA), + TypeUtils.GetMemberName(sr => sr.AssessmentLayerTwoA), RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a, - dataSource, + twoAResultDataSource, TypeUtils.GetMemberName((Expression, object>>) (edw => edw.Value)), TypeUtils.GetMemberName((Expression, object>>) (edw => edw.DisplayName))); - DataGridViewControl.AddTextBoxColumn( - TypeUtils.GetMemberName(sr => sr.AssessmentLayerTwoB), - RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_b - ); - DataGridViewControl.AddTextBoxColumn( - TypeUtils.GetMemberName(sr => sr.AssessmentLayerThree), + TypeUtils.GetMemberName(sr => sr.AssessmentLayerThree), RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three ); } Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/ArbitraryProbabilityFailureMechanismResultViewTest.cs =================================================================== diff -u -rb9d20365707e77623054f96f0c8b544e86658e67 -rf5a2d607a5b8053b232c1f3ad572a0acba6a4e3a --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/ArbitraryProbabilityFailureMechanismResultViewTest.cs (.../ArbitraryProbabilityFailureMechanismResultViewTest.cs) (revision b9d20365707e77623054f96f0c8b544e86658e67) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/ArbitraryProbabilityFailureMechanismResultViewTest.cs (.../ArbitraryProbabilityFailureMechanismResultViewTest.cs) (revision f5a2d607a5b8053b232c1f3ad572a0acba6a4e3a) @@ -51,11 +51,10 @@ // Then var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; - Assert.AreEqual(5, dataGridView.ColumnCount); + Assert.AreEqual(4, dataGridView.ColumnCount); Assert.IsInstanceOf(dataGridView.Columns[assessmentLayerOneIndex]); Assert.IsInstanceOf(dataGridView.Columns[assessmentLayerTwoAIndex]); - Assert.IsInstanceOf(dataGridView.Columns[assessmentLayerTwoBIndex]); Assert.IsInstanceOf(dataGridView.Columns[assessmentLayerThreeIndex]); Assert.AreEqual( @@ -67,10 +66,6 @@ dataGridView.Columns[assessmentLayerTwoAIndex].HeaderText ); Assert.AreEqual( - Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_b, - dataGridView.Columns[assessmentLayerTwoBIndex].HeaderText - ); - Assert.AreEqual( Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three, dataGridView.Columns[assessmentLayerThreeIndex].HeaderText ); @@ -98,14 +93,12 @@ { AssessmentLayerOne = true, AssessmentLayerTwoA = (RoundedDouble) random.NextDouble(), - AssessmentLayerTwoB = (RoundedDouble) random.NextDouble(), AssessmentLayerThree = (RoundedDouble) random.NextDouble() }; var result2 = new ArbitraryProbabilityFailureMechanismSectionResult(section2) { AssessmentLayerOne = false, AssessmentLayerTwoA = (RoundedDouble) random.NextDouble(), - AssessmentLayerTwoB = (RoundedDouble) random.NextDouble(), AssessmentLayerThree = (RoundedDouble) random.NextDouble() }; @@ -129,7 +122,7 @@ Assert.AreEqual(2, rows.Count); var cells = rows[0].Cells; - Assert.AreEqual(5, cells.Count); + Assert.AreEqual(4, cells.Count); Assert.AreEqual("Section 1", cells[nameColumnIndex].FormattedValue); Assert.AreEqual(result1.AssessmentLayerOne, cells[assessmentLayerOneIndex].Value); var expectedAssessmentLayer2AValue1 = (RoundedDouble) (1/result1.AssessmentLayerTwoA); @@ -138,15 +131,13 @@ expectedAssessmentLayer2AValue1 ); Assert.AreEqual(expectedAssessmentLayer2AString1, cells[assessmentLayerTwoAIndex].FormattedValue); - Assert.AreEqual(string.Format("{0}", result1.AssessmentLayerTwoB), cells[assessmentLayerTwoBIndex].FormattedValue); Assert.AreEqual(string.Format("{0}", result1.AssessmentLayerThree), cells[assessmentLayerThreeIndex].FormattedValue); AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); - AssertCellIsDisabled(cells[assessmentLayerTwoBIndex]); AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); cells = rows[1].Cells; - Assert.AreEqual(5, cells.Count); + Assert.AreEqual(4, cells.Count); Assert.AreEqual("Section 2", cells[nameColumnIndex].FormattedValue); Assert.AreEqual(result2.AssessmentLayerOne, cells[assessmentLayerOneIndex].Value); var expectedAssessmentLayer2AValue2 = (RoundedDouble)(1 / result2.AssessmentLayerTwoA); @@ -155,11 +146,9 @@ expectedAssessmentLayer2AValue2 ); Assert.AreEqual(expectedAssessmentLayer2AString2, cells[assessmentLayerTwoAIndex].FormattedValue); - Assert.AreEqual(string.Format("{0}", result2.AssessmentLayerTwoB), cells[assessmentLayerTwoBIndex].FormattedValue); Assert.AreEqual(string.Format("{0}", result2.AssessmentLayerThree), cells[assessmentLayerThreeIndex].FormattedValue); AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); - AssertCellIsEnabled(cells[assessmentLayerTwoBIndex]); AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); } } @@ -178,7 +167,6 @@ { AssessmentLayerOne = false, AssessmentLayerTwoA = (RoundedDouble)random.NextDouble(), - AssessmentLayerTwoB = (RoundedDouble)random.NextDouble(), AssessmentLayerThree = (RoundedDouble)random.NextDouble() }; using (var form = new Form()) @@ -203,10 +191,9 @@ Assert.AreEqual(1, rows.Count); var cells = rows[0].Cells; - Assert.AreEqual(5, cells.Count); + Assert.AreEqual(4, cells.Count); AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); - AssertCellIsDisabled(cells[assessmentLayerTwoBIndex]); AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); } } @@ -252,8 +239,7 @@ private const int nameColumnIndex = 0; private const int assessmentLayerOneIndex = 1; private const int assessmentLayerTwoAIndex = 2; - private const int assessmentLayerTwoBIndex = 3; - private const int assessmentLayerThreeIndex = 4; + private const int assessmentLayerThreeIndex = 3; private void AssertCellIsDisabled(DataGridViewCell dataGridViewCell) { Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/NumericFailureMechanismResultViewTest.cs =================================================================== diff -u -rb9d20365707e77623054f96f0c8b544e86658e67 -rf5a2d607a5b8053b232c1f3ad572a0acba6a4e3a --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/NumericFailureMechanismResultViewTest.cs (.../NumericFailureMechanismResultViewTest.cs) (revision b9d20365707e77623054f96f0c8b544e86658e67) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/NumericFailureMechanismResultViewTest.cs (.../NumericFailureMechanismResultViewTest.cs) (revision f5a2d607a5b8053b232c1f3ad572a0acba6a4e3a) @@ -50,16 +50,14 @@ // Then var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; - Assert.AreEqual(5, dataGridView.ColumnCount); + Assert.AreEqual(4, dataGridView.ColumnCount); Assert.IsInstanceOf(dataGridView.Columns[assessmentLayerOneIndex]); Assert.IsInstanceOf(dataGridView.Columns[assessmentLayerTwoAIndex]); - Assert.IsInstanceOf(dataGridView.Columns[assessmentLayerTwoBIndex]); Assert.IsInstanceOf(dataGridView.Columns[assessmentLayerThreeIndex]); Assert.AreEqual(Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one, dataGridView.Columns[assessmentLayerOneIndex].HeaderText); Assert.AreEqual(Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a, dataGridView.Columns[assessmentLayerTwoAIndex].HeaderText); - Assert.AreEqual(Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_b, dataGridView.Columns[assessmentLayerTwoBIndex].HeaderText); Assert.AreEqual(Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three, dataGridView.Columns[assessmentLayerThreeIndex].HeaderText); Assert.AreEqual(DataGridViewAutoSizeColumnsMode.AllCells, dataGridView.AutoSizeColumnsMode); @@ -85,14 +83,12 @@ { AssessmentLayerOne = true, AssessmentLayerTwoA = (RoundedDouble) random.NextDouble(), - AssessmentLayerTwoB = (RoundedDouble) random.NextDouble(), AssessmentLayerThree = (RoundedDouble) random.NextDouble() }; var result2 = new NumericFailureMechanismSectionResult(section2) { AssessmentLayerOne = false, AssessmentLayerTwoA = (RoundedDouble) random.NextDouble(), - AssessmentLayerTwoB = (RoundedDouble) random.NextDouble(), AssessmentLayerThree = (RoundedDouble) random.NextDouble() }; @@ -116,27 +112,23 @@ Assert.AreEqual(2, rows.Count); var cells = rows[0].Cells; - Assert.AreEqual(5, cells.Count); + Assert.AreEqual(4, cells.Count); Assert.AreEqual("Section 1", cells[nameColumnIndex].FormattedValue); Assert.AreEqual(result1.AssessmentLayerOne, cells[assessmentLayerOneIndex].Value); Assert.AreEqual(string.Format("{0}", result1.AssessmentLayerTwoA), cells[assessmentLayerTwoAIndex].FormattedValue); - Assert.AreEqual(string.Format("{0}", result1.AssessmentLayerTwoB), cells[assessmentLayerTwoBIndex].FormattedValue); Assert.AreEqual(string.Format("{0}", result1.AssessmentLayerThree), cells[assessmentLayerThreeIndex].FormattedValue); AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); - AssertCellIsDisabled(cells[assessmentLayerTwoBIndex]); AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); cells = rows[1].Cells; - Assert.AreEqual(5, cells.Count); + Assert.AreEqual(4, cells.Count); Assert.AreEqual("Section 2", cells[nameColumnIndex].FormattedValue); Assert.AreEqual(result2.AssessmentLayerOne, cells[assessmentLayerOneIndex].Value); Assert.AreEqual(string.Format("{0}", result2.AssessmentLayerTwoA), cells[assessmentLayerTwoAIndex].FormattedValue); - Assert.AreEqual(string.Format("{0}", result2.AssessmentLayerTwoB), cells[assessmentLayerTwoBIndex].FormattedValue); Assert.AreEqual(string.Format("{0}", result2.AssessmentLayerThree), cells[assessmentLayerThreeIndex].FormattedValue); AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); - AssertCellIsEnabled(cells[assessmentLayerTwoBIndex]); AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); } } @@ -155,7 +147,6 @@ { AssessmentLayerOne = false, AssessmentLayerTwoA = (RoundedDouble)random.NextDouble(), - AssessmentLayerTwoB = (RoundedDouble)random.NextDouble(), AssessmentLayerThree = (RoundedDouble)random.NextDouble() }; using (var form = new Form()) @@ -180,10 +171,9 @@ Assert.AreEqual(1, rows.Count); var cells = rows[0].Cells; - Assert.AreEqual(5, cells.Count); + Assert.AreEqual(4, cells.Count); AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); - AssertCellIsDisabled(cells[assessmentLayerTwoBIndex]); AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); } } @@ -229,8 +219,7 @@ private const int nameColumnIndex = 0; private const int assessmentLayerOneIndex = 1; private const int assessmentLayerTwoAIndex = 2; - private const int assessmentLayerTwoBIndex = 3; - private const int assessmentLayerThreeIndex = 4; + private const int assessmentLayerThreeIndex = 3; private void AssertCellIsDisabled(DataGridViewCell dataGridViewCell) { Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SimpleFailureMechanismResultViewTest.cs =================================================================== diff -u -r565199265c3608d4242ffeecb4e5ec1731e1dc84 -rf5a2d607a5b8053b232c1f3ad572a0acba6a4e3a --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SimpleFailureMechanismResultViewTest.cs (.../SimpleFailureMechanismResultViewTest.cs) (revision 565199265c3608d4242ffeecb4e5ec1731e1dc84) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SimpleFailureMechanismResultViewTest.cs (.../SimpleFailureMechanismResultViewTest.cs) (revision f5a2d607a5b8053b232c1f3ad572a0acba6a4e3a) @@ -53,16 +53,14 @@ // Assert var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; - Assert.AreEqual(5, dataGridView.ColumnCount); + Assert.AreEqual(4, dataGridView.ColumnCount); Assert.IsInstanceOf(dataGridView.Columns[assessmentLayerOneIndex]); Assert.IsInstanceOf(dataGridView.Columns[assessmentLayerTwoAIndex]); - Assert.IsInstanceOf(dataGridView.Columns[assessmentLayerTwoBIndex]); Assert.IsInstanceOf(dataGridView.Columns[assessmentLayerThreeIndex]); Assert.AreEqual(Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one, dataGridView.Columns[assessmentLayerOneIndex].HeaderText); Assert.AreEqual(Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a, dataGridView.Columns[assessmentLayerTwoAIndex].HeaderText); - Assert.AreEqual(Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_b, dataGridView.Columns[assessmentLayerTwoBIndex].HeaderText); Assert.AreEqual(Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three, dataGridView.Columns[assessmentLayerThreeIndex].HeaderText); Assert.AreEqual(DataGridViewAutoSizeColumnsMode.AllCells, dataGridView.AutoSizeColumnsMode); @@ -88,14 +86,12 @@ { AssessmentLayerOne = true, AssessmentLayerTwoA = AssessmentLayerTwoAResult.Failed, - AssessmentLayerTwoB = (RoundedDouble) random.NextDouble(), AssessmentLayerThree = (RoundedDouble) random.NextDouble() }; var result2 = new SimpleFailureMechanismSectionResult(section2) { AssessmentLayerOne = false, AssessmentLayerTwoA = AssessmentLayerTwoAResult.Successful, - AssessmentLayerTwoB = (RoundedDouble) random.NextDouble(), AssessmentLayerThree = (RoundedDouble) random.NextDouble() }; @@ -120,27 +116,23 @@ Assert.AreEqual(2, rows.Count); var cells = rows[0].Cells; - Assert.AreEqual(5, cells.Count); + Assert.AreEqual(4, cells.Count); Assert.AreEqual("Section 1", cells[nameColumnIndex].FormattedValue); Assert.AreEqual(result1.AssessmentLayerOne, cells[assessmentLayerOneIndex].Value); Assert.AreEqual(result1.AssessmentLayerTwoA, cells[assessmentLayerTwoAIndex].Value); - Assert.AreEqual(string.Format("{0}", result1.AssessmentLayerTwoB), cells[assessmentLayerTwoBIndex].FormattedValue); Assert.AreEqual(string.Format("{0}", result1.AssessmentLayerThree), cells[assessmentLayerThreeIndex].FormattedValue); AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); - AssertCellIsDisabled(cells[assessmentLayerTwoBIndex]); AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); cells = rows[1].Cells; - Assert.AreEqual(5, cells.Count); + Assert.AreEqual(4, cells.Count); Assert.AreEqual("Section 2", cells[nameColumnIndex].FormattedValue); Assert.AreEqual(result2.AssessmentLayerOne, cells[assessmentLayerOneIndex].Value); Assert.AreEqual(result2.AssessmentLayerTwoA, cells[assessmentLayerTwoAIndex].Value); - Assert.AreEqual(string.Format("{0}", result2.AssessmentLayerTwoB), cells[assessmentLayerTwoBIndex].FormattedValue); Assert.AreEqual(string.Format("{0}", result2.AssessmentLayerThree), cells[assessmentLayerThreeIndex].FormattedValue); AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); - AssertCellIsEnabled(cells[assessmentLayerTwoBIndex]); AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); } } @@ -159,7 +151,6 @@ { AssessmentLayerOne = false, AssessmentLayerTwoA = AssessmentLayerTwoAResult.Failed, - AssessmentLayerTwoB = (RoundedDouble) random.NextDouble(), AssessmentLayerThree = (RoundedDouble) random.NextDouble() }; using (var form = new Form()) @@ -184,10 +175,9 @@ Assert.AreEqual(1, rows.Count); var cells = rows[0].Cells; - Assert.AreEqual(5, cells.Count); + Assert.AreEqual(4, cells.Count); AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); - AssertCellIsDisabled(cells[assessmentLayerTwoBIndex]); AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); } } @@ -233,8 +223,7 @@ private const int nameColumnIndex = 0; private const int assessmentLayerOneIndex = 1; private const int assessmentLayerTwoAIndex = 2; - private const int assessmentLayerTwoBIndex = 3; - private const int assessmentLayerThreeIndex = 4; + private const int assessmentLayerThreeIndex = 3; private void AssertCellIsDisabled(DataGridViewCell dataGridViewCell) { Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSectionResult.cs =================================================================== diff -u -r8abb584035c1788f6e1d92985da399a9921e3a09 -rf5a2d607a5b8053b232c1f3ad572a0acba6a4e3a --- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSectionResult.cs (.../PipingFailureMechanismSectionResult.cs) (revision 8abb584035c1788f6e1d92985da399a9921e3a09) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSectionResult.cs (.../PipingFailureMechanismSectionResult.cs) (revision f5a2d607a5b8053b232c1f3ad572a0acba6a4e3a) @@ -60,11 +60,6 @@ } /// - /// Gets or sets the value of assessment layer two b. - /// - public RoundedDouble AssessmentLayerTwoB { get; set; } - - /// /// Gets or sets the value of assessment layer three. /// public RoundedDouble AssessmentLayerThree { get; set; } Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismResultView.cs =================================================================== diff -u -ra0275c8e9e0a8c07ac4f118a9314352441e9e0d6 -rf5a2d607a5b8053b232c1f3ad572a0acba6a4e3a --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismResultView.cs (.../PipingFailureMechanismResultView.cs) (revision a0275c8e9e0a8c07ac4f118a9314352441e9e0d6) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismResultView.cs (.../PipingFailureMechanismResultView.cs) (revision f5a2d607a5b8053b232c1f3ad572a0acba6a4e3a) @@ -88,19 +88,22 @@ protected override void AddDataGridColumns() { - base.AddDataGridColumns(); - DataGridViewControl.AddTextBoxColumn( - TypeUtils.GetMemberName(sr => sr.AssessmentLayerTwoA), - RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a, + TypeUtils.GetMemberName(sr => sr.Name), + RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Section_name, true ); + DataGridViewControl.AddCheckBoxColumn( + TypeUtils.GetMemberName(sr => sr.AssessmentLayerOne), + RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one + ); DataGridViewControl.AddTextBoxColumn( - TypeUtils.GetMemberName(sr => sr.AssessmentLayerTwoB), - RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_b + TypeUtils.GetMemberName(sr => sr.AssessmentLayerTwoA), + RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a, + true ); DataGridViewControl.AddTextBoxColumn( - TypeUtils.GetMemberName(sr => sr.AssessmentLayerThree), + TypeUtils.GetMemberName(sr => sr.AssessmentLayerThree), RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three ); } Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismSectionResultRow.cs =================================================================== diff -u -r219f8633c1b5b24f9e9aec3e903734fa94775f0e -rf5a2d607a5b8053b232c1f3ad572a0acba6a4e3a --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismSectionResultRow.cs (.../PipingFailureMechanismSectionResultRow.cs) (revision 219f8633c1b5b24f9e9aec3e903734fa94775f0e) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismSectionResultRow.cs (.../PipingFailureMechanismSectionResultRow.cs) (revision f5a2d607a5b8053b232c1f3ad572a0acba6a4e3a) @@ -87,21 +87,6 @@ } /// - /// Gets or sets the value representing the result of the layer 2b assessment. - /// - public RoundedDouble AssessmentLayerTwoB - { - get - { - return SectionResult.AssessmentLayerTwoB; - } - set - { - SectionResult.AssessmentLayerTwoB = value; - } - } - - /// /// Gets or sets the value representing the result of the layer 3 assessment. /// public RoundedDouble AssessmentLayerThree Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultTest.cs =================================================================== diff -u -r1faf46912e196f96171aef71ca800b0fe021f40b -rf5a2d607a5b8053b232c1f3ad572a0acba6a4e3a --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultTest.cs (.../PipingFailureMechanismSectionResultTest.cs) (revision 1faf46912e196f96171aef71ca800b0fe021f40b) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultTest.cs (.../PipingFailureMechanismSectionResultTest.cs) (revision f5a2d607a5b8053b232c1f3ad572a0acba6a4e3a) @@ -46,7 +46,6 @@ Assert.AreSame(section, sectionResult.Section); Assert.IsFalse(sectionResult.AssessmentLayerOne); Assert.AreEqual((RoundedDouble) 0, sectionResult.AssessmentLayerTwoA); - Assert.AreEqual((RoundedDouble) 0, sectionResult.AssessmentLayerTwoB); Assert.AreEqual((RoundedDouble) 0, sectionResult.AssessmentLayerThree); CollectionAssert.IsEmpty(sectionResult.CalculationScenarios); } @@ -247,21 +246,6 @@ } [Test] - public void AssessmentLayerTwoB_Always_ReturnsSetValue() - { - // Setup - FailureMechanismSection section = CreateSection(); - var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section); - var assessmentLayerTwoBValue = (RoundedDouble) 3.0; - - // Call - failureMechanismSectionResult.AssessmentLayerTwoB = assessmentLayerTwoBValue; - - // Assert - Assert.AreEqual(assessmentLayerTwoBValue, failureMechanismSectionResult.AssessmentLayerTwoB); - } - - [Test] public void AssessmentLayerThree_Always_ReturnsSetValue() { // Setup Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs =================================================================== diff -u -r219f8633c1b5b24f9e9aec3e903734fa94775f0e -rf5a2d607a5b8053b232c1f3ad572a0acba6a4e3a --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs (.../PipingFailureMechanismResultViewTest.cs) (revision 219f8633c1b5b24f9e9aec3e903734fa94775f0e) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs (.../PipingFailureMechanismResultViewTest.cs) (revision f5a2d607a5b8053b232c1f3ad572a0acba6a4e3a) @@ -77,7 +77,7 @@ // Assert var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; - Assert.AreEqual(5, dataGridView.ColumnCount); + Assert.AreEqual(4, dataGridView.ColumnCount); Assert.IsTrue(dataGridView.Columns[assessmentLayerTwoAIndex].ReadOnly); Assert.AreEqual(DataGridViewAutoSizeColumnsMode.AllCells, dataGridView.AutoSizeColumnsMode); @@ -158,19 +158,17 @@ Assert.AreEqual(2, rows.Count); var cells = rows[0].Cells; - Assert.AreEqual(5, cells.Count); + Assert.AreEqual(4, cells.Count); Assert.AreEqual("Section 1", cells[nameColumnIndex].FormattedValue); Assert.IsFalse((bool) cells[assessmentLayerOneIndex].FormattedValue); Assert.AreEqual("-", cells[assessmentLayerTwoAIndex].FormattedValue); - Assert.AreEqual(string.Format("{0}", 0), cells[assessmentLayerTwoBIndex].FormattedValue); Assert.AreEqual(string.Format("{0}", 0), cells[assessmentLayerThreeIndex].FormattedValue); cells = rows[1].Cells; - Assert.AreEqual(5, cells.Count); + Assert.AreEqual(4, cells.Count); Assert.AreEqual("Section 2", cells[nameColumnIndex].FormattedValue); Assert.IsFalse((bool) cells[assessmentLayerOneIndex].FormattedValue); Assert.AreEqual("-", cells[assessmentLayerTwoAIndex].FormattedValue); - Assert.AreEqual(string.Format("{0}", 0), cells[assessmentLayerTwoBIndex].FormattedValue); Assert.AreEqual(string.Format("{0}", 0), cells[assessmentLayerThreeIndex].FormattedValue); } } @@ -191,52 +189,41 @@ var rows = dataGridView.Rows; var cells = rows[0].Cells; - Assert.AreEqual(5, cells.Count); + Assert.AreEqual(4, cells.Count); Assert.AreEqual("Section 1", cells[nameColumnIndex].FormattedValue); var cellAssessmentLayerTwoA = cells[assessmentLayerTwoAIndex]; - var cellAssessmentLayerTwoB = cells[assessmentLayerTwoBIndex]; var cellAssessmentLayerThree = cells[assessmentLayerThreeIndex]; Assert.AreEqual(checkBoxSelected, (bool) cells[assessmentLayerOneIndex].FormattedValue); Assert.AreEqual("-", cellAssessmentLayerTwoA.FormattedValue); - Assert.AreEqual(string.Format("{0}", 0), cellAssessmentLayerTwoB.FormattedValue); Assert.AreEqual(string.Format("{0}", 0), cellAssessmentLayerThree.FormattedValue); var cellAssessmentLayerTwoABackColor = cellAssessmentLayerTwoA.Style.BackColor; var cellAssessmentLayerTwoAForeColor = cellAssessmentLayerTwoA.Style.ForeColor; - var cellAssessmentLayerTwoBBackColor = cellAssessmentLayerTwoB.Style.BackColor; - var cellAssessmentLayerTwoBForeColor = cellAssessmentLayerTwoB.Style.ForeColor; var cellAssessmentLayerThreeBackColor = cellAssessmentLayerThree.Style.BackColor; var cellAssessmentLayerThreeForeColor = cellAssessmentLayerThree.Style.ForeColor; if (checkBoxSelected) { Assert.AreEqual(Color.FromKnownColor(KnownColor.DarkGray), cellAssessmentLayerTwoABackColor); Assert.AreEqual(Color.FromKnownColor(KnownColor.GrayText), cellAssessmentLayerTwoAForeColor); - Assert.AreEqual(Color.FromKnownColor(KnownColor.DarkGray), cellAssessmentLayerTwoBBackColor); - Assert.AreEqual(Color.FromKnownColor(KnownColor.GrayText), cellAssessmentLayerTwoBForeColor); Assert.AreEqual(Color.FromKnownColor(KnownColor.DarkGray), cellAssessmentLayerThreeBackColor); Assert.AreEqual(Color.FromKnownColor(KnownColor.GrayText), cellAssessmentLayerThreeForeColor); } else { Assert.AreEqual(Color.FromKnownColor(KnownColor.White), cellAssessmentLayerTwoABackColor); Assert.AreEqual(Color.FromKnownColor(KnownColor.ControlText), cellAssessmentLayerTwoAForeColor); - Assert.AreEqual(Color.FromKnownColor(KnownColor.White), cellAssessmentLayerTwoBBackColor); - Assert.AreEqual(Color.FromKnownColor(KnownColor.ControlText), cellAssessmentLayerTwoBForeColor); Assert.AreEqual(Color.FromKnownColor(KnownColor.White), cellAssessmentLayerThreeBackColor); Assert.AreEqual(Color.FromKnownColor(KnownColor.ControlText), cellAssessmentLayerThreeForeColor); } - Assert.AreEqual(checkBoxSelected, cellAssessmentLayerTwoB.ReadOnly); Assert.AreEqual(checkBoxSelected, cellAssessmentLayerThree.ReadOnly); } } [Test] - [TestCase("test", assessmentLayerTwoBIndex)] [TestCase("test", assessmentLayerThreeIndex)] - [TestCase(";/[].,~!@#$%^&*()_-+={}|?", assessmentLayerTwoBIndex)] [TestCase(";/[].,~!@#$%^&*()_-+={}|?", assessmentLayerThreeIndex)] public void FailureMechanismResultView_EditValueInvalid_ShowsErrorTooltip(string newValue, int cellIndex) { @@ -254,10 +241,6 @@ } [Test] - [TestCase("1", assessmentLayerTwoBIndex, "AssessmentLayerTwoB")] - [TestCase("1e-6", assessmentLayerTwoBIndex, "AssessmentLayerTwoB")] - [TestCase("1e+6", assessmentLayerTwoBIndex, "AssessmentLayerTwoB")] - [TestCase("14.3", assessmentLayerTwoBIndex, "AssessmentLayerTwoB")] [TestCase("1", assessmentLayerThreeIndex, "AssessmentLayerThree")] [TestCase("1e-6", assessmentLayerThreeIndex, "AssessmentLayerThree")] [TestCase("1e+6", assessmentLayerThreeIndex, "AssessmentLayerThree")] @@ -542,8 +525,7 @@ private const int nameColumnIndex = 0; private const int assessmentLayerOneIndex = 1; private const int assessmentLayerTwoAIndex = 2; - private const int assessmentLayerTwoBIndex = 3; - private const int assessmentLayerThreeIndex = 4; + private const int assessmentLayerThreeIndex = 3; private PipingFailureMechanismResultView ShowFullyConfiguredFailureMechanismResultsView() { Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -r219f8633c1b5b24f9e9aec3e903734fa94775f0e -rf5a2d607a5b8053b232c1f3ad572a0acba6a4e3a --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismSectionResultRowTest.cs (.../PipingFailureMechanismSectionResultRowTest.cs) (revision 219f8633c1b5b24f9e9aec3e903734fa94775f0e) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismSectionResultRowTest.cs (.../PipingFailureMechanismSectionResultRowTest.cs) (revision f5a2d607a5b8053b232c1f3ad572a0acba6a4e3a) @@ -62,7 +62,6 @@ // Assert Assert.AreEqual(section.Name, row.Name); Assert.AreEqual(result.AssessmentLayerOne, row.AssessmentLayerOne); - Assert.AreEqual(result.AssessmentLayerTwoB, row.AssessmentLayerTwoB); Assert.AreEqual(result.AssessmentLayerThree, row.AssessmentLayerThree); } @@ -192,23 +191,6 @@ } [Test] - public void AssessmentLayerTwoB_AlwaysOnChange_ResultPropertyChanged() - { - // Setup - var random = new Random(21); - var newValue = random.NextDouble(); - var section = CreateSection(); - var result = new PipingFailureMechanismSectionResult(section); - var row = new PipingFailureMechanismSectionResultRow(result); - - // Call - row.AssessmentLayerTwoB = (RoundedDouble) newValue; - - // Assert - Assert.AreEqual(newValue, result.AssessmentLayerTwoB, row.AssessmentLayerTwoB.GetAccuracy()); - } - - [Test] public void AssessmentLayerThree_AlwaysOnChange_ResultPropertyChanged() { // Setup