Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs =================================================================== diff -u -re061d0d6f267605ae280fe036d8096cfc5448194 -r0f980b031fc6a5d44beed5dfedd59bc3abf58452 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs (.../AssessmentSectionTreeNodeInfoTest.cs) (revision e061d0d6f267605ae280fe036d8096cfc5448194) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs (.../AssessmentSectionTreeNodeInfoTest.cs) (revision 0f980b031fc6a5d44beed5dfedd59bc3abf58452) @@ -27,6 +27,7 @@ using System.Windows.Forms; using Core.Common.Base; using Core.Common.Base.Data; +using Core.Common.Base.Geometry; using Core.Common.Controls.TreeView; using Core.Common.Gui; using Core.Common.Gui.ContextMenu; @@ -65,8 +66,11 @@ using Riskeer.MacroStabilityInwards.Forms.PresentationObjects; using Riskeer.MacroStabilityInwards.KernelWrapper.Calculators; using Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Calculators; -using Riskeer.Piping.Data; +using Riskeer.Piping.Data.Probabilistic; +using Riskeer.Piping.Data.SemiProbabilistic; using Riskeer.Piping.Data.TestUtil; +using Riskeer.Piping.Data.TestUtil.Probabilistic; +using Riskeer.Piping.Data.TestUtil.SemiProbabilistic; using Riskeer.Piping.Forms.PresentationObjects; using Riskeer.Piping.KernelWrapper.SubCalculator; using Riskeer.Piping.KernelWrapper.TestUtil.SubCalculator; @@ -521,8 +525,18 @@ assessmentSection.SetHydraulicBoundaryLocationCalculations(hydraulicBoundaryLocations); assessmentSection.GrassCoverErosionOutwards.SetHydraulicBoundaryLocationCalculations(hydraulicBoundaryLocations); + assessmentSection.Piping.SetSections(new[] + { + new FailureMechanismSection("Section", new[] + { + new Point2D(0.0, 0.0), + new Point2D(5.0, 0.0) + }) + }, "path/to/sections"); + AddGrassCoverErosionInwardsCalculation(assessmentSection, hydraulicBoundaryLocation); - AddPipingCalculationScenario(assessmentSection, hydraulicBoundaryLocation); + AddSemiProbabilisticPipingCalculationScenario(assessmentSection, hydraulicBoundaryLocation); + AddProbabilisticPipingCalculationScenario(assessmentSection, hydraulicBoundaryLocation); AddMacroStabilityInwardsCalculationScenario(assessmentSection, hydraulicBoundaryLocation); AddStabilityStoneCoverCalculation(assessmentSection, hydraulicBoundaryLocation); AddWaveImpactAsphaltCoverCalculation(assessmentSection, hydraulicBoundaryLocation); @@ -548,6 +562,7 @@ { DesignWaterLevel = 2.0 }).Repeat.Times(4); + calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(Arg.Is.NotNull)) .WhenCalled(invocation => { @@ -556,13 +571,21 @@ }) .Return(new TestWaveHeightCalculator()).Repeat.Times(4); + calculatorFactory.Expect(cf => cf.CreatePipingCalculator(Arg.Is.NotNull)) + .WhenCalled(invocation => + { + HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings( + expectedCalculationSettings, (HydraRingCalculationSettings) invocation.Arguments[0]); + }) + .Return(new TestPipingCalculator()).Repeat.Twice(); + calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(Arg.Is.NotNull)) .WhenCalled(invocation => { HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings( expectedCalculationSettings, (HydraRingCalculationSettings) invocation.Arguments[0]); }) - .Return(new TestOvertoppingCalculator()); + .Return(new TestOvertoppingCalculator()).Repeat.Once(); calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Arg.Is.NotNull)) .WhenCalled(invocation => @@ -579,6 +602,7 @@ expectedCalculationSettings, (HydraRingCalculationSettings) invocation.Arguments[0]); }) .Return(new TestDesignWaterLevelCalculator()).Repeat.Times(3); + calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(Arg.Is.NotNull)) .WhenCalled(invocation => { @@ -602,7 +626,7 @@ HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings( expectedCalculationSettings, (HydraRingCalculationSettings) invocation.Arguments[0]); }) - .Return(new TestStructuresCalculator()); + .Return(new TestStructuresCalculator()).Repeat.Once(); calculatorFactory.Expect(cf => cf.CreateStructuresCalculator( Arg.Is.NotNull)) @@ -611,7 +635,7 @@ HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings( expectedCalculationSettings, (HydraRingCalculationSettings) invocation.Arguments[0]); }) - .Return(new TestStructuresCalculator()); + .Return(new TestStructuresCalculator()).Repeat.Once(); calculatorFactory.Expect(cf => cf.CreateStructuresCalculator( Arg.Is.NotNull)) @@ -620,7 +644,7 @@ HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings( expectedCalculationSettings, (HydraRingCalculationSettings) invocation.Arguments[0]); }) - .Return(new TestStructuresCalculator()); + .Return(new TestStructuresCalculator()).Repeat.Once(); calculatorFactory.Expect(cf => cf.CreateDunesBoundaryConditionsCalculator(Arg.Is.NotNull)) .WhenCalled(invocation => @@ -672,6 +696,52 @@ } } + [Test] + public void GivenPipingCalculationOfUnsupportedType_WhenCalculatingAllFromContextMenu_ThenThrowsNotSupportedException() + { + // Given + string hydraulicBoundaryDatabaseFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); + var assessmentSection = new AssessmentSection(AssessmentSectionComposition.DikeAndDune) + { + HydraulicBoundaryDatabase = + { + FilePath = hydraulicBoundaryDatabaseFilePath + } + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(assessmentSection.HydraulicBoundaryDatabase); + + assessmentSection.Piping.CalculationsGroup.Children.Add(new TestPipingCalculationScenario()); + + using (var treeViewControl = new TreeViewControl()) + { + var gui = mocks.Stub(); + gui.Stub(g => g.MainWindow).Return(mocks.Stub()); + gui.Stub(g => g.ProjectOpened += null).IgnoreArguments(); + gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); + gui.Stub(cmp => cmp.Get(assessmentSection, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); + gui.Stub(g => g.DocumentViewController).Return(mocks.Stub()); + + mocks.ReplayAll(); + + using (var plugin = new RiskeerPlugin()) + { + TreeNodeInfo info = GetInfo(plugin); + plugin.Gui = gui; + + using (ContextMenuStrip contextMenuAdapter = info.ContextMenuStrip(assessmentSection, null, treeViewControl)) + { + // When + void Call() => contextMenuAdapter.Items[contextMenuCalculateAllIndex].PerformClick(); + + // Then + Assert.Throws(Call); + } + } + + mocks.VerifyAll(); + } + } + private TreeNodeInfo GetInfo(RiskeerPlugin plugin) { return plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(AssessmentSection)); @@ -690,15 +760,25 @@ }); } - private static void AddPipingCalculationScenario(AssessmentSection assessmentSection, - HydraulicBoundaryLocation hydraulicBoundaryLocation) + private static void AddSemiProbabilisticPipingCalculationScenario(AssessmentSection assessmentSection, + HydraulicBoundaryLocation hydraulicBoundaryLocation) { - PipingCalculationScenario pipingCalculationScenario = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation); + var pipingCalculationScenario = + SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput( + hydraulicBoundaryLocation); pipingCalculationScenario.InputParameters.UseAssessmentLevelManualInput = true; pipingCalculationScenario.InputParameters.AssessmentLevel = new Random(39).NextRoundedDouble(); assessmentSection.Piping.CalculationsGroup.Children.Add(pipingCalculationScenario); } + private static void AddProbabilisticPipingCalculationScenario(AssessmentSection assessmentSection, + HydraulicBoundaryLocation hydraulicBoundaryLocation) + { + assessmentSection.Piping.CalculationsGroup.Children.Add( + ProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput( + hydraulicBoundaryLocation)); + } + private static void AddMacroStabilityInwardsCalculationScenario(AssessmentSection assessmentSection, HydraulicBoundaryLocation hydraulicBoundaryLocation) { Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs =================================================================== diff -u -re061d0d6f267605ae280fe036d8096cfc5448194 -r0f980b031fc6a5d44beed5dfedd59bc3abf58452 --- Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs (.../AssessmentSectionCalculationActivityFactoryTest.cs) (revision e061d0d6f267605ae280fe036d8096cfc5448194) +++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs (.../AssessmentSectionCalculationActivityFactoryTest.cs) (revision 0f980b031fc6a5d44beed5dfedd59bc3abf58452) @@ -48,8 +48,9 @@ using Riskeer.MacroStabilityInwards.Data.TestUtil; using Riskeer.MacroStabilityInwards.KernelWrapper.Calculators; using Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Calculators; -using Riskeer.Piping.Data; +using Riskeer.Piping.Data.SemiProbabilistic; using Riskeer.Piping.Data.TestUtil; +using Riskeer.Piping.Data.TestUtil.SemiProbabilistic; using Riskeer.Piping.KernelWrapper.SubCalculator; using Riskeer.Piping.KernelWrapper.TestUtil.SubCalculator; using Riskeer.StabilityPointStructures.Data.TestUtil; @@ -89,7 +90,7 @@ assessmentSection.GrassCoverErosionOutwards.SetHydraulicBoundaryLocationCalculations(hydraulicBoundaryLocations); AddGrassCoverErosionInwardsCalculation(assessmentSection, hydraulicBoundaryLocation); - AddPipingCalculationScenario(assessmentSection, hydraulicBoundaryLocation); + AddSemiProbabilisticPipingCalculationScenario(assessmentSection, hydraulicBoundaryLocation); AddMacroStabilityInwardsCalculationScenario(assessmentSection, hydraulicBoundaryLocation); AddStabilityStoneCoverCalculation(assessmentSection, hydraulicBoundaryLocation); AddWaveImpactAsphaltCoverCalculation(assessmentSection, hydraulicBoundaryLocation); @@ -253,7 +254,7 @@ private static IEnumerable GetFailureMechanismTestCases() { yield return new TestCaseData(new Action(section => section.Piping.IsRelevant = false), - new Action(section => AddPipingCalculationScenario(section, new TestHydraulicBoundaryLocation()))) + new Action(section => AddSemiProbabilisticPipingCalculationScenario(section, new TestHydraulicBoundaryLocation()))) .SetName("Piping"); yield return new TestCaseData(new Action(section => section.GrassCoverErosionInwards.IsRelevant = false), new Action(section => AddGrassCoverErosionInwardsCalculation(section, new TestHydraulicBoundaryLocation()))) @@ -311,10 +312,12 @@ }); } - private static void AddPipingCalculationScenario(AssessmentSection assessmentSection, - HydraulicBoundaryLocation hydraulicBoundaryLocation) + private static void AddSemiProbabilisticPipingCalculationScenario(AssessmentSection assessmentSection, + HydraulicBoundaryLocation hydraulicBoundaryLocation) { - PipingCalculationScenario pipingCalculationScenario = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation); + var pipingCalculationScenario = + SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput( + hydraulicBoundaryLocation); pipingCalculationScenario.InputParameters.UseAssessmentLevelManualInput = true; pipingCalculationScenario.InputParameters.AssessmentLevel = new Random(39).NextRoundedDouble(); assessmentSection.Piping.CalculationsGroup.Children.Add(pipingCalculationScenario); Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs =================================================================== diff -u -r527392890a626324db9ef8d31ca42c94fe7f4125 -r0f980b031fc6a5d44beed5dfedd59bc3abf58452 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs (.../MacroStabilityInwardsInputContextPropertiesTest.cs) (revision 527392890a626324db9ef8d31ca42c94fe7f4125) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs (.../MacroStabilityInwardsInputContextPropertiesTest.cs) (revision 0f980b031fc6a5d44beed5dfedd59bc3abf58452) @@ -98,11 +98,11 @@ var handler = mocks.Stub(); mocks.ReplayAll(); - var calculationItem = new MacroStabilityInwardsCalculationScenario(); + var calculation = new MacroStabilityInwardsCalculationScenario(); var failureMechanism = new MacroStabilityInwardsFailureMechanism(); - var context = new MacroStabilityInwardsInputContext(calculationItem.InputParameters, - calculationItem, + var context = new MacroStabilityInwardsInputContext(calculation.InputParameters, + calculation, Enumerable.Empty(), Enumerable.Empty(), failureMechanism, @@ -125,11 +125,11 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var calculationItem = new MacroStabilityInwardsCalculationScenario(); + var calculation = new MacroStabilityInwardsCalculationScenario(); var failureMechanism = new MacroStabilityInwardsFailureMechanism(); - var context = new MacroStabilityInwardsInputContext(calculationItem.InputParameters, - calculationItem, + var context = new MacroStabilityInwardsInputContext(calculation.InputParameters, + calculation, Enumerable.Empty(), Enumerable.Empty(), failureMechanism, @@ -154,11 +154,11 @@ var handler = mocks.Stub(); mocks.ReplayAll(); - var calculationItem = new MacroStabilityInwardsCalculationScenario(); + var calculation = new MacroStabilityInwardsCalculationScenario(); var failureMechanism = new MacroStabilityInwardsFailureMechanism(); - var context = new MacroStabilityInwardsInputContext(calculationItem.InputParameters, - calculationItem, + var context = new MacroStabilityInwardsInputContext(calculation.InputParameters, + calculation, Enumerable.Empty(), Enumerable.Empty(), failureMechanism, @@ -184,17 +184,17 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var calculationItem = new MacroStabilityInwardsCalculationScenario(); + var calculation = new MacroStabilityInwardsCalculationScenario(); var failureMechanism = new MacroStabilityInwardsFailureMechanism(); - var context = new MacroStabilityInwardsInputContext(calculationItem.InputParameters, - calculationItem, + var context = new MacroStabilityInwardsInputContext(calculation.InputParameters, + calculation, Enumerable.Empty(), Enumerable.Empty(), failureMechanism, assessmentSection); - var handler = new ObservablePropertyChangeHandler(calculationItem, calculationItem.InputParameters); + var handler = new ObservablePropertyChangeHandler(calculation, calculation.InputParameters); // Call var properties = new MacroStabilityInwardsInputContextProperties(context, @@ -329,17 +329,17 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var calculationItem = new MacroStabilityInwardsCalculationScenario(); + var calculation = new MacroStabilityInwardsCalculationScenario(); var failureMechanism = new MacroStabilityInwardsFailureMechanism(); - var context = new MacroStabilityInwardsInputContext(calculationItem.InputParameters, - calculationItem, + var context = new MacroStabilityInwardsInputContext(calculation.InputParameters, + calculation, Enumerable.Empty(), Enumerable.Empty(), failureMechanism, assessmentSection); - var handler = new ObservablePropertyChangeHandler(calculationItem, calculationItem.InputParameters); + var handler = new ObservablePropertyChangeHandler(calculation, calculation.InputParameters); // Call var properties = new MacroStabilityInwardsInputContextProperties(context, @@ -420,7 +420,7 @@ HydraulicBoundaryLocation hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); - var calculationItem = new MacroStabilityInwardsCalculationScenario + var calculation = new MacroStabilityInwardsCalculationScenario { InputParameters = { @@ -432,11 +432,11 @@ StochasticSoilProfile = stochasticSoilProfile } }; - MacroStabilityInwardsInput inputParameters = calculationItem.InputParameters; + MacroStabilityInwardsInput inputParameters = calculation.InputParameters; var failureMechanism = new MacroStabilityInwardsFailureMechanism(); var context = new MacroStabilityInwardsInputContext(inputParameters, - calculationItem, + calculation, Enumerable.Empty(), Enumerable.Empty(), failureMechanism, @@ -492,19 +492,19 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var calculationItem = new MacroStabilityInwardsCalculationScenario(); + var calculation = new MacroStabilityInwardsCalculationScenario(); var failureMechanism = new MacroStabilityInwardsFailureMechanism(); - MacroStabilityInwardsInput inputParameters = calculationItem.InputParameters; + MacroStabilityInwardsInput inputParameters = calculation.InputParameters; var context = new MacroStabilityInwardsInputContext(inputParameters, - calculationItem, + calculation, Enumerable.Empty(), Enumerable.Empty(), failureMechanism, assessmentSection); - var handler = new ObservablePropertyChangeHandler(calculationItem, calculationItem.InputParameters); + var handler = new ObservablePropertyChangeHandler(calculation, calculation.InputParameters); var properties = new MacroStabilityInwardsInputContextProperties(context, AssessmentSectionTestHelper.GetTestAssessmentLevel, handler); @@ -660,7 +660,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var calculationItem = new MacroStabilityInwardsCalculationScenario + var calculation = new MacroStabilityInwardsCalculationScenario { InputParameters = { @@ -669,10 +669,10 @@ }; var failureMechanism = new MacroStabilityInwardsFailureMechanism(); - MacroStabilityInwardsInput inputParameters = calculationItem.InputParameters; + MacroStabilityInwardsInput inputParameters = calculation.InputParameters; var context = new MacroStabilityInwardsInputContext(inputParameters, - calculationItem, + calculation, Enumerable.Empty(), Enumerable.Empty(), failureMechanism, @@ -716,7 +716,7 @@ stochasticSoilProfile }); - var calculationItem = new MacroStabilityInwardsCalculationScenario + var calculation = new MacroStabilityInwardsCalculationScenario { InputParameters = { @@ -726,10 +726,10 @@ } }; var failureMechanism = new MacroStabilityInwardsFailureMechanism(); - MacroStabilityInwardsInput inputParameters = calculationItem.InputParameters; + MacroStabilityInwardsInput inputParameters = calculation.InputParameters; var context = new MacroStabilityInwardsInputContext(inputParameters, - calculationItem, + calculation, Enumerable.Empty(), new[] { @@ -767,7 +767,7 @@ { stochasticSoilProfile }); - var calculationItem = new MacroStabilityInwardsCalculationScenario + var calculation = new MacroStabilityInwardsCalculationScenario { InputParameters = { @@ -777,11 +777,11 @@ } }; - MacroStabilityInwardsInput inputParameters = calculationItem.InputParameters; + MacroStabilityInwardsInput inputParameters = calculation.InputParameters; var failureMechanism = new MacroStabilityInwardsFailureMechanism(); var context = new MacroStabilityInwardsInputContext(inputParameters, - calculationItem, + calculation, Enumerable.Empty(), new[] { @@ -836,7 +836,7 @@ stochasticSoilProfile2 }); - var calculationItem = new MacroStabilityInwardsCalculationScenario + var calculation = new MacroStabilityInwardsCalculationScenario { InputParameters = { @@ -847,10 +847,10 @@ }; var failureMechanism = new MacroStabilityInwardsFailureMechanism(); - MacroStabilityInwardsInput inputParameters = calculationItem.InputParameters; + MacroStabilityInwardsInput inputParameters = calculation.InputParameters; var context = new MacroStabilityInwardsInputContext(inputParameters, - calculationItem, + calculation, Enumerable.Empty(), Enumerable.Empty(), failureMechanism, Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaterStressesPropertiesTest.cs =================================================================== diff -u -r527392890a626324db9ef8d31ca42c94fe7f4125 -r0f980b031fc6a5d44beed5dfedd59bc3abf58452 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaterStressesPropertiesTest.cs (.../MacroStabilityInwardsWaterStressesPropertiesTest.cs) (revision 527392890a626324db9ef8d31ca42c94fe7f4125) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaterStressesPropertiesTest.cs (.../MacroStabilityInwardsWaterStressesPropertiesTest.cs) (revision 0f980b031fc6a5d44beed5dfedd59bc3abf58452) @@ -311,10 +311,10 @@ public void GivenPropertiesWithData_WhenChangingProperties_ThenPropertiesSetOnInput() { // Given - var calculationItem = new MacroStabilityInwardsCalculationScenario(); - MacroStabilityInwardsInput input = calculationItem.InputParameters; + var calculation = new MacroStabilityInwardsCalculationScenario(); + MacroStabilityInwardsInput input = calculation.InputParameters; - var propertyChangeHandler = new ObservablePropertyChangeHandler(calculationItem, input); + var propertyChangeHandler = new ObservablePropertyChangeHandler(calculation, input); var properties = new MacroStabilityInwardsWaterStressesProperties(input, AssessmentSectionTestHelper.GetTestAssessmentLevel(), propertyChangeHandler); Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/UpliftVan/Input/PreConsolidationStressComparer.cs =================================================================== diff -u -r1250f75d43f878e4ad35f226cea3c68f556964c2 -r0f980b031fc6a5d44beed5dfedd59bc3abf58452 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/UpliftVan/Input/PreConsolidationStressComparer.cs (.../PreConsolidationStressComparer.cs) (revision 1250f75d43f878e4ad35f226cea3c68f556964c2) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/UpliftVan/Input/PreConsolidationStressComparer.cs (.../PreConsolidationStressComparer.cs) (revision 0f980b031fc6a5d44beed5dfedd59bc3abf58452) @@ -22,37 +22,35 @@ using System; using System.Collections; using System.Collections.Generic; -using Deltares.MacroStability.Geometry; +using Deltares.MacroStability.CSharpWrapper.Input; namespace Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Kernels.UpliftVan.Input { /// - /// This class compares the coordinates of two + /// This class compares the coordinates and stress values of two /// instances to determine whether they're equal to each other or not. /// - public class PreConsolidationStressComparer : IComparer, IComparer + public class PreconsolidationStressComparer : IComparer, IComparer { public int Compare(object x, object y) { - if (!(x is PreConsolidationStress) || !(y is PreConsolidationStress)) + if (!(x is PreconsolidationStress) || !(y is PreconsolidationStress)) { - throw new ArgumentException($"Cannot compare objects other than {typeof(PreConsolidationStress)} with this comparer."); + throw new ArgumentException($"Cannot compare objects other than {typeof(PreconsolidationStress)} with this comparer."); } - return Compare((PreConsolidationStress) x, (PreConsolidationStress) y); + return Compare((PreconsolidationStress) x, (PreconsolidationStress) y); } - public int Compare(PreConsolidationStress x, PreConsolidationStress y) + public int Compare(PreconsolidationStress x, PreconsolidationStress y) { if (x.Equals(y)) { return 0; } - if (Math.Abs(x.StressValue - y.StressValue) < 1e-6 - && x.Name == y.Name - && Math.Abs(x.X - y.X) < 1e-6 - && Math.Abs(x.Z - y.Z) < 1e-6) + && Math.Abs(x.Point.X - y.Point.X) < 1e-6 + && Math.Abs(x.Point.Z - y.Point.Z) < 1e-6) { return 0; } Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs =================================================================== diff -u -rd3d4f64d32720e6ac2c582b38e4b4e07398be1ae -r0f980b031fc6a5d44beed5dfedd59bc3abf58452 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs (.../MacroStabilityInwardsCalculationServiceTest.cs) (revision d3d4f64d32720e6ac2c582b38e4b4e07398be1ae) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs (.../MacroStabilityInwardsCalculationServiceTest.cs) (revision 0f980b031fc6a5d44beed5dfedd59bc3abf58452) @@ -63,7 +63,7 @@ } [Test] - public void Validate_Always_LogStartAndEndOfValidatingInputs() + public void Validate_Always_LogsStartAndEndOfValidation() { // Setup using (new MacroStabilityInwardsCalculatorFactoryConfig()) @@ -369,7 +369,7 @@ } [Test] - public void Calculate_ValidCalculation_LogStartAndEndOfValidatingInputsAndCalculation() + public void Calculate_ValidCalculation_LogsStartAndEndOfValidationAndCalculation() { // Setup RoundedDouble normativeAssessmentLevel = AssessmentSectionTestHelper.GetTestAssessmentLevel(); Fisheye: Tag 0f980b031fc6a5d44beed5dfedd59bc3abf58452 refers to a dead (removed) revision in file `Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/UpliftVan/Input/PreconsolidationStressComparer.cs'. Fisheye: No comparison available. Pass `N' to diff?