Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs =================================================================== diff -u -rcd7078972189cf51d899754097ef3cbc0ddc26ee -r00a04da4497b53cd599b616deb0431c4cea9baeb --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs (.../WaveHeightCalculationServiceTest.cs) (revision cd7078972189cf51d899754097ef3cbc0ddc26ee) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs (.../WaveHeightCalculationServiceTest.cs) (revision 00a04da4497b53cd599b616deb0431c4cea9baeb) @@ -138,7 +138,7 @@ const string calculationName = "locationName"; const string calculationNotConvergedMessage = "calculationNotConvergedMessage"; const string ringId = "ringId"; - const double returnPeriod = 30; + const double norm = 1.0/30; var mockRepository = new MockRepository(); var calculationMessageProviderMock = mockRepository.StrictMock(); @@ -158,14 +158,14 @@ new WaveHeightCalculationService().Calculate(hydraulicBoundaryLocation, validFilePath, ringId, - returnPeriod, + norm, calculationMessageProviderMock); // Assert Assert.AreEqual(testDataPath, testCalculator.HydraulicBoundaryDatabaseDirectory); Assert.AreEqual(ringId, testCalculator.RingId); - var expectedInput = CreateInput(hydraulicBoundaryLocation, returnPeriod); + var expectedInput = CreateInput(hydraulicBoundaryLocation, norm); AssertInput(expectedInput, testCalculator.ReceivedInputs.First()); Assert.IsFalse(testCalculator.IsCanceled); } @@ -186,6 +186,7 @@ { DesignWaterLevel = new RoundedDouble(2, double.NaN), }; + const double norm = 1.0/30; using (new HydraRingCalculatorFactoryConfig()) { @@ -198,7 +199,7 @@ service.Calculate(hydraulicBoundaryLocation, validFilePath, "ringId", - 30, + norm, calculationMessageProviderMock); // Assert @@ -216,6 +217,7 @@ const string locationName = "punt_flw_ 1"; const string calculationName = "locationName"; const string calculationFailedMessage = "calculationFailedMessage"; + const double norm = 1.0/30; var mockRepository = new MockRepository(); var calculationMessageProviderMock = mockRepository.StrictMock(); @@ -244,7 +246,7 @@ new WaveHeightCalculationService().Calculate(hydraulicBoundaryLocation, validFilePath, "ringId", - 30, + norm, calculationMessageProviderMock); } catch (HydraRingFileParserException) @@ -278,6 +280,7 @@ const string locationName = "punt_flw_ 1"; const string calculationName = "locationName"; const string calculationFailedMessage = "calculationFailedUnexplainedMessage"; + const double norm = 1.0/30; var mockRepository = new MockRepository(); var calculationMessageProviderMock = mockRepository.StrictMock(); @@ -305,7 +308,7 @@ new WaveHeightCalculationService().Calculate(hydraulicBoundaryLocation, validFilePath, "ringId", - 30, + norm, calculationMessageProviderMock); } catch (HydraRingFileParserException) @@ -339,6 +342,7 @@ const string locationName = "punt_flw_ 1"; const string calculationName = "locationName"; const string calculationFailedMessage = "calculationFailedMessage"; + const double norm = 1.0/30; var mockRepository = new MockRepository(); var calculationMessageProviderMock = mockRepository.StrictMock(); @@ -368,7 +372,7 @@ new WaveHeightCalculationService().Calculate(hydraulicBoundaryLocation, validFilePath, "ringId", - 30, + norm, calculationMessageProviderMock); } catch (HydraRingCalculationException e) @@ -402,9 +406,9 @@ Assert.AreEqual(expectedInput.Beta, hydraRingCalculationInput.Beta); } - private static AssessmentLevelCalculationInput CreateInput(HydraulicBoundaryLocation hydraulicBoundaryLocation, double returnPeriod) + private static AssessmentLevelCalculationInput CreateInput(HydraulicBoundaryLocation hydraulicBoundaryLocation, double norm) { - return new AssessmentLevelCalculationInput(1, hydraulicBoundaryLocation.Id, returnPeriod); + return new AssessmentLevelCalculationInput(1, hydraulicBoundaryLocation.Id, norm); } } } \ No newline at end of file