Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/GuiServices/DuneLocationCalculationGuiService.cs =================================================================== diff -u -r54cb5f9ab9e6f6fe428a1d6f7b07c81a50e2fcab -r4d7de1f1614ff778fca061558d2912ff752570fc --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/GuiServices/DuneLocationCalculationGuiService.cs (.../DuneLocationCalculationGuiService.cs) (revision 54cb5f9ab9e6f6fe428a1d6f7b07c81a50e2fcab) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/GuiServices/DuneLocationCalculationGuiService.cs (.../DuneLocationCalculationGuiService.cs) (revision 4d7de1f1614ff778fca061558d2912ff752570fc) @@ -80,7 +80,9 @@ ActivityProgressDialogRunner.Run(viewParent, locations .Select(l => new DuneErosionBoundaryCalculationActivity(l, failureMechanism, - assessmentSection)).ToArray()); + assessmentSection.HydraulicBoundaryDatabase.FilePath, + assessmentSection.Id, + assessmentSection.FailureMechanismContribution.Norm)).ToArray()); } } } \ No newline at end of file Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionBoundaryCalculationActivity.cs =================================================================== diff -u -rb2b9fdf365e70928a05c57966eeed30d9050e528 -r4d7de1f1614ff778fca061558d2912ff752570fc --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionBoundaryCalculationActivity.cs (.../DuneErosionBoundaryCalculationActivity.cs) (revision b2b9fdf365e70928a05c57966eeed30d9050e528) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionBoundaryCalculationActivity.cs (.../DuneErosionBoundaryCalculationActivity.cs) (revision 4d7de1f1614ff778fca061558d2912ff752570fc) @@ -21,7 +21,6 @@ using System; using Core.Common.Base.Service; -using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.DuneErosion.Data; using Ringtoets.HydraRing.Calculation.Activities; @@ -34,7 +33,9 @@ { private readonly DuneLocation duneLocation; private readonly DuneErosionFailureMechanism failureMechanism; - private readonly IAssessmentSection assessmentSection; + private readonly string hydraulicBoundaryDatabaseFilePath; + private readonly string ringId; + private readonly double norm; private readonly DuneErosionBoundaryCalculationService calculationService; /// @@ -43,11 +44,15 @@ /// The to perform the calculation for. /// The that holds information about the contribution and /// the general inputs used in the calculation. - /// The that hold information about the norm used in the calculation. + /// The HLCD file that should be used for performing the calculation. + /// The id of the ring to perform the calculation for. + /// The norm to use during the calculation. /// Thrown when any parameter is null. public DuneErosionBoundaryCalculationActivity(DuneLocation duneLocation, DuneErosionFailureMechanism failureMechanism, - IAssessmentSection assessmentSection) + string hydraulicBoundaryDatabaseFilePath, + string ringId, + double norm) { if (duneLocation == null) { @@ -57,14 +62,12 @@ { throw new ArgumentNullException(nameof(failureMechanism)); } - if (assessmentSection == null) - { - throw new ArgumentNullException(nameof(assessmentSection)); - } this.duneLocation = duneLocation; this.failureMechanism = failureMechanism; - this.assessmentSection = assessmentSection; + this.hydraulicBoundaryDatabaseFilePath = hydraulicBoundaryDatabaseFilePath; + this.ringId = ringId; + this.norm = norm; calculationService = new DuneErosionBoundaryCalculationService(); @@ -81,9 +84,9 @@ calculationService.Calculate(duneLocation, failureMechanism, - assessmentSection.Id, - assessmentSection.FailureMechanismContribution.Norm, - assessmentSection.HydraulicBoundaryDatabase.FilePath); + ringId, + norm, + hydraulicBoundaryDatabaseFilePath); } protected override void OnCancel() Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Integration.Test/DuneErosionBoundaryCalculationActivityIntegrationTest.cs =================================================================== diff -u -r5fcfd3d73f28585c211086ad413fc5d177ecd6b2 -r4d7de1f1614ff778fca061558d2912ff752570fc --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Integration.Test/DuneErosionBoundaryCalculationActivityIntegrationTest.cs (.../DuneErosionBoundaryCalculationActivityIntegrationTest.cs) (revision 5fcfd3d73f28585c211086ad413fc5d177ecd6b2) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Integration.Test/DuneErosionBoundaryCalculationActivityIntegrationTest.cs (.../DuneErosionBoundaryCalculationActivityIntegrationTest.cs) (revision 4d7de1f1614ff778fca061558d2912ff752570fc) @@ -26,14 +26,11 @@ using Core.Common.Base.Service; using Core.Common.TestUtil; using NUnit.Framework; -using Ringtoets.Common.Data.AssessmentSection; -using Ringtoets.Common.IO.FileImporters; using Ringtoets.DuneErosion.Data; using Ringtoets.DuneErosion.Data.TestUtil; using Ringtoets.DuneErosion.Service; using Ringtoets.HydraRing.Calculation.Calculator.Factory; using Ringtoets.HydraRing.Calculation.TestUtil.Calculator; -using Ringtoets.Integration.Data; namespace Ringtoets.DuneErosion.Integration.Test { @@ -47,16 +44,6 @@ public void Run_ValidCalculation_PerformCalculationAndLogStartAndEnd() { // Setup - var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike) - { - Id = "13-1" - }; - - using (var importer = new HydraulicBoundaryDatabaseImporter()) - { - importer.Import(assessmentSection, validFilePath); - } - var failureMechanism = new DuneErosionFailureMechanism { Contribution = 10 @@ -68,8 +55,12 @@ Orientation = 0, D50 = 0.000007 }); + var activity = new DuneErosionBoundaryCalculationActivity(duneLocation, + failureMechanism, + validFilePath, + "13-1", + 1.0 / 30000); - var activity = new DuneErosionBoundaryCalculationActivity(duneLocation, failureMechanism, assessmentSection); using (new HydraRingCalculatorFactoryConfig()) { // Call @@ -93,16 +84,6 @@ public void Run_FailureMechanismContributionNull_LogMessageAndActivityStateFailed() { // Setup - var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike) - { - Id = "13-1" - }; - - using (var importer = new HydraulicBoundaryDatabaseImporter()) - { - importer.Import(assessmentSection, validFilePath); - } - var failureMechanism = new DuneErosionFailureMechanism(); var duneLocation = new DuneLocation(1300001, "test", new Point2D(0, 0), new DuneLocation.ConstructionProperties { @@ -111,8 +92,12 @@ Orientation = 0, D50 = 0.000007 }); + var activity = new DuneErosionBoundaryCalculationActivity(duneLocation, + failureMechanism, + validFilePath, + "13-1", + 1.0 / 30000); - var activity = new DuneErosionBoundaryCalculationActivity(duneLocation, failureMechanism, assessmentSection); using (new HydraRingCalculatorFactoryConfig()) { // Call @@ -138,16 +123,6 @@ public void Run_InvalidCalculationAndRan_PerformCalculationAndActivityStateFailed(bool endInFailure, string lastErrorFileContent) { // Setup - var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike) - { - Id = "13-1" - }; - - using (var importer = new HydraulicBoundaryDatabaseImporter()) - { - importer.Import(assessmentSection, validFilePath); - } - var failureMechanism = new DuneErosionFailureMechanism(); var duneLocation = new DuneLocation(1300001, "test", new Point2D(0, 0), new DuneLocation.ConstructionProperties { @@ -156,8 +131,12 @@ Orientation = 0, D50 = 0.000007 }); + var activity = new DuneErosionBoundaryCalculationActivity(duneLocation, + failureMechanism, + validFilePath, + "13-1", + 1.0 / 30000); - var activity = new DuneErosionBoundaryCalculationActivity(duneLocation, failureMechanism, assessmentSection); using (new HydraRingCalculatorFactoryConfig()) { TestDunesBoundaryConditionsCalculator calculator = @@ -177,16 +156,6 @@ public void Run_CalculationAlreadyPerformed_CalculationNotPerformedAndActivityStateSkipped() { // Setup - var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike) - { - Id = "13-1" - }; - - using (var importer = new HydraulicBoundaryDatabaseImporter()) - { - importer.Import(assessmentSection, validFilePath); - } - var failureMechanism = new DuneErosionFailureMechanism { Contribution = 10 @@ -196,8 +165,12 @@ { Output = initialOutput }; + var activity = new DuneErosionBoundaryCalculationActivity(duneLocation, + failureMechanism, + validFilePath, + "13-1", + 1.0 / 30000); - var activity = new DuneErosionBoundaryCalculationActivity(duneLocation, failureMechanism, assessmentSection); using (new HydraRingCalculatorFactoryConfig()) { // Call Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationActivityTest.cs =================================================================== diff -u -r1d540d2625cac50321e2400129af64df6cd21310 -r4d7de1f1614ff778fca061558d2912ff752570fc --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationActivityTest.cs (.../DuneErosionBoundaryCalculationActivityTest.cs) (revision 1d540d2625cac50321e2400129af64df6cd21310) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationActivityTest.cs (.../DuneErosionBoundaryCalculationActivityTest.cs) (revision 4d7de1f1614ff778fca061558d2912ff752570fc) @@ -22,8 +22,6 @@ using System; using Core.Common.Base.Service; using NUnit.Framework; -using Rhino.Mocks; -using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.DuneErosion.Data; using Ringtoets.DuneErosion.Data.TestUtil; using Ringtoets.HydraRing.Calculation.Activities; @@ -37,75 +35,57 @@ public void Constructor_ExpectedValues() { // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - var duneLocation = new TestDuneLocation(); var failureMechanism = new DuneErosionFailureMechanism(); // Call - var activity = new DuneErosionBoundaryCalculationActivity(duneLocation, failureMechanism, assessmentSection); + var activity = new DuneErosionBoundaryCalculationActivity(duneLocation, + failureMechanism, + "path", + "id", + 1.0 / 30000); // Assert Assert.IsInstanceOf(activity); Assert.AreEqual(duneLocation.Name, activity.Name); Assert.IsNull(activity.ProgressText); Assert.AreEqual(ActivityState.None, activity.State); - mocks.VerifyAll(); } [Test] public void Constructor_DuneLocationNull_ThrowArgumentNullException() { // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - var failureMechanism = new DuneErosionFailureMechanism(); // Call - TestDelegate test = () => new DuneErosionBoundaryCalculationActivity(null, failureMechanism, assessmentSection); + TestDelegate test = () => new DuneErosionBoundaryCalculationActivity(null, + failureMechanism, + "path", + "id", + 1.0 / 30000); // Assert var exception = Assert.Throws(test); Assert.AreEqual("duneLocation", exception.ParamName); - mocks.VerifyAll(); } [Test] public void Constructor_FailureMechanismNull_ThrowArgumentNullException() { // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - var duneLocation = new TestDuneLocation(); // Call - TestDelegate test = () => new DuneErosionBoundaryCalculationActivity(duneLocation, null, assessmentSection); + TestDelegate test = () => new DuneErosionBoundaryCalculationActivity(duneLocation, + null, + "path", + "id", + 1.0 / 30000); // Assert var exception = Assert.Throws(test); Assert.AreEqual("failureMechanism", exception.ParamName); - mocks.VerifyAll(); } - - [Test] - public void Constructor_AssessmentSectionNull_ThrowArgumentNullException() - { - // Setup - var duneLocation = new TestDuneLocation(); - var failureMechanism = new DuneErosionFailureMechanism(); - - // Call - TestDelegate test = () => new DuneErosionBoundaryCalculationActivity(duneLocation, failureMechanism, null); - - // Assert - var exception = Assert.Throws(test); - Assert.AreEqual("assessmentSection", exception.ParamName); - } } } \ No newline at end of file