Index: Ringtoets.sln =================================================================== diff -u -re38a7c2baca2872af6319d535c6468133ea31fbc -r7713ffeaa9f54d0faaf54ec7d2570e775ec99093 --- Ringtoets.sln (.../Ringtoets.sln) (revision e38a7c2baca2872af6319d535c6468133ea31fbc) +++ Ringtoets.sln (.../Ringtoets.sln) (revision 7713ffeaa9f54d0faaf54ec7d2570e775ec99093) @@ -1165,8 +1165,14 @@ EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.Common.Forms.TestUtil", "Ringtoets\Common\test\Ringtoets.Common.Forms.TestUtil\Ringtoets.Common.Forms.TestUtil.csproj", "{D24FA2F7-28A7-413B-AFD3-EE10E985630B}" + ProjectSection(ProjectDependencies) = postProject + {C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC} + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.Common.Forms.TestUtil.Test", "Ringtoets\Common\test\Ringtoets.Common.Forms.TestUtil.Test\Ringtoets.Common.Forms.TestUtil.Test.csproj", "{659D7F4A-18FD-4999-9886-C8BA5017955D}" + ProjectSection(ProjectDependencies) = postProject + {C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC} + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismResultView.cs =================================================================== diff -u -re38a7c2baca2872af6319d535c6468133ea31fbc -r7713ffeaa9f54d0faaf54ec7d2570e775ec99093 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismResultView.cs (.../ClosingStructuresFailureMechanismResultView.cs) (revision e38a7c2baca2872af6319d535c6468133ea31fbc) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismResultView.cs (.../ClosingStructuresFailureMechanismResultView.cs) (revision 7713ffeaa9f54d0faaf54ec7d2570e775ec99093) @@ -38,7 +38,6 @@ /// public class ClosingStructuresFailureMechanismResultView : FailureMechanismResultView { - private const int assessmentLayerOneColumnIndex = 1; private const int assessmentLayerTwoAIndex = 2; private readonly RecursiveObserver calculationInputObserver; private readonly RecursiveObserver calculationOutputObserver; @@ -114,7 +113,7 @@ private void OnCellFormatting(object sender, DataGridViewCellFormattingEventArgs eventArgs) { - if (eventArgs.ColumnIndex > assessmentLayerOneColumnIndex) + if (eventArgs.ColumnIndex > AssessmentLayerOneColumnIndex) { if (HasPassedLevelOne(eventArgs.RowIndex)) { Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismResultViewTest.cs =================================================================== diff -u -re38a7c2baca2872af6319d535c6468133ea31fbc -r7713ffeaa9f54d0faaf54ec7d2570e775ec99093 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismResultViewTest.cs (.../ClosingStructuresFailureMechanismResultViewTest.cs) (revision e38a7c2baca2872af6319d535c6468133ea31fbc) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismResultViewTest.cs (.../ClosingStructuresFailureMechanismResultViewTest.cs) (revision 7713ffeaa9f54d0faaf54ec7d2570e775ec99093) @@ -180,15 +180,15 @@ if (assessmentLayerOneState == AssessmentLayerOneState.Sufficient) { - DataGridViewCellTester.AssertCellIsDisabled(cellAssessmentLayerTwoA); - DataGridViewCellTester.AssertCellIsDisabled(cellAssessmentLayerThree); + DataGridViewCellTestHelper.AssertCellIsDisabled(cellAssessmentLayerTwoA); + DataGridViewCellTestHelper.AssertCellIsDisabled(cellAssessmentLayerThree); Assert.IsTrue(cellAssessmentLayerThree.ReadOnly); } else { - DataGridViewCellTester.AssertCellIsEnabled(cellAssessmentLayerTwoA, true); - DataGridViewCellTester.AssertCellIsEnabled(cellAssessmentLayerThree); + DataGridViewCellTestHelper.AssertCellIsEnabled(cellAssessmentLayerTwoA, true); + DataGridViewCellTestHelper.AssertCellIsEnabled(cellAssessmentLayerThree); Assert.IsFalse(cellAssessmentLayerThree.ReadOnly); } @@ -276,8 +276,8 @@ Assert.AreEqual("-", cells[assessmentLayerTwoAIndex].FormattedValue); Assert.AreEqual(result1.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); cells = rows[1].Cells; Assert.AreEqual(4, cells.Count); @@ -286,8 +286,8 @@ Assert.AreEqual("-", cells[assessmentLayerTwoAIndex].FormattedValue); Assert.AreEqual(result2.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex], true); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex], true); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); cells = rows[2].Cells; Assert.AreEqual(4, cells.Count); @@ -296,8 +296,8 @@ Assert.AreEqual("-", cells[assessmentLayerTwoAIndex].FormattedValue); Assert.AreEqual(result3.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex], true); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex], true); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); } } @@ -337,8 +337,8 @@ DataGridViewCellCollection cells = rows[0].Cells; Assert.AreEqual(4, cells.Count); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); } } Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.cs =================================================================== diff -u -re38a7c2baca2872af6319d535c6468133ea31fbc -r7713ffeaa9f54d0faaf54ec7d2570e775ec99093 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.cs (.../FailureMechanismResultView.cs) (revision e38a7c2baca2872af6319d535c6468133ea31fbc) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.cs (.../FailureMechanismResultView.cs) (revision 7713ffeaa9f54d0faaf54ec7d2570e775ec99093) @@ -41,7 +41,7 @@ /// The type of results which are presented by the . public abstract partial class FailureMechanismResultView : UserControl, IView where T : FailureMechanismSectionResult { - private const int assessmentLayerOneColumnIndex = 1; + protected const int AssessmentLayerOneColumnIndex = 1; private readonly IList failureMechanismSectionResultObservers; private readonly Observer failureMechanismObserver; @@ -141,7 +141,7 @@ /// false if assessment level 1 has passed, true otherwise. protected bool HasPassedLevelOne(int rowIndex) { - return (AssessmentLayerOneState) DataGridViewControl.GetCell(rowIndex, assessmentLayerOneColumnIndex).Value + return (AssessmentLayerOneState) DataGridViewControl.GetCell(rowIndex, AssessmentLayerOneColumnIndex).Value == AssessmentLayerOneState.Sufficient; } Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/DataGridViewCellTestHelperTest.cs =================================================================== diff -u --- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/DataGridViewCellTestHelperTest.cs (revision 0) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/DataGridViewCellTestHelperTest.cs (revision 7713ffeaa9f54d0faaf54ec7d2570e775ec99093) @@ -0,0 +1,202 @@ +// Copyright (C) Stichting Deltares 2016. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System.Collections.Generic; +using System.Drawing; +using System.Windows.Forms; +using NUnit.Framework; + +namespace Ringtoets.Common.Forms.TestUtil.Test +{ + [TestFixture] + public class DataGridViewCellTestHelperTest + { + [Test] + public void AssertCellIsDisabled_DisabledCell_DoesNotThrowAssertionException() + { + // Setup + DataGridViewRow row = new DataGridViewRow() + { + ReadOnly = true, + Cells = + { + new DataCell(new DataGridViewCellStyle() + { + ForeColor = Color.FromKnownColor(KnownColor.GrayText), + BackColor = Color.FromKnownColor(KnownColor.DarkGray) + }) + } + }; + + // Call + TestDelegate call = () => DataGridViewCellTestHelper.AssertCellIsDisabled(row.Cells[0]); + + // Assert + Assert.DoesNotThrow(call); + } + + [Test] + [TestCase(true)] + [TestCase(false)] + public void AssertCellIsEnabled_EnabledCell_DoesNotThrowAssertionException(bool readOnlyProperty) + { + // Setup + DataGridViewRow row = new DataGridViewRow() + { + ReadOnly = readOnlyProperty, + Cells = + { + new DataCell(new DataGridViewCellStyle() + { + ForeColor = Color.FromKnownColor(KnownColor.ControlText), + BackColor = Color.FromKnownColor(KnownColor.White) + }) + } + }; + + // Call + TestDelegate call = () => DataGridViewCellTestHelper.AssertCellIsEnabled(row.Cells[0], readOnlyProperty); + + // Assert + Assert.DoesNotThrow(call); + } + + [Test] + [TestCaseSource("InvalidDisabledCells")] + public void AssertCellIsDisabled_InvalidDisabledCells_ThrowAssertionException(DataGridViewRow row) + { + // Call + TestDelegate call = () => DataGridViewCellTestHelper.AssertCellIsDisabled(row.Cells[0]); + + // Assert + Assert.Throws(call); + } + + [Test] + [TestCaseSource("InvalidEnabledCells")] + public void AssertCellIsEnabled_InvalidDisabledCells_ThrowAssertionException(DataGridViewRow row) + { + // Call + TestDelegate call = () => DataGridViewCellTestHelper.AssertCellIsEnabled(row.Cells[0]); + + // Assert + Assert.Throws(call); + } + + private class DataCell : DataGridViewCell + { + public DataCell(DataGridViewCellStyle style) + { + Style = style; + } + } + + #region Test data + + private static IEnumerable InvalidDisabledCells + { + get + { + yield return new TestCaseData(new DataGridViewRow() + { + ReadOnly = false, + Cells = + { + new DataCell(new DataGridViewCellStyle() + { + ForeColor = Color.FromKnownColor(KnownColor.GrayText), + BackColor = Color.FromKnownColor(KnownColor.DarkGray) + }) + } + }).SetName("ReadOnlyPropertyFalse"); + yield return new TestCaseData(new DataGridViewRow() + { + ReadOnly = true, + Cells = + { + new DataCell(new DataGridViewCellStyle() + { + ForeColor = Color.FromKnownColor(KnownColor.ControlText), + BackColor = Color.FromKnownColor(KnownColor.DarkGray) + }) + } + }).SetName("ForeColorPropertyEnabledColor"); + yield return new TestCaseData(new DataGridViewRow() + { + ReadOnly = true, + Cells = + { + new DataCell(new DataGridViewCellStyle() + { + ForeColor = Color.FromKnownColor(KnownColor.GrayText), + BackColor = Color.FromKnownColor(KnownColor.White) + }) + } + }).SetName("BackColorPropertyEnabledColor"); + } + } + + private static IEnumerable InvalidEnabledCells + { + get + { + yield return new TestCaseData(new DataGridViewRow() + { + ReadOnly = true, + Cells = + { + new DataCell(new DataGridViewCellStyle() + { + ForeColor = Color.FromKnownColor(KnownColor.ControlText), + BackColor = Color.FromKnownColor(KnownColor.White) + }) + } + }).SetName("ReadOnlyPropertyTrue"); + yield return new TestCaseData(new DataGridViewRow() + { + ReadOnly = false, + Cells = + { + new DataCell(new DataGridViewCellStyle() + { + ForeColor = Color.FromKnownColor(KnownColor.GrayText), + BackColor = Color.FromKnownColor(KnownColor.White) + }) + } + }).SetName("ForeColorPropertyDisabledColor"); + yield return new TestCaseData(new DataGridViewRow() + { + ReadOnly = false, + Cells = + { + new DataCell(new DataGridViewCellStyle() + { + ForeColor = Color.FromKnownColor(KnownColor.ControlText), + BackColor = Color.FromKnownColor(KnownColor.DarkGray) + }) + } + }).SetName("BackColorPropertyDisabledColor"); + } + } + + #endregion + } +} \ No newline at end of file Fisheye: Tag 7713ffeaa9f54d0faaf54ec7d2570e775ec99093 refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/DataGridViewCellTesterTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/Ringtoets.Common.Forms.TestUtil.Test.csproj =================================================================== diff -u -re38a7c2baca2872af6319d535c6468133ea31fbc -r7713ffeaa9f54d0faaf54ec7d2570e775ec99093 --- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/Ringtoets.Common.Forms.TestUtil.Test.csproj (.../Ringtoets.Common.Forms.TestUtil.Test.csproj) (revision e38a7c2baca2872af6319d535c6468133ea31fbc) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/Ringtoets.Common.Forms.TestUtil.Test.csproj (.../Ringtoets.Common.Forms.TestUtil.Test.csproj) (revision 7713ffeaa9f54d0faaf54ec7d2570e775ec99093) @@ -51,7 +51,7 @@ Properties\GlobalAssembly.cs - + Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/DataGridViewCellTestHelper.cs =================================================================== diff -u --- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/DataGridViewCellTestHelper.cs (revision 0) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/DataGridViewCellTestHelper.cs (revision 7713ffeaa9f54d0faaf54ec7d2570e775ec99093) @@ -0,0 +1,68 @@ +// Copyright (C) Stichting Deltares 2016. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System.Drawing; +using System.Windows.Forms; +using NUnit.Framework; + +namespace Ringtoets.Common.Forms.TestUtil +{ + /// + /// Class that can be used to test properties of a . + /// + public static class DataGridViewCellTestHelper + { + /// + /// Asserts whether a is in a disabled state. + /// + /// The cell that needs to be asserted. + /// Thrown when: + /// + /// The readonly property of the cell is false. + /// The is not . + /// The is not . + /// + public static void AssertCellIsDisabled(DataGridViewCell dataGridViewCell) + { + Assert.AreEqual(true, dataGridViewCell.ReadOnly); + Assert.AreEqual(Color.FromKnownColor(KnownColor.GrayText), dataGridViewCell.Style.ForeColor); + Assert.AreEqual(Color.FromKnownColor(KnownColor.DarkGray), dataGridViewCell.Style.BackColor); + } + + /// + /// Asserts whether a is in an enabled state. + /// + /// The cell that needs to be asserted. + /// Flag indicating whether the cell is readonly + /// Thrown when: + /// + /// The readonly property of the cell does not match with . + /// The is not . + /// The is not . + /// + public static void AssertCellIsEnabled(DataGridViewCell dataGridViewCell, bool isReadOnly = false) + { + Assert.AreEqual(isReadOnly, dataGridViewCell.ReadOnly); + Assert.AreEqual(Color.FromKnownColor(KnownColor.ControlText), dataGridViewCell.Style.ForeColor); + Assert.AreEqual(Color.FromKnownColor(KnownColor.White), dataGridViewCell.Style.BackColor); + } + } +} \ No newline at end of file Fisheye: Tag 7713ffeaa9f54d0faaf54ec7d2570e775ec99093 refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/DataGridViewCellTester.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/Ringtoets.Common.Forms.TestUtil.csproj =================================================================== diff -u -re38a7c2baca2872af6319d535c6468133ea31fbc -r7713ffeaa9f54d0faaf54ec7d2570e775ec99093 --- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/Ringtoets.Common.Forms.TestUtil.csproj (.../Ringtoets.Common.Forms.TestUtil.csproj) (revision e38a7c2baca2872af6319d535c6468133ea31fbc) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/Ringtoets.Common.Forms.TestUtil.csproj (.../Ringtoets.Common.Forms.TestUtil.csproj) (revision 7713ffeaa9f54d0faaf54ec7d2570e775ec99093) @@ -51,7 +51,7 @@ Properties\GlobalAssembly.cs - + Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismResultView.cs =================================================================== diff -u -re38a7c2baca2872af6319d535c6468133ea31fbc -r7713ffeaa9f54d0faaf54ec7d2570e775ec99093 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismResultView.cs (.../GrassCoverErosionInwardsFailureMechanismResultView.cs) (revision e38a7c2baca2872af6319d535c6468133ea31fbc) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismResultView.cs (.../GrassCoverErosionInwardsFailureMechanismResultView.cs) (revision 7713ffeaa9f54d0faaf54ec7d2570e775ec99093) @@ -114,7 +114,7 @@ private void DisableIrrelevantFieldsFormatting(object sender, DataGridViewCellFormattingEventArgs eventArgs) { - if (eventArgs.ColumnIndex > 1) + if (eventArgs.ColumnIndex > AssessmentLayerOneColumnIndex) { if (HasPassedLevelOne(eventArgs.RowIndex)) { Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs =================================================================== diff -u -re38a7c2baca2872af6319d535c6468133ea31fbc -r7713ffeaa9f54d0faaf54ec7d2570e775ec99093 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionInwardsFailureMechanismResultViewTest.cs) (revision e38a7c2baca2872af6319d535c6468133ea31fbc) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionInwardsFailureMechanismResultViewTest.cs) (revision 7713ffeaa9f54d0faaf54ec7d2570e775ec99093) @@ -203,15 +203,15 @@ if (assessmentLayerOneState == AssessmentLayerOneState.Sufficient) { - DataGridViewCellTester.AssertCellIsDisabled(cellAssessmentLayerTwoA); - DataGridViewCellTester.AssertCellIsDisabled(cellAssessmentLayerThree); + DataGridViewCellTestHelper.AssertCellIsDisabled(cellAssessmentLayerTwoA); + DataGridViewCellTestHelper.AssertCellIsDisabled(cellAssessmentLayerThree); Assert.IsTrue(cellAssessmentLayerThree.ReadOnly); } else { - DataGridViewCellTester.AssertCellIsEnabled(cellAssessmentLayerTwoA, true); - DataGridViewCellTester.AssertCellIsEnabled(cellAssessmentLayerThree); + DataGridViewCellTestHelper.AssertCellIsEnabled(cellAssessmentLayerTwoA, true); + DataGridViewCellTestHelper.AssertCellIsEnabled(cellAssessmentLayerThree); Assert.IsFalse(cellAssessmentLayerThree.ReadOnly); } Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismResultView.cs =================================================================== diff -u -re38a7c2baca2872af6319d535c6468133ea31fbc -r7713ffeaa9f54d0faaf54ec7d2570e775ec99093 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismResultView.cs (.../GrassCoverErosionOutwardsFailureMechanismResultView.cs) (revision e38a7c2baca2872af6319d535c6468133ea31fbc) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismResultView.cs (.../GrassCoverErosionOutwardsFailureMechanismResultView.cs) (revision 7713ffeaa9f54d0faaf54ec7d2570e775ec99093) @@ -36,8 +36,6 @@ /// public class GrassCoverErosionOutwardsFailureMechanismResultView : FailureMechanismResultView { - private const int assessmentLayerOneColumnIndex = 1; - /// /// Creates a new instance of . /// @@ -81,7 +79,7 @@ private void OnCellFormatting(object sender, DataGridViewCellFormattingEventArgs eventArgs) { - if (eventArgs.ColumnIndex > assessmentLayerOneColumnIndex) + if (eventArgs.ColumnIndex > AssessmentLayerOneColumnIndex) { if (HasPassedLevelOne(eventArgs.RowIndex)) { Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs =================================================================== diff -u -re38a7c2baca2872af6319d535c6468133ea31fbc -r7713ffeaa9f54d0faaf54ec7d2570e775ec99093 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs) (revision e38a7c2baca2872af6319d535c6468133ea31fbc) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs) (revision 7713ffeaa9f54d0faaf54ec7d2570e775ec99093) @@ -138,8 +138,8 @@ Assert.AreEqual(result1.AssessmentLayerTwoA, cells[assessmentLayerTwoAIndex].Value); Assert.AreEqual(result1.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); cells = rows[1].Cells; Assert.AreEqual(4, cells.Count); @@ -148,8 +148,8 @@ Assert.AreEqual(result2.AssessmentLayerTwoA, cells[assessmentLayerTwoAIndex].Value); Assert.AreEqual(result2.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); cells = rows[2].Cells; Assert.AreEqual(4, cells.Count); @@ -158,8 +158,8 @@ Assert.AreEqual(result3.AssessmentLayerTwoA, cells[assessmentLayerTwoAIndex].Value); Assert.AreEqual(result3.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); } } } @@ -206,8 +206,8 @@ var cells = rows[0].Cells; Assert.AreEqual(4, cells.Count); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); } } } Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismResultView.cs =================================================================== diff -u -re38a7c2baca2872af6319d535c6468133ea31fbc -r7713ffeaa9f54d0faaf54ec7d2570e775ec99093 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismResultView.cs (.../HeightStructuresFailureMechanismResultView.cs) (revision e38a7c2baca2872af6319d535c6468133ea31fbc) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismResultView.cs (.../HeightStructuresFailureMechanismResultView.cs) (revision 7713ffeaa9f54d0faaf54ec7d2570e775ec99093) @@ -38,7 +38,6 @@ /// public class HeightStructuresFailureMechanismResultView : FailureMechanismResultView { - private const int assessmentLayerOneColumnIndex = 1; private const int assessmentLayerTwoAIndex = 2; private readonly RecursiveObserver calculationInputObserver; private readonly RecursiveObserver calculationOutputObserver; @@ -117,7 +116,7 @@ private void DisableIrrelevantFieldsFormatting(object sender, DataGridViewCellFormattingEventArgs eventArgs) { - if (eventArgs.ColumnIndex > assessmentLayerOneColumnIndex) + if (eventArgs.ColumnIndex > AssessmentLayerOneColumnIndex) { if (HasPassedLevelOne(eventArgs.RowIndex)) { Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs =================================================================== diff -u -re38a7c2baca2872af6319d535c6468133ea31fbc -r7713ffeaa9f54d0faaf54ec7d2570e775ec99093 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs (.../HeightStructuresFailureMechanismResultViewTest.cs) (revision e38a7c2baca2872af6319d535c6468133ea31fbc) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs (.../HeightStructuresFailureMechanismResultViewTest.cs) (revision 7713ffeaa9f54d0faaf54ec7d2570e775ec99093) @@ -208,15 +208,15 @@ if (assessmentLayerOneState == AssessmentLayerOneState.Sufficient) { - DataGridViewCellTester.AssertCellIsDisabled(cellAssessmentLayerTwoA); - DataGridViewCellTester.AssertCellIsDisabled(cellAssessmentLayerThree); + DataGridViewCellTestHelper.AssertCellIsDisabled(cellAssessmentLayerTwoA); + DataGridViewCellTestHelper.AssertCellIsDisabled(cellAssessmentLayerThree); Assert.IsTrue(cellAssessmentLayerThree.ReadOnly); } else { - DataGridViewCellTester.AssertCellIsEnabled(cellAssessmentLayerTwoA, true); - DataGridViewCellTester.AssertCellIsEnabled(cellAssessmentLayerThree); + DataGridViewCellTestHelper.AssertCellIsEnabled(cellAssessmentLayerTwoA, true); + DataGridViewCellTestHelper.AssertCellIsEnabled(cellAssessmentLayerThree); Assert.IsFalse(cellAssessmentLayerThree.ReadOnly); } Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/DuneErosionResultView.cs =================================================================== diff -u -re38a7c2baca2872af6319d535c6468133ea31fbc -r7713ffeaa9f54d0faaf54ec7d2570e775ec99093 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/DuneErosionResultView.cs (.../DuneErosionResultView.cs) (revision e38a7c2baca2872af6319d535c6468133ea31fbc) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/DuneErosionResultView.cs (.../DuneErosionResultView.cs) (revision 7713ffeaa9f54d0faaf54ec7d2570e775ec99093) @@ -80,7 +80,7 @@ private void DisableIrrelevantFieldsFormatting(object sender, DataGridViewCellFormattingEventArgs eventArgs) { - if (eventArgs.ColumnIndex > 1) + if (eventArgs.ColumnIndex > AssessmentLayerOneColumnIndex) { if (HasPassedLevelOne(eventArgs.RowIndex)) { Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/GrassCoverSlipOffInwardsResultView.cs =================================================================== diff -u -re38a7c2baca2872af6319d535c6468133ea31fbc -r7713ffeaa9f54d0faaf54ec7d2570e775ec99093 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/GrassCoverSlipOffInwardsResultView.cs (.../GrassCoverSlipOffInwardsResultView.cs) (revision e38a7c2baca2872af6319d535c6468133ea31fbc) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/GrassCoverSlipOffInwardsResultView.cs (.../GrassCoverSlipOffInwardsResultView.cs) (revision 7713ffeaa9f54d0faaf54ec7d2570e775ec99093) @@ -37,8 +37,6 @@ /// public class GrassCoverSlipOffInwardsResultView : FailureMechanismResultView { - private const int assessmentLayerOneColumnIndex = 1; - /// /// Creates a new instance of . /// @@ -82,7 +80,7 @@ private void OnCellFormatting(object sender, DataGridViewCellFormattingEventArgs eventArgs) { - if (eventArgs.ColumnIndex > assessmentLayerOneColumnIndex) + if (eventArgs.ColumnIndex > AssessmentLayerOneColumnIndex) { if (HasPassedLevelOne(eventArgs.RowIndex)) { Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/GrassCoverSlipOffOutwardsResultView.cs =================================================================== diff -u -re38a7c2baca2872af6319d535c6468133ea31fbc -r7713ffeaa9f54d0faaf54ec7d2570e775ec99093 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/GrassCoverSlipOffOutwardsResultView.cs (.../GrassCoverSlipOffOutwardsResultView.cs) (revision e38a7c2baca2872af6319d535c6468133ea31fbc) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/GrassCoverSlipOffOutwardsResultView.cs (.../GrassCoverSlipOffOutwardsResultView.cs) (revision 7713ffeaa9f54d0faaf54ec7d2570e775ec99093) @@ -37,8 +37,6 @@ /// public class GrassCoverSlipOffOutwardsResultView : FailureMechanismResultView { - private const int assessmentLayerOneColumnIndex = 1; - /// /// Creates a new instance of . /// @@ -82,7 +80,7 @@ private void OnCellFormatting(object sender, DataGridViewCellFormattingEventArgs eventArgs) { - if (eventArgs.ColumnIndex > assessmentLayerOneColumnIndex) + if (eventArgs.ColumnIndex > AssessmentLayerOneColumnIndex) { if (HasPassedLevelOne(eventArgs.RowIndex)) { Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MacrostabilityInwardsResultView.cs =================================================================== diff -u -re38a7c2baca2872af6319d535c6468133ea31fbc -r7713ffeaa9f54d0faaf54ec7d2570e775ec99093 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MacrostabilityInwardsResultView.cs (.../MacrostabilityInwardsResultView.cs) (revision e38a7c2baca2872af6319d535c6468133ea31fbc) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MacrostabilityInwardsResultView.cs (.../MacrostabilityInwardsResultView.cs) (revision 7713ffeaa9f54d0faaf54ec7d2570e775ec99093) @@ -33,8 +33,6 @@ /// public class MacrostabilityInwardsResultView : FailureMechanismResultView { - private const int assessmentLayerOneColumnIndex = 1; - /// /// Creates a new instance of . /// @@ -69,7 +67,7 @@ private void OnCellFormatting(object sender, DataGridViewCellFormattingEventArgs eventArgs) { - if (eventArgs.ColumnIndex > assessmentLayerOneColumnIndex) + if (eventArgs.ColumnIndex > AssessmentLayerOneColumnIndex) { if (HasPassedLevelOne(eventArgs.RowIndex)) { Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MacrostabilityOutwardsResultView.cs =================================================================== diff -u -re38a7c2baca2872af6319d535c6468133ea31fbc -r7713ffeaa9f54d0faaf54ec7d2570e775ec99093 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MacrostabilityOutwardsResultView.cs (.../MacrostabilityOutwardsResultView.cs) (revision e38a7c2baca2872af6319d535c6468133ea31fbc) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MacrostabilityOutwardsResultView.cs (.../MacrostabilityOutwardsResultView.cs) (revision 7713ffeaa9f54d0faaf54ec7d2570e775ec99093) @@ -33,8 +33,6 @@ /// public class MacrostabilityOutwardsResultView : FailureMechanismResultView { - private const int assessmentLayerOneColumnIndex = 1; - /// /// Creates a new instance of . /// @@ -69,7 +67,7 @@ private void OnCellFormatting(object sender, DataGridViewCellFormattingEventArgs eventArgs) { - if (eventArgs.ColumnIndex > assessmentLayerOneColumnIndex) + if (eventArgs.ColumnIndex > AssessmentLayerOneColumnIndex) { if (HasPassedLevelOne(eventArgs.RowIndex)) { Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MicrostabilityResultView.cs =================================================================== diff -u -re38a7c2baca2872af6319d535c6468133ea31fbc -r7713ffeaa9f54d0faaf54ec7d2570e775ec99093 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MicrostabilityResultView.cs (.../MicrostabilityResultView.cs) (revision e38a7c2baca2872af6319d535c6468133ea31fbc) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MicrostabilityResultView.cs (.../MicrostabilityResultView.cs) (revision 7713ffeaa9f54d0faaf54ec7d2570e775ec99093) @@ -37,8 +37,6 @@ /// public class MicrostabilityResultView : FailureMechanismResultView { - private const int assessmentLayerOneColumnIndex = 1; - /// /// Creates a new instance of . /// @@ -82,7 +80,7 @@ private void OnCellFormatting(object sender, DataGridViewCellFormattingEventArgs eventArgs) { - if (eventArgs.ColumnIndex > assessmentLayerOneColumnIndex) + if (eventArgs.ColumnIndex > AssessmentLayerOneColumnIndex) { if (HasPassedLevelOne(eventArgs.RowIndex)) { Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/PipingStructureResultView.cs =================================================================== diff -u -re38a7c2baca2872af6319d535c6468133ea31fbc -r7713ffeaa9f54d0faaf54ec7d2570e775ec99093 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/PipingStructureResultView.cs (.../PipingStructureResultView.cs) (revision e38a7c2baca2872af6319d535c6468133ea31fbc) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/PipingStructureResultView.cs (.../PipingStructureResultView.cs) (revision 7713ffeaa9f54d0faaf54ec7d2570e775ec99093) @@ -37,8 +37,6 @@ /// public class PipingStructureResultView : FailureMechanismResultView { - private const int assessmentLayerOneColumnIndex = 1; - /// /// Creates a new instance of . /// @@ -82,7 +80,7 @@ private void OnCellFormatting(object sender, DataGridViewCellFormattingEventArgs eventArgs) { - if (eventArgs.ColumnIndex > assessmentLayerOneColumnIndex) + if (eventArgs.ColumnIndex > AssessmentLayerOneColumnIndex) { if (HasPassedLevelOne(eventArgs.RowIndex)) { Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultView.cs =================================================================== diff -u -re38a7c2baca2872af6319d535c6468133ea31fbc -r7713ffeaa9f54d0faaf54ec7d2570e775ec99093 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultView.cs (.../StrengthStabilityLengthwiseConstructionResultView.cs) (revision e38a7c2baca2872af6319d535c6468133ea31fbc) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultView.cs (.../StrengthStabilityLengthwiseConstructionResultView.cs) (revision 7713ffeaa9f54d0faaf54ec7d2570e775ec99093) @@ -33,8 +33,6 @@ /// public class StrengthStabilityLengthwiseConstructionResultView : FailureMechanismResultView { - private const int assessmentLayerOneColumnIndex = 1; - /// /// Creates a new instance of . /// @@ -66,7 +64,7 @@ private void OnCellFormatting(object sender, DataGridViewCellFormattingEventArgs eventArgs) { - if (eventArgs.ColumnIndex > assessmentLayerOneColumnIndex) + if (eventArgs.ColumnIndex > AssessmentLayerOneColumnIndex) { if (HasPassedLevelOne(eventArgs.RowIndex)) { Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/TechnicalInnovationResultView.cs =================================================================== diff -u -re38a7c2baca2872af6319d535c6468133ea31fbc -r7713ffeaa9f54d0faaf54ec7d2570e775ec99093 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/TechnicalInnovationResultView.cs (.../TechnicalInnovationResultView.cs) (revision e38a7c2baca2872af6319d535c6468133ea31fbc) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/TechnicalInnovationResultView.cs (.../TechnicalInnovationResultView.cs) (revision 7713ffeaa9f54d0faaf54ec7d2570e775ec99093) @@ -33,8 +33,6 @@ /// public class TechnicalInnovationResultView : FailureMechanismResultView { - private const int assessmentLayerOneColumnIndex = 1; - /// /// Creates a new instance of . /// @@ -66,7 +64,7 @@ private void OnCellFormatting(object sender, DataGridViewCellFormattingEventArgs eventArgs) { - if (eventArgs.ColumnIndex > assessmentLayerOneColumnIndex) + if (eventArgs.ColumnIndex > AssessmentLayerOneColumnIndex) { if (HasPassedLevelOne(eventArgs.RowIndex)) { Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/WaterPressureAsphaltCoverResultView.cs =================================================================== diff -u -re38a7c2baca2872af6319d535c6468133ea31fbc -r7713ffeaa9f54d0faaf54ec7d2570e775ec99093 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/WaterPressureAsphaltCoverResultView.cs (.../WaterPressureAsphaltCoverResultView.cs) (revision e38a7c2baca2872af6319d535c6468133ea31fbc) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/WaterPressureAsphaltCoverResultView.cs (.../WaterPressureAsphaltCoverResultView.cs) (revision 7713ffeaa9f54d0faaf54ec7d2570e775ec99093) @@ -33,8 +33,6 @@ /// public class WaterPressureAsphaltCoverResultView : FailureMechanismResultView { - private const int assessmentLayerOneColumnIndex = 1; - /// /// Creates a new instance of . /// @@ -66,7 +64,7 @@ private void OnCellFormatting(object sender, DataGridViewCellFormattingEventArgs eventArgs) { - if (eventArgs.ColumnIndex > assessmentLayerOneColumnIndex) + if (eventArgs.ColumnIndex > AssessmentLayerOneColumnIndex) { if (HasPassedLevelOne(eventArgs.RowIndex)) { Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/DuneErosionResultViewTest.cs =================================================================== diff -u -re38a7c2baca2872af6319d535c6468133ea31fbc -r7713ffeaa9f54d0faaf54ec7d2570e775ec99093 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/DuneErosionResultViewTest.cs (.../DuneErosionResultViewTest.cs) (revision e38a7c2baca2872af6319d535c6468133ea31fbc) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/DuneErosionResultViewTest.cs (.../DuneErosionResultViewTest.cs) (revision 7713ffeaa9f54d0faaf54ec7d2570e775ec99093) @@ -135,8 +135,8 @@ Assert.AreEqual(result1.AssessmentLayerTwoA, cells[assessmentLayerTwoAIndex].Value); Assert.AreEqual(result1.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); cells = rows[1].Cells; Assert.AreEqual(4, cells.Count); @@ -145,8 +145,8 @@ Assert.AreEqual(result2.AssessmentLayerTwoA, cells[assessmentLayerTwoAIndex].Value); Assert.AreEqual(result2.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); cells = rows[2].Cells; Assert.AreEqual(4, cells.Count); @@ -155,8 +155,8 @@ Assert.AreEqual(result3.AssessmentLayerTwoA, cells[assessmentLayerTwoAIndex].Value); Assert.AreEqual(result3.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); } } Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffInwardsResultViewTest.cs =================================================================== diff -u -re38a7c2baca2872af6319d535c6468133ea31fbc -r7713ffeaa9f54d0faaf54ec7d2570e775ec99093 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffInwardsResultViewTest.cs (.../GrassCoverSlipOffInwardsResultViewTest.cs) (revision e38a7c2baca2872af6319d535c6468133ea31fbc) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffInwardsResultViewTest.cs (.../GrassCoverSlipOffInwardsResultViewTest.cs) (revision 7713ffeaa9f54d0faaf54ec7d2570e775ec99093) @@ -134,8 +134,8 @@ Assert.AreEqual(result1.AssessmentLayerTwoA, cells[assessmentLayerTwoAIndex].Value); Assert.AreEqual(result1.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); cells = rows[1].Cells; Assert.AreEqual(4, cells.Count); @@ -144,8 +144,8 @@ Assert.AreEqual(result2.AssessmentLayerTwoA, cells[assessmentLayerTwoAIndex].Value); Assert.AreEqual(result2.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); cells = rows[2].Cells; Assert.AreEqual(4, cells.Count); @@ -154,8 +154,8 @@ Assert.AreEqual(result3.AssessmentLayerTwoA, cells[assessmentLayerTwoAIndex].Value); Assert.AreEqual(result3.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); } } @@ -200,8 +200,8 @@ var cells = rows[0].Cells; Assert.AreEqual(4, cells.Count); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); } } Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffOutwardsResultViewTest.cs =================================================================== diff -u -re38a7c2baca2872af6319d535c6468133ea31fbc -r7713ffeaa9f54d0faaf54ec7d2570e775ec99093 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffOutwardsResultViewTest.cs (.../GrassCoverSlipOffOutwardsResultViewTest.cs) (revision e38a7c2baca2872af6319d535c6468133ea31fbc) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffOutwardsResultViewTest.cs (.../GrassCoverSlipOffOutwardsResultViewTest.cs) (revision 7713ffeaa9f54d0faaf54ec7d2570e775ec99093) @@ -134,8 +134,8 @@ Assert.AreEqual(result1.AssessmentLayerTwoA, cells[assessmentLayerTwoAIndex].Value); Assert.AreEqual(result1.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); cells = rows[1].Cells; Assert.AreEqual(4, cells.Count); @@ -144,8 +144,8 @@ Assert.AreEqual(result2.AssessmentLayerTwoA, cells[assessmentLayerTwoAIndex].Value); Assert.AreEqual(result2.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); cells = rows[2].Cells; Assert.AreEqual(4, cells.Count); @@ -154,8 +154,8 @@ Assert.AreEqual(result3.AssessmentLayerTwoA, cells[assessmentLayerTwoAIndex].Value); Assert.AreEqual(result3.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); } } @@ -200,8 +200,8 @@ var cells = rows[0].Cells; Assert.AreEqual(4, cells.Count); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); } } Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacrostabilityInwardsResultViewTest.cs =================================================================== diff -u -re38a7c2baca2872af6319d535c6468133ea31fbc -r7713ffeaa9f54d0faaf54ec7d2570e775ec99093 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacrostabilityInwardsResultViewTest.cs (.../MacrostabilityInwardsResultViewTest.cs) (revision e38a7c2baca2872af6319d535c6468133ea31fbc) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacrostabilityInwardsResultViewTest.cs (.../MacrostabilityInwardsResultViewTest.cs) (revision 7713ffeaa9f54d0faaf54ec7d2570e775ec99093) @@ -134,8 +134,8 @@ Assert.AreEqual(expectedAssessmentLayer2AString1, cells[assessmentLayerTwoAIndex].FormattedValue); Assert.AreEqual(result1.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); cells = rows[1].Cells; Assert.AreEqual(4, cells.Count); @@ -153,8 +153,8 @@ Assert.AreEqual(expectedAssessmentLayer2AString3, cells[assessmentLayerTwoAIndex].FormattedValue); Assert.AreEqual(result3.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); } } @@ -199,8 +199,8 @@ var cells = rows[0].Cells; Assert.AreEqual(4, cells.Count); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); } } Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacrostabilityOutwardsResultViewTest.cs =================================================================== diff -u -re38a7c2baca2872af6319d535c6468133ea31fbc -r7713ffeaa9f54d0faaf54ec7d2570e775ec99093 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacrostabilityOutwardsResultViewTest.cs (.../MacrostabilityOutwardsResultViewTest.cs) (revision e38a7c2baca2872af6319d535c6468133ea31fbc) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacrostabilityOutwardsResultViewTest.cs (.../MacrostabilityOutwardsResultViewTest.cs) (revision 7713ffeaa9f54d0faaf54ec7d2570e775ec99093) @@ -134,8 +134,8 @@ Assert.AreEqual(expectedAssessmentLayer2AString1, cells[assessmentLayerTwoAIndex].FormattedValue); Assert.AreEqual(result1.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); cells = rows[1].Cells; Assert.AreEqual(4, cells.Count); @@ -145,8 +145,8 @@ Assert.AreEqual(expectedAssessmentLayer2AString2, cells[assessmentLayerTwoAIndex].FormattedValue); Assert.AreEqual(result2.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); cells = rows[2].Cells; Assert.AreEqual(4, cells.Count); @@ -156,8 +156,8 @@ Assert.AreEqual(expectedAssessmentLayer2AString3, cells[assessmentLayerTwoAIndex].FormattedValue); Assert.AreEqual(result3.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); } } @@ -202,8 +202,8 @@ var cells = rows[0].Cells; Assert.AreEqual(4, cells.Count); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); } } Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MicrostabilityResultViewTest.cs =================================================================== diff -u -re38a7c2baca2872af6319d535c6468133ea31fbc -r7713ffeaa9f54d0faaf54ec7d2570e775ec99093 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MicrostabilityResultViewTest.cs (.../MicrostabilityResultViewTest.cs) (revision e38a7c2baca2872af6319d535c6468133ea31fbc) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MicrostabilityResultViewTest.cs (.../MicrostabilityResultViewTest.cs) (revision 7713ffeaa9f54d0faaf54ec7d2570e775ec99093) @@ -135,8 +135,8 @@ Assert.AreEqual(result1.AssessmentLayerTwoA, cells[assessmentLayerTwoAIndex].Value); Assert.AreEqual(result1.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); cells = rows[1].Cells; Assert.AreEqual(4, cells.Count); @@ -145,8 +145,8 @@ Assert.AreEqual(result2.AssessmentLayerTwoA, cells[assessmentLayerTwoAIndex].Value); Assert.AreEqual(result2.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); cells = rows[2].Cells; Assert.AreEqual(4, cells.Count); @@ -155,8 +155,8 @@ Assert.AreEqual(result3.AssessmentLayerTwoA, cells[assessmentLayerTwoAIndex].Value); Assert.AreEqual(result3.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); } } @@ -201,8 +201,8 @@ var cells = rows[0].Cells; Assert.AreEqual(4, cells.Count); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); } } Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/PipingStructureResultViewTest.cs =================================================================== diff -u -re38a7c2baca2872af6319d535c6468133ea31fbc -r7713ffeaa9f54d0faaf54ec7d2570e775ec99093 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/PipingStructureResultViewTest.cs (.../PipingStructureResultViewTest.cs) (revision e38a7c2baca2872af6319d535c6468133ea31fbc) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/PipingStructureResultViewTest.cs (.../PipingStructureResultViewTest.cs) (revision 7713ffeaa9f54d0faaf54ec7d2570e775ec99093) @@ -135,8 +135,8 @@ Assert.AreEqual(result1.AssessmentLayerTwoA, cells[assessmentLayerTwoAIndex].Value); Assert.AreEqual(result1.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); cells = rows[1].Cells; Assert.AreEqual(4, cells.Count); @@ -145,8 +145,8 @@ Assert.AreEqual(result2.AssessmentLayerTwoA, cells[assessmentLayerTwoAIndex].Value); Assert.AreEqual(result2.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); cells = rows[2].Cells; Assert.AreEqual(4, cells.Count); @@ -155,8 +155,8 @@ Assert.AreEqual(result3.AssessmentLayerTwoA, cells[assessmentLayerTwoAIndex].Value); Assert.AreEqual(result3.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); } } @@ -201,8 +201,8 @@ var cells = rows[0].Cells; Assert.AreEqual(4, cells.Count); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); } } Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultViewTest.cs =================================================================== diff -u -re38a7c2baca2872af6319d535c6468133ea31fbc -r7713ffeaa9f54d0faaf54ec7d2570e775ec99093 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultViewTest.cs (.../StrengthStabilityLengthwiseConstructionResultViewTest.cs) (revision e38a7c2baca2872af6319d535c6468133ea31fbc) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultViewTest.cs (.../StrengthStabilityLengthwiseConstructionResultViewTest.cs) (revision 7713ffeaa9f54d0faaf54ec7d2570e775ec99093) @@ -125,23 +125,23 @@ Assert.AreEqual(result1.AssessmentLayerOne, cells[assessmentLayerOneIndex].Value); Assert.AreEqual(result1.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); cells = rows[1].Cells; Assert.AreEqual(3, cells.Count); Assert.AreEqual("Section 2", cells[nameColumnIndex].FormattedValue); Assert.AreEqual(result2.AssessmentLayerOne, cells[assessmentLayerOneIndex].Value); Assert.AreEqual(result2.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); cells = rows[2].Cells; Assert.AreEqual(3, cells.Count); Assert.AreEqual("Section 3", cells[nameColumnIndex].FormattedValue); Assert.AreEqual(result3.AssessmentLayerOne, cells[assessmentLayerOneIndex].Value); Assert.AreEqual(result3.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); } } @@ -185,7 +185,7 @@ var cells = rows[0].Cells; Assert.AreEqual(3, cells.Count); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); } } Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/TechnicalInnovationResultViewTest.cs =================================================================== diff -u -re38a7c2baca2872af6319d535c6468133ea31fbc -r7713ffeaa9f54d0faaf54ec7d2570e775ec99093 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/TechnicalInnovationResultViewTest.cs (.../TechnicalInnovationResultViewTest.cs) (revision e38a7c2baca2872af6319d535c6468133ea31fbc) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/TechnicalInnovationResultViewTest.cs (.../TechnicalInnovationResultViewTest.cs) (revision 7713ffeaa9f54d0faaf54ec7d2570e775ec99093) @@ -129,23 +129,23 @@ Assert.AreEqual(result1.AssessmentLayerOne, cells[assessmentLayerOneIndex].Value); Assert.AreEqual(result1.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); cells = rows[1].Cells; Assert.AreEqual(3, cells.Count); Assert.AreEqual("Section 2", cells[nameColumnIndex].FormattedValue); Assert.AreEqual(result2.AssessmentLayerOne, cells[assessmentLayerOneIndex].Value); Assert.AreEqual(result2.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); cells = rows[2].Cells; Assert.AreEqual(3, cells.Count); Assert.AreEqual("Section 3", cells[nameColumnIndex].FormattedValue); Assert.AreEqual(result3.AssessmentLayerOne, cells[assessmentLayerOneIndex].Value); Assert.AreEqual(result3.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); } } @@ -189,7 +189,7 @@ var cells = rows[0].Cells; Assert.AreEqual(3, cells.Count); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); } } Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/WaterPressureAsphaltCoverResultViewTest.cs =================================================================== diff -u -re38a7c2baca2872af6319d535c6468133ea31fbc -r7713ffeaa9f54d0faaf54ec7d2570e775ec99093 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/WaterPressureAsphaltCoverResultViewTest.cs (.../WaterPressureAsphaltCoverResultViewTest.cs) (revision e38a7c2baca2872af6319d535c6468133ea31fbc) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/WaterPressureAsphaltCoverResultViewTest.cs (.../WaterPressureAsphaltCoverResultViewTest.cs) (revision 7713ffeaa9f54d0faaf54ec7d2570e775ec99093) @@ -128,23 +128,23 @@ Assert.AreEqual(result1.AssessmentLayerOne, cells[assessmentLayerOneIndex].Value); Assert.AreEqual(result1.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); cells = rows[1].Cells; Assert.AreEqual(3, cells.Count); Assert.AreEqual("Section 2", cells[nameColumnIndex].FormattedValue); Assert.AreEqual(result2.AssessmentLayerOne, cells[assessmentLayerOneIndex].Value); Assert.AreEqual(result2.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); cells = rows[2].Cells; Assert.AreEqual(3, cells.Count); Assert.AreEqual("Section 3", cells[nameColumnIndex].FormattedValue); Assert.AreEqual(result3.AssessmentLayerOne, cells[assessmentLayerOneIndex].Value); Assert.AreEqual(result3.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); } } } @@ -190,7 +190,7 @@ var cells = rows[0].Cells; Assert.AreEqual(3, cells.Count); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); } } } Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismResultView.cs =================================================================== diff -u -re38a7c2baca2872af6319d535c6468133ea31fbc -r7713ffeaa9f54d0faaf54ec7d2570e775ec99093 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismResultView.cs (.../PipingFailureMechanismResultView.cs) (revision e38a7c2baca2872af6319d535c6468133ea31fbc) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismResultView.cs (.../PipingFailureMechanismResultView.cs) (revision 7713ffeaa9f54d0faaf54ec7d2570e775ec99093) @@ -38,7 +38,6 @@ /// public class PipingFailureMechanismResultView : FailureMechanismResultView { - private const int assessmentLayerOneColumnIndex = 1; private const int assessmentLayerTwoAIndex = 2; private const double tolerance = 1e-6; private readonly RecursiveObserver calculationInputObserver; @@ -122,7 +121,7 @@ private void DisableIrrelevantFieldsFormatting(object sender, DataGridViewCellFormattingEventArgs eventArgs) { - if (eventArgs.ColumnIndex > assessmentLayerOneColumnIndex) + if (eventArgs.ColumnIndex > AssessmentLayerOneColumnIndex) { if (HasPassedLevelOne(eventArgs.RowIndex)) { Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs =================================================================== diff -u -re38a7c2baca2872af6319d535c6468133ea31fbc -r7713ffeaa9f54d0faaf54ec7d2570e775ec99093 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs (.../PipingFailureMechanismResultViewTest.cs) (revision e38a7c2baca2872af6319d535c6468133ea31fbc) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs (.../PipingFailureMechanismResultViewTest.cs) (revision 7713ffeaa9f54d0faaf54ec7d2570e775ec99093) @@ -204,15 +204,15 @@ if (assessmentLayerOneState == AssessmentLayerOneState.Sufficient) { - DataGridViewCellTester.AssertCellIsDisabled(cellAssessmentLayerTwoA); - DataGridViewCellTester.AssertCellIsDisabled(cellAssessmentLayerThree); + DataGridViewCellTestHelper.AssertCellIsDisabled(cellAssessmentLayerTwoA); + DataGridViewCellTestHelper.AssertCellIsDisabled(cellAssessmentLayerThree); Assert.IsTrue(cellAssessmentLayerThree.ReadOnly); } else { - DataGridViewCellTester.AssertCellIsEnabled(cellAssessmentLayerTwoA, true); - DataGridViewCellTester.AssertCellIsEnabled(cellAssessmentLayerThree); + DataGridViewCellTestHelper.AssertCellIsEnabled(cellAssessmentLayerTwoA, true); + DataGridViewCellTestHelper.AssertCellIsEnabled(cellAssessmentLayerThree); Assert.IsFalse(cellAssessmentLayerThree.ReadOnly); } Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismResultView.cs =================================================================== diff -u -re38a7c2baca2872af6319d535c6468133ea31fbc -r7713ffeaa9f54d0faaf54ec7d2570e775ec99093 --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismResultView.cs (.../StabilityPointStructuresFailureMechanismResultView.cs) (revision e38a7c2baca2872af6319d535c6468133ea31fbc) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismResultView.cs (.../StabilityPointStructuresFailureMechanismResultView.cs) (revision 7713ffeaa9f54d0faaf54ec7d2570e775ec99093) @@ -38,7 +38,6 @@ /// public class StabilityPointStructuresFailureMechanismResultView : FailureMechanismResultView { - private const int assessmentLayerOneColumnIndex = 1; private const int assessmentLayerTwoAIndex = 2; private readonly RecursiveObserver calculationInputObserver; private readonly RecursiveObserver calculationOutputObserver; @@ -116,7 +115,7 @@ private void DisableIrrelevantFieldsFormatting(object sender, DataGridViewCellFormattingEventArgs eventArgs) { - if (eventArgs.ColumnIndex > assessmentLayerOneColumnIndex) + if (eventArgs.ColumnIndex > AssessmentLayerOneColumnIndex) { if (HasPassedLevelOne(eventArgs.RowIndex)) { Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs =================================================================== diff -u -re38a7c2baca2872af6319d535c6468133ea31fbc -r7713ffeaa9f54d0faaf54ec7d2570e775ec99093 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs (.../StabilityPointStructuresFailureMechanismResultViewTest.cs) (revision e38a7c2baca2872af6319d535c6468133ea31fbc) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs (.../StabilityPointStructuresFailureMechanismResultViewTest.cs) (revision 7713ffeaa9f54d0faaf54ec7d2570e775ec99093) @@ -181,15 +181,15 @@ if (assessmentLayerOneState == AssessmentLayerOneState.Sufficient) { - DataGridViewCellTester.AssertCellIsDisabled(cellAssessmentLayerTwoA); - DataGridViewCellTester.AssertCellIsDisabled(cellAssessmentLayerThree); + DataGridViewCellTestHelper.AssertCellIsDisabled(cellAssessmentLayerTwoA); + DataGridViewCellTestHelper.AssertCellIsDisabled(cellAssessmentLayerThree); Assert.IsTrue(cellAssessmentLayerThree.ReadOnly); } else { - DataGridViewCellTester.AssertCellIsEnabled(cellAssessmentLayerTwoA, true); - DataGridViewCellTester.AssertCellIsEnabled(cellAssessmentLayerThree); + DataGridViewCellTestHelper.AssertCellIsEnabled(cellAssessmentLayerTwoA, true); + DataGridViewCellTestHelper.AssertCellIsEnabled(cellAssessmentLayerThree); Assert.IsFalse(cellAssessmentLayerThree.ReadOnly); } @@ -277,8 +277,8 @@ Assert.AreEqual("-", cells[assessmentLayerTwoAIndex].FormattedValue); Assert.AreEqual(result1.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); cells = rows[1].Cells; Assert.AreEqual(4, cells.Count); @@ -287,8 +287,8 @@ Assert.AreEqual("-", cells[assessmentLayerTwoAIndex].FormattedValue); Assert.AreEqual(result2.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex], true); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex], true); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); cells = rows[2].Cells; Assert.AreEqual(4, cells.Count); @@ -297,8 +297,8 @@ Assert.AreEqual("-", cells[assessmentLayerTwoAIndex].FormattedValue); Assert.AreEqual(result3.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex], true); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex], true); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); } } @@ -338,8 +338,8 @@ DataGridViewCellCollection cells = rows[0].Cells; Assert.AreEqual(4, cells.Count); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); } } Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverResultViewTest.cs =================================================================== diff -u -re38a7c2baca2872af6319d535c6468133ea31fbc -r7713ffeaa9f54d0faaf54ec7d2570e775ec99093 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverResultViewTest.cs (.../StabilityStoneCoverResultViewTest.cs) (revision e38a7c2baca2872af6319d535c6468133ea31fbc) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverResultViewTest.cs (.../StabilityStoneCoverResultViewTest.cs) (revision 7713ffeaa9f54d0faaf54ec7d2570e775ec99093) @@ -135,8 +135,8 @@ Assert.AreEqual(result1.AssessmentLayerTwoA, cells[assessmentLayerTwoAIndex].Value); Assert.AreEqual(result1.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); cells = rows[1].Cells; Assert.AreEqual(4, cells.Count); @@ -145,8 +145,8 @@ Assert.AreEqual(result2.AssessmentLayerTwoA, cells[assessmentLayerTwoAIndex].Value); Assert.AreEqual(result2.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); cells = rows[2].Cells; Assert.AreEqual(4, cells.Count); @@ -155,8 +155,8 @@ Assert.AreEqual(result3.AssessmentLayerTwoA, cells[assessmentLayerTwoAIndex].Value); Assert.AreEqual(result3.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); } } @@ -202,8 +202,8 @@ var cells = rows[0].Cells; Assert.AreEqual(4, cells.Count); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); } } } Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismResultView.cs =================================================================== diff -u -re38a7c2baca2872af6319d535c6468133ea31fbc -r7713ffeaa9f54d0faaf54ec7d2570e775ec99093 --- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismResultView.cs (.../WaveImpactAsphaltCoverFailureMechanismResultView.cs) (revision e38a7c2baca2872af6319d535c6468133ea31fbc) +++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismResultView.cs (.../WaveImpactAsphaltCoverFailureMechanismResultView.cs) (revision 7713ffeaa9f54d0faaf54ec7d2570e775ec99093) @@ -32,8 +32,6 @@ /// public class WaveImpactAsphaltCoverFailureMechanismResultView : FailureMechanismResultView { - private const int assessmentLayerOneColumnIndex = 1; - /// /// Creates a new instance of . /// @@ -68,7 +66,7 @@ private void OnCellFormatting(object sender, DataGridViewCellFormattingEventArgs eventArgs) { - if (eventArgs.ColumnIndex > assessmentLayerOneColumnIndex) + if (eventArgs.ColumnIndex > AssessmentLayerOneColumnIndex) { if (HasPassedLevelOne(eventArgs.RowIndex)) { Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs =================================================================== diff -u -re38a7c2baca2872af6319d535c6468133ea31fbc -r7713ffeaa9f54d0faaf54ec7d2570e775ec99093 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs (.../WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs) (revision e38a7c2baca2872af6319d535c6468133ea31fbc) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs (.../WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs) (revision 7713ffeaa9f54d0faaf54ec7d2570e775ec99093) @@ -135,8 +135,8 @@ Assert.AreEqual(result1.AssessmentLayerTwoA.ToString(), cells[assessmentLayerTwoAIndex].FormattedValue); Assert.AreEqual(result1.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); cells = rows[1].Cells; Assert.AreEqual(4, cells.Count); @@ -145,8 +145,8 @@ Assert.AreEqual(result2.AssessmentLayerTwoA.ToString(), cells[assessmentLayerTwoAIndex].FormattedValue); Assert.AreEqual(result2.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); cells = rows[2].Cells; Assert.AreEqual(4, cells.Count); @@ -155,8 +155,8 @@ Assert.AreEqual(result3.AssessmentLayerTwoA.ToString(), cells[assessmentLayerTwoAIndex].FormattedValue); Assert.AreEqual(result3.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); - DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); + DataGridViewCellTestHelper.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); } } } @@ -203,8 +203,8 @@ var cells = rows[0].Cells; Assert.AreEqual(4, cells.Count); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); - DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); + DataGridViewCellTestHelper.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); } } }