Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs =================================================================== diff -u -r959924f8d1ddff924bb3306444d1f13fef85e545 -rbf818267e52cd63655978eb8b06d421f5abd5f0a --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs (.../WaveHeightCalculationServiceTest.cs) (revision 959924f8d1ddff924bb3306444d1f13fef85e545) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs (.../WaveHeightCalculationServiceTest.cs) (revision bf818267e52cd63655978eb8b06d421f5abd5f0a) @@ -146,7 +146,8 @@ } [Test] - public void Calculate_ValidHydraulicBoundaryLocation_StartsCalculationWithRightParameters() + public void Calculate_ValidWaveHeightCalculation_StartsCalculationWithRightParameters( + [Values(true, false)] bool withIllustrationPoints) { // Setup string validFilePath = Path.Combine(testDataPath, validFile); @@ -165,6 +166,7 @@ calculation.Stub(c => c.GetName()).Return(locationName); calculation.Expect(c => c.GetId()).Return(id); calculation.Expect(c => c.SetOutput(null)).Constraints(new TypeOf(typeof(HydraulicBoundaryLocationOutput))); + calculation.Expect(c => c.GetCalculateIllustrationPoints()).Return(withIllustrationPoints); var calculationMessageProviderMock = mockRepository.StrictMock(); calculationMessageProviderMock.Stub(calc => calc.GetCalculationName(locationName)).Return(string.Empty); @@ -182,6 +184,8 @@ AssessmentLevelCalculationInput expectedInput = CreateInput(id, norm); AssertInput(expectedInput, calculator.ReceivedInputs.Single()); Assert.IsFalse(calculator.IsCanceled); + + Assert.AreEqual(withIllustrationPoints, calculator.CalculatedWithIllustrationPoints); } mockRepository.VerifyAll(); } @@ -200,6 +204,7 @@ var calculation = mockRepository.Stub(); calculation.Stub(c => c.GetName()).Return("name"); calculation.Expect(c => c.GetId()).Return(0); + calculation.Expect(c => c.GetCalculateIllustrationPoints()).Return(false); var calculationMessageProviderStub = mockRepository.Stub(); mockRepository.ReplayAll(); @@ -247,6 +252,7 @@ var calculation = mockRepository.Stub(); calculation.Stub(c => c.GetName()).Return(locationName); calculation.Expect(c => c.GetId()).Return(0); + calculation.Expect(c => c.GetCalculateIllustrationPoints()).Return(false); var calculationMessageProviderMock = mockRepository.StrictMock(); calculationMessageProviderMock.Stub(calc => calc.GetCalculationName(locationName)).Return(calculationName); @@ -311,6 +317,7 @@ var calculation = mockRepository.Stub(); calculation.Stub(c => c.GetName()).Return(locationName); calculation.Expect(c => c.GetId()).Return(0); + calculation.Expect(c => c.GetCalculateIllustrationPoints()).Return(false); var calculationMessageProviderMock = mockRepository.StrictMock(); calculationMessageProviderMock.Stub(calc => calc.GetCalculationName(locationName)).Return(calculationName); @@ -376,6 +383,7 @@ var calculation = mockRepository.Stub(); calculation.Stub(c => c.GetName()).Return(locationName); calculation.Expect(c => c.GetId()).Return(0); + calculation.Expect(c => c.GetCalculateIllustrationPoints()).Return(false); var calculationMessageProviderMock = mockRepository.StrictMock(); calculationMessageProviderMock.Stub(calc => calc.GetCalculationName(locationName)).Return(calculationName);