Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs =================================================================== diff -u -r5d85231b68fed820235a1ac76e937d8527acf5ca -rdae940b791df05e36b3c51339c75ceb156c1b19d --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs (.../AssessmentSectionTreeNodeInfoTest.cs) (revision 5d85231b68fed820235a1ac76e937d8527acf5ca) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs (.../AssessmentSectionTreeNodeInfoTest.cs) (revision dae940b791df05e36b3c51339c75ceb156c1b19d) @@ -549,9 +549,8 @@ calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(Arg.Is.NotNull)) .WhenCalled(invocation => { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(hydraulicBoundaryDatabaseFilePath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); + HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings( + expectedCalculationSettings, (HydraRingCalculationSettings) invocation.Arguments[0]); }) .Return(new TestWaveHeightCalculator()).Repeat.Times(4); @@ -567,9 +566,8 @@ calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Arg.Is.NotNull)) .WhenCalled(invocation => { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(hydraulicBoundaryDatabaseFilePath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); + HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings( + expectedCalculationSettings, (HydraRingCalculationSettings) invocation.Arguments[0]); }) .Return(new TestWaveConditionsCosineCalculator()).Repeat.Times(9); @@ -583,18 +581,16 @@ calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(Arg.Is.NotNull)) .WhenCalled(invocation => { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(hydraulicBoundaryDatabaseFilePath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); + HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings( + expectedCalculationSettings, (HydraRingCalculationSettings) invocation.Arguments[0]); }) .Return(new TestWaveHeightCalculator()).Repeat.Times(3); calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Arg.Is.NotNull)) .WhenCalled(invocation => { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(hydraulicBoundaryDatabaseFilePath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); + HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings( + expectedCalculationSettings, (HydraRingCalculationSettings) invocation.Arguments[0]); }) .Return(new TestWaveConditionsCosineCalculator()).Repeat.Times(3); @@ -631,9 +627,8 @@ calculatorFactory.Expect(cf => cf.CreateDunesBoundaryConditionsCalculator(Arg.Is.NotNull)) .WhenCalled(invocation => { - var hydraRingCalculationSettings = (HydraRingCalculationSettings) invocation.Arguments[0]; - HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(expectedCalculationSettings, - hydraRingCalculationSettings); + HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings( + expectedCalculationSettings, (HydraRingCalculationSettings) invocation.Arguments[0]); }) .Return(new TestDunesBoundaryConditionsCalculator()).Repeat.Times(5); }