Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r2e12ba2136827703874abbf7ddc7f2bf49d3f91b -r0b7593ffcb59808f2a39fcb029da8fb9a09887fd --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 2e12ba2136827703874abbf7ddc7f2bf49d3f91b) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 0b7593ffcb59808f2a39fcb029da8fb9a09887fd) @@ -49,6 +49,7 @@ using Ringtoets.GrassCoverErosionOutwards.Data.TestUtil; using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects; using Ringtoets.HydraRing.Calculation.Calculator.Factory; +using Ringtoets.HydraRing.Calculation.Data.Input; using Ringtoets.HydraRing.Calculation.TestUtil.Calculator; using Ringtoets.Revetment.Data; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; @@ -1194,7 +1195,14 @@ gui.Stub(g => g.MainWindow).Return(mainWindow); var calculatorFactory = mocks.Stub(); - calculatorFactory.Stub(cf => cf.CreateWaveConditionsCosineCalculator(Path.GetDirectoryName(validFilePath), string.Empty)).Return(new TestWaveConditionsCosineCalculator()); + calculatorFactory.Stub(cf => cf.CreateWaveConditionsCosineCalculator(Arg.Is.NotNull)) + .WhenCalled(invocation => + { + var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; + Assert.AreEqual(validFilePath, settings.HlcdFilePath); + Assert.IsEmpty(settings.PreprocessorDirectory); + }) + .Return(new TestWaveConditionsCosineCalculator()); mocks.ReplayAll(); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) @@ -1256,7 +1264,14 @@ gui.Stub(g => g.MainWindow).Return(mainWindow); var calculatorFactory = mocks.Stub(); - calculatorFactory.Stub(cf => cf.CreateWaveConditionsCosineCalculator(Path.GetDirectoryName(validFilePath), string.Empty)).Return(new TestWaveConditionsCosineCalculator()); + calculatorFactory.Stub(cf => cf.CreateWaveConditionsCosineCalculator(Arg.Is.NotNull)) + .WhenCalled(invocation => + { + var settings = (HydraRingCalculationSettings)invocation.Arguments[0]; + Assert.AreEqual(validFilePath, settings.HlcdFilePath); + Assert.IsEmpty(settings.PreprocessorDirectory); + }) + .Return(new TestWaveConditionsCosineCalculator()); mocks.ReplayAll(); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) @@ -1306,7 +1321,14 @@ gui.Stub(g => g.MainWindow).Return(mainWindow); var calculatorFactory = mocks.Stub(); - calculatorFactory.Stub(cf => cf.CreateWaveConditionsCosineCalculator(Path.GetDirectoryName(validFilePath), string.Empty)).Return(new TestWaveConditionsCosineCalculator()); + calculatorFactory.Stub(cf => cf.CreateWaveConditionsCosineCalculator(Arg.Is.NotNull)) + .WhenCalled(invocation => + { + var settings = (HydraRingCalculationSettings)invocation.Arguments[0]; + Assert.AreEqual(validFilePath, settings.HlcdFilePath); + Assert.IsEmpty(settings.PreprocessorDirectory); + }) + .Return(new TestWaveConditionsCosineCalculator()); mocks.ReplayAll(); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) @@ -1383,7 +1405,14 @@ gui.Stub(g => g.MainWindow).Return(mainWindow); var calculatorFactory = mocks.Stub(); - calculatorFactory.Stub(cf => cf.CreateWaveConditionsCosineCalculator(Path.GetDirectoryName(validFilePath), string.Empty)).Return(new TestWaveConditionsCosineCalculator()); + calculatorFactory.Stub(cf => cf.CreateWaveConditionsCosineCalculator(Arg.Is.NotNull)) + .WhenCalled(invocation => + { + var settings = (HydraRingCalculationSettings)invocation.Arguments[0]; + Assert.AreEqual(validFilePath, settings.HlcdFilePath); + Assert.IsEmpty(settings.PreprocessorDirectory); + }) + .Return(new TestWaveConditionsCosineCalculator()); mocks.ReplayAll(); using (new HydraRingCalculatorFactoryConfig(calculatorFactory))