Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationServiceTest.cs =================================================================== diff -u -rfb58ab4a91a86c0b07665d31beb2334bdbd18413 -rb4ed912781c24bc513aa9898d3a50ee68b6f8179 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationServiceTest.cs (.../DuneErosionBoundaryCalculationServiceTest.cs) (revision fb58ab4a91a86c0b07665d31beb2334bdbd18413) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationServiceTest.cs (.../DuneErosionBoundaryCalculationServiceTest.cs) (revision b4ed912781c24bc513aa9898d3a50ee68b6f8179) @@ -75,7 +75,11 @@ { try { - new DuneErosionBoundaryCalculationService().Calculate(duneLocation, failureMechanism, assessmentSection, validFilePath); + new DuneErosionBoundaryCalculationService().Calculate(duneLocation, + failureMechanism, + assessmentSection.Id, + assessmentSection.FailureMechanismContribution.Norm, + validFilePath); } catch (Exception) { @@ -129,13 +133,17 @@ var testCalculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DunesBoundaryConditionsCalculator; // Call - new DuneErosionBoundaryCalculationService().Calculate(duneLocation, failureMechanism, assessmentSection, validFilePath); + new DuneErosionBoundaryCalculationService().Calculate(duneLocation, + failureMechanism, + assessmentSection.Id, + assessmentSection.FailureMechanismContribution.Norm, + validFilePath); // Assert Assert.AreEqual(testDataPath, testCalculator.HydraulicBoundaryDatabaseDirectory); Assert.AreEqual(ringId, testCalculator.RingId); - var expectedInput = CreateInput(duneLocation, failureMechanism.GetMechanismSpecificNorm(assessmentSection)); + var expectedInput = CreateInput(duneLocation, failureMechanism.GetMechanismSpecificNorm(assessmentSection.FailureMechanismContribution.Norm)); AssertInput(expectedInput, testCalculator.ReceivedInputs.First()); Assert.IsFalse(testCalculator.IsCanceled); } @@ -182,7 +190,11 @@ testCalculator.WavePeriod = 10.65437; // Call - Action test = () => new DuneErosionBoundaryCalculationService().Calculate(duneLocation, failureMechanism, assessmentSection, validFilePath); + Action test = () => new DuneErosionBoundaryCalculationService().Calculate(duneLocation, + failureMechanism, + assessmentSection.Id, + assessmentSection.FailureMechanismContribution.Norm, + validFilePath); // Assert TestHelper.AssertLogMessages(test, messages => @@ -193,7 +205,7 @@ StringAssert.StartsWith("Duinafslag berekening is uitgevoerd op de tijdelijke locatie", msgs[1]); StringAssert.StartsWith(string.Format("Berekening van '{0}' beƫindigd om: ", duneLocation.Name), msgs[2]); }); - double mechanismSpecificNorm = failureMechanism.GetMechanismSpecificNorm(assessmentSection); + double mechanismSpecificNorm = failureMechanism.GetMechanismSpecificNorm(assessmentSection.FailureMechanismContribution.Norm); double targetReliability = StatisticsConverter.ProbabilityToReliability(mechanismSpecificNorm); double calculatedProbability = StatisticsConverter.ReliabilityToProbability(testCalculator.ReliabilityIndex); @@ -241,7 +253,11 @@ testCalculator.ReliabilityIndex = 0.01; // Call - Action test = () => new DuneErosionBoundaryCalculationService().Calculate(duneLocation, failureMechanism, assessmentSection, validFilePath); + Action test = () => new DuneErosionBoundaryCalculationService().Calculate(duneLocation, + failureMechanism, + assessmentSection.Id, + assessmentSection.FailureMechanismContribution.Norm, + validFilePath); // Assert TestHelper.AssertLogMessages(test, messages => @@ -291,7 +307,11 @@ testCalculator.CalculationFinishedHandler += (s, e) => service.Cancel(); // Call - service.Calculate(duneLocation, failureMechanism, assessmentSection, validFilePath); + service.Calculate(duneLocation, + failureMechanism, + assessmentSection.Id, + assessmentSection.FailureMechanismContribution.Norm, + validFilePath); // Assert Assert.IsTrue(testCalculator.IsCanceled); @@ -339,7 +359,11 @@ { try { - new DuneErosionBoundaryCalculationService().Calculate(duneLocation, failureMechanism, assessmentSection, validFilePath); + new DuneErosionBoundaryCalculationService().Calculate(duneLocation, + failureMechanism, + assessmentSection.Id, + assessmentSection.FailureMechanismContribution.Norm, + validFilePath); } catch (HydraRingFileParserException) { @@ -402,7 +426,11 @@ { try { - new DuneErosionBoundaryCalculationService().Calculate(duneLocation, failureMechanism, assessmentSection, validFilePath); + new DuneErosionBoundaryCalculationService().Calculate(duneLocation, + failureMechanism, + assessmentSection.Id, + assessmentSection.FailureMechanismContribution.Norm, + validFilePath); } catch (HydraRingFileParserException) { @@ -467,7 +495,11 @@ { try { - new DuneErosionBoundaryCalculationService().Calculate(duneLocation, failureMechanism, assessmentSection, validFilePath); + new DuneErosionBoundaryCalculationService().Calculate(duneLocation, + failureMechanism, + assessmentSection.Id, + assessmentSection.FailureMechanismContribution.Norm, + validFilePath); } catch (HydraRingCalculationException e) {