Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/CombinedFailureMechanismSectionAssemblyResultRowTest.cs =================================================================== diff -u -r0df4117d473d18cdc06648036fdb1580591acd0e -r8eb3bdcdb2cae9a56d63b4e0b49f1532bd317e5e --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/CombinedFailureMechanismSectionAssemblyResultRowTest.cs (.../CombinedFailureMechanismSectionAssemblyResultRowTest.cs) (revision 0df4117d473d18cdc06648036fdb1580591acd0e) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/CombinedFailureMechanismSectionAssemblyResultRowTest.cs (.../CombinedFailureMechanismSectionAssemblyResultRowTest.cs) (revision 8eb3bdcdb2cae9a56d63b4e0b49f1532bd317e5e) @@ -66,10 +66,12 @@ } [Test] - public void Constructor_WithCombinedFailureMechanismAssemblyResult_ExpectedValues() + [TestCase(true)] + [TestCase(false)] + public void Constructor_WithCombinedFailureMechanismAssemblyResult_ExpectedValues(bool failureMechanismsInAssembly) { // Setup - CombinedFailureMechanismSectionAssemblyResult result = GetCombinedFailureMechanismSectionAssemblyResult(); + CombinedFailureMechanismSectionAssemblyResult result = GetCombinedFailureMechanismSectionAssemblyResult(failureMechanismsInAssembly); // Call var row = new CombinedFailureMechanismSectionAssemblyResultRow(result); @@ -102,21 +104,21 @@ Assert.AreEqual(2, row.SectionStart.NumberOfDecimalPlaces); Assert.AreEqual(result.SectionEnd, row.SectionEnd, row.SectionEnd.GetAccuracy()); Assert.AreEqual(EnumDisplayNameHelper.GetDisplayName(result.TotalResult), row.TotalResult); - Assert.AreEqual(EnumDisplayNameHelper.GetDisplayName(result.Piping), row.Piping); - Assert.AreEqual(EnumDisplayNameHelper.GetDisplayName(result.GrassCoverErosionInwards), row.GrassCoverErosionInwards); - Assert.AreEqual(EnumDisplayNameHelper.GetDisplayName(result.MacroStabilityInwards), row.MacroStabilityInwards); - Assert.AreEqual(EnumDisplayNameHelper.GetDisplayName(result.Microstability), row.Microstability); - Assert.AreEqual(EnumDisplayNameHelper.GetDisplayName(result.StabilityStoneCover), row.StabilityStoneCover); - Assert.AreEqual(EnumDisplayNameHelper.GetDisplayName(result.WaveImpactAsphaltCover), row.WaveImpactAsphaltCover); - Assert.AreEqual(EnumDisplayNameHelper.GetDisplayName(result.WaterPressureAsphaltCover), row.WaterPressureAsphaltCover); - Assert.AreEqual(EnumDisplayNameHelper.GetDisplayName(result.GrassCoverErosionOutwards), row.GrassCoverErosionOutwards); - Assert.AreEqual(EnumDisplayNameHelper.GetDisplayName(result.GrassCoverSlipOffOutwards), row.GrassCoverSlipOffOutwards); - Assert.AreEqual(EnumDisplayNameHelper.GetDisplayName(result.GrassCoverSlipOffInwards), row.GrassCoverSlipOffInwards); - Assert.AreEqual(EnumDisplayNameHelper.GetDisplayName(result.HeightStructures), row.HeightStructures); - Assert.AreEqual(EnumDisplayNameHelper.GetDisplayName(result.ClosingStructures), row.ClosingStructures); - Assert.AreEqual(EnumDisplayNameHelper.GetDisplayName(result.PipingStructure), row.PipingStructure); - Assert.AreEqual(EnumDisplayNameHelper.GetDisplayName(result.StabilityPointStructures), row.StabilityPointStructures); - Assert.AreEqual(EnumDisplayNameHelper.GetDisplayName(result.DuneErosion), row.DuneErosion); + Assert.AreEqual(GetExpectedDisplayNameForFailureMechanism(result.Piping), row.Piping); + Assert.AreEqual(GetExpectedDisplayNameForFailureMechanism(result.GrassCoverErosionInwards), row.GrassCoverErosionInwards); + Assert.AreEqual(GetExpectedDisplayNameForFailureMechanism(result.MacroStabilityInwards), row.MacroStabilityInwards); + Assert.AreEqual(GetExpectedDisplayNameForFailureMechanism(result.Microstability), row.Microstability); + Assert.AreEqual(GetExpectedDisplayNameForFailureMechanism(result.StabilityStoneCover), row.StabilityStoneCover); + Assert.AreEqual(GetExpectedDisplayNameForFailureMechanism(result.WaveImpactAsphaltCover), row.WaveImpactAsphaltCover); + Assert.AreEqual(GetExpectedDisplayNameForFailureMechanism(result.WaterPressureAsphaltCover), row.WaterPressureAsphaltCover); + Assert.AreEqual(GetExpectedDisplayNameForFailureMechanism(result.GrassCoverErosionOutwards), row.GrassCoverErosionOutwards); + Assert.AreEqual(GetExpectedDisplayNameForFailureMechanism(result.GrassCoverSlipOffOutwards), row.GrassCoverSlipOffOutwards); + Assert.AreEqual(GetExpectedDisplayNameForFailureMechanism(result.GrassCoverSlipOffInwards), row.GrassCoverSlipOffInwards); + Assert.AreEqual(GetExpectedDisplayNameForFailureMechanism(result.HeightStructures), row.HeightStructures); + Assert.AreEqual(GetExpectedDisplayNameForFailureMechanism(result.ClosingStructures), row.ClosingStructures); + Assert.AreEqual(GetExpectedDisplayNameForFailureMechanism(result.PipingStructure), row.PipingStructure); + Assert.AreEqual(GetExpectedDisplayNameForFailureMechanism(result.StabilityPointStructures), row.StabilityPointStructures); + Assert.AreEqual(GetExpectedDisplayNameForFailureMechanism(result.DuneErosion), row.DuneErosion); } [Test] @@ -176,7 +178,7 @@ DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnWithColorState(columnStateDefinitions[duneErosionIndex], expectedBackgroundColor); } - private static CombinedFailureMechanismSectionAssemblyResult GetCombinedFailureMechanismSectionAssemblyResult() + private static CombinedFailureMechanismSectionAssemblyResult GetCombinedFailureMechanismSectionAssemblyResult(bool failureMechanismsInAssembly) { var random = new Random(21); return new CombinedFailureMechanismSectionAssemblyResult( @@ -186,22 +188,36 @@ random.NextEnumValue(), new CombinedFailureMechanismSectionAssemblyResult.ConstructionProperties { - Piping = random.NextEnumValue(), - GrassCoverErosionInwards = random.NextEnumValue(), - MacroStabilityInwards = random.NextEnumValue(), - Microstability = random.NextEnumValue(), - StabilityStoneCover = random.NextEnumValue(), - WaveImpactAsphaltCover = random.NextEnumValue(), - WaterPressureAsphaltCover = random.NextEnumValue(), - GrassCoverErosionOutwards = random.NextEnumValue(), - GrassCoverSlipOffOutwards = random.NextEnumValue(), - GrassCoverSlipOffInwards = random.NextEnumValue(), - HeightStructures = random.NextEnumValue(), - ClosingStructures = random.NextEnumValue(), - PipingStructure = random.NextEnumValue(), - StabilityPointStructures = random.NextEnumValue(), - DuneErosion = random.NextEnumValue() + Piping = GetFailureMechanismSectionAssemblyGroup(failureMechanismsInAssembly, random), + GrassCoverErosionInwards = GetFailureMechanismSectionAssemblyGroup(failureMechanismsInAssembly, random), + MacroStabilityInwards = GetFailureMechanismSectionAssemblyGroup(failureMechanismsInAssembly, random), + Microstability = GetFailureMechanismSectionAssemblyGroup(failureMechanismsInAssembly, random), + StabilityStoneCover = GetFailureMechanismSectionAssemblyGroup(failureMechanismsInAssembly, random), + WaveImpactAsphaltCover = GetFailureMechanismSectionAssemblyGroup(failureMechanismsInAssembly, random), + WaterPressureAsphaltCover = GetFailureMechanismSectionAssemblyGroup(failureMechanismsInAssembly, random), + GrassCoverErosionOutwards = GetFailureMechanismSectionAssemblyGroup(failureMechanismsInAssembly, random), + GrassCoverSlipOffOutwards = GetFailureMechanismSectionAssemblyGroup(failureMechanismsInAssembly, random), + GrassCoverSlipOffInwards = GetFailureMechanismSectionAssemblyGroup(failureMechanismsInAssembly, random), + HeightStructures = GetFailureMechanismSectionAssemblyGroup(failureMechanismsInAssembly, random), + ClosingStructures = GetFailureMechanismSectionAssemblyGroup(failureMechanismsInAssembly, random), + PipingStructure = GetFailureMechanismSectionAssemblyGroup(failureMechanismsInAssembly, random), + StabilityPointStructures = GetFailureMechanismSectionAssemblyGroup(failureMechanismsInAssembly, random), + DuneErosion = GetFailureMechanismSectionAssemblyGroup(failureMechanismsInAssembly, random) }); } + + private static FailureMechanismSectionAssemblyGroup? GetFailureMechanismSectionAssemblyGroup(bool failureMechanismInAssembly, Random random) + { + return failureMechanismInAssembly + ? random.NextEnumValue() + : (FailureMechanismSectionAssemblyGroup?) null; + } + + private static string GetExpectedDisplayNameForFailureMechanism(FailureMechanismSectionAssemblyGroup? failureMechanismSectionAssemblyGroup) + { + return failureMechanismSectionAssemblyGroup.HasValue + ? EnumDisplayNameHelper.GetDisplayName(failureMechanismSectionAssemblyGroup.Value) + : "-"; + } } } \ No newline at end of file