Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneLocationCalculationActivity.cs =================================================================== diff -u -ra494bde768f1b989d31bff6a801a1816d6f9692e -rf49d4d7c45ecd482bd93b04bce65b6592004b0ce --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneLocationCalculationActivity.cs (.../DuneLocationCalculationActivity.cs) (revision a494bde768f1b989d31bff6a801a1816d6f9692e) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneLocationCalculationActivity.cs (.../DuneLocationCalculationActivity.cs) (revision f49d4d7c45ecd482bd93b04bce65b6592004b0ce) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using Core.Common.Base.Service; using Ringtoets.Common.Service; using Ringtoets.DuneErosion.Data; using Ringtoets.DuneErosion.Service.Properties; @@ -69,26 +68,17 @@ protected override bool Validate() { - if (AlreadyCalculated) - { - State = ActivityState.Skipped; - return true; - } - return calculationService.Validate(hydraulicBoundaryDatabaseFilePath, preprocessorDirectory, norm); } protected override void PerformCalculation() { - if (State != ActivityState.Skipped) - { - calculationService.Calculate(duneLocationCalculation, - norm, - hydraulicBoundaryDatabaseFilePath, - preprocessorDirectory); - } + calculationService.Calculate(duneLocationCalculation, + norm, + hydraulicBoundaryDatabaseFilePath, + preprocessorDirectory); } protected override void OnCancel() @@ -100,13 +90,5 @@ { duneLocationCalculation.NotifyObservers(); } - - private bool AlreadyCalculated - { - get - { - return duneLocationCalculation.Output != null; - } - } } } \ No newline at end of file Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneLocationCalculationActivityTest.cs =================================================================== diff -u -ra494bde768f1b989d31bff6a801a1816d6f9692e -rf49d4d7c45ecd482bd93b04bce65b6592004b0ce --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneLocationCalculationActivityTest.cs (.../DuneLocationCalculationActivityTest.cs) (revision a494bde768f1b989d31bff6a801a1816d6f9692e) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneLocationCalculationActivityTest.cs (.../DuneLocationCalculationActivityTest.cs) (revision f49d4d7c45ecd482bd93b04bce65b6592004b0ce) @@ -215,27 +215,6 @@ } [Test] - public void Run_OutputSet_ValidationAndCalculationNotPerformedAndStateSkipped() - { - // Setup - var duneLocationCalculation = new DuneLocationCalculation(new TestDuneLocation()) - { - Output = new TestDuneLocationCalculationOutput() - }; - - var activity = new DuneLocationCalculationActivity(duneLocationCalculation, - validFilePath, - validPreprocessorDirectory, - 0.5); - - // Call - activity.Run(); - - // Assert - Assert.AreEqual(ActivityState.Skipped, activity.State); - } - - [Test] public void Run_ValidCalculationAndRun_SetsOutput() { // Setup Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationActivityTest.cs =================================================================== diff -u -rbd3005f6e588e9dabb067acd8b61a3682c43970c -rf49d4d7c45ecd482bd93b04bce65b6592004b0ce --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationActivityTest.cs (.../MacroStabilityInwardsCalculationActivityTest.cs) (revision bd3005f6e588e9dabb067acd8b61a3682c43970c) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationActivityTest.cs (.../MacroStabilityInwardsCalculationActivityTest.cs) (revision f49d4d7c45ecd482bd93b04bce65b6592004b0ce) @@ -57,7 +57,7 @@ } [Test] - public void Run_InvalidMacroStabilityInwardsCalculationWithOutput_LogValidationStartAndEndWithErrors() + public void Run_InvalidMacroStabilityInwardsCalculation_LogValidationStartAndEndWithErrors() { // Setup MacroStabilityInwardsCalculationScenario invalidMacroStabilityInwardsCalculation = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithInvalidInput();