Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Activities/TargetProbabilityCalculationActivity.cs =================================================================== diff -u -r67100b9ae4581855aa4b6e1675c3fdf550614c7a -r1ed8634b879f06546f5e532048bbf6481bf39088 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Activities/TargetProbabilityCalculationActivity.cs (.../TargetProbabilityCalculationActivity.cs) (revision 67100b9ae4581855aa4b6e1675c3fdf550614c7a) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Activities/TargetProbabilityCalculationActivity.cs (.../TargetProbabilityCalculationActivity.cs) (revision 1ed8634b879f06546f5e532048bbf6481bf39088) @@ -94,7 +94,10 @@ protected override void OnFinish() { - handleCalculationOutputAction(targetProbabilityCalculationOutput); + if (State == ActivityState.Executed) + { + handleCalculationOutputAction(targetProbabilityCalculationOutput); + } } } } \ No newline at end of file Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Activities/TargetProbabilityCalculationActivityTest.cs =================================================================== diff -u -rd5c50cc39d4a4fb74a6af53c257f8d78be6e776a -r1ed8634b879f06546f5e532048bbf6481bf39088 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Activities/TargetProbabilityCalculationActivityTest.cs (.../TargetProbabilityCalculationActivityTest.cs) (revision d5c50cc39d4a4fb74a6af53c257f8d78be6e776a) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Activities/TargetProbabilityCalculationActivityTest.cs (.../TargetProbabilityCalculationActivityTest.cs) (revision 1ed8634b879f06546f5e532048bbf6481bf39088) @@ -20,6 +20,7 @@ // All rights reserved. using Core.Common.Base.Service; +using Core.Common.Utils.Reflection; using NUnit.Framework; using Rhino.Mocks; using Ringtoets.HydraRing.Calculation.Activities; @@ -101,8 +102,12 @@ mocks.VerifyAll(); } - [Test] - public void Finish_TargetProbabilityCalculationActivity_OutputActionPerformed() + [TestCase(ActivityState.None, false)] + [TestCase(ActivityState.Executed, true)] + [TestCase(ActivityState.Cancelled, false)] + [TestCase(ActivityState.Failed, false)] + [TestCase(ActivityState.Finished, false)] + public void Finish_TargetProbabilityCalculationActivityWithSpecificState_OutputActionPerformedAsExpected(ActivityState state, bool outputActionPerformed) { // Setup var count = 0; @@ -114,11 +119,13 @@ var activity = new TargetProbabilityCalculationActivity("Name of activity", "hlcdDirectory", "ringId", HydraRingTimeIntegrationSchemeType.FBC, HydraRingUncertaintiesType.All, targetProbabilityCalculationInput, output => { count++; }, hydraRingCalculationService); + TypeUtils.SetPrivatePropertyValue(activity, "State", state); + // Call activity.Finish(); // Assert - Assert.AreEqual(1, count); + Assert.AreEqual(outputActionPerformed, count > 0); } } } \ No newline at end of file Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj =================================================================== diff -u -r463dcadb39cfbf80854af4350af89cf6c14808be -r1ed8634b879f06546f5e532048bbf6481bf39088 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj (.../Ringtoets.HydraRing.Calculation.Test.csproj) (revision 463dcadb39cfbf80854af4350af89cf6c14808be) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj (.../Ringtoets.HydraRing.Calculation.Test.csproj) (revision 1ed8634b879f06546f5e532048bbf6481bf39088) @@ -91,6 +91,10 @@ {3BBFD65B-B277-4E50-AE6D-BD24C3434609} Core.Common.Base + + {F49BD8B2-332A-4C91-A196-8CCE0A2C7D98} + Core.Common.Utils + {D749EE4C-CE50-4C17-BF01-9A953028C126} Core.Common.TestUtil