Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs =================================================================== diff -u -r9c5748ebe48d1499c78ecb4ac2c91850cd7c4e48 -rd8ec9b8eec266efcbd1044008022bcf5171efb31 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision 9c5748ebe48d1499c78ecb4ac2c91850cd7c4e48) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision d8ec9b8eec266efcbd1044008022bcf5171efb31) @@ -784,15 +784,15 @@ assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.AddRange( new[] { - new HydraulicBoundaryLocationCalculationsForTargetProbability(), - new HydraulicBoundaryLocationCalculationsForTargetProbability() + new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1), + new HydraulicBoundaryLocationCalculationsForTargetProbability(0.01) }); assessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities.AddRange( new[] { - new HydraulicBoundaryLocationCalculationsForTargetProbability(), - new HydraulicBoundaryLocationCalculationsForTargetProbability() + new HydraulicBoundaryLocationCalculationsForTargetProbability(0.025), + new HydraulicBoundaryLocationCalculationsForTargetProbability(0.0025) }); } Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r9c5748ebe48d1499c78ecb4ac2c91850cd7c4e48 -rd8ec9b8eec266efcbd1044008022bcf5171efb31 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs (.../WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs) (revision 9c5748ebe48d1499c78ecb4ac2c91850cd7c4e48) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs (.../WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs) (revision d8ec9b8eec266efcbd1044008022bcf5171efb31) @@ -132,8 +132,8 @@ var calculations = new ObservableList { - new HydraulicBoundaryLocationCalculationsForTargetProbability(), - new HydraulicBoundaryLocationCalculationsForTargetProbability() + new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1), + new HydraulicBoundaryLocationCalculationsForTargetProbability(0.01) }; var calculationsGroupContext = new WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContext(calculations, assessmentSection); @@ -324,7 +324,7 @@ var calculations = new ObservableList { - new HydraulicBoundaryLocationCalculationsForTargetProbability() + new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1) }; var nodeData = new WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContext(calculations, assessmentSection); @@ -371,7 +371,7 @@ var calculations = new ObservableList { - new HydraulicBoundaryLocationCalculationsForTargetProbability() + new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1) }; var nodeData = new WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContext(calculations, assessmentSection); @@ -419,7 +419,7 @@ var calculations = new ObservableList { - new HydraulicBoundaryLocationCalculationsForTargetProbability() + new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1) }; var nodeData = new WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContext(calculations, assessmentSection); @@ -790,7 +790,7 @@ assessmentSectionStub); var draggedData = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext( - new HydraulicBoundaryLocationCalculationsForTargetProbability(), + new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1), assessmentSectionStub); // Call @@ -810,7 +810,7 @@ TreeNodeInfo info = GetInfo(plugin); var assessmentSectionStub = new AssessmentSectionStub(); - var calculationsForTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability(); + var calculationsForTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1); var targetData = new WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContext( new ObservableList @@ -866,7 +866,7 @@ assessmentSectionStub); var draggedData = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext( - new HydraulicBoundaryLocationCalculationsForTargetProbability(), + new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1), assessmentSectionStub); // Call @@ -886,7 +886,7 @@ TreeNodeInfo info = GetInfo(plugin); var assessmentSectionStub = new AssessmentSectionStub(); - var calculationsForTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability(); + var calculationsForTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1); var targetData = new WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContext( new ObservableList @@ -917,9 +917,9 @@ var assessmentSectionStub = new AssessmentSectionStub(); - var calculationsForTargetProbability1 = new HydraulicBoundaryLocationCalculationsForTargetProbability(); - var calculationsForTargetProbability2 = new HydraulicBoundaryLocationCalculationsForTargetProbability(); - var calculationsForTargetProbability3 = new HydraulicBoundaryLocationCalculationsForTargetProbability(); + var calculationsForTargetProbability1 = new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1); + var calculationsForTargetProbability2 = new HydraulicBoundaryLocationCalculationsForTargetProbability(0.01); + var calculationsForTargetProbability3 = new HydraulicBoundaryLocationCalculationsForTargetProbability(0.001); var calculationsForTargetProbabilities = new ObservableList { Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs =================================================================== diff -u -r7acad0fffa8ab8be61368d034b41a5bf144c03a2 -rd8ec9b8eec266efcbd1044008022bcf5171efb31 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs (.../WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs) (revision 7acad0fffa8ab8be61368d034b41a5bf144c03a2) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs (.../WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs) (revision d8ec9b8eec266efcbd1044008022bcf5171efb31) @@ -102,10 +102,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mockRepository); mockRepository.ReplayAll(); - var context = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability - { - TargetProbability = 0.01 - }, + var context = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(0.01), assessmentSection); using (var plugin = new RiskeerPlugin()) @@ -181,8 +178,8 @@ mockRepository.ReplayAll(); - var calculationForFirstTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability(); - var calculationForSecondTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability(); + var calculationForFirstTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1); + var calculationForSecondTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability(0.01); var calculations = new ObservableList { calculationForFirstTargetProbability, @@ -232,7 +229,7 @@ menuBuilder.Expect(mb => mb.Build()).Return(null); } - var nodeData = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(), + var nodeData = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1), assessmentSection); using (var treeViewControl = new TreeViewControl()) @@ -263,7 +260,7 @@ // Setup IAssessmentSection assessmentSection = new AssessmentSectionStub(); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - var nodeData = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(), + var nodeData = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1), assessmentSection); using (var treeViewControl = new TreeViewControl()) @@ -310,7 +307,7 @@ // Setup IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mockRepository); - var nodeData = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(), + var nodeData = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1), assessmentSection); using (var treeViewControl = new TreeViewControl()) @@ -349,7 +346,7 @@ // Setup IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mockRepository, "invalidFilePath"); - var nodeData = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(), + var nodeData = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1), assessmentSection); using (var treeViewControl = new TreeViewControl()) @@ -395,7 +392,7 @@ var assessmentSection = mockRepository.Stub(); assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); - var nodeData = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(), + var nodeData = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1), assessmentSection); using (var treeViewControl = new TreeViewControl()) @@ -444,7 +441,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mockRepository); - var nodeData = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability + var nodeData = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1) { HydraulicBoundaryLocationCalculations = { @@ -498,7 +495,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mockRepository, "invalidFilePath"); - var nodeData = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability + var nodeData = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1) { HydraulicBoundaryLocationCalculations = { @@ -552,7 +549,7 @@ const double targetProbability = 0.01; - var context = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability + var context = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1) { TargetProbability = targetProbability, HydraulicBoundaryLocationCalculations = @@ -637,7 +634,7 @@ var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation("locationName"); - var context = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability + var context = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1) { TargetProbability = targetProbability, HydraulicBoundaryLocationCalculations = @@ -721,7 +718,7 @@ const double targetProbability = 0.01; - var context = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability + var context = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1) { TargetProbability = targetProbability, HydraulicBoundaryLocationCalculations = @@ -797,7 +794,7 @@ var calculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation("locationName")); - var context = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability + var context = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1) { TargetProbability = 0.01, HydraulicBoundaryLocationCalculations = @@ -891,9 +888,8 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mockRepository, "invalidFilePath"); - var nodeData = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability + var nodeData = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(0.01) { - TargetProbability = 0.01, HydraulicBoundaryLocationCalculations = { calculation @@ -934,7 +930,7 @@ contextMenu.Items[contextMenuClearIllustrationPointsIndex].PerformClick(); // Then - string expectedMessage = "Weet u zeker dat u alle berekende illustratiepunten bij '1/100' wilt wissen?"; + var expectedMessage = "Weet u zeker dat u alle berekende illustratiepunten bij '1/100' wilt wissen?"; Assert.AreEqual(expectedMessage, messageBoxText); Assert.IsTrue(calculation.HasOutput); Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r9c5748ebe48d1499c78ecb4ac2c91850cd7c4e48 -rd8ec9b8eec266efcbd1044008022bcf5171efb31 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs (.../WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs) (revision 9c5748ebe48d1499c78ecb4ac2c91850cd7c4e48) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs (.../WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs) (revision d8ec9b8eec266efcbd1044008022bcf5171efb31) @@ -132,8 +132,8 @@ var calculations = new ObservableList { - new HydraulicBoundaryLocationCalculationsForTargetProbability(), - new HydraulicBoundaryLocationCalculationsForTargetProbability() + new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1), + new HydraulicBoundaryLocationCalculationsForTargetProbability(0.01) }; var calculationsGroupContext = new WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContext(calculations, assessmentSection); @@ -324,7 +324,7 @@ var calculations = new ObservableList { - new HydraulicBoundaryLocationCalculationsForTargetProbability() + new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1) }; var nodeData = new WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContext(calculations, assessmentSection); @@ -371,7 +371,7 @@ var calculations = new ObservableList { - new HydraulicBoundaryLocationCalculationsForTargetProbability() + new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1) }; var nodeData = new WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContext(calculations, assessmentSection); @@ -419,7 +419,7 @@ var calculations = new ObservableList { - new HydraulicBoundaryLocationCalculationsForTargetProbability() + new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1) }; var nodeData = new WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContext(calculations, assessmentSection); @@ -790,7 +790,7 @@ assessmentSectionStub); var draggedData = new WaveHeightCalculationsForUserDefinedTargetProbabilityContext( - new HydraulicBoundaryLocationCalculationsForTargetProbability(), + new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1), assessmentSectionStub); // Call @@ -810,7 +810,7 @@ TreeNodeInfo info = GetInfo(plugin); var assessmentSectionStub = new AssessmentSectionStub(); - var calculationsForTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability(); + var calculationsForTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1); var targetData = new WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContext( new ObservableList @@ -866,7 +866,7 @@ assessmentSectionStub); var draggedData = new WaveHeightCalculationsForUserDefinedTargetProbabilityContext( - new HydraulicBoundaryLocationCalculationsForTargetProbability(), + new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1), assessmentSectionStub); // Call @@ -886,7 +886,7 @@ TreeNodeInfo info = GetInfo(plugin); var assessmentSectionStub = new AssessmentSectionStub(); - var calculationsForTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability(); + var calculationsForTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1); var targetData = new WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContext( new ObservableList @@ -917,9 +917,9 @@ var assessmentSectionStub = new AssessmentSectionStub(); - var calculationsForTargetProbability1 = new HydraulicBoundaryLocationCalculationsForTargetProbability(); - var calculationsForTargetProbability2 = new HydraulicBoundaryLocationCalculationsForTargetProbability(); - var calculationsForTargetProbability3 = new HydraulicBoundaryLocationCalculationsForTargetProbability(); + var calculationsForTargetProbability1 = new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1); + var calculationsForTargetProbability2 = new HydraulicBoundaryLocationCalculationsForTargetProbability(0.01); + var calculationsForTargetProbability3 = new HydraulicBoundaryLocationCalculationsForTargetProbability(0.001); var calculationsForTargetProbabilities = new ObservableList {