Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs =================================================================== diff -u -r0b7593ffcb59808f2a39fcb029da8fb9a09887fd -r631448b5dbf13f2c3c4e411729c9fba4e1e8cdcd --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs) (revision 0b7593ffcb59808f2a39fcb029da8fb9a09887fd) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs) (revision 631448b5dbf13f2c3c4e411729c9fba4e1e8cdcd) @@ -231,7 +231,7 @@ .WhenCalled(invocation => { var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); + Assert.AreEqual(validFilePath, settings.HlcdFilePath); Assert.IsEmpty(settings.PreprocessorDirectory); }) .Return(new TestWaveConditionsCosineCalculator()) @@ -294,7 +294,7 @@ .WhenCalled(invocation => { var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); + Assert.AreEqual(validFilePath, settings.HlcdFilePath); Assert.IsEmpty(settings.PreprocessorDirectory); }) .Return(waveConditionsCosineCalculator) @@ -361,7 +361,7 @@ .WhenCalled(invocation => { var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); + Assert.AreEqual(validFilePath, settings.HlcdFilePath); Assert.IsEmpty(settings.PreprocessorDirectory); }) .Return(new TestWaveConditionsCosineCalculator()); @@ -428,7 +428,7 @@ .WhenCalled(invocation => { var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); + Assert.AreEqual(validFilePath, settings.HlcdFilePath); Assert.IsEmpty(settings.PreprocessorDirectory); }) .Return(new TestWaveConditionsCosineCalculator()); @@ -485,7 +485,7 @@ .WhenCalled(invocation => { var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); + Assert.AreEqual(validFilePath, settings.HlcdFilePath); Assert.IsEmpty(settings.PreprocessorDirectory); }) .Return(new TestWaveConditionsCosineCalculator()) @@ -540,7 +540,7 @@ .WhenCalled(invocation => { var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); + Assert.AreEqual(validFilePath, settings.HlcdFilePath); Assert.IsEmpty(settings.PreprocessorDirectory); }) .Return(calculator) @@ -601,7 +601,7 @@ .WhenCalled(invocation => { var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); + Assert.AreEqual(validFilePath, settings.HlcdFilePath); Assert.IsEmpty(settings.PreprocessorDirectory); }) .Return(waveConditionsCosineCalculator) @@ -648,7 +648,7 @@ .WhenCalled(invocation => { var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); + Assert.AreEqual(validFilePath, settings.HlcdFilePath); Assert.IsEmpty(settings.PreprocessorDirectory); }) .Return(new TestWaveConditionsCosineCalculator()) @@ -697,7 +697,7 @@ .WhenCalled(invocation => { var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); + Assert.AreEqual(validFilePath, settings.HlcdFilePath); Assert.AreEqual(validPreprocessorDirectory, settings.PreprocessorDirectory); }) .Return(new TestWaveConditionsCosineCalculator()) @@ -746,7 +746,7 @@ .WhenCalled(invocation => { var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); + Assert.AreEqual(validFilePath, settings.HlcdFilePath); Assert.IsEmpty(settings.PreprocessorDirectory); }) .Return(new TestWaveConditionsCosineCalculator()) @@ -779,7 +779,7 @@ .WhenCalled(invocation => { var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); + Assert.AreEqual(validFilePath, settings.HlcdFilePath); Assert.IsEmpty(settings.PreprocessorDirectory); }) .Return(new TestWaveConditionsCosineCalculator Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -r0b7593ffcb59808f2a39fcb029da8fb9a09887fd -r631448b5dbf13f2c3c4e411729c9fba4e1e8cdcd --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs) (revision 0b7593ffcb59808f2a39fcb029da8fb9a09887fd) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs) (revision 631448b5dbf13f2c3c4e411729c9fba4e1e8cdcd) @@ -616,21 +616,11 @@ }; var mockRepository = new MockRepository(); var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Arg.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); - calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Arg.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(); Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs =================================================================== diff -u -ra859fcf6b915f33c03f0d965c19589c7e4579fa9 -r631448b5dbf13f2c3c4e411729c9fba4e1e8cdcd --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs (.../AssessmentSectionTreeNodeInfoTest.cs) (revision a859fcf6b915f33c03f0d965c19589c7e4579fa9) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs (.../AssessmentSectionTreeNodeInfoTest.cs) (revision 631448b5dbf13f2c3c4e411729c9fba4e1e8cdcd) @@ -502,11 +502,12 @@ public void GivenValidCalculations_WhenCalculatingAllFromContextMenu_ThenAllCalculationsScheduled() { // Given + string hydraulicBoundaryDatabaseFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); var assessmentSection = new AssessmentSection(AssessmentSectionComposition.DikeAndDune) { HydraulicBoundaryDatabase = { - FilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite") + FilePath = hydraulicBoundaryDatabaseFilePath } }; @@ -554,7 +555,7 @@ .WhenCalled(invocation => { var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); + Assert.AreEqual(hydraulicBoundaryDatabaseFilePath, settings.HlcdFilePath); Assert.IsEmpty(settings.PreprocessorDirectory); }) .Return(new TestWaveConditionsCosineCalculator()).Repeat.Times(9); @@ -568,7 +569,7 @@ .WhenCalled(invocation => { var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); + Assert.AreEqual(hydraulicBoundaryDatabaseFilePath, settings.HlcdFilePath); Assert.IsEmpty(settings.PreprocessorDirectory); }) .Return(new TestWaveConditionsCosineCalculator()).Repeat.Times(3); Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs =================================================================== diff -u -ra859fcf6b915f33c03f0d965c19589c7e4579fa9 -r631448b5dbf13f2c3c4e411729c9fba4e1e8cdcd --- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs (.../AssessmentSectionCalculationActivityFactoryTest.cs) (revision a859fcf6b915f33c03f0d965c19589c7e4579fa9) +++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs (.../AssessmentSectionCalculationActivityFactoryTest.cs) (revision 631448b5dbf13f2c3c4e411729c9fba4e1e8cdcd) @@ -78,6 +78,7 @@ { // Setup AssessmentSection assessmentSection = CreateAssessmentSection(); + string hydraulicBoundaryDatabaseFilePath = assessmentSection.HydraulicBoundaryDatabase.FilePath; var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); IEnumerable hydraulicBoundaryLocations = new[] @@ -124,7 +125,7 @@ .WhenCalled(invocation => { var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); + Assert.AreEqual(hydraulicBoundaryDatabaseFilePath, settings.HlcdFilePath); Assert.IsEmpty(settings.PreprocessorDirectory); }) .Return(new TestWaveConditionsCosineCalculator()).Repeat.Times(9); @@ -138,7 +139,7 @@ .WhenCalled(invocation => { var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); + Assert.AreEqual(hydraulicBoundaryDatabaseFilePath, settings.HlcdFilePath); Assert.IsEmpty(settings.PreprocessorDirectory); }) .Return(new TestWaveConditionsCosineCalculator()).Repeat.Times(3); Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs =================================================================== diff -u -re3dfee35e824946dbdc46353425a493d77b2a0c8 -r631448b5dbf13f2c3c4e411729c9fba4e1e8cdcd --- Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs (.../WaveConditionsCalculationServiceBaseTest.cs) (revision e3dfee35e824946dbdc46353425a493d77b2a0c8) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs (.../WaveConditionsCalculationServiceBaseTest.cs) (revision 631448b5dbf13f2c3c4e411729c9fba4e1e8cdcd) @@ -839,30 +839,14 @@ }; var mockRepository = new MockRepository(); var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Arg.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); - calculatorFactory.Expect(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()); - calculatorFactory.Expect(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()); + calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(null)) + .IgnoreArguments() + .Return(new TestWaveConditionsCosineCalculator()) + .Repeat + .Twice(); mockRepository.ReplayAll(); var waterLevelUpperBoundary = new RoundedDouble(2, 4.00); Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -rfbc809bf871ca665101266c90ac80fd7c6198734 -r631448b5dbf13f2c3c4e411729c9fba4e1e8cdcd --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs (.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs) (revision fbc809bf871ca665101266c90ac80fd7c6198734) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs (.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs) (revision 631448b5dbf13f2c3c4e411729c9fba4e1e8cdcd) @@ -655,21 +655,11 @@ var mockRepository = new MockRepository(); var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Arg.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); - calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Arg.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(5); @@ -767,31 +757,16 @@ var mockRepository = new MockRepository(); var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Arg.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); - calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Arg.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); - calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Arg.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(); Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -rb6dc614ba3531e6b25df9e6ac377b60679b1ff26 -r631448b5dbf13f2c3c4e411729c9fba4e1e8cdcd --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs) (revision b6dc614ba3531e6b25df9e6ac377b60679b1ff26) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs) (revision 631448b5dbf13f2c3c4e411729c9fba4e1e8cdcd) @@ -567,21 +567,11 @@ var mockRepository = new MockRepository(); var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Arg.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); - calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Arg.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(); @@ -749,7 +739,7 @@ }) .Return(calculator) .Repeat - .Times(3); + .Times(3); mockRepository.ReplayAll(); using (new HydraRingCalculatorFactoryConfig(calculatorFactory))