Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs
===================================================================
diff -u -r631448b5dbf13f2c3c4e411729c9fba4e1e8cdcd -reac7f671d426fac073e5d154d020f56f45fa3669
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs)	(revision 631448b5dbf13f2c3c4e411729c9fba4e1e8cdcd)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs)	(revision eac7f671d426fac073e5d154d020f56f45fa3669)
@@ -77,8 +77,7 @@
             TestDelegate test = () => new WaveImpactAsphaltCoverWaveConditionsCalculationService().Calculate(
                 null,
                 assessmentSection,
-                failureMechanism.GeneralInput,
-                validFilePath);
+                failureMechanism.GeneralInput);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
@@ -97,8 +96,7 @@
             TestDelegate test = () => new WaveImpactAsphaltCoverWaveConditionsCalculationService().Calculate(
                 calculation,
                 null,
-                failureMechanism.GeneralInput,
-                validFilePath);
+                failureMechanism.GeneralInput);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
@@ -119,8 +117,7 @@
             TestDelegate test = () => new WaveImpactAsphaltCoverWaveConditionsCalculationService().Calculate(
                 calculation,
                 assessmentSection,
-                null,
-                validFilePath);
+                null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
@@ -145,13 +142,8 @@
 
             var mockRepository = new MockRepository();
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
-            calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Arg<HydraRingCalculationSettings>.Is.NotNull))
-                             .WhenCalled(invocation =>
-                             {
-                                 var settings = (HydraRingCalculationSettings) invocation.Arguments[0];
-                                 Assert.AreEqual(validFilePath, settings.HlcdFilePath);
-                                 Assert.IsEmpty(settings.PreprocessorDirectory);
-                             })
+            calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(null))
+                             .IgnoreArguments()
                              .Return(new TestWaveConditionsCosineCalculator())
                              .Repeat
                              .Twice();
@@ -163,8 +155,7 @@
                 Action call = () => new WaveImpactAsphaltCoverWaveConditionsCalculationService().Calculate(
                     calculation,
                     assessmentSection,
-                    waveImpactAsphaltCoverFailureMechanism.GeneralInput,
-                    validFilePath);
+                    waveImpactAsphaltCoverFailureMechanism.GeneralInput);
 
                 // Assert
                 TestHelper.AssertLogMessages(call, messages =>
@@ -205,13 +196,8 @@
 
             var mockRepository = new MockRepository();
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
-            calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Arg<HydraRingCalculationSettings>.Is.NotNull))
-                             .WhenCalled(invocation =>
-                             {
-                                 var settings = (HydraRingCalculationSettings) invocation.Arguments[0];
-                                 Assert.AreEqual(validFilePath, settings.HlcdFilePath);
-                                 Assert.IsEmpty(settings.PreprocessorDirectory);
-                             })
+            calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(null))
+                             .IgnoreArguments()
                              .Return(new TestWaveConditionsCosineCalculator())
                              .Repeat
                              .Twice();
@@ -238,8 +224,7 @@
                 Action call = () => new WaveImpactAsphaltCoverWaveConditionsCalculationService().Calculate(
                     calculation,
                     assessmentSection,
-                    waveImpactAsphaltCoverFailureMechanism.GeneralInput,
-                    validFilePath);
+                    waveImpactAsphaltCoverFailureMechanism.GeneralInput);
 
                 // Assert
                 TestHelper.AssertLogMessages(call, messages =>
@@ -287,9 +272,9 @@
             calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Arg<HydraRingCalculationSettings>.Is.NotNull))
                              .WhenCalled(invocation =>
                              {
-                                 var settings = (HydraRingCalculationSettings) invocation.Arguments[0];
-                                 Assert.AreEqual(validFilePath, settings.HlcdFilePath);
-                                 Assert.IsEmpty(settings.PreprocessorDirectory);
+                                 HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(
+                                     HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryDatabase),
+                                     (HydraRingCalculationSettings) invocation.Arguments[0]);
                              })
                              .Return(calculator)
                              .Repeat
@@ -302,8 +287,7 @@
                 new WaveImpactAsphaltCoverWaveConditionsCalculationService().Calculate(
                     calculation,
                     assessmentSection,
-                    waveImpactAsphaltCoverFailureMechanism.GeneralInput,
-                    validFilePath);
+                    waveImpactAsphaltCoverFailureMechanism.GeneralInput);
 
                 // Assert
                 WaveConditionsCosineCalculationInput[] testWaveConditionsInputs = calculator.ReceivedInputs.ToArray();
@@ -355,8 +339,7 @@
                 waveImpactAsphaltCoverWaveConditionsCalculationService.Calculate(
                     calculation,
                     assessmentSection,
-                    waveImpactAsphaltCoverFailureMechanism.GeneralInput,
-                    validFilePath);
+                    waveImpactAsphaltCoverFailureMechanism.GeneralInput);
 
                 // Assert
                 Assert.IsFalse(calculation.HasOutput);
@@ -378,13 +361,8 @@
 
             var mockRepository = new MockRepository();
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
-            calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Arg<HydraRingCalculationSettings>.Is.NotNull))
-                             .WhenCalled(invocation =>
-                             {
-                                 var settings = (HydraRingCalculationSettings) invocation.Arguments[0];
-                                 Assert.AreEqual(validFilePath, settings.HlcdFilePath);
-                                 Assert.IsEmpty(settings.PreprocessorDirectory);
-                             })
+            calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(null))
+                             .IgnoreArguments()
                              .Return(calculator);
             mockRepository.ReplayAll();
 
