Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/PresentationObjects/DuneLocationCalculationsForUserDefinedTargetProbabilityContextTest.cs =================================================================== diff -u -rc07341d07d9f9d32e1b5ac99d727396716e998a3 -r9453b0efd19b36bd38b1bc4e79e4c29923965fce --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/PresentationObjects/DuneLocationCalculationsForUserDefinedTargetProbabilityContextTest.cs (.../DuneLocationCalculationsForUserDefinedTargetProbabilityContextTest.cs) (revision c07341d07d9f9d32e1b5ac99d727396716e998a3) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/PresentationObjects/DuneLocationCalculationsForUserDefinedTargetProbabilityContextTest.cs (.../DuneLocationCalculationsForUserDefinedTargetProbabilityContextTest.cs) (revision 9453b0efd19b36bd38b1bc4e79e4c29923965fce) @@ -35,7 +35,7 @@ public void Constructor_FailureMechanismNull_ThrowsArgumentNullException() { // Call - void Call() => new DuneLocationCalculationsForUserDefinedTargetProbabilityContext(new DuneLocationCalculationsForTargetProbability(), + void Call() => new DuneLocationCalculationsForUserDefinedTargetProbabilityContext(new DuneLocationCalculationsForTargetProbability(0.1), null, new AssessmentSectionStub()); @@ -48,7 +48,7 @@ public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException() { // Call - void Call() => new DuneLocationCalculationsForUserDefinedTargetProbabilityContext(new DuneLocationCalculationsForTargetProbability(), + void Call() => new DuneLocationCalculationsForUserDefinedTargetProbabilityContext(new DuneLocationCalculationsForTargetProbability(0.1), new DuneErosionFailureMechanism(), null); @@ -63,7 +63,7 @@ // Setup var assessmentSection = new AssessmentSectionStub(); var failureMechanism = new DuneErosionFailureMechanism(); - var duneLocationCalculationsForTargetProbability = new DuneLocationCalculationsForTargetProbability(); + var duneLocationCalculationsForTargetProbability = new DuneLocationCalculationsForTargetProbability(0.1); // Call var context = new DuneLocationCalculationsForUserDefinedTargetProbabilityContext(duneLocationCalculationsForTargetProbability, Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/PropertyClasses/DuneLocationCalculationsForUserDefinedTargetProbabilityPropertiesTest.cs =================================================================== diff -u -rb17e8fa0423f0f7d3c4ed78d2c9919fb57b8e844 -r9453b0efd19b36bd38b1bc4e79e4c29923965fce --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/PropertyClasses/DuneLocationCalculationsForUserDefinedTargetProbabilityPropertiesTest.cs (.../DuneLocationCalculationsForUserDefinedTargetProbabilityPropertiesTest.cs) (revision b17e8fa0423f0f7d3c4ed78d2c9919fb57b8e844) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/PropertyClasses/DuneLocationCalculationsForUserDefinedTargetProbabilityPropertiesTest.cs (.../DuneLocationCalculationsForUserDefinedTargetProbabilityPropertiesTest.cs) (revision 9453b0efd19b36bd38b1bc4e79e4c29923965fce) @@ -64,7 +64,7 @@ { // Call void Call() => new DuneLocationCalculationsForUserDefinedTargetProbabilityProperties( - new DuneLocationCalculationsForTargetProbability(), null); + new DuneLocationCalculationsForTargetProbability(0.1), null); // Assert string paramName = Assert.Throws(Call).ParamName; @@ -80,7 +80,7 @@ mocks.ReplayAll(); var calculation = new DuneLocationCalculation(new TestDuneLocation()); - var calculationsForTargetProbability = new DuneLocationCalculationsForTargetProbability + var calculationsForTargetProbability = new DuneLocationCalculationsForTargetProbability(0.1) { DuneLocationCalculations = { @@ -116,7 +116,7 @@ // Call using (var properties = new DuneLocationCalculationsForUserDefinedTargetProbabilityProperties( - new DuneLocationCalculationsForTargetProbability(), targetProbabilityChangeHandler)) + new DuneLocationCalculationsForTargetProbability(0.1), targetProbabilityChangeHandler)) { // Assert PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties); @@ -155,7 +155,7 @@ observable }); - var calculationsForTargetProbability = new DuneLocationCalculationsForTargetProbability + var calculationsForTargetProbability = new DuneLocationCalculationsForTargetProbability(0.1) { DuneLocationCalculations = { @@ -182,7 +182,7 @@ mocks.ReplayAll(); var calculation = new DuneLocationCalculation(new TestDuneLocation()); - var calculationsForTargetProbability = new DuneLocationCalculationsForTargetProbability + var calculationsForTargetProbability = new DuneLocationCalculationsForTargetProbability(0.1) { DuneLocationCalculations = { @@ -214,7 +214,7 @@ mocks.ReplayAll(); var calculation = new DuneLocationCalculation(new TestDuneLocation()); - var calculationsForTargetProbability = new DuneLocationCalculationsForTargetProbability + var calculationsForTargetProbability = new DuneLocationCalculationsForTargetProbability(0.1) { DuneLocationCalculations = { Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/DuneErosionPluginTest.cs =================================================================== diff -u -rf7201fff47918e66edbdcb608a5a4410e441c618 -r9453b0efd19b36bd38b1bc4e79e4c29923965fce --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/DuneErosionPluginTest.cs (.../DuneErosionPluginTest.cs) (revision f7201fff47918e66edbdcb608a5a4410e441c618) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/DuneErosionPluginTest.cs (.../DuneErosionPluginTest.cs) (revision 9453b0efd19b36bd38b1bc4e79e4c29923965fce) @@ -210,7 +210,7 @@ gui.Run(); - var calculationsForTargetProbability = new DuneLocationCalculationsForTargetProbability(); + var calculationsForTargetProbability = new DuneLocationCalculationsForTargetProbability(0.1); var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike) { DuneErosion = Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/ExportInfos/DuneLocationCalculationsForUserDefinedTargetProbabilityContextExportInfoTest.cs =================================================================== diff -u -rc8325e7bd679e2c5cbdfb919c00d6651d46bafd7 -r9453b0efd19b36bd38b1bc4e79e4c29923965fce --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/ExportInfos/DuneLocationCalculationsForUserDefinedTargetProbabilityContextExportInfoTest.cs (.../DuneLocationCalculationsForUserDefinedTargetProbabilityContextExportInfoTest.cs) (revision c8325e7bd679e2c5cbdfb919c00d6651d46bafd7) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/ExportInfos/DuneLocationCalculationsForUserDefinedTargetProbabilityContextExportInfoTest.cs (.../DuneLocationCalculationsForUserDefinedTargetProbabilityContextExportInfoTest.cs) (revision 9453b0efd19b36bd38b1bc4e79e4c29923965fce) @@ -65,7 +65,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var context = new DuneLocationCalculationsForUserDefinedTargetProbabilityContext(new DuneLocationCalculationsForTargetProbability(), + var context = new DuneLocationCalculationsForUserDefinedTargetProbabilityContext(new DuneLocationCalculationsForTargetProbability(0.1), new DuneErosionFailureMechanism(), assessmentSection); @@ -91,7 +91,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var calculationsForTargetProbability = new DuneLocationCalculationsForTargetProbability + var calculationsForTargetProbability = new DuneLocationCalculationsForTargetProbability(0.1) { DuneLocationCalculations = { @@ -125,7 +125,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var calculationsForTargetProbability = new DuneLocationCalculationsForTargetProbability + var calculationsForTargetProbability = new DuneLocationCalculationsForTargetProbability(0.1) { DuneLocationCalculations = { Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/Handlers/DuneLocationCalculationsForTargetProbabilityChangeHandlerTest.cs =================================================================== diff -u -r957ad1c554bde71257ca18e577155a1956630112 -r9453b0efd19b36bd38b1bc4e79e4c29923965fce --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/Handlers/DuneLocationCalculationsForTargetProbabilityChangeHandlerTest.cs (.../DuneLocationCalculationsForTargetProbabilityChangeHandlerTest.cs) (revision 957ad1c554bde71257ca18e577155a1956630112) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/Handlers/DuneLocationCalculationsForTargetProbabilityChangeHandlerTest.cs (.../DuneLocationCalculationsForTargetProbabilityChangeHandlerTest.cs) (revision 9453b0efd19b36bd38b1bc4e79e4c29923965fce) @@ -52,7 +52,7 @@ { // Call var handler = new DuneLocationCalculationsForTargetProbabilityChangeHandler( - new DuneLocationCalculationsForTargetProbability()); + new DuneLocationCalculationsForTargetProbability(0.1)); // Assert Assert.IsInstanceOf(handler); @@ -63,7 +63,7 @@ { // Setup var handler = new DuneLocationCalculationsForTargetProbabilityChangeHandler( - new DuneLocationCalculationsForTargetProbability()); + new DuneLocationCalculationsForTargetProbability(0.1)); // Call void Call() => handler.SetPropertyValueAfterConfirmation(null); @@ -89,7 +89,7 @@ }; var handler = new DuneLocationCalculationsForTargetProbabilityChangeHandler( - new DuneLocationCalculationsForTargetProbability()); + new DuneLocationCalculationsForTargetProbability(0.1)); // Call handler.SetPropertyValueAfterConfirmation(() => {}); @@ -148,7 +148,7 @@ tester.ClickOk(); }; - var calculationsForTargetProbability = new DuneLocationCalculationsForTargetProbability + var calculationsForTargetProbability = new DuneLocationCalculationsForTargetProbability(0.1) { DuneLocationCalculations = { @@ -185,7 +185,7 @@ }; var handler = new DuneLocationCalculationsForTargetProbabilityChangeHandler( - new DuneLocationCalculationsForTargetProbability()); + new DuneLocationCalculationsForTargetProbability(0.1)); var handlerExecuted = false; @@ -232,7 +232,7 @@ }; var handler = new DuneLocationCalculationsForTargetProbabilityChangeHandler( - new DuneLocationCalculationsForTargetProbability()); + new DuneLocationCalculationsForTargetProbability(0.1)); var expectedException = new Exception(); @@ -256,7 +256,7 @@ Output = new TestDuneLocationCalculationOutput() }; - return new DuneLocationCalculationsForTargetProbability + return new DuneLocationCalculationsForTargetProbability(0.1) { DuneLocationCalculations = { Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/PropertyInfos/DuneLocationCalculationsForUserDefinedTargetProbabilityContextPropertyInfoTest.cs =================================================================== diff -u -r81b3fa7b45e8512447809a56a0e31a37ed67e652 -r9453b0efd19b36bd38b1bc4e79e4c29923965fce --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/PropertyInfos/DuneLocationCalculationsForUserDefinedTargetProbabilityContextPropertyInfoTest.cs (.../DuneLocationCalculationsForUserDefinedTargetProbabilityContextPropertyInfoTest.cs) (revision 81b3fa7b45e8512447809a56a0e31a37ed67e652) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/PropertyInfos/DuneLocationCalculationsForUserDefinedTargetProbabilityContextPropertyInfoTest.cs (.../DuneLocationCalculationsForUserDefinedTargetProbabilityContextPropertyInfoTest.cs) (revision 9453b0efd19b36bd38b1bc4e79e4c29923965fce) @@ -56,7 +56,7 @@ var assessmentSection = mockRepository.Stub(); mockRepository.ReplayAll(); - var context = new DuneLocationCalculationsForUserDefinedTargetProbabilityContext(new DuneLocationCalculationsForTargetProbability(), + var context = new DuneLocationCalculationsForUserDefinedTargetProbabilityContext(new DuneLocationCalculationsForTargetProbability(0.1), new DuneErosionFailureMechanism(), assessmentSection); Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneErosionHydraulicLoadsContextTreeNodeInfoTest.cs =================================================================== diff -u -rc46ab97375853f37848d639772671873cfc08df5 -r9453b0efd19b36bd38b1bc4e79e4c29923965fce --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneErosionHydraulicLoadsContextTreeNodeInfoTest.cs (.../DuneErosionHydraulicLoadsContextTreeNodeInfoTest.cs) (revision c46ab97375853f37848d639772671873cfc08df5) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneErosionHydraulicLoadsContextTreeNodeInfoTest.cs (.../DuneErosionHydraulicLoadsContextTreeNodeInfoTest.cs) (revision 9453b0efd19b36bd38b1bc4e79e4c29923965fce) @@ -270,14 +270,8 @@ { DuneLocationCalculationsForUserDefinedTargetProbabilities = { - new DuneLocationCalculationsForTargetProbability - { - TargetProbability = 0.1 - }, - new DuneLocationCalculationsForTargetProbability - { - TargetProbability = 0.01 - } + new DuneLocationCalculationsForTargetProbability(0.1), + new DuneLocationCalculationsForTargetProbability(0.01) } }; Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r08ed675bb4d7ce84ce02be1b010f5f289093081e -r9453b0efd19b36bd38b1bc4e79e4c29923965fce --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs (.../DuneLocationCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs) (revision 08ed675bb4d7ce84ce02be1b010f5f289093081e) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs (.../DuneLocationCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs) (revision 9453b0efd19b36bd38b1bc4e79e4c29923965fce) @@ -288,8 +288,8 @@ new TestDuneLocation() }); - var duneLocationCalculationsForTargetProbability1 = new DuneLocationCalculationsForTargetProbability(); - var duneLocationCalculationsForTargetProbability2 = new DuneLocationCalculationsForTargetProbability(); + var duneLocationCalculationsForTargetProbability1 = new DuneLocationCalculationsForTargetProbability(0.1); + var duneLocationCalculationsForTargetProbability2 = new DuneLocationCalculationsForTargetProbability(0.01); var calculationsForTargetProbabilities = new ObservableList { @@ -327,8 +327,8 @@ public void ChildNodeObjects_NoDuneLocationsPresent_ReturnsExpectedChildData() { // Setup - var duneLocationCalculationsForTargetProbability1 = new DuneLocationCalculationsForTargetProbability(); - var duneLocationCalculationsForTargetProbability2 = new DuneLocationCalculationsForTargetProbability(); + var duneLocationCalculationsForTargetProbability1 = new DuneLocationCalculationsForTargetProbability(0.1); + var duneLocationCalculationsForTargetProbability2 = new DuneLocationCalculationsForTargetProbability(0.01); var calculationsForTargetProbabilities = new ObservableList { @@ -559,14 +559,8 @@ { DuneLocationCalculationsForUserDefinedTargetProbabilities = { - new DuneLocationCalculationsForTargetProbability - { - TargetProbability = 0.1 - }, - new DuneLocationCalculationsForTargetProbability - { - TargetProbability = 0.01 - } + new DuneLocationCalculationsForTargetProbability(0.1), + new DuneLocationCalculationsForTargetProbability(0.01) } }; @@ -680,7 +674,7 @@ assessmentSectionStub); var draggedData = new DuneLocationCalculationsForUserDefinedTargetProbabilityContext( - new DuneLocationCalculationsForTargetProbability(), + new DuneLocationCalculationsForTargetProbability(0.1), failureMechanism, assessmentSectionStub); @@ -702,7 +696,7 @@ var assessmentSectionStub = new AssessmentSectionStub(); var failureMechanism = new DuneErosionFailureMechanism(); - var calculationsForTargetProbability = new DuneLocationCalculationsForTargetProbability(); + var calculationsForTargetProbability = new DuneLocationCalculationsForTargetProbability(0.1); var targetData = new DuneLocationCalculationsForUserDefinedTargetProbabilitiesGroupContext( new ObservableList @@ -763,7 +757,7 @@ assessmentSectionStub); var draggedData = new DuneLocationCalculationsForUserDefinedTargetProbabilityContext( - new DuneLocationCalculationsForTargetProbability(), + new DuneLocationCalculationsForTargetProbability(0.1), failureMechanism, assessmentSectionStub); @@ -785,7 +779,7 @@ var assessmentSectionStub = new AssessmentSectionStub(); var failureMechanism = new DuneErosionFailureMechanism(); - var calculationsForTargetProbability = new DuneLocationCalculationsForTargetProbability(); + var calculationsForTargetProbability = new DuneLocationCalculationsForTargetProbability(0.1); var targetData = new DuneLocationCalculationsForUserDefinedTargetProbabilitiesGroupContext( new ObservableList @@ -819,9 +813,9 @@ var assessmentSectionStub = new AssessmentSectionStub(); var failureMechanism = new DuneErosionFailureMechanism(); - var calculationsForTargetProbability1 = new DuneLocationCalculationsForTargetProbability(); - var calculationsForTargetProbability2 = new DuneLocationCalculationsForTargetProbability(); - var calculationsForTargetProbability3 = new DuneLocationCalculationsForTargetProbability(); + var calculationsForTargetProbability1 = new DuneLocationCalculationsForTargetProbability(0.1); + var calculationsForTargetProbability2 = new DuneLocationCalculationsForTargetProbability(0.01); + var calculationsForTargetProbability3 = new DuneLocationCalculationsForTargetProbability(0.001); var calculationsForTargetProbabilities = new ObservableList { Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs =================================================================== diff -u -re2fad5b2b37e27385650e123af4d1d7f374b8aba -r9453b0efd19b36bd38b1bc4e79e4c29923965fce --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs (.../DuneLocationCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs) (revision e2fad5b2b37e27385650e123af4d1d7f374b8aba) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs (.../DuneLocationCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs) (revision 9453b0efd19b36bd38b1bc4e79e4c29923965fce) @@ -115,10 +115,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var context = new DuneLocationCalculationsForUserDefinedTargetProbabilityContext(new DuneLocationCalculationsForTargetProbability - { - TargetProbability = 0.01 - }, + var context = new DuneLocationCalculationsForUserDefinedTargetProbabilityContext(new DuneLocationCalculationsForTargetProbability(0.01), new DuneErosionFailureMechanism(), assessmentSection); @@ -175,8 +172,8 @@ mocks.ReplayAll(); - var calculationForFirstTargetProbability = new DuneLocationCalculationsForTargetProbability(); - var calculationForSecondTargetProbability = new DuneLocationCalculationsForTargetProbability(); + var calculationForFirstTargetProbability = new DuneLocationCalculationsForTargetProbability(0.1); + var calculationForSecondTargetProbability = new DuneLocationCalculationsForTargetProbability(0.01); var calculations = new ObservableList { calculationForFirstTargetProbability, @@ -208,7 +205,7 @@ using (var treeViewControl = new TreeViewControl()) { IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); - var context = new DuneLocationCalculationsForUserDefinedTargetProbabilityContext(new DuneLocationCalculationsForTargetProbability(), + var context = new DuneLocationCalculationsForUserDefinedTargetProbabilityContext(new DuneLocationCalculationsForTargetProbability(0.1), new DuneErosionFailureMechanism(), assessmentSection); @@ -252,7 +249,7 @@ var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); var nodeData = new DuneLocationCalculationsForUserDefinedTargetProbabilityContext( - new DuneLocationCalculationsForTargetProbability(), + new DuneLocationCalculationsForTargetProbability(0.1), new DuneErosionFailureMechanism(), assessmentSection); @@ -292,7 +289,7 @@ { IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mocks, "invalidFilePath"); - var context = new DuneLocationCalculationsForUserDefinedTargetProbabilityContext(new DuneLocationCalculationsForTargetProbability(), + var context = new DuneLocationCalculationsForUserDefinedTargetProbabilityContext(new DuneLocationCalculationsForTargetProbability(0.1), new DuneErosionFailureMechanism(), assessmentSection); @@ -333,7 +330,7 @@ var assessmentSection = mocks.Stub(); assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); - var context = new DuneLocationCalculationsForUserDefinedTargetProbabilityContext(new DuneLocationCalculationsForTargetProbability(), + var context = new DuneLocationCalculationsForUserDefinedTargetProbabilityContext(new DuneLocationCalculationsForTargetProbability(0.1), new DuneErosionFailureMechanism(), assessmentSection); @@ -369,9 +366,8 @@ using (var treeViewControl = new TreeViewControl()) { - var duneLocationCalculationsForTargetProbability = new DuneLocationCalculationsForTargetProbability + var duneLocationCalculationsForTargetProbability = new DuneLocationCalculationsForTargetProbability(0.01) { - TargetProbability = 0.01, DuneLocationCalculations = { new DuneLocationCalculation(new DuneLocation(1300001, locationName1, new Point2D(0, 0), new DuneLocation.ConstructionProperties @@ -475,9 +471,8 @@ public void PerformDuneLocationCalculationsFromContextMenu_HydraulicBoundaryDatabaseWithCanUsePreprocessorFalse_SendsRightInputToCalculationService() { // Setup - var duneLocationCalculationsForTargetProbability = new DuneLocationCalculationsForTargetProbability + var duneLocationCalculationsForTargetProbability = new DuneLocationCalculationsForTargetProbability(0.01) { - TargetProbability = 0.01, DuneLocationCalculations = { new DuneLocationCalculation(new DuneLocation(1300001, "A", new Point2D(0, 0), new DuneLocation.ConstructionProperties @@ -559,9 +554,8 @@ // Setup string preprocessorDirectory = TestHelper.GetScratchPadPath(); - var duneLocationCalculationsForTargetProbability = new DuneLocationCalculationsForTargetProbability + var duneLocationCalculationsForTargetProbability = new DuneLocationCalculationsForTargetProbability(0.01) { - TargetProbability = 0.01, DuneLocationCalculations = { new DuneLocationCalculation(new DuneLocation(1300001, "A", new Point2D(0, 0), new DuneLocation.ConstructionProperties @@ -648,9 +642,8 @@ public void PerformDuneLocationCalculationsFromContextMenu_HydraulicBoundaryDatabaseWithUsePreprocessorFalse_SendsRightInputToCalculationService() { // Setup - var duneLocationCalculationsForTargetProbability = new DuneLocationCalculationsForTargetProbability + var duneLocationCalculationsForTargetProbability = new DuneLocationCalculationsForTargetProbability(0.01) { - TargetProbability = 0.01, DuneLocationCalculations = { new DuneLocationCalculation(new DuneLocation(1300001, "A", new Point2D(0, 0), new DuneLocation.ConstructionProperties Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/ViewInfos/DuneLocationCalculationsViewInfoTest.cs =================================================================== diff -u -ra228fa87c173763ac0593adc031c0bbf1499bcc2 -r9453b0efd19b36bd38b1bc4e79e4c29923965fce --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/ViewInfos/DuneLocationCalculationsViewInfoTest.cs (.../DuneLocationCalculationsViewInfoTest.cs) (revision a228fa87c173763ac0593adc031c0bbf1499bcc2) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/ViewInfos/DuneLocationCalculationsViewInfoTest.cs (.../DuneLocationCalculationsViewInfoTest.cs) (revision 9453b0efd19b36bd38b1bc4e79e4c29923965fce) @@ -51,10 +51,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var context = new DuneLocationCalculationsForUserDefinedTargetProbabilityContext(new DuneLocationCalculationsForTargetProbability - { - TargetProbability = 0.01 - }, + var context = new DuneLocationCalculationsForUserDefinedTargetProbabilityContext(new DuneLocationCalculationsForTargetProbability(0.01), new DuneErosionFailureMechanism(), assessmentSection); @@ -127,7 +124,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var context = new DuneLocationCalculationsForUserDefinedTargetProbabilityContext(new DuneLocationCalculationsForTargetProbability(), + var context = new DuneLocationCalculationsForUserDefinedTargetProbabilityContext(new DuneLocationCalculationsForTargetProbability(0.1), new DuneErosionFailureMechanism(), assessmentSection); @@ -157,7 +154,7 @@ mocks.ReplayAll(); var failureMechanism = new DuneErosionFailureMechanism(); - var context = new DuneLocationCalculationsForUserDefinedTargetProbabilityContext(new DuneLocationCalculationsForTargetProbability(), + var context = new DuneLocationCalculationsForUserDefinedTargetProbabilityContext(new DuneLocationCalculationsForTargetProbability(0.1), failureMechanism, assessmentSection); @@ -193,7 +190,7 @@ mocks.ReplayAll(); var failureMechanism = new DuneErosionFailureMechanism(); - var data = new DuneLocationCalculationsForUserDefinedTargetProbabilityContext(new DuneLocationCalculationsForTargetProbability(), + var data = new DuneLocationCalculationsForUserDefinedTargetProbabilityContext(new DuneLocationCalculationsForTargetProbability(0.1), failureMechanism, assessmentSection); Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Service.Test/DuneErosionDataSynchronizationServiceTest.cs =================================================================== diff -u -rda7b7a01f44d2440b564e71ace0b1d6bd3a39f74 -r9453b0efd19b36bd38b1bc4e79e4c29923965fce --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Service.Test/DuneErosionDataSynchronizationServiceTest.cs (.../DuneErosionDataSynchronizationServiceTest.cs) (revision da7b7a01f44d2440b564e71ace0b1d6bd3a39f74) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Service.Test/DuneErosionDataSynchronizationServiceTest.cs (.../DuneErosionDataSynchronizationServiceTest.cs) (revision 9453b0efd19b36bd38b1bc4e79e4c29923965fce) @@ -166,7 +166,7 @@ public void SetDuneLocations_DuneLocationsMatchNameNotAccordingFormat_DuneLocationNotAddedLogMessage(double offset) { // Setup - string locationName = $"Location_{offset}"; + var locationName = $"Location_{offset}"; var failureMechanism = new DuneErosionFailureMechanism(); var readDuneLocation = new ReadDuneLocation("dune location 1", new Point2D(1.0, 5.3), 8, offset, 2.2, 3.3); @@ -237,8 +237,8 @@ new TestDuneLocation() }; - var duneLocationCalculationsForTargetProbability1 = new DuneLocationCalculationsForTargetProbability(); - var duneLocationCalculationsForTargetProbability2 = new DuneLocationCalculationsForTargetProbability(); + var duneLocationCalculationsForTargetProbability1 = new DuneLocationCalculationsForTargetProbability(0.1); + var duneLocationCalculationsForTargetProbability2 = new DuneLocationCalculationsForTargetProbability(0.01); var failureMechanism = new DuneErosionFailureMechanism { Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Service.Test/DuneLocationCalculationActivityFactoryTest.cs =================================================================== diff -u -r726845a5b3a4c2682e60fc5bc4c658754704a8a6 -r9453b0efd19b36bd38b1bc4e79e4c29923965fce --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Service.Test/DuneLocationCalculationActivityFactoryTest.cs (.../DuneLocationCalculationActivityFactoryTest.cs) (revision 726845a5b3a4c2682e60fc5bc4c658754704a8a6) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Service.Test/DuneLocationCalculationActivityFactoryTest.cs (.../DuneLocationCalculationActivityFactoryTest.cs) (revision 9453b0efd19b36bd38b1bc4e79e4c29923965fce) @@ -154,16 +154,9 @@ // Setup AssessmentSectionStub assessmentSection = CreateAssessmentSection(usePreprocessor); - var duneLocationCalculationsForTargetProbability1 = new DuneLocationCalculationsForTargetProbability - { - TargetProbability = 0.1 - }; + var duneLocationCalculationsForTargetProbability1 = new DuneLocationCalculationsForTargetProbability(0.1); + var duneLocationCalculationsForTargetProbability2 = new DuneLocationCalculationsForTargetProbability(0.01); - var duneLocationCalculationsForTargetProbability2 = new DuneLocationCalculationsForTargetProbability - { - TargetProbability = 0.01 - }; - var failureMechanism = new DuneErosionFailureMechanism { DuneLocationCalculationsForUserDefinedTargetProbabilities = @@ -268,7 +261,7 @@ } } - string expectedLogMessage = $"Hydraulische belastingen berekenen voor locatie '{locationName}' ({calculationIdentifier}) is gestart."; + var expectedLogMessage = $"Hydraulische belastingen berekenen voor locatie '{locationName}' ({calculationIdentifier}) is gestart."; TestHelper.AssertLogMessageIsGenerated(Call, expectedLogMessage); DunesBoundaryConditionsCalculationInput dunesBoundaryConditionsCalculationInput = calculator.ReceivedInputs.Last(); Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs =================================================================== diff -u -r9b48ccdd1f5893bd5951d2eefa2a0d643d853b32 -r9453b0efd19b36bd38b1bc4e79e4c29923965fce --- Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs (.../AssessmentSectionCalculationActivityFactoryTest.cs) (revision 9b48ccdd1f5893bd5951d2eefa2a0d643d853b32) +++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs (.../AssessmentSectionCalculationActivityFactoryTest.cs) (revision 9453b0efd19b36bd38b1bc4e79e4c29923965fce) @@ -454,7 +454,7 @@ private static void AddDuneLocationCalculation(AssessmentSection assessmentSection) { assessmentSection.DuneErosion.DuneLocationCalculationsForUserDefinedTargetProbabilities.Add( - new DuneLocationCalculationsForTargetProbability()); + new DuneLocationCalculationsForTargetProbability(0.1)); assessmentSection.DuneErosion.SetDuneLocations(new[] { Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs =================================================================== diff -u -r9b48ccdd1f5893bd5951d2eefa2a0d643d853b32 -r9453b0efd19b36bd38b1bc4e79e4c29923965fce --- Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs (.../RiskeerDataSynchronizationServiceTest.cs) (revision 9b48ccdd1f5893bd5951d2eefa2a0d643d853b32) +++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs (.../RiskeerDataSynchronizationServiceTest.cs) (revision 9453b0efd19b36bd38b1bc4e79e4c29923965fce) @@ -471,8 +471,8 @@ DuneErosionFailureMechanism duneErosionFailureMechanism = assessmentSection.DuneErosion; - var duneLocationCalculationsForTargetProbability1 = new DuneLocationCalculationsForTargetProbability(); - var duneLocationCalculationsForTargetProbability2 = new DuneLocationCalculationsForTargetProbability(); + var duneLocationCalculationsForTargetProbability1 = new DuneLocationCalculationsForTargetProbability(0.1); + var duneLocationCalculationsForTargetProbability2 = new DuneLocationCalculationsForTargetProbability(0.01); duneErosionFailureMechanism.DuneLocationCalculationsForUserDefinedTargetProbabilities.AddRange(new[] { @@ -1861,24 +1861,7 @@ yield return sectionResult; } } - - private static void ConfigureDuneErosionFailureMechanism(DuneErosionFailureMechanism failureMechanism, bool hasOutput) - { - failureMechanism.SetDuneLocations(new[] - { - new TestDuneLocation() - }); - - if (hasOutput) - { - failureMechanism.CalculationsForMechanismSpecificFactorizedSignalingNorm.First().Output = new TestDuneLocationCalculationOutput(); - failureMechanism.CalculationsForMechanismSpecificSignalingNorm.First().Output = new TestDuneLocationCalculationOutput(); - failureMechanism.CalculationsForMechanismSpecificLowerLimitNorm.First().Output = new TestDuneLocationCalculationOutput(); - failureMechanism.CalculationsForLowerLimitNorm.First().Output = new TestDuneLocationCalculationOutput(); - failureMechanism.CalculationsForFactorizedLowerLimitNorm.First().Output = new TestDuneLocationCalculationOutput(); - } - } - + private static IAssessmentSection GetConfiguredAssessmentSectionWithHydraulicBoundaryLocationCalculations() { var assessmentSection = new AssessmentSectionStub(); Index: Riskeer/Integration/test/Riskeer.Integration.TestUtil/TestDataGenerator.cs =================================================================== diff -u -r9b48ccdd1f5893bd5951d2eefa2a0d643d853b32 -r9453b0efd19b36bd38b1bc4e79e4c29923965fce --- Riskeer/Integration/test/Riskeer.Integration.TestUtil/TestDataGenerator.cs (.../TestDataGenerator.cs) (revision 9b48ccdd1f5893bd5951d2eefa2a0d643d853b32) +++ Riskeer/Integration/test/Riskeer.Integration.TestUtil/TestDataGenerator.cs (.../TestDataGenerator.cs) (revision 9453b0efd19b36bd38b1bc4e79e4c29923965fce) @@ -937,7 +937,7 @@ private static void SetFullyConfiguredFailureMechanism(DuneErosionFailureMechanism failureMechanism) { - var calculationsForTargetProbability = new DuneLocationCalculationsForTargetProbability(); + var calculationsForTargetProbability = new DuneLocationCalculationsForTargetProbability(0.1); failureMechanism.DuneLocationCalculationsForUserDefinedTargetProbabilities.Add(calculationsForTargetProbability);