Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismResultView.cs =================================================================== diff -u -re4493326e76838a769820463a71e14ede6c6351e -r238bf704788e704cba7b7fd64590a10ca9050227 --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismResultView.cs (.../StabilityPointStructuresFailureMechanismResultView.cs) (revision e4493326e76838a769820463a71e14ede6c6351e) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismResultView.cs (.../StabilityPointStructuresFailureMechanismResultView.cs) (revision 238bf704788e704cba7b7fd64590a10ca9050227) @@ -112,6 +112,10 @@ DataGridViewControl, nameof(StabilityPointStructuresFailureMechanismSectionResultRow.SimpleAssessmentResult)); + FailureMechanismSectionResultViewColumnBuilder.AddDetailedAssessmentResultColumn( + DataGridViewControl, + nameof(StabilityPointStructuresFailureMechanismSectionResultRow.DetailedAssessmentResult)); + FailureMechanismSectionResultViewColumnBuilder.AddDetailedAssessmentProbabilityColumn( DataGridViewControl, nameof(StabilityPointStructuresFailureMechanismSectionResultRow.DetailedAssessmentProbability)); Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs =================================================================== diff -u -re4493326e76838a769820463a71e14ede6c6351e -r238bf704788e704cba7b7fd64590a10ca9050227 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs (.../StabilityPointStructuresFailureMechanismResultViewTest.cs) (revision e4493326e76838a769820463a71e14ede6c6351e) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs (.../StabilityPointStructuresFailureMechanismResultViewTest.cs) (revision 238bf704788e704cba7b7fd64590a10ca9050227) @@ -45,8 +45,10 @@ { private const int nameColumnIndex = 0; private const int simpleAssessmentResultIndex = 1; - private const int detailedAssessmentProbabilityIndex = 2; - private const int tailorMadeAssessmentProbabilityIndex = 3; + private const int detailedAssessmentResultIndex = 2; + private const int detailedAssessmentProbabilityIndex = 3; + private const int tailorMadeAssessmentProbabilityIndex = 4; + private const int columnCount = 5; private Form testForm; @@ -110,20 +112,23 @@ // Then var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject; - Assert.AreEqual(4, dataGridView.ColumnCount); + Assert.AreEqual(columnCount, dataGridView.ColumnCount); Assert.IsInstanceOf(dataGridView.Columns[nameColumnIndex]); Assert.IsInstanceOf(dataGridView.Columns[simpleAssessmentResultIndex]); + Assert.IsInstanceOf(dataGridView.Columns[detailedAssessmentResultIndex]); Assert.IsInstanceOf(dataGridView.Columns[detailedAssessmentProbabilityIndex]); Assert.IsInstanceOf(dataGridView.Columns[tailorMadeAssessmentProbabilityIndex]); Assert.AreEqual("Vak", dataGridView.Columns[nameColumnIndex].HeaderText); Assert.AreEqual("Eenvoudige toets", dataGridView.Columns[simpleAssessmentResultIndex].HeaderText); + Assert.AreEqual("Gedetailleerde toets per vak", dataGridView.Columns[detailedAssessmentResultIndex].HeaderText); Assert.AreEqual("Gedetailleerde toets per vak\r\nfaalkans", dataGridView.Columns[detailedAssessmentProbabilityIndex].HeaderText); Assert.AreEqual("Toets op maat\r\nfaalkans", dataGridView.Columns[tailorMadeAssessmentProbabilityIndex].HeaderText); Assert.IsTrue(dataGridView.Columns[nameColumnIndex].ReadOnly); Assert.IsFalse(dataGridView.Columns[simpleAssessmentResultIndex].ReadOnly); + Assert.IsFalse(dataGridView.Columns[detailedAssessmentResultIndex].ReadOnly); Assert.IsTrue(dataGridView.Columns[detailedAssessmentProbabilityIndex].ReadOnly); Assert.IsFalse(dataGridView.Columns[tailorMadeAssessmentProbabilityIndex].ReadOnly); @@ -150,9 +155,10 @@ Assert.AreEqual(1, rows.Count); DataGridViewCellCollection cells = rows[0].Cells; - Assert.AreEqual(4, cells.Count); + Assert.AreEqual(columnCount, cells.Count); Assert.AreEqual("Section 1", cells[nameColumnIndex].FormattedValue); Assert.AreEqual(SimpleAssessmentResultValidityOnlyType.None, cells[simpleAssessmentResultIndex].Value); + Assert.AreEqual(DetailedAssessmentResultType.Probability, cells[detailedAssessmentResultIndex].Value); Assert.AreEqual("-", cells[detailedAssessmentProbabilityIndex].FormattedValue); Assert.AreEqual("-", cells[tailorMadeAssessmentProbabilityIndex].FormattedValue); } Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -r9fbb85cdbc3fd1dd58ae2d03dbe37fe2714d0e04 -r238bf704788e704cba7b7fd64590a10ca9050227 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismSectionResultRowTest.cs (.../StabilityPointStructuresFailureMechanismSectionResultRowTest.cs) (revision 9fbb85cdbc3fd1dd58ae2d03dbe37fe2714d0e04) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismSectionResultRowTest.cs (.../StabilityPointStructuresFailureMechanismSectionResultRowTest.cs) (revision 238bf704788e704cba7b7fd64590a10ca9050227) @@ -105,6 +105,8 @@ Assert.AreEqual("assessmentSection", exception.ParamName); } + #region Registration + [Test] public void SimpleAssessmentResult_SetNewValue_NotifyObserversAndPropertyChanged() { @@ -258,60 +260,6 @@ } [Test] - public void GetSectionResultCalculation_NoCalculationSetOnSectionResult_ReturnNull() - { - // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - - var failureMechanism = new StabilityPointStructuresFailureMechanism(); - - FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); - var result = new StabilityPointStructuresFailureMechanismSectionResult(section); - - // Precondition - Assert.IsNull(result.Calculation); - - var row = new StabilityPointStructuresFailureMechanismSectionResultRow(result, failureMechanism, assessmentSection); - - // Call - StructuresCalculation calculation = row.GetSectionResultCalculation(); - - // Assert - Assert.IsNull(calculation); - mocks.VerifyAll(); - } - - [Test] - public void GetSectionResultCalculation_WithCalculationSetOnSectionResult_ReturnCalculation() - { - // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - - var failureMechanism = new StabilityPointStructuresFailureMechanism(); - - var expectedCalculation = new StructuresCalculation(); - - FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); - var result = new StabilityPointStructuresFailureMechanismSectionResult(section) - { - Calculation = expectedCalculation - }; - - var row = new StabilityPointStructuresFailureMechanismSectionResultRow(result, failureMechanism, assessmentSection); - - // Call - StructuresCalculation calculation = row.GetSectionResultCalculation(); - - // Assert - Assert.AreSame(expectedCalculation, calculation); - mocks.VerifyAll(); - } - - [Test] public void TailorMadeAssessmentResult_SetNewValue_NotifyObserversAndPropertyChanged() { // Setup @@ -402,5 +350,61 @@ TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage); mocks.VerifyAll(); } + + #endregion + + [Test] + public void GetSectionResultCalculation_NoCalculationSetOnSectionResult_ReturnNull() + { + // Setup + var mocks = new MockRepository(); + var assessmentSection = mocks.Stub(); + mocks.ReplayAll(); + + var failureMechanism = new StabilityPointStructuresFailureMechanism(); + + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); + var result = new StabilityPointStructuresFailureMechanismSectionResult(section); + + // Precondition + Assert.IsNull(result.Calculation); + + var row = new StabilityPointStructuresFailureMechanismSectionResultRow(result, failureMechanism, assessmentSection); + + // Call + StructuresCalculation calculation = row.GetSectionResultCalculation(); + + // Assert + Assert.IsNull(calculation); + mocks.VerifyAll(); + } + + [Test] + public void GetSectionResultCalculation_WithCalculationSetOnSectionResult_ReturnCalculation() + { + // Setup + var mocks = new MockRepository(); + var assessmentSection = mocks.Stub(); + mocks.ReplayAll(); + + var failureMechanism = new StabilityPointStructuresFailureMechanism(); + + var expectedCalculation = new StructuresCalculation(); + + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); + var result = new StabilityPointStructuresFailureMechanismSectionResult(section) + { + Calculation = expectedCalculation + }; + + var row = new StabilityPointStructuresFailureMechanismSectionResultRow(result, failureMechanism, assessmentSection); + + // Call + StructuresCalculation calculation = row.GetSectionResultCalculation(); + + // Assert + Assert.AreSame(expectedCalculation, calculation); + mocks.VerifyAll(); + } } } \ No newline at end of file