Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneErosionHydraulicLoadsContextTreeNodeInfoTest.cs =================================================================== diff -u -rad7de8440b9293c49d8801d4707d8b5c779634cf -r1e676df0bdd841aeaf937249d09d4d8175d1ab32 --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneErosionHydraulicLoadsContextTreeNodeInfoTest.cs (.../DuneErosionHydraulicLoadsContextTreeNodeInfoTest.cs) (revision ad7de8440b9293c49d8801d4707d8b5c779634cf) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneErosionHydraulicLoadsContextTreeNodeInfoTest.cs (.../DuneErosionHydraulicLoadsContextTreeNodeInfoTest.cs) (revision 1e676df0bdd841aeaf937249d09d4d8175d1ab32) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using System.IO; using System.Linq; using System.Windows.Forms; @@ -270,7 +269,17 @@ var failureMechanism = new DuneErosionFailureMechanism { - Contribution = 5 + DuneLocationCalculationsForUserDefinedTargetProbabilities = + { + new DuneLocationCalculationsForTargetProbability + { + TargetProbability = 0.1 + }, + new DuneLocationCalculationsForTargetProbability + { + TargetProbability = 0.01 + } + } }; var duneLocation = new TestDuneLocation("Test"); @@ -304,7 +313,7 @@ HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryDatabase), (HydraRingCalculationSettings) invocation.Arguments[0]); }) - .Return(dunesBoundaryConditionsCalculator).Repeat.Times(5); + .Return(dunesBoundaryConditionsCalculator).Repeat.Times(2); mocksRepository.ReplayAll(); plugin.Gui = gui; @@ -314,27 +323,21 @@ using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { // When - Action call = () => contextMenuAdapter.Items[contextMenuCalculateAllIndex].PerformClick(); + void Call() => contextMenuAdapter.Items[contextMenuCalculateAllIndex].PerformClick(); // Then - TestHelper.AssertLogMessages(call, messages => + TestHelper.AssertLogMessages(Call, messages => { string[] msgs = messages.ToArray(); - Assert.AreEqual(40, msgs.Length); + Assert.AreEqual(16, msgs.Length); const string calculationTypeDisplayName = "Hydraulische belastingen"; const string calculationDisplayName = "Hydraulische belastingenberekening"; HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Iv", msgs, 0); + duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "1/10", msgs, 0); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "IIv", msgs, 8); - HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "IIIv", msgs, 16); - HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "IVv", msgs, 24); - HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Vv", msgs, 32); + duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "1/100", msgs, 8); }); } } Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r721d4ca390c54f3e958890da9a85b4c5b119bdf5 -r1e676df0bdd841aeaf937249d09d4d8175d1ab32 --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs (.../DuneLocationCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs) (revision 721d4ca390c54f3e958890da9a85b4c5b119bdf5) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs (.../DuneLocationCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs) (revision 1e676df0bdd841aeaf937249d09d4d8175d1ab32) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using System.Drawing; using System.IO; using System.Linq; @@ -397,7 +396,17 @@ var failureMechanism = new DuneErosionFailureMechanism { - Contribution = 5 + DuneLocationCalculationsForUserDefinedTargetProbabilities = + { + new DuneLocationCalculationsForTargetProbability + { + TargetProbability = 0.1 + }, + new DuneLocationCalculationsForTargetProbability + { + TargetProbability = 0.01 + } + } }; var duneLocation = new TestDuneLocation("Test"); @@ -436,7 +445,7 @@ HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryDatabase), (HydraRingCalculationSettings) invocation.Arguments[0]); }) - .Return(dunesBoundaryConditionsCalculator).Repeat.Times(5); + .Return(dunesBoundaryConditionsCalculator).Repeat.Times(2); mocks.ReplayAll(); using (var plugin = new DuneErosionPlugin()) @@ -450,27 +459,21 @@ using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { // When - Action call = () => contextMenuAdapter.Items[contextMenuCalculateAllIndex].PerformClick(); + void Call() => contextMenuAdapter.Items[contextMenuCalculateAllIndex].PerformClick(); // Then - TestHelper.AssertLogMessages(call, messages => + TestHelper.AssertLogMessages(Call, messages => { string[] msgs = messages.ToArray(); - Assert.AreEqual(40, msgs.Length); + Assert.AreEqual(16, msgs.Length); const string calculationTypeDisplayName = "Hydraulische belastingen"; const string calculationDisplayName = "Hydraulische belastingenberekening"; HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Iv", msgs, 0); + duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "1/10", msgs, 0); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "IIv", msgs, 8); - HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "IIIv", msgs, 16); - HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "IVv", msgs, 24); - HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Vv", msgs, 32); + duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "1/100", msgs, 8); }); } }