Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/FailureMechanismSectionResultRowTestHelper.cs =================================================================== diff -u --- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/FailureMechanismSectionResultRowTestHelper.cs (revision 0) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/FailureMechanismSectionResultRowTestHelper.cs (revision c715370e848d5d61ce51ed73aabfc5a8aea329da) @@ -0,0 +1,103 @@ +// Copyright (C) Stichting Deltares 2017. 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 Core.Common.Controls.DataGrid; +using NUnit.Framework; +using Ringtoets.Common.Forms.Views; + +namespace Ringtoets.Common.Forms.TestUtil +{ + /// + /// Class that can be used to test properties of a . + /// + public static class FailureMechanismSectionResultRowTestHelper + { + /// + /// Asserts the state of the . + /// + /// The + /// to assert. + /// Indicator whether the state should be enabled or not. + /// Indicator whether the state should be read-only or not. + /// Thrown when the state of + /// is not equal to the given parameters. + public static void AssertColumnState(DataGridViewColumnStateDefinition columnStateDefinition, + bool isEnabled, + bool isReadOnly = false) + { + if (isEnabled) + { + AssertColumnStateIsEnabled(columnStateDefinition, isReadOnly); + } + else + { + AssertColumnStateIsDisabled(columnStateDefinition); + } + } + + /// + /// Asserts the state of the with an expected + /// background color. + /// + /// The + /// to assert. + /// The expected background color of the column style. + /// Thrown when the state of + /// is not the same as the expected state. + public static void AssertColumnWithColorState(DataGridViewColumnStateDefinition columnStateDefinition, + Color expectedBackgroundColor) + { + Assert.IsTrue(columnStateDefinition.ReadOnly); + Assert.AreEqual(Color.FromKnownColor(KnownColor.ControlText), columnStateDefinition.Style.TextColor); + Assert.AreEqual(expectedBackgroundColor, columnStateDefinition.Style.BackgroundColor); + } + + /// + /// Asserts that the state of the is disabled. + /// + /// The + /// to assert. + /// Thrown when the state of + /// is not the same as the expected disabled state. + public static void AssertColumnStateIsDisabled(DataGridViewColumnStateDefinition columnStateDefinition) + { + Assert.AreEqual(CellStyle.Disabled, columnStateDefinition.Style); + Assert.IsTrue(columnStateDefinition.ReadOnly); + Assert.AreEqual(string.Empty, columnStateDefinition.ErrorText); + } + + /// + /// Asserts that the state of the is enabled. + /// + /// The + /// to assert. + /// Indicator whether the column state should be read-only or not. + /// Thrown when the state of + /// is not the same as the expected enabled state. + public static void AssertColumnStateIsEnabled(DataGridViewColumnStateDefinition columnStateDefinition, bool readOnly = false) + { + Assert.AreEqual(CellStyle.Enabled, columnStateDefinition.Style); + Assert.AreEqual(readOnly, columnStateDefinition.ReadOnly); + Assert.AreEqual(string.Empty, columnStateDefinition.ErrorText); + } + } +} \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/Ringtoets.Common.Forms.TestUtil.csproj =================================================================== diff -u -r09e2881b5639ab468288f91bebc0c0406ac9c05d -rc715370e848d5d61ce51ed73aabfc5a8aea329da --- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/Ringtoets.Common.Forms.TestUtil.csproj (.../Ringtoets.Common.Forms.TestUtil.csproj) (revision 09e2881b5639ab468288f91bebc0c0406ac9c05d) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/Ringtoets.Common.Forms.TestUtil.csproj (.../Ringtoets.Common.Forms.TestUtil.csproj) (revision c715370e848d5d61ce51ed73aabfc5a8aea329da) @@ -13,9 +13,11 @@ + + Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -r3ecc2e64c1eadaff263507f37c6d2cb608409d8f -rc715370e848d5d61ce51ed73aabfc5a8aea329da --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs) (revision 3ecc2e64c1eadaff263507f37c6d2cb608409d8f) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs) (revision c715370e848d5d61ce51ed73aabfc5a8aea329da) @@ -35,6 +35,7 @@ using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.TestUtil; +using Ringtoets.Common.Forms.TestUtil; using Ringtoets.Common.Forms.TypeConverters; using Ringtoets.Common.Forms.Views; using Ringtoets.Common.Primitives; @@ -174,20 +175,22 @@ Assert.IsNotNull(columnStateDefinitions[i]); } - AssertColumnStateIsEnabled(columnStateDefinitions[ConstructionProperties.SimpleAssessmentResultIndex]); - AssertColumnStateIsEnabled(columnStateDefinitions[ConstructionProperties.DetailedAssessmentResultIndex]); - AssertColumnStateIsEnabled(columnStateDefinitions[ConstructionProperties.DetailedAssessmentProbabilityIndex], true); - AssertColumnStateIsEnabled(columnStateDefinitions[ConstructionProperties.TailorMadeAssessmentResultIndex]); - AssertColumnStateIsDisabled(columnStateDefinitions[ConstructionProperties.TailorMadeAssessmentProbabilityIndex]); - AssertColumnStateIsDisabled(columnStateDefinitions[ConstructionProperties.ManualAssemblyProbabilityIndex]); + FailureMechanismSectionResultRowTestHelper.AssertColumnStateIsEnabled(columnStateDefinitions[ConstructionProperties.SimpleAssessmentResultIndex]); + FailureMechanismSectionResultRowTestHelper.AssertColumnStateIsEnabled(columnStateDefinitions[ConstructionProperties.DetailedAssessmentResultIndex]); + FailureMechanismSectionResultRowTestHelper.AssertColumnStateIsEnabled(columnStateDefinitions[ConstructionProperties.DetailedAssessmentProbabilityIndex], + true); + FailureMechanismSectionResultRowTestHelper.AssertColumnStateIsEnabled(columnStateDefinitions[ConstructionProperties.TailorMadeAssessmentResultIndex]); + FailureMechanismSectionResultRowTestHelper.AssertColumnStateIsDisabled(columnStateDefinitions[ConstructionProperties.TailorMadeAssessmentProbabilityIndex]); + FailureMechanismSectionResultRowTestHelper.AssertColumnStateIsDisabled(columnStateDefinitions[ConstructionProperties.ManualAssemblyProbabilityIndex]); Assert.AreEqual(result.SimpleAssessmentResult, row.SimpleAssessmentResult); Assert.AreEqual(result.DetailedAssessmentResult, row.DetailedAssessmentResult); Assert.AreEqual(result.TailorMadeAssessmentResult, row.TailorMadeAssessmentResult); Assert.AreEqual(result.TailorMadeAssessmentProbability, row.TailorMadeAssessmentProbability); Assert.AreEqual(result.UseManualAssemblyProbability, row.UseManualAssemblyProbability); Assert.AreEqual(result.ManualAssemblyProbability, row.ManualAssemblyProbability); - AssertColumnStateIsEnabled(columnStateDefinitions[ConstructionProperties.CombinedAssemblyProbabilityIndex], true); + FailureMechanismSectionResultRowTestHelper.AssertColumnStateIsEnabled(columnStateDefinitions[ConstructionProperties.CombinedAssemblyProbabilityIndex], + true); TestHelper.AssertTypeConverter( @@ -417,40 +420,6 @@ } } - private static void AssertColumnState(DataGridViewColumnStateDefinition columnStateDefinition, bool isEnabled, bool isReadOnly = false) - { - if (isEnabled) - { - AssertColumnStateIsEnabled(columnStateDefinition, isReadOnly); - } - else - { - AssertColumnStateIsDisabled(columnStateDefinition); - } - } - - private static void AssertColumnWithColorState(DataGridViewColumnStateDefinition columnStateDefinition, - Color expectedBackgroundColor) - { - Assert.IsTrue(columnStateDefinition.ReadOnly); - Assert.AreEqual(Color.FromKnownColor(KnownColor.ControlText), columnStateDefinition.Style.TextColor); - Assert.AreEqual(expectedBackgroundColor, columnStateDefinition.Style.BackgroundColor); - } - - private static void AssertColumnStateIsDisabled(DataGridViewColumnStateDefinition columnStateDefinition) - { - Assert.AreEqual(CellStyle.Disabled, columnStateDefinition.Style); - Assert.IsTrue(columnStateDefinition.ReadOnly); - Assert.AreEqual(string.Empty, columnStateDefinition.ErrorText); - } - - private static void AssertColumnStateIsEnabled(DataGridViewColumnStateDefinition columnStateDefinition, bool readOnly = false) - { - Assert.AreEqual(CellStyle.Enabled, columnStateDefinition.Style); - Assert.AreEqual(readOnly, columnStateDefinition.ReadOnly); - Assert.AreEqual(string.Empty, columnStateDefinition.ErrorText); - } - #region Column States [Test] @@ -484,11 +453,16 @@ // Assert IDictionary columnStateDefinitions = row.ColumnStateDefinitions; - AssertColumnState(columnStateDefinitions[ConstructionProperties.DetailedAssessmentResultIndex], cellsEnabled); - AssertColumnState(columnStateDefinitions[ConstructionProperties.DetailedAssessmentProbabilityIndex], cellsEnabled, true); + FailureMechanismSectionResultRowTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.DetailedAssessmentResultIndex], + cellsEnabled); + FailureMechanismSectionResultRowTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.DetailedAssessmentProbabilityIndex], + cellsEnabled, + true); - AssertColumnState(columnStateDefinitions[ConstructionProperties.TailorMadeAssessmentResultIndex], cellsEnabled); - AssertColumnState(columnStateDefinitions[ConstructionProperties.TailorMadeAssessmentProbabilityIndex], cellsEnabled); + FailureMechanismSectionResultRowTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.TailorMadeAssessmentResultIndex], + cellsEnabled); + FailureMechanismSectionResultRowTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.TailorMadeAssessmentProbabilityIndex], + cellsEnabled); mocks.VerifyAll(); } @@ -522,7 +496,9 @@ // Assert IDictionary columnStateDefinitions = row.ColumnStateDefinitions; - AssertColumnState(columnStateDefinitions[ConstructionProperties.DetailedAssessmentProbabilityIndex], cellEnabled, true); + FailureMechanismSectionResultRowTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.DetailedAssessmentProbabilityIndex], + cellEnabled, + true); mocks.VerifyAll(); } } @@ -557,7 +533,8 @@ // Assert IDictionary columnStateDefinitions = row.ColumnStateDefinitions; - AssertColumnState(columnStateDefinitions[ConstructionProperties.TailorMadeAssessmentProbabilityIndex], cellEnabled); + FailureMechanismSectionResultRowTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.TailorMadeAssessmentProbabilityIndex], + cellEnabled); mocks.VerifyAll(); } } @@ -591,22 +568,33 @@ // Assert IDictionary columnStateDefinitions = row.ColumnStateDefinitions; - AssertColumnState(columnStateDefinitions[ConstructionProperties.SimpleAssessmentResultIndex], !useManualAssemblyProbability); - AssertColumnState(columnStateDefinitions[ConstructionProperties.DetailedAssessmentResultIndex], !useManualAssemblyProbability); - AssertColumnState(columnStateDefinitions[ConstructionProperties.DetailedAssessmentProbabilityIndex], !useManualAssemblyProbability, true); - AssertColumnState(columnStateDefinitions[ConstructionProperties.TailorMadeAssessmentResultIndex], !useManualAssemblyProbability); - AssertColumnState(columnStateDefinitions[ConstructionProperties.TailorMadeAssessmentProbabilityIndex], !useManualAssemblyProbability); + FailureMechanismSectionResultRowTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.SimpleAssessmentResultIndex], + !useManualAssemblyProbability); + FailureMechanismSectionResultRowTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.DetailedAssessmentResultIndex], + !useManualAssemblyProbability); + FailureMechanismSectionResultRowTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.DetailedAssessmentProbabilityIndex], + !useManualAssemblyProbability, true); + FailureMechanismSectionResultRowTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.TailorMadeAssessmentResultIndex], + !useManualAssemblyProbability); + FailureMechanismSectionResultRowTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.TailorMadeAssessmentProbabilityIndex], + !useManualAssemblyProbability); if (useManualAssemblyProbability) { - AssertColumnStateIsDisabled(columnStateDefinitions[ConstructionProperties.SimpleAssemblyCategoryGroupIndex]); - AssertColumnStateIsDisabled(columnStateDefinitions[ConstructionProperties.DetailedAssemblyCategoryGroupIndex]); - AssertColumnStateIsDisabled(columnStateDefinitions[ConstructionProperties.TailorMadeAssemblyCategoryGroupIndex]); - AssertColumnStateIsDisabled(columnStateDefinitions[ConstructionProperties.CombinedAssemblyCategoryGroupIndex]); + FailureMechanismSectionResultRowTestHelper.AssertColumnStateIsDisabled( + columnStateDefinitions[ConstructionProperties.SimpleAssemblyCategoryGroupIndex]); + FailureMechanismSectionResultRowTestHelper.AssertColumnStateIsDisabled( + columnStateDefinitions[ConstructionProperties.DetailedAssemblyCategoryGroupIndex]); + FailureMechanismSectionResultRowTestHelper.AssertColumnStateIsDisabled( + columnStateDefinitions[ConstructionProperties.TailorMadeAssemblyCategoryGroupIndex]); + FailureMechanismSectionResultRowTestHelper.AssertColumnStateIsDisabled( + columnStateDefinitions[ConstructionProperties.CombinedAssemblyCategoryGroupIndex]); } - AssertColumnState(columnStateDefinitions[ConstructionProperties.CombinedAssemblyProbabilityIndex], !useManualAssemblyProbability, true); - AssertColumnState(columnStateDefinitions[ConstructionProperties.ManualAssemblyProbabilityIndex], useManualAssemblyProbability); + FailureMechanismSectionResultRowTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.CombinedAssemblyProbabilityIndex], + !useManualAssemblyProbability, true); + FailureMechanismSectionResultRowTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.ManualAssemblyProbabilityIndex], + useManualAssemblyProbability); mocks.VerifyAll(); } @@ -647,10 +635,14 @@ // Assert IDictionary columnStateDefinitions = row.ColumnStateDefinitions; - AssertColumnWithColorState(columnStateDefinitions[ConstructionProperties.SimpleAssemblyCategoryGroupIndex], expectedBackgroundColor); - AssertColumnWithColorState(columnStateDefinitions[ConstructionProperties.DetailedAssemblyCategoryGroupIndex], expectedBackgroundColor); - AssertColumnWithColorState(columnStateDefinitions[ConstructionProperties.TailorMadeAssemblyCategoryGroupIndex], expectedBackgroundColor); - AssertColumnWithColorState(columnStateDefinitions[ConstructionProperties.CombinedAssemblyCategoryGroupIndex], expectedBackgroundColor); + FailureMechanismSectionResultRowTestHelper.AssertColumnWithColorState( + columnStateDefinitions[ConstructionProperties.SimpleAssemblyCategoryGroupIndex], expectedBackgroundColor); + FailureMechanismSectionResultRowTestHelper.AssertColumnWithColorState( + columnStateDefinitions[ConstructionProperties.DetailedAssemblyCategoryGroupIndex], expectedBackgroundColor); + FailureMechanismSectionResultRowTestHelper.AssertColumnWithColorState( + columnStateDefinitions[ConstructionProperties.TailorMadeAssemblyCategoryGroupIndex], expectedBackgroundColor); + FailureMechanismSectionResultRowTestHelper.AssertColumnWithColorState( + columnStateDefinitions[ConstructionProperties.CombinedAssemblyCategoryGroupIndex], expectedBackgroundColor); mocks.VerifyAll(); } Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/MacroStabilityOutwardsSectionResultRowTest.cs =================================================================== diff -u -r16155640e5a575b9b59a9614be69c5bcc9dc02f7 -rc715370e848d5d61ce51ed73aabfc5a8aea329da --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/MacroStabilityOutwardsSectionResultRowTest.cs (.../MacroStabilityOutwardsSectionResultRowTest.cs) (revision 16155640e5a575b9b59a9614be69c5bcc9dc02f7) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/MacroStabilityOutwardsSectionResultRowTest.cs (.../MacroStabilityOutwardsSectionResultRowTest.cs) (revision c715370e848d5d61ce51ed73aabfc5a8aea329da) @@ -34,6 +34,7 @@ using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.TestUtil; +using Ringtoets.Common.Forms.TestUtil; using Ringtoets.Common.Forms.TypeConverters; using Ringtoets.Common.Forms.Views; using Ringtoets.Common.Primitives; @@ -168,12 +169,12 @@ Assert.IsNotNull(columnStateDefinitions[i]); } - AssertColumnStateIsEnabled(columnStateDefinitions[ConstructionProperties.SimpleAssessmentResultIndex]); - AssertColumnStateIsEnabled(columnStateDefinitions[ConstructionProperties.DetailedAssessmentResultIndex]); - AssertColumnStateIsEnabled(columnStateDefinitions[ConstructionProperties.DetailedAssessmentProbabilityIndex]); - AssertColumnStateIsEnabled(columnStateDefinitions[ConstructionProperties.TailorMadeAssessmentResultIndex]); - AssertColumnStateIsDisabled(columnStateDefinitions[ConstructionProperties.TailorMadeAssessmentProbabilityIndex]); - AssertColumnStateIsDisabled(columnStateDefinitions[ConstructionProperties.ManualAssemblyCategoryGroupIndex]); + FailureMechanismSectionResultRowTestHelper.AssertColumnStateIsEnabled(columnStateDefinitions[ConstructionProperties.SimpleAssessmentResultIndex]); + FailureMechanismSectionResultRowTestHelper.AssertColumnStateIsEnabled(columnStateDefinitions[ConstructionProperties.DetailedAssessmentResultIndex]); + FailureMechanismSectionResultRowTestHelper.AssertColumnStateIsEnabled(columnStateDefinitions[ConstructionProperties.DetailedAssessmentProbabilityIndex]); + FailureMechanismSectionResultRowTestHelper.AssertColumnStateIsEnabled(columnStateDefinitions[ConstructionProperties.TailorMadeAssessmentResultIndex]); + FailureMechanismSectionResultRowTestHelper.AssertColumnStateIsDisabled(columnStateDefinitions[ConstructionProperties.TailorMadeAssessmentProbabilityIndex]); + FailureMechanismSectionResultRowTestHelper.AssertColumnStateIsDisabled(columnStateDefinitions[ConstructionProperties.ManualAssemblyCategoryGroupIndex]); Assert.AreEqual(result.SimpleAssessmentResult, row.SimpleAssessmentResult); Assert.AreEqual(result.DetailedAssessmentResult, row.DetailedAssessmentResult); @@ -436,40 +437,6 @@ } } - private static void AssertColumnState(DataGridViewColumnStateDefinition columnStateDefinition, bool cellsEnabled) - { - if (cellsEnabled) - { - AssertColumnStateIsEnabled(columnStateDefinition); - } - else - { - AssertColumnStateIsDisabled(columnStateDefinition); - } - } - - private static void AssertColumnWithColorState(DataGridViewColumnStateDefinition columnStateDefinition, - Color expectedBackgroundColor) - { - Assert.IsTrue(columnStateDefinition.ReadOnly); - Assert.AreEqual(Color.FromKnownColor(KnownColor.ControlText), columnStateDefinition.Style.TextColor); - Assert.AreEqual(expectedBackgroundColor, columnStateDefinition.Style.BackgroundColor); - } - - private static void AssertColumnStateIsDisabled(DataGridViewColumnStateDefinition columnStateDefinition) - { - Assert.AreSame(CellStyle.Disabled, columnStateDefinition.Style); - Assert.IsTrue(columnStateDefinition.ReadOnly); - Assert.AreEqual(string.Empty, columnStateDefinition.ErrorText); - } - - private static void AssertColumnStateIsEnabled(DataGridViewColumnStateDefinition columnStateDefinition) - { - Assert.AreSame(CellStyle.Enabled, columnStateDefinition.Style); - Assert.IsFalse(columnStateDefinition.ReadOnly); - Assert.AreEqual(string.Empty, columnStateDefinition.ErrorText); - } - #region Column States [Test] @@ -478,7 +445,7 @@ [TestCase(SimpleAssessmentResultType.NotApplicable, false)] [TestCase(SimpleAssessmentResultType.ProbabilityNegligible, false)] public void Constructor_WithSimpleAssessmentResultSet_ExpectedColumnStates(SimpleAssessmentResultType simpleAssessmentResult, - bool cellsEnabled) + bool cellsEnabled) { // Setup var failureMechanism = new MacroStabilityOutwardsFailureMechanism(); @@ -503,10 +470,14 @@ // Assert IDictionary columnStateDefinitions = row.ColumnStateDefinitions; - AssertColumnState(columnStateDefinitions[ConstructionProperties.DetailedAssessmentResultIndex], cellsEnabled); - AssertColumnState(columnStateDefinitions[ConstructionProperties.DetailedAssessmentProbabilityIndex], cellsEnabled); - AssertColumnState(columnStateDefinitions[ConstructionProperties.TailorMadeAssessmentResultIndex], cellsEnabled); - AssertColumnState(columnStateDefinitions[ConstructionProperties.TailorMadeAssessmentProbabilityIndex], cellsEnabled); + FailureMechanismSectionResultRowTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.DetailedAssessmentResultIndex], + cellsEnabled); + FailureMechanismSectionResultRowTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.DetailedAssessmentProbabilityIndex], + cellsEnabled); + FailureMechanismSectionResultRowTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.TailorMadeAssessmentResultIndex], + cellsEnabled); + FailureMechanismSectionResultRowTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.TailorMadeAssessmentProbabilityIndex], + cellsEnabled); mocks.VerifyAll(); } @@ -539,7 +510,8 @@ // Assert IDictionary columnStateDefinitions = row.ColumnStateDefinitions; - AssertColumnState(columnStateDefinitions[ConstructionProperties.DetailedAssessmentProbabilityIndex], cellEnabled); + FailureMechanismSectionResultRowTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.DetailedAssessmentProbabilityIndex], + cellEnabled); mocks.VerifyAll(); } @@ -576,7 +548,8 @@ // Assert IDictionary columnStateDefinitions = row.ColumnStateDefinitions; - AssertColumnState(columnStateDefinitions[ConstructionProperties.TailorMadeAssessmentProbabilityIndex], cellEnabled); + FailureMechanismSectionResultRowTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.TailorMadeAssessmentProbabilityIndex], + cellEnabled); mocks.VerifyAll(); } @@ -610,21 +583,31 @@ // Assert IDictionary columnStateDefinitions = row.ColumnStateDefinitions; - AssertColumnState(columnStateDefinitions[ConstructionProperties.SimpleAssessmentResultIndex], !useManualAssemblyCategoryGroup); - AssertColumnState(columnStateDefinitions[ConstructionProperties.DetailedAssessmentResultIndex], !useManualAssemblyCategoryGroup); - AssertColumnState(columnStateDefinitions[ConstructionProperties.DetailedAssessmentProbabilityIndex], !useManualAssemblyCategoryGroup); - AssertColumnState(columnStateDefinitions[ConstructionProperties.TailorMadeAssessmentResultIndex], !useManualAssemblyCategoryGroup); - AssertColumnState(columnStateDefinitions[ConstructionProperties.TailorMadeAssessmentProbabilityIndex], !useManualAssemblyCategoryGroup); + FailureMechanismSectionResultRowTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.SimpleAssessmentResultIndex], + !useManualAssemblyCategoryGroup); + FailureMechanismSectionResultRowTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.DetailedAssessmentResultIndex], + !useManualAssemblyCategoryGroup); + FailureMechanismSectionResultRowTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.DetailedAssessmentProbabilityIndex], + !useManualAssemblyCategoryGroup); + FailureMechanismSectionResultRowTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.TailorMadeAssessmentResultIndex], + !useManualAssemblyCategoryGroup); + FailureMechanismSectionResultRowTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.TailorMadeAssessmentProbabilityIndex], + !useManualAssemblyCategoryGroup); if (useManualAssemblyCategoryGroup) { - AssertColumnStateIsDisabled(columnStateDefinitions[ConstructionProperties.SimpleAssemblyCategoryGroupIndex]); - AssertColumnStateIsDisabled(columnStateDefinitions[ConstructionProperties.DetailedAssemblyCategoryGroupIndex]); - AssertColumnStateIsDisabled(columnStateDefinitions[ConstructionProperties.TailorMadeAssemblyCategoryGroupIndex]); - AssertColumnStateIsDisabled(columnStateDefinitions[ConstructionProperties.CombinedAssemblyCategoryGroupIndex]); + FailureMechanismSectionResultRowTestHelper.AssertColumnStateIsDisabled( + columnStateDefinitions[ConstructionProperties.SimpleAssemblyCategoryGroupIndex]); + FailureMechanismSectionResultRowTestHelper.AssertColumnStateIsDisabled( + columnStateDefinitions[ConstructionProperties.DetailedAssemblyCategoryGroupIndex]); + FailureMechanismSectionResultRowTestHelper.AssertColumnStateIsDisabled( + columnStateDefinitions[ConstructionProperties.TailorMadeAssemblyCategoryGroupIndex]); + FailureMechanismSectionResultRowTestHelper.AssertColumnStateIsDisabled( + columnStateDefinitions[ConstructionProperties.CombinedAssemblyCategoryGroupIndex]); } - AssertColumnState(columnStateDefinitions[ConstructionProperties.ManualAssemblyCategoryGroupIndex], useManualAssemblyCategoryGroup); + FailureMechanismSectionResultRowTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.ManualAssemblyCategoryGroupIndex], + useManualAssemblyCategoryGroup); mocks.VerifyAll(); } @@ -665,10 +648,14 @@ // Assert IDictionary columnStateDefinitions = row.ColumnStateDefinitions; - AssertColumnWithColorState(columnStateDefinitions[ConstructionProperties.SimpleAssemblyCategoryGroupIndex], expectedBackgroundColor); - AssertColumnWithColorState(columnStateDefinitions[ConstructionProperties.DetailedAssemblyCategoryGroupIndex], expectedBackgroundColor); - AssertColumnWithColorState(columnStateDefinitions[ConstructionProperties.TailorMadeAssemblyCategoryGroupIndex], expectedBackgroundColor); - AssertColumnWithColorState(columnStateDefinitions[ConstructionProperties.CombinedAssemblyCategoryGroupIndex], expectedBackgroundColor); + FailureMechanismSectionResultRowTestHelper.AssertColumnWithColorState(columnStateDefinitions[ConstructionProperties.SimpleAssemblyCategoryGroupIndex], + expectedBackgroundColor); + FailureMechanismSectionResultRowTestHelper.AssertColumnWithColorState(columnStateDefinitions[ConstructionProperties.DetailedAssemblyCategoryGroupIndex], + expectedBackgroundColor); + FailureMechanismSectionResultRowTestHelper.AssertColumnWithColorState(columnStateDefinitions[ConstructionProperties.TailorMadeAssemblyCategoryGroupIndex], + expectedBackgroundColor); + FailureMechanismSectionResultRowTestHelper.AssertColumnWithColorState(columnStateDefinitions[ConstructionProperties.CombinedAssemblyCategoryGroupIndex], + expectedBackgroundColor); mocks.VerifyAll(); }