Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationService.cs =================================================================== diff -u -re69acb9595f7bf1d202ddd1fb51934b66768b75d -re4f43547afaab47559c5aa667b1aac661a0d1a8b --- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationService.cs (.../StabilityStoneCoverWaveConditionsCalculationService.cs) (revision e69acb9595f7bf1d202ddd1fb51934b66768b75d) +++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationService.cs (.../StabilityStoneCoverWaveConditionsCalculationService.cs) (revision e4f43547afaab47559c5aa667b1aac661a0d1a8b) @@ -28,7 +28,6 @@ using Ringtoets.Revetment.Service; using Ringtoets.StabilityStoneCover.Data; using Ringtoets.StabilityStoneCover.Service.Properties; - using RingtoetsRevetmentsServicesResources = Ringtoets.Revetment.Service.Properties.Resources; namespace Ringtoets.StabilityStoneCover.Service @@ -50,8 +49,8 @@ public bool Validate(StabilityStoneCoverWaveConditionsCalculation calculation, string hydraulicBoundaryDatabaseFilePath) { return ValidateWaveConditionsInput( - calculation.InputParameters, - calculation.Name, + calculation.InputParameters, + calculation.Name, hydraulicBoundaryDatabaseFilePath, RingtoetsRevetmentsServicesResources.WaveConditionsCalculationService_ValidateInput_default_DesignWaterLevel_name); } @@ -66,7 +65,10 @@ /// The that holds information about the norm used in the calculation. /// Calculation input parameters that apply to all instances. /// The path of the HLCD file that should be used for performing the calculation. - public void Calculate(StabilityStoneCoverWaveConditionsCalculation calculation, IAssessmentSection assessmentSection, GeneralStabilityStoneCoverWaveConditionsInput generalWaveConditionsInput, string hlcdFilePath) + public void Calculate(StabilityStoneCoverWaveConditionsCalculation calculation, + IAssessmentSection assessmentSection, + GeneralStabilityStoneCoverWaveConditionsInput generalWaveConditionsInput, + string hlcdFilePath) { string calculationName = calculation.Name; @@ -82,7 +84,7 @@ var ringId = assessmentSection.Id; var norm = assessmentSection.FailureMechanismContribution.Norm; - TotalWaterLevelCalculations = calculation.InputParameters.WaterLevels.Count() * 2; + TotalWaterLevelCalculations = calculation.InputParameters.WaterLevels.Count()*2; log.InfoFormat(Resources.StabilityStoneCoverWaveConditionsCalculationService_Calculate_Calculation_0_for_blocks_started, calculationName); IEnumerable blocksOutputs = CalculateWaveConditions(calculationName, calculation.InputParameters, aBlocks, bBlocks, cBlocks, norm, ringId, hlcdFilePath); Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/Ringtoets.StabilityStoneCover.Integration.Test.csproj =================================================================== diff -u -r02670d8c9fceeaea5f829937a2eb269f3488c6b1 -re4f43547afaab47559c5aa667b1aac661a0d1a8b --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/Ringtoets.StabilityStoneCover.Integration.Test.csproj (.../Ringtoets.StabilityStoneCover.Integration.Test.csproj) (revision 02670d8c9fceeaea5f829937a2eb269f3488c6b1) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/Ringtoets.StabilityStoneCover.Integration.Test.csproj (.../Ringtoets.StabilityStoneCover.Integration.Test.csproj) (revision e4f43547afaab47559c5aa667b1aac661a0d1a8b) @@ -70,10 +70,6 @@ {3bbfd65b-b277-4e50-ae6d-bd24c3434609} Core.Common.Base - - {F49BD8B2-332A-4C91-A196-8CCE0A2C7D98} - Core.Common.Utils - {D749EE4C-CE50-4C17-BF01-9A953028C126} Core.Common.TestUtil @@ -82,14 +78,6 @@ {d4200f43-3f72-4f42-af0a-8ced416a38ec} Ringtoets.Common.Data - - {52BA7627-CBAB-4209-BE77-3B5F31378277} - Ringtoets.Common.IO - - - {4843D6E5-066F-4795-94F5-1D53932DD03C} - Ringtoets.Common.Data.TestUtil - {888d4097-8bc2-4703-9fb1-8744c94d525e} Ringtoets.HydraRing.Calculation @@ -102,22 +90,10 @@ {74CBA865-9338-447F-BAD9-28312446AE84} Ringtoets.HydraRing.Calculation.TestUtil - - {11F1F874-45AF-43E4-8AE5-15A5C9593E28} - Ringtoets.Integration.Data - - - {C8383B76-B3F1-4E6E-B56C-527B469FA20A} - Ringtoets.Integration.Plugin - {87C2C553-C0BC-40BF-B1EA-B83BFF357F27} Ringtoets.Revetment.Data - - {2331235F-1E56-4344-ACC2-191C22A39594} - Ringtoets.Revetment.Service - {B479E3AF-7C34-488C-BB73-D324100D36C9} Ringtoets.StabilityStoneCover.Data Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationActivityTest.cs =================================================================== diff -u -r02670d8c9fceeaea5f829937a2eb269f3488c6b1 -re4f43547afaab47559c5aa667b1aac661a0d1a8b --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationActivityTest.cs (.../StabilityStoneCoverWaveConditionsCalculationActivityTest.cs) (revision 02670d8c9fceeaea5f829937a2eb269f3488c6b1) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationActivityTest.cs (.../StabilityStoneCoverWaveConditionsCalculationActivityTest.cs) (revision e4f43547afaab47559c5aa667b1aac661a0d1a8b) @@ -24,6 +24,7 @@ using NUnit.Framework; using Rhino.Mocks; using Ringtoets.Common.Data.AssessmentSection; +using Ringtoets.HydraRing.Calculation.Activities; using Ringtoets.StabilityStoneCover.Data; namespace Ringtoets.StabilityStoneCover.Service.Test @@ -46,6 +47,7 @@ var activity = new StabilityStoneCoverWaveConditionsCalculationActivity(calculation, string.Empty, failureMechanism, assessmentSectionMock); // Assert + Assert.IsInstanceOf(activity); Assert.IsNull(activity.ProgressText); Assert.AreEqual(ActivityState.None, activity.State); Assert.AreEqual(string.Format("Golfcondities voor blokken en zuilen voor {0} berekenen", calculation.Name), activity.Name);