Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs =================================================================== diff -u -r44420c717ac32101ba0da4739d259c622f47976e -r1c200c32948d83b6a93a92da6a728120634e6e4f --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs (.../PipingFailureMechanismResultViewTest.cs) (revision 44420c717ac32101ba0da4739d259c622f47976e) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs (.../PipingFailureMechanismResultViewTest.cs) (revision 1c200c32948d83b6a93a92da6a728120634e6e4f) @@ -48,7 +48,7 @@ private const int nameColumnIndex = 0; private const int simpleAssessmentIndex = 1; private const int detailedAssessmentIndex = 2; - private const int assessmentLayerThreeIndex = 3; + private const int tailorMadeAssessmentProbabilityIndex = 3; private Form testForm; [SetUp] @@ -117,11 +117,11 @@ Assert.IsTrue(dataGridView.Columns[detailedAssessmentIndex].ReadOnly); Assert.IsInstanceOf(dataGridView.Columns[simpleAssessmentIndex]); Assert.IsInstanceOf(dataGridView.Columns[detailedAssessmentIndex]); - Assert.IsInstanceOf(dataGridView.Columns[assessmentLayerThreeIndex]); + Assert.IsInstanceOf(dataGridView.Columns[tailorMadeAssessmentProbabilityIndex]); Assert.AreEqual("Eenvoudige toets", dataGridView.Columns[simpleAssessmentIndex].HeaderText); Assert.AreEqual("Gedetailleerde toets per vak", dataGridView.Columns[detailedAssessmentIndex].HeaderText); - Assert.AreEqual("Toets op maat", dataGridView.Columns[assessmentLayerThreeIndex].HeaderText); + Assert.AreEqual("Toets op maat", dataGridView.Columns[tailorMadeAssessmentProbabilityIndex].HeaderText); Assert.AreEqual(DataGridViewAutoSizeColumnsMode.AllCells, dataGridView.AutoSizeColumnsMode); Assert.AreEqual(DataGridViewContentAlignment.MiddleCenter, dataGridView.ColumnHeadersDefaultCellStyle.Alignment); @@ -148,14 +148,14 @@ Assert.AreEqual("Section 1", cells[nameColumnIndex].FormattedValue); Assert.AreEqual(SimpleAssessmentResultType.None, cells[simpleAssessmentIndex].Value); Assert.AreEqual("-", cells[detailedAssessmentIndex].FormattedValue); - Assert.AreEqual("-", cells[assessmentLayerThreeIndex].FormattedValue); + Assert.AreEqual("-", cells[tailorMadeAssessmentProbabilityIndex].FormattedValue); cells = rows[1].Cells; Assert.AreEqual(4, cells.Count); Assert.AreEqual("Section 2", cells[nameColumnIndex].FormattedValue); Assert.AreEqual(SimpleAssessmentResultType.None, cells[simpleAssessmentIndex].Value); Assert.AreEqual("-", cells[detailedAssessmentIndex].FormattedValue); - Assert.AreEqual("-", cells[assessmentLayerThreeIndex].FormattedValue); + Assert.AreEqual("-", cells[tailorMadeAssessmentProbabilityIndex].FormattedValue); } } @@ -184,33 +184,33 @@ Assert.AreEqual(4, cells.Count); Assert.AreEqual("Section 1", cells[nameColumnIndex].FormattedValue); DataGridViewCell cellDetailedAssessment = cells[detailedAssessmentIndex]; - DataGridViewCell cellAssessmentLayerThree = cells[assessmentLayerThreeIndex]; + DataGridViewCell cellTailorMadeAssessmentProbability = cells[tailorMadeAssessmentProbabilityIndex]; Assert.AreEqual(simpleAssessmentType, cells[simpleAssessmentIndex].Value); Assert.AreEqual("-", cellDetailedAssessment.FormattedValue); - Assert.AreEqual("-", cellAssessmentLayerThree.FormattedValue); + Assert.AreEqual("-", cellTailorMadeAssessmentProbability.FormattedValue); if (simpleAssessmentType == SimpleAssessmentResultType.ProbabilityNegligible || simpleAssessmentType == SimpleAssessmentResultType.NotApplicable) { DataGridViewTestHelper.AssertCellIsDisabled(cellDetailedAssessment); - DataGridViewTestHelper.AssertCellIsDisabled(cellAssessmentLayerThree); + DataGridViewTestHelper.AssertCellIsDisabled(cellTailorMadeAssessmentProbability); - Assert.IsTrue(cellAssessmentLayerThree.ReadOnly); + Assert.IsTrue(cellTailorMadeAssessmentProbability.ReadOnly); } else { DataGridViewTestHelper.AssertCellIsEnabled(cellDetailedAssessment, true); - DataGridViewTestHelper.AssertCellIsEnabled(cellAssessmentLayerThree); + DataGridViewTestHelper.AssertCellIsEnabled(cellTailorMadeAssessmentProbability); - Assert.IsFalse(cellAssessmentLayerThree.ReadOnly); + Assert.IsFalse(cellTailorMadeAssessmentProbability.ReadOnly); } } } [Test] - [TestCase("test", assessmentLayerThreeIndex)] - [TestCase(";/[].,~!@#$%^&*()_-+={}|?", assessmentLayerThreeIndex)] + [TestCase("test", tailorMadeAssessmentProbabilityIndex)] + [TestCase(";/[].,~!@#$%^&*()_-+={}|?", tailorMadeAssessmentProbabilityIndex)] public void FailureMechanismResultView_EditValueInvalid_ShowsErrorTooltip(string newValue, int cellIndex) { // Setup @@ -233,7 +233,7 @@ [TestCase(-0.01)] [TestCase(5)] [TestCase(-10)] - public void FailureMechanismResultView_EditValueAssessmentLayerThreeInvalid_ShowErrorToolTip(double newValue) + public void FailureMechanismResultView_EditValueTailorMadeAssessmentProbabilityInvalid_ShowErrorToolTip(double newValue) { // Setup PipingFailureMechanism pipingFailureMechanism = GetFullyConfiguredFailureMechanism(); @@ -242,10 +242,10 @@ var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; // Call - dataGridView.Rows[0].Cells[assessmentLayerThreeIndex].Value = newValue.ToString(CultureInfo.CurrentCulture); + dataGridView.Rows[0].Cells[tailorMadeAssessmentProbabilityIndex].Value = newValue.ToString(CultureInfo.CurrentCulture); // Assert - Assert.AreEqual("Kans moet in het bereik [0,0, 1,0] liggen.", dataGridView.Rows[0].ErrorText); + Assert.AreEqual("De waarde voor de faalkans moet in het bereik [0,0, 1,0] liggen.", dataGridView.Rows[0].ErrorText); } } @@ -256,7 +256,7 @@ [TestCase(0.5)] [TestCase(1e-6)] [TestCase(double.NaN)] - public void FailureMechanismResultView_EditValueAssessmentLayerThreeValid_DoNotShowErrorToolTipAndEditValue(double newValue) + public void FailureMechanismResultView_EditValueTailorMadeAssessmentProbabilityValid_DoNotShowErrorToolTipAndEditValue(double newValue) { // Setup PipingFailureMechanism pipingFailureMechanism = GetFullyConfiguredFailureMechanism(); @@ -265,11 +265,11 @@ var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; // Call - dataGridView.Rows[0].Cells[assessmentLayerThreeIndex].Value = newValue.ToString(CultureInfo.CurrentCulture); + dataGridView.Rows[0].Cells[tailorMadeAssessmentProbabilityIndex].Value = newValue.ToString(CultureInfo.CurrentCulture); // Assert Assert.IsEmpty(dataGridView.Rows[0].ErrorText); - Assert.AreEqual(newValue, pipingFailureMechanism.SectionResults.First().AssessmentLayerThree); + Assert.AreEqual(newValue, pipingFailureMechanism.SectionResults.First().TailorMadeAssessmentProbability); } }