Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs =================================================================== diff -u -r5f79a720fc22eee311073ce2af9ab7613b2d357b -r1bc819a56d1680c99010ec65c0e2967edcf23628 --- Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs (.../WaveConditionsCalculationServiceBaseTest.cs) (revision 5f79a720fc22eee311073ce2af9ab7613b2d357b) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs (.../WaveConditionsCalculationServiceBaseTest.cs) (revision 1bc819a56d1680c99010ec65c0e2967edcf23628) @@ -678,21 +678,14 @@ var calculator = new TestWaveConditionsCosineCalculator(); int nrOfCalculators = input.GetWaterLevels(waterLevel).Count(); - string expectedHlcdFilePath = Path.Combine(testDataPath, "HLCD.sqlite"); - string expectedPreprocessorDirectory = hydraulicBoundaryDatabase.UsePreprocessor - ? validPreprocessorDirectory - : string.Empty; - var expectedCalculationSettings = new HydraulicBoundaryCalculationSettings(hydraulicBoundaryDatabase.FilePath, - expectedHlcdFilePath, - expectedPreprocessorDirectory); - var mockRepository = new MockRepository(); var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Arg.Is.NotNull)) .WhenCalled(invocation => { HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings( - expectedCalculationSettings, (HydraRingCalculationSettings) invocation.Arguments[0]); + HydraulicBoundaryCalculationSettingsFactory.CreateSettings(hydraulicBoundaryDatabase), + (HydraRingCalculationSettings) invocation.Arguments[0]); }) .Return(calculator) .Repeat @@ -1007,6 +1000,7 @@ private static IEnumerable GetHydraulicBoundaryDatabaseConfigurations() { + string expectedHlcdDirectory = Path.Combine(testDataPath, "HLCD.sqlite"); yield return new TestCaseData(new HydraulicBoundaryDatabase { CanUsePreprocessor = true,