Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismResultView.cs =================================================================== diff -u -ra0a6258257c414bfebdab21480a2278aa9748c35 -r7af42667c0a4cd9f2521bd5118225dbf024454a1 --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismResultView.cs (.../StabilityPointStructuresFailureMechanismResultView.cs) (revision a0a6258257c414bfebdab21480a2278aa9748c35) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismResultView.cs (.../StabilityPointStructuresFailureMechanismResultView.cs) (revision 7af42667c0a4cd9f2521bd5118225dbf024454a1) @@ -26,7 +26,6 @@ using Core.Common.Util; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.Calculation; -using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.Structures; using Ringtoets.Common.Forms.Helpers; using Ringtoets.Common.Forms.Views; @@ -117,18 +116,18 @@ { base.AddDataGridColumns(); - EnumDisplayWrapper[] layerOneDataSource = - Enum.GetValues(typeof(AssessmentLayerOneState)) - .OfType() - .Select(sa => new EnumDisplayWrapper(sa)) + EnumDisplayWrapper[] layerOneDataSource = + Enum.GetValues(typeof(SimpleAssessmentResultValidityOnlyType)) + .OfType() + .Select(sa => new EnumDisplayWrapper(sa)) .ToArray(); DataGridViewControl.AddComboBoxColumn( - nameof(StabilityPointStructuresFailureMechanismSectionResultRow.AssessmentLayerOne), + nameof(StabilityPointStructuresFailureMechanismSectionResultRow.SimpleAssessmentResult), RingtoetsCommonFormsResources.FailureMechanismResultView_SimpleAssessmentResult_ColumnHeader, layerOneDataSource, - nameof(EnumDisplayWrapper.Value), - nameof(EnumDisplayWrapper.DisplayName)); + nameof(EnumDisplayWrapper.Value), + nameof(EnumDisplayWrapper.DisplayName)); DataGridViewControl.AddTextBoxColumn( nameof(StabilityPointStructuresFailureMechanismSectionResultRow.DetailedAssessmentProbability), @@ -138,17 +137,13 @@ RingtoetsCommonFormsResources.FailureMechanismResultView_TailorMadeAssessment_ColumnHeader); } - private bool HasPassedSimpleAssessment(int rowIndex) - { - return (AssessmentLayerOneState) DataGridViewControl.GetCell(rowIndex, SimpleAssessmentColumnIndex).Value - == AssessmentLayerOneState.Sufficient; - } - private void DisableIrrelevantFieldsFormatting(object sender, DataGridViewCellFormattingEventArgs eventArgs) { if (eventArgs.ColumnIndex > SimpleAssessmentColumnIndex) { - if (HasPassedSimpleAssessment(eventArgs.RowIndex)) + var simpleAssessmentResult = (SimpleAssessmentResultValidityOnlyType) DataGridViewControl.GetCell(eventArgs.RowIndex, + SimpleAssessmentColumnIndex).Value; + if (FailureMechanismResultViewHelper.HasPassedSimpleAssessment(simpleAssessmentResult)) { DataGridViewControl.DisableCell(eventArgs.RowIndex, eventArgs.ColumnIndex); } @@ -171,7 +166,7 @@ StructuresCalculation normativeCalculation = resultRow.GetSectionResultCalculation(); FailureMechanismSectionResultRowHelper.SetDetailedAssessmentError(currentDataGridViewCell, - resultRow.AssessmentLayerOne, + resultRow.SimpleAssessmentResult, resultRow.DetailedAssessmentProbability, normativeCalculation); } Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismSectionResultRow.cs =================================================================== diff -u -ra0a6258257c414bfebdab21480a2278aa9748c35 -r7af42667c0a4cd9f2521bd5118225dbf024454a1 --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismSectionResultRow.cs (.../StabilityPointStructuresFailureMechanismSectionResultRow.cs) (revision a0a6258257c414bfebdab21480a2278aa9748c35) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismSectionResultRow.cs (.../StabilityPointStructuresFailureMechanismSectionResultRow.cs) (revision 7af42667c0a4cd9f2521bd5118225dbf024454a1) @@ -22,10 +22,10 @@ using System; using System.ComponentModel; using Ringtoets.Common.Data.AssessmentSection; -using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.Structures; using Ringtoets.Common.Forms.TypeConverters; using Ringtoets.Common.Forms.Views; +using Ringtoets.Common.Primitives; using Ringtoets.StabilityPointStructures.Data; namespace Ringtoets.StabilityPointStructures.Forms.Views @@ -67,17 +67,17 @@ } /// - /// Gets or sets the value representing whether the section passed the layer 1 assessment. + /// Gets or sets the value representing the simple assessment result. /// - public AssessmentLayerOneState AssessmentLayerOne + public SimpleAssessmentResultValidityOnlyType SimpleAssessmentResult { get { - return SectionResult.AssessmentLayerOne; + return SectionResult.SimpleAssessmentResult; } set { - SectionResult.AssessmentLayerOne = value; + SectionResult.SimpleAssessmentResult = value; SectionResult.NotifyObservers(); } } Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Ringtoets.StabilityPointStructures.Forms.Test.csproj =================================================================== diff -u -r7ec3c942280c558bf69d4b92a3610fcdbf29899c -r7af42667c0a4cd9f2521bd5118225dbf024454a1 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Ringtoets.StabilityPointStructures.Forms.Test.csproj (.../Ringtoets.StabilityPointStructures.Forms.Test.csproj) (revision 7ec3c942280c558bf69d4b92a3610fcdbf29899c) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Ringtoets.StabilityPointStructures.Forms.Test.csproj (.../Ringtoets.StabilityPointStructures.Forms.Test.csproj) (revision 7af42667c0a4cd9f2521bd5118225dbf024454a1) @@ -81,6 +81,10 @@ {4d840673-3812-4338-a352-84854e32b8a0} Ringtoets.Common.Forms + + {78AA56F5-431D-465C-AC50-3173D7E90AC1} + Ringtoets.Common.Primitives + {4843D6E5-066F-4795-94F5-1D53932DD03C} Ringtoets.Common.Data.TestUtil Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs =================================================================== diff -u -ra0a6258257c414bfebdab21480a2278aa9748c35 -r7af42667c0a4cd9f2521bd5118225dbf024454a1 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs (.../StabilityPointStructuresFailureMechanismResultViewTest.cs) (revision a0a6258257c414bfebdab21480a2278aa9748c35) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs (.../StabilityPointStructuresFailureMechanismResultViewTest.cs) (revision 7af42667c0a4cd9f2521bd5118225dbf024454a1) @@ -21,7 +21,6 @@ using System; using System.Collections; -using System.Collections.Generic; using System.Globalization; using System.Linq; using System.Windows.Forms; @@ -37,6 +36,7 @@ using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.Helpers; using Ringtoets.Common.Forms.Views; +using Ringtoets.Common.Primitives; using Ringtoets.StabilityPointStructures.Data; using Ringtoets.StabilityPointStructures.Forms.Views; @@ -46,7 +46,7 @@ public class StabilityPointStructuresFailureMechanismResultViewTest { private const int nameColumnIndex = 0; - private const int assessmentLayerOneIndex = 1; + private const int simpleAssessmentResultIndex = 1; private const int detailedAssessmentIndex = 2; private const int assessmentLayerThreeIndex = 3; @@ -118,34 +118,34 @@ DataGridViewCellCollection cells = rows[0].Cells; Assert.AreEqual(4, cells.Count); Assert.AreEqual("Section 1", cells[nameColumnIndex].FormattedValue); - Assert.AreEqual(AssessmentLayerOneState.NotAssessed, cells[assessmentLayerOneIndex].Value); + Assert.AreEqual(SimpleAssessmentResultValidityOnlyType.None, cells[simpleAssessmentResultIndex].Value); Assert.AreEqual("-", cells[detailedAssessmentIndex].FormattedValue); Assert.AreEqual("-", cells[assessmentLayerThreeIndex].FormattedValue); cells = rows[1].Cells; Assert.AreEqual(4, cells.Count); Assert.AreEqual("Section 2", cells[nameColumnIndex].FormattedValue); - Assert.AreEqual(AssessmentLayerOneState.NotAssessed, cells[assessmentLayerOneIndex].Value); + Assert.AreEqual(SimpleAssessmentResultValidityOnlyType.None, cells[simpleAssessmentResultIndex].Value); Assert.AreEqual("-", cells[detailedAssessmentIndex].FormattedValue); Assert.AreEqual("-", cells[assessmentLayerThreeIndex].FormattedValue); } } [Test] [SetCulture("nl-NL")] - [TestCase(AssessmentLayerOneState.NotAssessed)] - [TestCase(AssessmentLayerOneState.NoVerdict)] - [TestCase(AssessmentLayerOneState.Sufficient)] - public void FailureMechanismResultsView_ChangeCheckBox_DataGridViewCorrectlySyncedAndStylingSet( - AssessmentLayerOneState assessmentLayerOneState) + [TestCase(SimpleAssessmentResultValidityOnlyType.None)] + [TestCase(SimpleAssessmentResultValidityOnlyType.Applicable)] + [TestCase(SimpleAssessmentResultValidityOnlyType.NotApplicable)] + public void FailureMechanismResultsView_ChangeComboBox_DataGridViewCorrectlySyncedAndStylingSet( + SimpleAssessmentResultValidityOnlyType simpleAssessmentResult) { // Setup using (CreateConfiguredFailureMechanismResultsView(new StabilityPointStructuresFailureMechanism())) { var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; // Call - dataGridView.Rows[0].Cells[assessmentLayerOneIndex].Value = assessmentLayerOneState; + dataGridView.Rows[0].Cells[simpleAssessmentResultIndex].Value = simpleAssessmentResult; // Assert DataGridViewRowCollection rows = dataGridView.Rows; @@ -155,14 +155,14 @@ Assert.AreEqual("Section 1", cells[nameColumnIndex].FormattedValue); DataGridViewCell cellDetailedAssessment = cells[detailedAssessmentIndex]; DataGridViewCell cellAssessmentLayerThree = cells[assessmentLayerThreeIndex]; - DataGridViewCell dataGridViewCell = cells[assessmentLayerOneIndex]; + DataGridViewCell dataGridViewCell = cells[simpleAssessmentResultIndex]; - Assert.AreEqual(assessmentLayerOneState, dataGridViewCell.Value); + Assert.AreEqual(simpleAssessmentResult, dataGridViewCell.Value); Assert.AreEqual("-", cellDetailedAssessment.FormattedValue); Assert.AreEqual("-", cellAssessmentLayerThree.FormattedValue); Assert.IsEmpty(dataGridViewCell.ErrorText); - if (assessmentLayerOneState == AssessmentLayerOneState.Sufficient) + if (simpleAssessmentResult == SimpleAssessmentResultValidityOnlyType.NotApplicable) { DataGridViewTestHelper.AssertCellIsDisabled(cellDetailedAssessment); DataGridViewTestHelper.AssertCellIsDisabled(cellAssessmentLayerThree); @@ -190,11 +190,11 @@ Assert.AreEqual(4, dataGridView.ColumnCount); - Assert.IsInstanceOf(dataGridView.Columns[assessmentLayerOneIndex]); + Assert.IsInstanceOf(dataGridView.Columns[simpleAssessmentResultIndex]); Assert.IsInstanceOf(dataGridView.Columns[detailedAssessmentIndex]); Assert.IsInstanceOf(dataGridView.Columns[assessmentLayerThreeIndex]); - Assert.AreEqual("Eenvoudige toets", dataGridView.Columns[assessmentLayerOneIndex].HeaderText); + Assert.AreEqual("Eenvoudige toets", dataGridView.Columns[simpleAssessmentResultIndex].HeaderText); Assert.AreEqual("Gedetailleerde toets per vak", dataGridView.Columns[detailedAssessmentIndex].HeaderText); Assert.AreEqual("Toets op maat", dataGridView.Columns[assessmentLayerThreeIndex].HeaderText); @@ -223,17 +223,17 @@ var random = new Random(21); var result1 = new StabilityPointStructuresFailureMechanismSectionResult(section1) { - AssessmentLayerOne = AssessmentLayerOneState.Sufficient, + SimpleAssessmentResult = SimpleAssessmentResultValidityOnlyType.NotApplicable, AssessmentLayerThree = random.NextRoundedDouble() }; var result2 = new StabilityPointStructuresFailureMechanismSectionResult(section2) { - AssessmentLayerOne = AssessmentLayerOneState.NotAssessed, + SimpleAssessmentResult = SimpleAssessmentResultValidityOnlyType.Applicable, AssessmentLayerThree = random.NextRoundedDouble() }; var result3 = new StabilityPointStructuresFailureMechanismSectionResult(section3) { - AssessmentLayerOne = AssessmentLayerOneState.NoVerdict, + SimpleAssessmentResult = SimpleAssessmentResultValidityOnlyType.None, AssessmentLayerThree = random.NextRoundedDouble() }; @@ -254,7 +254,7 @@ DataGridViewCellCollection cells = rows[0].Cells; Assert.AreEqual(4, cells.Count); Assert.AreEqual("Section 1", cells[nameColumnIndex].FormattedValue); - Assert.AreEqual(result1.AssessmentLayerOne, cells[assessmentLayerOneIndex].Value); + Assert.AreEqual(result1.SimpleAssessmentResult, cells[simpleAssessmentResultIndex].Value); Assert.AreEqual("-", cells[detailedAssessmentIndex].FormattedValue); Assert.AreEqual(ProbabilityFormattingHelper.Format(result1.AssessmentLayerThree), @@ -266,7 +266,7 @@ cells = rows[1].Cells; Assert.AreEqual(4, cells.Count); Assert.AreEqual("Section 2", cells[nameColumnIndex].FormattedValue); - Assert.AreEqual(result2.AssessmentLayerOne, cells[assessmentLayerOneIndex].Value); + Assert.AreEqual(result2.SimpleAssessmentResult, cells[simpleAssessmentResultIndex].Value); Assert.AreEqual("-", cells[detailedAssessmentIndex].FormattedValue); Assert.AreEqual(ProbabilityFormattingHelper.Format(result2.AssessmentLayerThree), cells[assessmentLayerThreeIndex].FormattedValue); @@ -277,7 +277,7 @@ cells = rows[2].Cells; Assert.AreEqual(4, cells.Count); Assert.AreEqual("Section 3", cells[nameColumnIndex].FormattedValue); - Assert.AreEqual(result3.AssessmentLayerOne, cells[assessmentLayerOneIndex].Value); + Assert.AreEqual(result3.SimpleAssessmentResult, cells[simpleAssessmentResultIndex].Value); Assert.AreEqual("-", cells[detailedAssessmentIndex].FormattedValue); Assert.AreEqual(ProbabilityFormattingHelper.Format(result3.AssessmentLayerThree), cells[assessmentLayerThreeIndex].FormattedValue); @@ -288,10 +288,10 @@ } [Test] - [TestCase(AssessmentLayerOneState.NotAssessed, TestName = "ResultView_SectionPassesLevel0AndListenersNotified_RowsDisabled(notAssessed)")] - [TestCase(AssessmentLayerOneState.NoVerdict, TestName = "ResultView_SectionPassesLevel0AndListenersNotified_RowsDisabled(noVerdict)")] - public void GivenFormWithFailureMechanismResultView_WhenSectionPassesLevel0AndListenersNotified_ThenRowsForSectionDisabled( - AssessmentLayerOneState assessmentLayerOneState) + [TestCase(SimpleAssessmentResultValidityOnlyType.None, TestName = "ResultView_SectionnBecomesNotApplicableAndListenersNotified_RowsDisabled(None)")] + [TestCase(SimpleAssessmentResultValidityOnlyType.Applicable, TestName = "ResultView_SectionnBecomesNotApplicableAndListenersNotified_RowsDisabled(Applicable)")] + public void GivenFormWithFailureMechanismResultView_WhenSectionBecomesNotApplicableAndListenersNotified_ThenRowsForSectionDisabled( + SimpleAssessmentResultValidityOnlyType assessmentLayerOneState) { // Given var section = new FailureMechanismSection("Section 1", new[] @@ -301,7 +301,7 @@ var random = new Random(21); var result = new StabilityPointStructuresFailureMechanismSectionResult(section) { - AssessmentLayerOne = assessmentLayerOneState, + SimpleAssessmentResult = assessmentLayerOneState, AssessmentLayerThree = random.NextRoundedDouble() }; using (ShowFailureMechanismResultsView( @@ -311,7 +311,7 @@ })) { // When - result.AssessmentLayerOne = AssessmentLayerOneState.Sufficient; + result.SimpleAssessmentResult = SimpleAssessmentResultValidityOnlyType.NotApplicable; result.NotifyObservers(); // Then @@ -359,16 +359,16 @@ } [Test] - [TestCase(AssessmentLayerOneState.NotAssessed)] - [TestCase(AssessmentLayerOneState.NoVerdict)] + [TestCase(SimpleAssessmentResultValidityOnlyType.None)] + [TestCase(SimpleAssessmentResultValidityOnlyType.Applicable)] public void GivenSectionResultAndCalculationNotCalculated_ThenDetailedAssessmentErrorTooltip( - AssessmentLayerOneState assessmentLayerOneState) + SimpleAssessmentResultValidityOnlyType simpleAssessmentResult) { // Given var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(CreateSimpleFailureMechanismSection()) { Calculation = new StructuresCalculation(), - AssessmentLayerOne = assessmentLayerOneState + SimpleAssessmentResult = simpleAssessmentResult }; using (ShowFailureMechanismResultsView( @@ -485,10 +485,10 @@ } [Test] - [TestCase(AssessmentLayerOneState.NotAssessed, TestName = "SectionResultSuccessfulCalculation_CalculationToFailed_DetailedAssessmentHasError(notAssessed)")] - [TestCase(AssessmentLayerOneState.NoVerdict, TestName = "SectionResultSuccessfulCalculation_CalculationToFailed_DetailedAssessmentHasError(noVerdict)")] - public void GivenSectionResultAndSuccessfulCalculation_WhenChangingCalculationToFailed_ThenDetailedAssessmentHasError( - AssessmentLayerOneState assessmentLayerOneState) + [TestCase(SimpleAssessmentResultValidityOnlyType.None, TestName = "SectionResultSuccessfulCalculation_CalculationToFailed_LayerTwoAHasError(None)")] + [TestCase(SimpleAssessmentResultValidityOnlyType.Applicable, TestName = "SectionResultSuccessfulCalculation_CalculationToFailed_LayerTwoAHasError(Applicable)")] + public void GivenSectionResultAndSuccessfulCalculation_WhenChangingCalculationToFailed_ThenLayerTwoAHasError( + SimpleAssessmentResultValidityOnlyType simpleAssessmentResult) { // Given var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(CreateSimpleFailureMechanismSection()) @@ -497,7 +497,7 @@ { Output = new TestStructuresOutput(0.56789) }, - AssessmentLayerOne = assessmentLayerOneState + SimpleAssessmentResult = simpleAssessmentResult }; using (ShowFailureMechanismResultsView( @@ -599,24 +599,24 @@ yield return new TestCaseData(new StabilityPointStructuresFailureMechanismSectionResult(section) { - AssessmentLayerOne = AssessmentLayerOneState.Sufficient + SimpleAssessmentResult = SimpleAssessmentResultValidityOnlyType.NotApplicable }, "-").SetName("SectionWithoutCalculation"); yield return new TestCaseData(new StabilityPointStructuresFailureMechanismSectionResult(section) { - AssessmentLayerOne = AssessmentLayerOneState.Sufficient, + SimpleAssessmentResult = SimpleAssessmentResultValidityOnlyType.NotApplicable, Calculation = new StructuresCalculation() }, "-").SetName("SectionWithCalculationNoOutput"); yield return new TestCaseData(new StabilityPointStructuresFailureMechanismSectionResult(section) { - AssessmentLayerOne = AssessmentLayerOneState.Sufficient, + SimpleAssessmentResult = SimpleAssessmentResultValidityOnlyType.NotApplicable, Calculation = new StructuresCalculation { Output = new TestStructuresOutput(double.NaN) } }, "-").SetName("SectionWithInvalidCalculationOutput"); yield return new TestCaseData(new StabilityPointStructuresFailureMechanismSectionResult(section) { - AssessmentLayerOne = AssessmentLayerOneState.Sufficient, + SimpleAssessmentResult = SimpleAssessmentResultValidityOnlyType.NotApplicable, Calculation = new StructuresCalculation { Output = new TestStructuresOutput(0.56789) @@ -626,25 +626,23 @@ private static FailureMechanismSection CreateSimpleFailureMechanismSection() { - var section = new FailureMechanismSection("A", - new[] - { - new Point2D(1, 2), - new Point2D(3, 4) - }); - return section; + return FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[] + { + new Point2D(1, 2), + new Point2D(3, 4) + }); } private StabilityPointStructuresFailureMechanismResultView CreateConfiguredFailureMechanismResultsView( StabilityPointStructuresFailureMechanism failureMechanism) { - failureMechanism.AddSection(new FailureMechanismSection("Section 1", new List + failureMechanism.AddSection(new FailureMechanismSection("Section 1", new[] { new Point2D(0.0, 0.0), new Point2D(5.0, 0.0) })); - failureMechanism.AddSection(new FailureMechanismSection("Section 2", new List + failureMechanism.AddSection(new FailureMechanismSection("Section 2", new[] { new Point2D(5.0, 0.0), new Point2D(10.0, 0.0) Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -ra0a6258257c414bfebdab21480a2278aa9748c35 -r7af42667c0a4cd9f2521bd5118225dbf024454a1 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismSectionResultRowTest.cs (.../StabilityPointStructuresFailureMechanismSectionResultRowTest.cs) (revision a0a6258257c414bfebdab21480a2278aa9748c35) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismSectionResultRowTest.cs (.../StabilityPointStructuresFailureMechanismSectionResultRowTest.cs) (revision 7af42667c0a4cd9f2521bd5118225dbf024454a1) @@ -31,6 +31,7 @@ using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.TypeConverters; using Ringtoets.Common.Forms.Views; +using Ringtoets.Common.Primitives; using Ringtoets.StabilityPointStructures.Data; using Ringtoets.StabilityPointStructures.Forms.Views; @@ -57,7 +58,7 @@ // Assert Assert.IsInstanceOf>(row); - Assert.AreEqual(result.AssessmentLayerOne, row.AssessmentLayerOne); + Assert.AreEqual(result.AssessmentLayerOne, row.SimpleAssessmentResult); Assert.AreEqual(result.GetDetailedAssessmentProbability(failureMechanism, assessmentSection), row.DetailedAssessmentProbability); Assert.AreEqual(row.AssessmentLayerThree, result.AssessmentLayerThree); @@ -105,10 +106,7 @@ } [Test] - [TestCase(AssessmentLayerOneState.NotAssessed)] - [TestCase(AssessmentLayerOneState.Sufficient)] - [TestCase(AssessmentLayerOneState.NoVerdict)] - public void AssessmentLayerOne_AlwaysOnChange_NotifyObserversOfResultAndResultPropertyChanged(AssessmentLayerOneState newValue) + public void SimpleAssessmentResult_AlwaysOnChange_NotifyObserversOfResultAndResultPropertyChanged() { // Setup var mocks = new MockRepository(); @@ -121,15 +119,17 @@ var result = new StabilityPointStructuresFailureMechanismSectionResult(section); result.Attach(observer); + var newValue = new Random(21).NextEnumValue(); + var row = new StabilityPointStructuresFailureMechanismSectionResultRow(result, new StabilityPointStructuresFailureMechanism(), assessmentSection); // Call - row.AssessmentLayerOne = newValue; + row.SimpleAssessmentResult = newValue; // Assert - Assert.AreEqual(newValue, result.AssessmentLayerOne); + Assert.AreEqual(newValue, result.SimpleAssessmentResult); mocks.VerifyAll(); }