Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -r631448b5dbf13f2c3c4e411729c9fba4e1e8cdcd -r1b2f308e90780fcde51b1ffb06233fc7d211fa9e --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs (.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs) (revision 631448b5dbf13f2c3c4e411729c9fba4e1e8cdcd) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs (.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs) (revision 1b2f308e90780fcde51b1ffb06233fc7d211fa9e) @@ -49,10 +49,6 @@ [TestFixture] public class StabilityStoneCoverWaveConditionsCalculationServiceTest { - private static readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation"); - private static readonly string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); - private static readonly string validPreprocessorDirectory = TestHelper.GetScratchPadPath(); - [Test] public void Constructor_ReturnsNewInstance() { @@ -76,8 +72,7 @@ // Call TestDelegate test = () => new StabilityStoneCoverWaveConditionsCalculationService().Calculate(null, assessmentSection, - failureMechanism.GeneralInput, - validFilePath); + failureMechanism.GeneralInput); // Assert var exception = Assert.Throws(test); @@ -95,8 +90,7 @@ // Call TestDelegate test = () => new StabilityStoneCoverWaveConditionsCalculationService().Calculate(calculation, null, - failureMechanism.GeneralInput, - validFilePath); + failureMechanism.GeneralInput); // Assert var exception = Assert.Throws(test); @@ -116,8 +110,7 @@ // Call TestDelegate test = () => new StabilityStoneCoverWaveConditionsCalculationService().Calculate(calculation, assessmentSection, - null, - validFilePath); + null); // Assert var exception = Assert.Throws(test); @@ -145,13 +138,8 @@ var calculatorFactory = mockRepository.StrictMock(); RoundedDouble[] waterLevels = GetWaterLevels(calculation, assessmentSection).ToArray(); int nrOfCalculators = waterLevels.Length * 2; - 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(nrOfCalculators); @@ -162,8 +150,7 @@ // Call Action call = () => new StabilityStoneCoverWaveConditionsCalculationService().Calculate(calculation, assessmentSection, - stabilityStoneCoverFailureMechanism.GeneralInput, - validFilePath); + stabilityStoneCoverFailureMechanism.GeneralInput); // Assert TestHelper.AssertLogMessages(call, messages => @@ -218,13 +205,8 @@ var calculatorFactory = mockRepository.StrictMock(); RoundedDouble[] waterLevels = GetWaterLevels(calculation, assessmentSection).ToArray(); int nrOfCalculators = waterLevels.Length * 2; - 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(nrOfCalculators); @@ -250,8 +232,7 @@ // Call Action call = () => new StabilityStoneCoverWaveConditionsCalculationService().Calculate(calculation, assessmentSection, - stabilityStoneCoverFailureMechanism.GeneralInput, - validFilePath); + stabilityStoneCoverFailureMechanism.GeneralInput); // Assert TestHelper.AssertLogMessages(call, messages => @@ -302,13 +283,8 @@ var calculatorFactory = mockRepository.StrictMock(); RoundedDouble[] waterLevels = GetWaterLevels(calculation, assessmentSection).ToArray(); int nrOfCalculators = waterLevels.Length * 2; - 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(nrOfCalculators); @@ -330,8 +306,7 @@ // Call stabilityStoneCoverWaveConditionsCalculationService.Calculate(calculation, assessmentSection, - stabilityStoneCoverFailureMechanism.GeneralInput, - validFilePath); + stabilityStoneCoverFailureMechanism.GeneralInput); } mockRepository.VerifyAll(); @@ -359,9 +334,9 @@ 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); + HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings( + HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryDatabase), + (HydraRingCalculationSettings) invocation.Arguments[0]); }) .Return(calculator) .Repeat @@ -373,8 +348,7 @@ // Call new StabilityStoneCoverWaveConditionsCalculationService().Calculate(calculation, assessmentSection, - stabilityStoneCoverFailureMechanism.GeneralInput, - validFilePath); + stabilityStoneCoverFailureMechanism.GeneralInput); // Assert WaveConditionsCosineCalculationInput[] testWaveConditionsInputs = calculator.ReceivedInputs.ToArray(); @@ -446,8 +420,7 @@ // Call stabilityStoneCoverWaveConditionsCalculationService.Calculate(calculation, assessmentSection, - stabilityStoneCoverFailureMechanism.GeneralInput, - validFilePath); + stabilityStoneCoverFailureMechanism.GeneralInput); // Assert Assert.IsFalse(calculation.HasOutput); @@ -468,13 +441,8 @@ 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(calculator); mockRepository.ReplayAll(); @@ -485,7 +453,7 @@ // Call stabilityStoneCoverWaveConditionsCalculationService.Calculate(calculation, - assessmentSection, stabilityStoneCoverFailureMechanism.GeneralInput, validFilePath); + assessmentSection, stabilityStoneCoverFailureMechanism.GeneralInput); // Assert Assert.IsNull(calculation.Output); @@ -507,13 +475,8 @@ var mockRepository = new MockRepository(); var calculatorFactory = mockRepository.StrictMock(); int nrOfCalculators = GetWaterLevels(calculation, assessmentSection).Count() * 2; - 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(nrOfCalculators); @@ -524,8 +487,7 @@ // Call new StabilityStoneCoverWaveConditionsCalculationService().Calculate(calculation, assessmentSection, - stabilityStoneCoverFailureMechanism.GeneralInput, - validFilePath); + stabilityStoneCoverFailureMechanism.GeneralInput); // Assert Assert.IsNotNull(calculation.Output); @@ -558,13 +520,8 @@ 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) .Repeat .Times(3); @@ -584,8 +541,7 @@ { new StabilityStoneCoverWaveConditionsCalculationService().Calculate(calculation, assessmentSection, - failureMechanism.GeneralInput, - validFilePath); + failureMechanism.GeneralInput); } catch (HydraRingCalculationException e) { @@ -675,8 +631,7 @@ // Call Action call = () => service.Calculate(calculation, assessmentSection, - failureMechanism.GeneralInput, - validFilePath); + failureMechanism.GeneralInput); // Assert RoundedDouble[] waterLevels = GetWaterLevels(calculation, assessmentSection).ToArray(); @@ -782,8 +737,7 @@ // Call Action call = () => service.Calculate(calculation, assessmentSection, - failureMechanism.GeneralInput, - validFilePath); + failureMechanism.GeneralInput); // Assert RoundedDouble[] waterLevels = GetWaterLevels(calculation, assessmentSection).ToArray(); @@ -857,9 +811,9 @@ 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); + HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings( + HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryDatabase), + (HydraRingCalculationSettings) invocation.Arguments[0]); }) .Return(new TestWaveConditionsCosineCalculator()) .Repeat @@ -871,8 +825,7 @@ // Call new StabilityStoneCoverWaveConditionsCalculationService().Calculate(calculation, assessmentSection, - stabilityStoneCoverFailureMechanism.GeneralInput, - validFilePath); + stabilityStoneCoverFailureMechanism.GeneralInput); } // Assert @@ -886,7 +839,7 @@ IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); assessmentSection.HydraulicBoundaryDatabase.CanUsePreprocessor = true; assessmentSection.HydraulicBoundaryDatabase.UsePreprocessor = true; - assessmentSection.HydraulicBoundaryDatabase.PreprocessorDirectory = validPreprocessorDirectory; + assessmentSection.HydraulicBoundaryDatabase.PreprocessorDirectory = TestHelper.GetScratchPadPath(); StabilityStoneCoverWaveConditionsCalculation calculation = GetValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); @@ -898,9 +851,9 @@ calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Arg.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(new TestWaveConditionsCosineCalculator()) .Repeat @@ -912,8 +865,7 @@ // Call new StabilityStoneCoverWaveConditionsCalculationService().Calculate(calculation, assessmentSection, - stabilityStoneCoverFailureMechanism.GeneralInput, - validFilePath); + stabilityStoneCoverFailureMechanism.GeneralInput); } // Assert @@ -939,9 +891,9 @@ 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); + HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings( + HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryDatabase), + (HydraRingCalculationSettings) invocation.Arguments[0]); }) .Return(new TestWaveConditionsCosineCalculator()) .Repeat @@ -953,8 +905,7 @@ // Call new StabilityStoneCoverWaveConditionsCalculationService().Calculate(calculation, assessmentSection, - stabilityStoneCoverFailureMechanism.GeneralInput, - validFilePath); + stabilityStoneCoverFailureMechanism.GeneralInput); } // Assert @@ -963,6 +914,9 @@ private static IAssessmentSection CreateAssessmentSectionWithHydraulicBoundaryOutput() { + string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation"); + string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); + var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1300001, string.Empty, 0, 0); var assessmentSection = new AssessmentSectionStub