Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyResultTotalView.cs =================================================================== diff -u -r9618f924a79a6f3abb88c31b2cebb54418128031 -r29fa3a5e54e1ba71a95a4405088a8a5b87c7b3c8 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyResultTotalView.cs (.../AssemblyResultTotalView.cs) (revision 9618f924a79a6f3abb88c31b2cebb54418128031) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyResultTotalView.cs (.../AssemblyResultTotalView.cs) (revision 29fa3a5e54e1ba71a95a4405088a8a5b87c7b3c8) @@ -21,13 +21,13 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Windows.Forms; using Core.Common.Controls.Views; using Core.Common.Util.Extensions; -using Ringtoets.AssemblyTool.Data; using Ringtoets.ClosingStructures.Data; +using Ringtoets.DuneErosion.Data; using Ringtoets.GrassCoverErosionInwards.Data; +using Ringtoets.GrassCoverErosionOutwards.Data; using Ringtoets.HeightStructures.Data; using Ringtoets.Integration.Data; using Ringtoets.Integration.Data.StandAlone; @@ -36,6 +36,8 @@ using Ringtoets.MacroStabilityInwards.Data; using Ringtoets.Piping.Data; using Ringtoets.StabilityPointStructures.Data; +using Ringtoets.StabilityStoneCover.Data; +using Ringtoets.WaveImpactAsphaltCover.Data; using CommonGuiResources = Core.Common.Gui.Properties.Resources; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; @@ -114,96 +116,182 @@ CreateGrassCoverErosionInwardsFailureMechanismAssemblyResultRow(), CreateMacroStabilityInwardsFailureMechanismAssemblyResultRow(), CreateMacroStabilityOutwardsFailureMechanismAssemblyResultRow(), - new FailureMechanismAssemblyCategoryGroupResultRow(AssessmentSection.Microstability, GetFailureMechanismAssemblyCategoryGroup), - new FailureMechanismAssemblyCategoryGroupResultRow(AssessmentSection.StabilityStoneCover, GetFailureMechanismAssemblyCategoryGroup), - new FailureMechanismAssemblyCategoryGroupResultRow(AssessmentSection.WaveImpactAsphaltCover, GetFailureMechanismAssemblyCategoryGroup), - new FailureMechanismAssemblyCategoryGroupResultRow(AssessmentSection.WaterPressureAsphaltCover, GetFailureMechanismAssemblyCategoryGroup), - new FailureMechanismAssemblyCategoryGroupResultRow(AssessmentSection.GrassCoverErosionOutwards, GetFailureMechanismAssemblyCategoryGroup), - new FailureMechanismAssemblyCategoryGroupResultRow(AssessmentSection.GrassCoverSlipOffOutwards, GetFailureMechanismAssemblyCategoryGroup), - new FailureMechanismAssemblyCategoryGroupResultRow(AssessmentSection.GrassCoverSlipOffInwards, GetFailureMechanismAssemblyCategoryGroup), + CreateMicrostabilityFailureMechanismAssemblyResultRow(), + CreateStabilityStoneCoverFailureMechanismAssemblyResultRow(), + CreateWaveImpactFailureMechanismAssemblyResultRow(), + CreateWaterPressureAsphaltCoverFailureMechanismAssemblyResultRow(), + CreateGrassCoverErosionOutwardsFailureMechanismAssemblyResultRow(), + CreateGrassCoverSlipOffOutwardsFailureMechanismAssemblyResultRow(), + CreateGrassCoverSlipOffInwardsFailureMechanismAssemblyResultRow(), CreateHeightStructuresFailureMechanismAssemblyResultRow(), CreateClosingStructuresFailureMechanismAssemblyResultRow(), - new FailureMechanismAssemblyCategoryGroupResultRow(AssessmentSection.PipingStructure, GetFailureMechanismAssemblyCategoryGroup), + CreatePipingStructureFailureMechanismAssemblyResultRow(), CreateStabilityPointsStructuresFailureMechanismAssemblyResultRow(), - new FailureMechanismAssemblyCategoryGroupResultRow(AssessmentSection.StrengthStabilityLengthwiseConstruction, GetFailureMechanismAssemblyCategoryGroup), - new FailureMechanismAssemblyCategoryGroupResultRow(AssessmentSection.DuneErosion, GetFailureMechanismAssemblyCategoryGroup), - new FailureMechanismAssemblyCategoryGroupResultRow(AssessmentSection.TechnicalInnovation, GetFailureMechanismAssemblyCategoryGroup) + CreateStrengthStabilityLengthWiseConstructionFailureMechanismAssemblyResultRow(), + CreateDuneErosionFailureMechanismAssemblyResultRow(), + CreateTechnicalInnovationFailureMechanismAssemblyResultRow() }; dataGridViewControl.SetDataSource(assemblyResultRows); } - private FailureMechanismAssemblyResultRowBase CreateMacroStabilityOutwardsFailureMechanismAssemblyResultRow() + private void RefreshAssemblyResults_Click(object sender, EventArgs e) { - MacroStabilityOutwardsFailureMechanism macroStabilityOutwards = AssessmentSection.MacroStabilityOutwards; - return new FailureMechanismAssemblyCategoryGroupResultRow(macroStabilityOutwards, GetFailureMechanismAssemblyCategoryGroup); + assemblyResultRows.ForEachElementDo(row => row.Update()); + dataGridViewControl.RefreshDataGridView(); } - private FailureMechanismAssemblyResultRowBase CreateMacroStabilityInwardsFailureMechanismAssemblyResultRow() - { - MacroStabilityInwardsFailureMechanism macroStabilityInwards = AssessmentSection.MacroStabilityInwards; - return new FailureMechanismAssemblyResultRow(macroStabilityInwards, - () => MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism(macroStabilityInwards.SectionResults, - macroStabilityInwards.Calculations.Cast(), - macroStabilityInwards, - AssessmentSection)); - } + #region Failure mechanism assembly result rows - private FailureMechanismAssemblyResultRowBase CreatePipingFailureMechanismAssemblyResultRow() - { - PipingFailureMechanism piping = AssessmentSection.Piping; - return new FailureMechanismAssemblyResultRow(piping, - () => PipingFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism(piping.SectionResults, - piping.Calculations.Cast(), - piping, - AssessmentSection)); - } + #region Group 1 - private FailureMechanismAssemblyResultRow CreateStabilityPointsStructuresFailureMechanismAssemblyResultRow() - { - StabilityPointStructuresFailureMechanism stabilityPointStructures = AssessmentSection.StabilityPointStructures; - return new FailureMechanismAssemblyResultRow(stabilityPointStructures, - () => StabilityPointStructuresFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism(stabilityPointStructures.SectionResults, - stabilityPointStructures, - AssessmentSection)); - } - private FailureMechanismAssemblyResultRow CreateClosingStructuresFailureMechanismAssemblyResultRow() { ClosingStructuresFailureMechanism closingStructures = AssessmentSection.ClosingStructures; return new FailureMechanismAssemblyResultRow(closingStructures, - () => ClosingStructuresFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism(closingStructures.SectionResults, - closingStructures, + () => ClosingStructuresFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism(closingStructures, AssessmentSection)); } private FailureMechanismAssemblyResultRow CreateHeightStructuresFailureMechanismAssemblyResultRow() { HeightStructuresFailureMechanism heightStructures = AssessmentSection.HeightStructures; return new FailureMechanismAssemblyResultRow(heightStructures, - () => HeightStructuresFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism(heightStructures.SectionResults, - heightStructures, + () => HeightStructuresFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism(heightStructures, AssessmentSection)); } + private FailureMechanismAssemblyResultRow CreateStabilityPointsStructuresFailureMechanismAssemblyResultRow() + { + StabilityPointStructuresFailureMechanism stabilityPointStructures = AssessmentSection.StabilityPointStructures; + return new FailureMechanismAssemblyResultRow(stabilityPointStructures, + () => StabilityPointStructuresFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism(stabilityPointStructures, + AssessmentSection)); + } + private FailureMechanismAssemblyResultRow CreateGrassCoverErosionInwardsFailureMechanismAssemblyResultRow() { GrassCoverErosionInwardsFailureMechanism grassCoverErosionInwards = AssessmentSection.GrassCoverErosionInwards; return new FailureMechanismAssemblyResultRow(grassCoverErosionInwards, - () => GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism(grassCoverErosionInwards.SectionResults, - grassCoverErosionInwards, + () => GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism(grassCoverErosionInwards, AssessmentSection)); } - private static FailureMechanismAssemblyCategoryGroup GetFailureMechanismAssemblyCategoryGroup() + #endregion + + #region Group 2 + + private FailureMechanismAssemblyResultRowBase CreatePipingFailureMechanismAssemblyResultRow() { - return FailureMechanismAssemblyCategoryGroup.IIIt; + PipingFailureMechanism piping = AssessmentSection.Piping; + return new FailureMechanismAssemblyResultRow(piping, + () => PipingFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism(piping, + AssessmentSection)); } - private void RefreshAssemblyResults_Click(object sender, EventArgs e) + private FailureMechanismAssemblyResultRowBase CreateMacroStabilityInwardsFailureMechanismAssemblyResultRow() { - assemblyResultRows.ForEachElementDo(row => row.Update()); - dataGridViewControl.RefreshDataGridView(); + MacroStabilityInwardsFailureMechanism macroStabilityInwards = AssessmentSection.MacroStabilityInwards; + return new FailureMechanismAssemblyResultRow(macroStabilityInwards, + () => MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism(macroStabilityInwards, + AssessmentSection)); } + + #endregion + + #region Group 3 + + private FailureMechanismAssemblyCategoryGroupResultRow CreateStabilityStoneCoverFailureMechanismAssemblyResultRow() + { + StabilityStoneCoverFailureMechanism stabilityStoneCover = AssessmentSection.StabilityStoneCover; + return new FailureMechanismAssemblyCategoryGroupResultRow(stabilityStoneCover, + () => StabilityStoneCoverFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism(stabilityStoneCover.SectionResults)); + } + + private FailureMechanismAssemblyCategoryGroupResultRow CreateWaveImpactFailureMechanismAssemblyResultRow() + { + WaveImpactAsphaltCoverFailureMechanism waveImpactAsphaltCover = AssessmentSection.WaveImpactAsphaltCover; + return new FailureMechanismAssemblyCategoryGroupResultRow(waveImpactAsphaltCover, + () => WaveImpactAsphaltCoverFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism(waveImpactAsphaltCover.SectionResults)); + } + + private FailureMechanismAssemblyCategoryGroupResultRow CreateGrassCoverErosionOutwardsFailureMechanismAssemblyResultRow() + { + GrassCoverErosionOutwardsFailureMechanism grassCoverErosionOutwards = AssessmentSection.GrassCoverErosionOutwards; + return new FailureMechanismAssemblyCategoryGroupResultRow(grassCoverErosionOutwards, + () => GrassCoverErosionOutwardsFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism(grassCoverErosionOutwards.SectionResults)); + } + + private FailureMechanismAssemblyCategoryGroupResultRow CreateDuneErosionFailureMechanismAssemblyResultRow() + { + DuneErosionFailureMechanism duneErosion = AssessmentSection.DuneErosion; + return new FailureMechanismAssemblyCategoryGroupResultRow(duneErosion, + () => DuneErosionFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism(duneErosion.SectionResults)); + } + + #endregion + + #region Group 4 + + private FailureMechanismAssemblyResultRowBase CreateMacroStabilityOutwardsFailureMechanismAssemblyResultRow() + { + MacroStabilityOutwardsFailureMechanism macroStabilityOutwards = AssessmentSection.MacroStabilityOutwards; + return new FailureMechanismAssemblyCategoryGroupResultRow(macroStabilityOutwards, + () => MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism(macroStabilityOutwards, + AssessmentSection)); + } + + private FailureMechanismAssemblyCategoryGroupResultRow CreateMicrostabilityFailureMechanismAssemblyResultRow() + { + MicrostabilityFailureMechanism microstability = AssessmentSection.Microstability; + return new FailureMechanismAssemblyCategoryGroupResultRow(microstability, + () => MicrostabilityFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism(microstability.SectionResults)); + } + + private FailureMechanismAssemblyCategoryGroupResultRow CreateWaterPressureAsphaltCoverFailureMechanismAssemblyResultRow() + { + WaterPressureAsphaltCoverFailureMechanism waterPressureAsphaltCover = AssessmentSection.WaterPressureAsphaltCover; + return new FailureMechanismAssemblyCategoryGroupResultRow(waterPressureAsphaltCover, + () => WaterPressureAsphaltCoverFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism(waterPressureAsphaltCover.SectionResults)); + } + + private FailureMechanismAssemblyCategoryGroupResultRow CreateGrassCoverSlipOffOutwardsFailureMechanismAssemblyResultRow() + { + GrassCoverSlipOffOutwardsFailureMechanism grassCoverSlipOffOutwards = AssessmentSection.GrassCoverSlipOffOutwards; + return new FailureMechanismAssemblyCategoryGroupResultRow(grassCoverSlipOffOutwards, + () => GrassCoverSlipOffOutwardsFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism(grassCoverSlipOffOutwards.SectionResults)); + } + + private FailureMechanismAssemblyCategoryGroupResultRow CreateGrassCoverSlipOffInwardsFailureMechanismAssemblyResultRow() + { + GrassCoverSlipOffInwardsFailureMechanism grassCoverSlipOffInwards = AssessmentSection.GrassCoverSlipOffInwards; + return new FailureMechanismAssemblyCategoryGroupResultRow(grassCoverSlipOffInwards, + () => GrassCoverSlipOffInwardsFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism(grassCoverSlipOffInwards.SectionResults)); + } + + private FailureMechanismAssemblyCategoryGroupResultRow CreatePipingStructureFailureMechanismAssemblyResultRow() + { + PipingStructureFailureMechanism pipingStructure = AssessmentSection.PipingStructure; + return new FailureMechanismAssemblyCategoryGroupResultRow(pipingStructure, + () => PipingStructureFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism(pipingStructure.SectionResults)); + } + + private FailureMechanismAssemblyCategoryGroupResultRow CreateStrengthStabilityLengthWiseConstructionFailureMechanismAssemblyResultRow() + { + StrengthStabilityLengthwiseConstructionFailureMechanism strengthStabilityLengthwiseConstruction = AssessmentSection.StrengthStabilityLengthwiseConstruction; + return new FailureMechanismAssemblyCategoryGroupResultRow(strengthStabilityLengthwiseConstruction, + () => StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism(strengthStabilityLengthwiseConstruction.SectionResults)); + } + + private FailureMechanismAssemblyCategoryGroupResultRow CreateTechnicalInnovationFailureMechanismAssemblyResultRow() + { + TechnicalInnovationFailureMechanism technicalInnovation = AssessmentSection.TechnicalInnovation; + return new FailureMechanismAssemblyCategoryGroupResultRow(technicalInnovation, + () => TechnicalInnovationFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism(technicalInnovation.SectionResults)); + } + + #endregion + + #endregion } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssemblyResultTotalViewTest.cs =================================================================== diff -u -r627e592a7186d8a8264b16e14f773c845ca34ece -r29fa3a5e54e1ba71a95a4405088a8a5b87c7b3c8 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssemblyResultTotalViewTest.cs (.../AssemblyResultTotalViewTest.cs) (revision 627e592a7186d8a8264b16e14f773c845ca34ece) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssemblyResultTotalViewTest.cs (.../AssemblyResultTotalViewTest.cs) (revision 29fa3a5e54e1ba71a95a4405088a8a5b87c7b3c8) @@ -167,7 +167,10 @@ // Then var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; - AssertFailureMechanismRows(assessmentSection, calculator.FailureMechanismAssemblyOutput, dataGridView.Rows); + AssertFailureMechanismRows(assessmentSection, + calculator.FailureMechanismAssemblyOutput, + calculator.FailureMechanismAssemblyCategoryGroupOutput.Value, + dataGridView.Rows); } } } @@ -192,16 +195,21 @@ // Precondition var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; DataGridViewRowCollection rows = dataGridView.Rows; - AssertFailureMechanismRows(assessmentSection, calculator.FailureMechanismAssemblyOutput, rows); + AssertFailureMechanismRows(assessmentSection, + calculator.FailureMechanismAssemblyOutput, + calculator.FailureMechanismAssemblyCategoryGroupOutput.Value, + rows); // When var newAssemblyResult = new FailureMechanismAssembly(random.NextDouble(), random.NextEnumValue()); + var newCategoryGroup = random.NextEnumValue(); calculator.FailureMechanismAssemblyOutput = newAssemblyResult; + calculator.FailureMechanismAssemblyCategoryGroupOutput = newCategoryGroup; var buttonTester = new ButtonTester("RefreshAssemblyResultsButton", testForm); buttonTester.Click(); // Then - AssertFailureMechanismRows(assessmentSection, newAssemblyResult, rows); + AssertFailureMechanismRows(assessmentSection, newAssemblyResult, newCategoryGroup, rows); } } @@ -235,7 +243,10 @@ } } - private static void AssertFailureMechanismRows(AssessmentSection assessmentSection, FailureMechanismAssembly assemblyOutput, DataGridViewRowCollection rows) + private static void AssertFailureMechanismRows(AssessmentSection assessmentSection, + FailureMechanismAssembly assemblyOutput, + FailureMechanismAssemblyCategoryGroup assemblyCategoryGroup, + DataGridViewRowCollection rows) { Assert.AreEqual(assessmentSection.GetFailureMechanisms().Count(), rows.Count); @@ -249,28 +260,28 @@ AssertAssemblyRow(macroStabilityInwards, assemblyOutput, rows[2].Cells); MacroStabilityOutwardsFailureMechanism macroStabilityOutwards = assessmentSection.MacroStabilityOutwards; - AssertAssemblyRow(macroStabilityOutwards, rows[3].Cells); + AssertAssemblyRow(macroStabilityOutwards, assemblyCategoryGroup, rows[3].Cells); MicrostabilityFailureMechanism microStability = assessmentSection.Microstability; - AssertAssemblyRow(microStability, rows[4].Cells); + AssertAssemblyRow(microStability, assemblyCategoryGroup, rows[4].Cells); StabilityStoneCoverFailureMechanism stabilityStoneCover = assessmentSection.StabilityStoneCover; - AssertAssemblyRow(stabilityStoneCover, rows[5].Cells); + AssertAssemblyRow(stabilityStoneCover, assemblyCategoryGroup, rows[5].Cells); WaveImpactAsphaltCoverFailureMechanism waveImpactAsphaltCover = assessmentSection.WaveImpactAsphaltCover; - AssertAssemblyRow(waveImpactAsphaltCover, rows[6].Cells); + AssertAssemblyRow(waveImpactAsphaltCover, assemblyCategoryGroup, rows[6].Cells); WaterPressureAsphaltCoverFailureMechanism waterPressureAsphaltCover = assessmentSection.WaterPressureAsphaltCover; - AssertAssemblyRow(waterPressureAsphaltCover, rows[7].Cells); + AssertAssemblyRow(waterPressureAsphaltCover, assemblyCategoryGroup, rows[7].Cells); GrassCoverErosionOutwardsFailureMechanism grassCoverErosionOutwards = assessmentSection.GrassCoverErosionOutwards; - AssertAssemblyRow(grassCoverErosionOutwards, rows[8].Cells); + AssertAssemblyRow(grassCoverErosionOutwards, assemblyCategoryGroup, rows[8].Cells); GrassCoverSlipOffOutwardsFailureMechanism grassCoverSlipOffOutwards = assessmentSection.GrassCoverSlipOffOutwards; - AssertAssemblyRow(grassCoverSlipOffOutwards, rows[9].Cells); + AssertAssemblyRow(grassCoverSlipOffOutwards, assemblyCategoryGroup, rows[9].Cells); GrassCoverSlipOffInwardsFailureMechanism grassCoverSlipOffInwards = assessmentSection.GrassCoverSlipOffInwards; - AssertAssemblyRow(grassCoverSlipOffInwards, rows[10].Cells); + AssertAssemblyRow(grassCoverSlipOffInwards, assemblyCategoryGroup, rows[10].Cells); HeightStructuresFailureMechanism heightStructures = assessmentSection.HeightStructures; AssertAssemblyRow(heightStructures, assemblyOutput, rows[11].Cells); @@ -279,19 +290,19 @@ AssertAssemblyRow(closingStructures, assemblyOutput, rows[12].Cells); PipingStructureFailureMechanism pipingStructure = assessmentSection.PipingStructure; - AssertAssemblyRow(pipingStructure, rows[13].Cells); + AssertAssemblyRow(pipingStructure, assemblyCategoryGroup, rows[13].Cells); StabilityPointStructuresFailureMechanism stabilityPointStructures = assessmentSection.StabilityPointStructures; AssertAssemblyRow(stabilityPointStructures, assemblyOutput, rows[14].Cells); StrengthStabilityLengthwiseConstructionFailureMechanism strengthStabilityLengthwiseConstruction = assessmentSection.StrengthStabilityLengthwiseConstruction; - AssertAssemblyRow(strengthStabilityLengthwiseConstruction, rows[15].Cells); + AssertAssemblyRow(strengthStabilityLengthwiseConstruction, assemblyCategoryGroup, rows[15].Cells); DuneErosionFailureMechanism duneErosion = assessmentSection.DuneErosion; - AssertAssemblyRow(duneErosion, rows[16].Cells); + AssertAssemblyRow(duneErosion, assemblyCategoryGroup, rows[16].Cells); TechnicalInnovationFailureMechanism technicalInnovation = assessmentSection.TechnicalInnovation; - AssertAssemblyRow(technicalInnovation, rows[17].Cells); + AssertAssemblyRow(technicalInnovation, assemblyCategoryGroup, rows[17].Cells); } private static void AssertAssemblyRow(IFailureMechanism failureMechanism, DataGridViewCellCollection row) @@ -313,5 +324,15 @@ Assert.AreEqual(ProbabilityFormattingHelper.Format(assemblyOutput.Probability), row[failureMechanisProbabilityColumnIndex].FormattedValue); } + + private static void AssertAssemblyRow(IFailureMechanism failureMechanism, + FailureMechanismAssemblyCategoryGroup categoryGroup, + DataGridViewCellCollection row) + { + AssertAssemblyRow(failureMechanism, row); + + Assert.AreEqual(categoryGroup, row[failureMechanismAssemblyCategoryColumnIndex].Value); + Assert.AreEqual("-", row[failureMechanisProbabilityColumnIndex].FormattedValue); + } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/AssemblyResultTotalViewInfoTest.cs =================================================================== diff -u -r5973ea19f0223d8e4331d1646e505032a569f0b4 -r29fa3a5e54e1ba71a95a4405088a8a5b87c7b3c8 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/AssemblyResultTotalViewInfoTest.cs (.../AssemblyResultTotalViewInfoTest.cs) (revision 5973ea19f0223d8e4331d1646e505032a569f0b4) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/AssemblyResultTotalViewInfoTest.cs (.../AssemblyResultTotalViewInfoTest.cs) (revision 29fa3a5e54e1ba71a95a4405088a8a5b87c7b3c8) @@ -25,6 +25,7 @@ using Core.Common.Gui.Plugin; using Core.Common.TestUtil; using NUnit.Framework; +using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Integration.Data; using Ringtoets.Integration.Forms.PresentationObjects; @@ -97,6 +98,7 @@ var random = new Random(21); var assessmentSection = new AssessmentSection(random.NextEnumValue()); + using (new AssemblyToolCalculatorFactoryConfig()) using (var view = new AssemblyResultTotalView(assessmentSection)) { // Call @@ -115,6 +117,7 @@ var assessmentSection1 = new AssessmentSection(random.NextEnumValue()); var assessmentSection2 = new AssessmentSection(random.NextEnumValue()); + using (new AssemblyToolCalculatorFactoryConfig()) using (var view = new AssemblyResultTotalView(assessmentSection1)) { // Call