@@ -397,8 +375,7 @@
                 waveImpactAsphaltCoverWaveConditionsCalculationService.Calculate(
                     calculation,
                     assessmentSection,
-                    waveImpactAsphaltCoverFailureMechanism.GeneralInput,
-                    validFilePath);
+                    waveImpactAsphaltCoverFailureMechanism.GeneralInput);
 
                 // Assert
                 Assert.IsNull(calculation.Output);
@@ -419,13 +396,8 @@
 
             var mockRepository = new MockRepository();
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
-            calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Arg<HydraRingCalculationSettings>.Is.NotNull))
-                             .WhenCalled(invocation =>
-                             {
-                                 var settings = (HydraRingCalculationSettings) invocation.Arguments[0];
-                                 Assert.AreEqual(validFilePath, settings.HlcdFilePath);
-                                 Assert.IsEmpty(settings.PreprocessorDirectory);
-                             })
+            calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(null))
+                             .IgnoreArguments()
                              .Return(new TestWaveConditionsCosineCalculator())
                              .Repeat
                              .Times(3);
@@ -437,8 +409,7 @@
                 new WaveImpactAsphaltCoverWaveConditionsCalculationService().Calculate(
                     calculation,
                     assessmentSection,
-                    waveImpactAsphaltCoverFailureMechanism.GeneralInput,
-                    validFilePath);
+                    waveImpactAsphaltCoverFailureMechanism.GeneralInput);
 
                 // Assert
                 Assert.IsNotNull(calculation.Output);
@@ -470,13 +441,8 @@
 
             var mockRepository = new MockRepository();
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
-            calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Arg<HydraRingCalculationSettings>.Is.NotNull))
-                             .WhenCalled(invocation =>
-                             {
-                                 var settings = (HydraRingCalculationSettings) invocation.Arguments[0];
-                                 Assert.AreEqual(validFilePath, settings.HlcdFilePath);
-                                 Assert.IsEmpty(settings.PreprocessorDirectory);
-                             })
+            calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(null))
+                             .IgnoreArguments()
                              .Return(calculatorThatFails)
                              .Repeat
                              .Times(3);
@@ -497,8 +463,7 @@
                         new WaveImpactAsphaltCoverWaveConditionsCalculationService().Calculate(
                             calculation,
                             assessmentSection,
-                            failureMechanism.GeneralInput,
-                            validFilePath);
+                            failureMechanism.GeneralInput);
                     }
                     catch (HydraRingCalculationException e)
                     {
@@ -587,8 +552,7 @@
                 // Call
                 Action call = () => service.Calculate(calculation,
                                                       assessmentSection,
-                                                      failureMechanism.GeneralInput,
-                                                      validFilePath);
+                                                      failureMechanism.GeneralInput);
 
                 // Assert
                 RoundedDouble[] waterLevels = GetWaterLevels(calculation, assessmentSection).ToArray();
@@ -647,9 +611,9 @@
             calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Arg<HydraRingCalculationSettings>.Is.NotNull))
                              .WhenCalled(invocation =>
                              {
-                                 var settings = (HydraRingCalculationSettings) invocation.Arguments[0];
-                                 Assert.AreEqual(validFilePath, settings.HlcdFilePath);
-                                 Assert.IsEmpty(settings.PreprocessorDirectory);
+                                 HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(
+                                     HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryDatabase),
+                                     (HydraRingCalculationSettings) invocation.Arguments[0]);
                              })
                              .Return(calculator)
                              .Repeat
@@ -662,8 +626,7 @@
                 new WaveImpactAsphaltCoverWaveConditionsCalculationService().Calculate(
                     calculation,
                     assessmentSection,
-                    waveImpactAsphaltCoverFailureMechanism.GeneralInput,
-                    validFilePath);
+                    waveImpactAsphaltCoverFailureMechanism.GeneralInput);
             }
 
             // Assert
@@ -690,9 +653,9 @@
             calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Arg<HydraRingCalculationSettings>.Is.NotNull))
                              .WhenCalled(invocation =>
                              {
-                                 var settings = (HydraRingCalculationSettings) invocation.Arguments[0];
-                                 Assert.AreEqual(validFilePath, settings.HlcdFilePath);
-                                 Assert.AreEqual(validPreprocessorDirectory, settings.PreprocessorDirectory);
+                                 HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(
+                                     HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryDatabase),
+                                     (HydraRingCalculationSettings) invocation.Arguments[0]);
                              })
                              .Return(calculator)
                              .Repeat
@@ -705,8 +668,7 @@
                 new WaveImpactAsphaltCoverWaveConditionsCalculationService().Calculate(
                     calculation,
                     assessmentSection,
-                    waveImpactAsphaltCoverFailureMechanism.GeneralInput,
-                    validFilePath);
+                    waveImpactAsphaltCoverFailureMechanism.GeneralInput);
             }
 
             // Assert
@@ -733,9 +695,9 @@
             calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Arg<HydraRingCalculationSettings>.Is.NotNull))
                              .WhenCalled(invocation =>
                              {
-                                 var settings = (HydraRingCalculationSettings) invocation.Arguments[0];
-                                 Assert.AreEqual(validFilePath, settings.HlcdFilePath);
-                                 Assert.IsEmpty(settings.PreprocessorDirectory);
+                                 HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(
+                                     HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryDatabase),
+                                     (HydraRingCalculationSettings) invocation.Arguments[0]);
                              })
                              .Return(calculator)
                              .Repeat
@@ -748,8 +710,7 @@
                 new WaveImpactAsphaltCoverWaveConditionsCalculationService().Calculate(
                     calculation,
                     assessmentSection,
-                    waveImpactAsphaltCoverFailureMechanism.GeneralInput,
-                    validFilePath);
+                    waveImpactAsphaltCoverFailureMechanism.GeneralInput);
             }
 
             // Assert