Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationServiceTest.cs =================================================================== diff -u -ra6446f4410e56fb44c754aa1ce1d204d43c301f0 -r2dd4e7b2186f20dacfadad09722baa2a955819f2 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationServiceTest.cs (.../DuneErosionBoundaryCalculationServiceTest.cs) (revision a6446f4410e56fb44c754aa1ce1d204d43c301f0) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationServiceTest.cs (.../DuneErosionBoundaryCalculationServiceTest.cs) (revision 2dd4e7b2186f20dacfadad09722baa2a955819f2) @@ -26,9 +26,6 @@ using Core.Common.TestUtil; using Core.Common.Utils; using NUnit.Framework; -using Rhino.Mocks; -using Ringtoets.Common.Data.AssessmentSection; -using Ringtoets.Common.Data.Contribution; using Ringtoets.Common.Data.TestUtil; using Ringtoets.DuneErosion.Data; using Ringtoets.DuneErosion.Data.TestUtil; @@ -64,7 +61,7 @@ public void Calculate_FailureMechanismNull_ThrowArgumentNullException() { // Call - TestDelegate test = () => new DuneErosionBoundaryCalculationService().Calculate(new TestDuneLocation(), + TestDelegate test = () => new DuneErosionBoundaryCalculationService().Calculate(new TestDuneLocation(), null, "1", 1, @@ -125,7 +122,7 @@ { Contribution = 10 }; - double mechanismSpecificNorm = failureMechanism.GetMechanismSpecificNorm(1.0 / 200); + double mechanismSpecificNorm = failureMechanism.GetMechanismSpecificNorm(1.0/200); var duneLocation = new DuneLocation(1300001, "test", new Point2D(0, 0), new DuneLocation.ConstructionProperties { @@ -140,7 +137,7 @@ using (new HydraRingCalculatorFactoryConfig()) { - TestDunesBoundaryConditionsCalculator testCalculator = + TestDunesBoundaryConditionsCalculator testCalculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DunesBoundaryConditionsCalculator; testCalculator.ReliabilityIndex = 3.27052; testCalculator.WaterLevel = 4.82912; @@ -181,29 +178,11 @@ public void Calculate_CalculationRanNotConverged_LogMessage() { // Setup - const double norm = 1.0/200; - const double contribution = 10; - const string ringId = "1"; var failureMechanism = new DuneErosionFailureMechanism { - Contribution = contribution + Contribution = 10 }; - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - assessmentSection.Stub(a => a.Id).Return(ringId); - assessmentSection.Stub(a => a.GetFailureMechanisms()) - .Return(new[] - { - failureMechanism - }); - assessmentSection.Stub(a => a.FailureMechanismContribution) - .Return(new FailureMechanismContribution(new[] - { - failureMechanism - }, 1, norm)); - mocks.ReplayAll(); - var duneLocation = new DuneLocation(1300001, "test", new Point2D(0, 0), new DuneLocation.ConstructionProperties { CoastalAreaId = 0, @@ -214,15 +193,15 @@ using (new HydraRingCalculatorFactoryConfig()) { - TestDunesBoundaryConditionsCalculator testCalculator = + TestDunesBoundaryConditionsCalculator testCalculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DunesBoundaryConditionsCalculator; testCalculator.ReliabilityIndex = 0.01; // Call Action test = () => new DuneErosionBoundaryCalculationService().Calculate(duneLocation, failureMechanism, - assessmentSection.Id, - assessmentSection.FailureMechanismContribution.Norm, + "1", + failureMechanism.GetMechanismSpecificNorm(1.0/200), validFilePath); // Assert @@ -242,28 +221,11 @@ public void Calculate_CancelCalculationWithValidInput_CancelsCalculator() { // Setup - const double norm = 1.0/200; - const double contribution = 10; - const string ringId = "1"; var failureMechanism = new DuneErosionFailureMechanism { - Contribution = contribution + Contribution = 10 }; - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - assessmentSection.Stub(a => a.Id).Return(ringId); - assessmentSection.Stub(a => a.GetFailureMechanisms()).Return(new[] - { - failureMechanism - }); - assessmentSection.Stub(a => a.FailureMechanismContribution) - .Return(new FailureMechanismContribution(new[] - { - failureMechanism - }, 1, norm)); - mocks.ReplayAll(); - var duneLocation = new DuneLocation(1300001, "test", new Point2D(0, 0), new DuneLocation.ConstructionProperties { CoastalAreaId = 0, @@ -274,7 +236,7 @@ using (new HydraRingCalculatorFactoryConfig()) { - TestDunesBoundaryConditionsCalculator testCalculator = + TestDunesBoundaryConditionsCalculator testCalculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DunesBoundaryConditionsCalculator; var service = new DuneErosionBoundaryCalculationService(); @@ -283,42 +245,24 @@ // Call service.Calculate(duneLocation, failureMechanism, - assessmentSection.Id, - assessmentSection.FailureMechanismContribution.Norm, + "1", + failureMechanism.GetMechanismSpecificNorm(1.0/200), validFilePath); // Assert Assert.IsTrue(testCalculator.IsCanceled); } - mocks.VerifyAll(); } [Test] public void Calculate_CalculationFailedWithExceptionAndLastErrorPresent_LogErrorAndThrowException() { // Setup - const double norm = 1.0/200; - const double contribution = 10; - const string ringId = "1"; var failureMechanism = new DuneErosionFailureMechanism { - Contribution = contribution + Contribution = 10 }; - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - assessmentSection.Stub(a => a.Id).Return(ringId); - assessmentSection.Stub(a => a.GetFailureMechanisms()).Return(new[] - { - failureMechanism - }); - assessmentSection.Stub(a => a.FailureMechanismContribution) - .Return(new FailureMechanismContribution(new[] - { - failureMechanism - }, 1, norm)); - mocks.ReplayAll(); - var duneLocation = new DuneLocation(1300001, "test", new Point2D(0, 0), new DuneLocation.ConstructionProperties { CoastalAreaId = 0, @@ -329,7 +273,7 @@ using (new HydraRingCalculatorFactoryConfig()) { - TestDunesBoundaryConditionsCalculator calculator = + TestDunesBoundaryConditionsCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DunesBoundaryConditionsCalculator; calculator.LastErrorFileContent = "An error occurred"; calculator.EndInFailure = true; @@ -343,8 +287,8 @@ { new DuneErosionBoundaryCalculationService().Calculate(duneLocation, failureMechanism, - assessmentSection.Id, - assessmentSection.FailureMechanismContribution.Norm, + "1", + failureMechanism.GetMechanismSpecificNorm(1.0/200), validFilePath); } catch (HydraRingCalculationException) @@ -366,35 +310,17 @@ Assert.IsTrue(exceptionThrown); Assert.IsNull(duneLocation.Output); } - mocks.VerifyAll(); } [Test] public void Calculate_CalculationFailedWithExceptionAndNoLastErrorPresent_LogErrorAndThrowException() { // Setup - const double norm = 1.0/200; - const double contribution = 10; - const string ringId = "1"; var failureMechanism = new DuneErosionFailureMechanism { - Contribution = contribution + Contribution = 10 }; - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - assessmentSection.Stub(a => a.Id).Return(ringId); - assessmentSection.Stub(a => a.GetFailureMechanisms()).Return(new[] - { - failureMechanism - }); - assessmentSection.Stub(a => a.FailureMechanismContribution) - .Return(new FailureMechanismContribution(new[] - { - failureMechanism - }, 1, norm)); - mocks.ReplayAll(); - var duneLocation = new DuneLocation(1300001, "test", new Point2D(0, 0), new DuneLocation.ConstructionProperties { CoastalAreaId = 0, @@ -405,7 +331,7 @@ using (new HydraRingCalculatorFactoryConfig()) { - TestDunesBoundaryConditionsCalculator calculator = + TestDunesBoundaryConditionsCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DunesBoundaryConditionsCalculator; calculator.EndInFailure = true; @@ -418,8 +344,8 @@ { new DuneErosionBoundaryCalculationService().Calculate(duneLocation, failureMechanism, - assessmentSection.Id, - assessmentSection.FailureMechanismContribution.Norm, + "1", + failureMechanism.GetMechanismSpecificNorm(1.0/200), validFilePath); } catch (HydraRingCalculationException) @@ -441,35 +367,17 @@ Assert.IsTrue(exceptionThrown); Assert.IsNull(duneLocation.Output); } - mocks.VerifyAll(); } [Test] public void Calculate_CalculationFailedWithoutExceptionAndWithLastErrorPresent_LogErrorAndThrowException() { // Setup - const double norm = 1.0/200; - const double contribution = 10; - const string ringId = "1"; var failureMechanism = new DuneErosionFailureMechanism { - Contribution = contribution + Contribution = 10 }; - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - assessmentSection.Stub(a => a.Id).Return(ringId); - assessmentSection.Stub(a => a.GetFailureMechanisms()).Return(new[] - { - failureMechanism - }); - assessmentSection.Stub(a => a.FailureMechanismContribution) - .Return(new FailureMechanismContribution(new[] - { - failureMechanism - }, 1, norm)); - mocks.ReplayAll(); - var duneLocation = new DuneLocation(1300001, "test", new Point2D(0, 0), new DuneLocation.ConstructionProperties { CoastalAreaId = 0, @@ -480,7 +388,7 @@ using (new HydraRingCalculatorFactoryConfig()) { - TestDunesBoundaryConditionsCalculator calculator = + TestDunesBoundaryConditionsCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DunesBoundaryConditionsCalculator; calculator.EndInFailure = false; calculator.LastErrorFileContent = "An error occurred"; @@ -495,8 +403,8 @@ { new DuneErosionBoundaryCalculationService().Calculate(duneLocation, failureMechanism, - assessmentSection.Id, - assessmentSection.FailureMechanismContribution.Norm, + "1", + failureMechanism.GetMechanismSpecificNorm(1.0/200), validFilePath); } catch (HydraRingCalculationException e) @@ -520,7 +428,6 @@ Assert.IsNull(duneLocation.Output); Assert.AreEqual(calculator.LastErrorFileContent, exceptionMessage); } - mocks.VerifyAll(); } private static void AssertInput(DunesBoundaryConditionsCalculationInput expectedInput, DunesBoundaryConditionsCalculationInput actualInput)