Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsContextTreeNodeInfoTest.cs =================================================================== diff -u -r3f33a67c2e73865c56f405756b30d73d8cb1862e -r2b5c91f2bd6369a53ab9e89915707f98ce553463 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsContextTreeNodeInfoTest.cs (.../DuneLocationCalculationsContextTreeNodeInfoTest.cs) (revision 3f33a67c2e73865c56f405756b30d73d8cb1862e) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsContextTreeNodeInfoTest.cs (.../DuneLocationCalculationsContextTreeNodeInfoTest.cs) (revision 2b5c91f2bd6369a53ab9e89915707f98ce553463) @@ -19,6 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System; using System.Collections.Generic; using System.Drawing; using System.IO; @@ -113,7 +114,9 @@ var context = new DuneLocationCalculationsContext(new ObservableList(), new DuneErosionFailureMechanism(), - assessmentSection); + assessmentSection, + () => 0.01, + "Category Boundary Name"); // Call string text = info.Text(context); @@ -144,7 +147,9 @@ var context = new DuneLocationCalculationsContext(new ObservableList(), new DuneErosionFailureMechanism(), - assessmentSection); + assessmentSection, + () => 0.01, + "Category Boundary Name"); // Call Color textColor = info.ForeColor(context); @@ -166,7 +171,9 @@ }; var context = new DuneLocationCalculationsContext(duneLocationCalculations, new DuneErosionFailureMechanism(), - assessmentSection); + assessmentSection, + () => 0.01, + "Category Boundary Name"); // Call Color textColor = info.ForeColor(context); @@ -184,7 +191,9 @@ var assessmentSection = mocks.Stub(); var context = new DuneLocationCalculationsContext(new ObservableList(), new DuneErosionFailureMechanism(), - assessmentSection); + assessmentSection, + () => 0.01, + "Category Boundary Name"); var menuBuilder = mocks.StrictMock(); using (mocks.Ordered()) @@ -233,7 +242,9 @@ }; var context = new DuneLocationCalculationsContext(duneLocationCalculations, failureMechanism, - assessmentSection); + assessmentSection, + () => 0.01, + "Category Boundary Name"); var builder = new CustomItemsOnlyContextMenuBuilder(); var gui = mocks.Stub(); @@ -281,7 +292,9 @@ var builder = new CustomItemsOnlyContextMenuBuilder(); var context = new DuneLocationCalculationsContext(new ObservableList(), failureMechanism, - assessmentSection); + assessmentSection, + () => 0.01, + "Category Boundary Name"); var gui = mocks.Stub(); gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(builder); @@ -324,7 +337,9 @@ var builder = new CustomItemsOnlyContextMenuBuilder(); var context = new DuneLocationCalculationsContext(new ObservableList(), failureMechanism, - assessmentSection); + assessmentSection, + () => 0.01, + "Category Boundary Name"); var gui = mocks.Stub(); gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(builder); @@ -375,7 +390,9 @@ }; var context = new DuneLocationCalculationsContext(duneLocationCalculations, failureMechanism, - assessmentSection); + assessmentSection, + () => 0.01, + "Category Boundary Name"); var builder = new CustomItemsOnlyContextMenuBuilder(); var gui = mocks.Stub(); @@ -444,7 +461,11 @@ failureMechanism })); - var context = new DuneLocationCalculationsContext(duneLocationCalculations, failureMechanism, assessmentSection); + var context = new DuneLocationCalculationsContext(duneLocationCalculations, + failureMechanism, + assessmentSection, + () => 0.01, + "Category Boundary Name"); var builder = new CustomItemsOnlyContextMenuBuilder(); @@ -507,6 +528,8 @@ public void CalculateDuneLocationsFromContextMenu_HydraulicBoundaryDatabaseWithCanUsePreprocessorFalse_SendsRightInputToCalculationService() { // Setup + const double norm = 0.01; + string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); var duneLocationCalculations = new ObservableList @@ -542,7 +565,11 @@ failureMechanism })); - var context = new DuneLocationCalculationsContext(duneLocationCalculations, failureMechanism, assessmentSection); + var context = new DuneLocationCalculationsContext(duneLocationCalculations, + failureMechanism, + assessmentSection, + () => norm, + "Category Boundary Name"); using (var treeViewControl = new TreeViewControl()) { @@ -570,8 +597,7 @@ DunesBoundaryConditionsCalculationInput dunesBoundaryConditionsCalculationInput = dunesBoundaryConditionsCalculator.ReceivedInputs.First(); Assert.AreEqual(duneLocationCalculations[0].DuneLocation.Id, dunesBoundaryConditionsCalculationInput.HydraulicBoundaryLocationId); - double expectedProbability = failureMechanism.GetMechanismSpecificNorm(assessmentSection.FailureMechanismContribution.Norm); - Assert.AreEqual(StatisticsConverter.ProbabilityToReliability(expectedProbability), dunesBoundaryConditionsCalculationInput.Beta); + Assert.AreEqual(StatisticsConverter.ProbabilityToReliability(norm), dunesBoundaryConditionsCalculationInput.Beta); } } } @@ -580,6 +606,7 @@ public void CalculateDuneLocationsFromContextMenu_HydraulicBoundaryDatabaseWithUsePreprocessorTrue_SendsRightInputToCalculationService() { // Setup + const double norm = 0.01; string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); string preprocessorDirectory = TestHelper.GetScratchPadPath(); @@ -619,7 +646,11 @@ failureMechanism })); - var context = new DuneLocationCalculationsContext(duneLocationCalculations, failureMechanism, assessmentSection); + var context = new DuneLocationCalculationsContext(duneLocationCalculations, + failureMechanism, + assessmentSection, + () => norm, + "Category boundary name"); using (var treeViewControl = new TreeViewControl()) { @@ -647,8 +678,7 @@ DunesBoundaryConditionsCalculationInput dunesBoundaryConditionsCalculationInput = dunesBoundaryConditionsCalculator.ReceivedInputs.First(); Assert.AreEqual(duneLocationCalculations[0].DuneLocation.Id, dunesBoundaryConditionsCalculationInput.HydraulicBoundaryLocationId); - double expectedProbability = failureMechanism.GetMechanismSpecificNorm(assessmentSection.FailureMechanismContribution.Norm); - Assert.AreEqual(StatisticsConverter.ProbabilityToReliability(expectedProbability), dunesBoundaryConditionsCalculationInput.Beta); + Assert.AreEqual(StatisticsConverter.ProbabilityToReliability(norm), dunesBoundaryConditionsCalculationInput.Beta); } } } @@ -657,6 +687,7 @@ public void CalculateDuneLocationsFromContextMenu_HydraulicBoundaryDatabaseWithUsePreprocessorFalse_SendsRightInputToCalculationService() { // Setup + const double norm = 0.01; string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); var duneLocationCalculations = new ObservableList @@ -695,7 +726,11 @@ failureMechanism })); - var context = new DuneLocationCalculationsContext(duneLocationCalculations, failureMechanism, assessmentSection); + var context = new DuneLocationCalculationsContext(duneLocationCalculations, + failureMechanism, + assessmentSection, + () => norm, + "Category Boundary Name"); using (var treeViewControl = new TreeViewControl()) { @@ -723,8 +758,7 @@ DunesBoundaryConditionsCalculationInput dunesBoundaryConditionsCalculationInput = dunesBoundaryConditionsCalculator.ReceivedInputs.First(); Assert.AreEqual(duneLocationCalculations[0].DuneLocation.Id, dunesBoundaryConditionsCalculationInput.HydraulicBoundaryLocationId); - double expectedProbability = failureMechanism.GetMechanismSpecificNorm(assessmentSection.FailureMechanismContribution.Norm); - Assert.AreEqual(StatisticsConverter.ProbabilityToReliability(expectedProbability), dunesBoundaryConditionsCalculationInput.Beta); + Assert.AreEqual(StatisticsConverter.ProbabilityToReliability(norm), dunesBoundaryConditionsCalculationInput.Beta); } } }