Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -r7044ef7d789aec3c3d9dd2c6f38b3699bea0444b -r6c049c504e7f599a8cebb26ae37fcd82b03782f2 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs) (revision 7044ef7d789aec3c3d9dd2c6f38b3699bea0444b) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs) (revision 6c049c504e7f599a8cebb26ae37fcd82b03782f2) @@ -38,7 +38,6 @@ using Ringtoets.HydraRing.Calculation.TestUtil.Calculator; using Ringtoets.Revetment.Data; using Ringtoets.Revetment.Service; -using Ringtoets.Revetment.TestUtil; using Ringtoets.WaveImpactAsphaltCover.Data; namespace Ringtoets.WaveImpactAsphaltCover.Service.Test @@ -641,15 +640,24 @@ } [Test] - [TestCaseSource(typeof(WaveConditionsCosineCalculatorTestHelper), nameof(WaveConditionsCosineCalculatorTestHelper.FailingWaveConditionsCosineCalculators))] - public void Calculate_ThreeCalculationsFail_ThrowsHydraRingCalculationExceptionAndLogError(TestWaveConditionsCosineCalculator calculatorThatFails, + [TestCaseSource(typeof(HydraRingCalculatorTestCaseProvider), nameof(HydraRingCalculatorTestCaseProvider.GetCalculatorFailingConditionsWithReportDetails), new object[] + { + nameof(Calculate_OneOutOfThreeCalculationsFails_ReturnsOutputsAndLogError) + })] + public void Calculate_ThreeCalculationsFail_ThrowsHydraRingCalculationExceptionAndLogError(bool endInFailure, + string lastErrorFileContent, string detailedReport) { // Setup var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism { Contribution = 20 }; + var calculatorThatFails = new TestWaveConditionsCosineCalculator + { + EndInFailure = endInFailure, + LastErrorFileContent = lastErrorFileContent + }; var mockRepository = new MockRepository(); var calculatorFactory = mockRepository.StrictMock(); @@ -723,15 +731,24 @@ } [Test] - [TestCaseSource(typeof(WaveConditionsCosineCalculatorTestHelper), nameof(WaveConditionsCosineCalculatorTestHelper.FailingWaveConditionsCosineCalculators))] - public void Calculate_OneOutOfThreeCalculationsFails_ReturnsOutputsAndLogError(TestWaveConditionsCosineCalculator calculatorThatFails, + [TestCaseSource(typeof(HydraRingCalculatorTestCaseProvider), nameof(HydraRingCalculatorTestCaseProvider.GetCalculatorFailingConditionsWithReportDetails), new object[] + { + nameof(Calculate_OneOutOfThreeCalculationsFails_ReturnsOutputsAndLogError) + })] + public void Calculate_OneOutOfThreeCalculationsFails_ReturnsOutputsAndLogError(bool endInFailure, + string lastErrorFileContent, string detailedReport) { // Setup var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism { Contribution = 20 }; + var calculatorThatFails = new TestWaveConditionsCosineCalculator + { + EndInFailure = endInFailure, + LastErrorFileContent = lastErrorFileContent + }; var mockRepository = new MockRepository(); var calculatorFactory = mockRepository.Stub();