Index: Core/Common/src/Core.Common.Base/Properties/Resources.Designer.cs =================================================================== diff -u -rb3ae56275cac62d9d7b2a0bee5b0d4c0b112d5d5 -r5e6503b31c813b6f1c4d4dfbab28092bcf4809a6 --- Core/Common/src/Core.Common.Base/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision b3ae56275cac62d9d7b2a0bee5b0d4c0b112d5d5) +++ Core/Common/src/Core.Common.Base/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 5e6503b31c813b6f1c4d4dfbab28092bcf4809a6) @@ -61,24 +61,6 @@ } /// - /// Looks up a localized string similar to Activiteit is '{0}'. 'Initialize()' moet aangeroepen worden voor 'Execute()'.. - /// - internal static string Activity_Execute_Activity_is_0_Initialize_must_be_called_before_Execute { - get { - return ResourceManager.GetString("Activity_Execute_Activity_is_0_Initialize_must_be_called_before_Execute", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Kan Execute() niet aanroepen voor activiteit met de '{0}' status.. - /// - internal static string Activity_Execute_Can_t_call_Execute_for_activity_in_0_state { - get { - return ResourceManager.GetString("Activity_Execute_Can_t_call_Execute_for_activity_in_0_state", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Uitvoering van {0} is geannuleerd.. /// internal static string Activity_Run_Execution_of_0_has_been_canceled { Index: Core/Common/src/Core.Common.Base/Properties/Resources.resx =================================================================== diff -u -rb3ae56275cac62d9d7b2a0bee5b0d4c0b112d5d5 -r5e6503b31c813b6f1c4d4dfbab28092bcf4809a6 --- Core/Common/src/Core.Common.Base/Properties/Resources.resx (.../Resources.resx) (revision b3ae56275cac62d9d7b2a0bee5b0d4c0b112d5d5) +++ Core/Common/src/Core.Common.Base/Properties/Resources.resx (.../Resources.resx) (revision 5e6503b31c813b6f1c4d4dfbab28092bcf4809a6) @@ -117,12 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Activiteit is '{0}'. 'Initialize()' moet aangeroepen worden voor 'Execute()'. - - - Kan Execute() niet aanroepen voor activiteit met de '{0}' status. - Initialisatie van {0} is mislukt. Index: Core/Common/src/Core.Common.Base/Service/Activity.cs =================================================================== diff -u -reeb8bcc69eda031ff6363caf83e8893e2abe9a04 -r5e6503b31c813b6f1c4d4dfbab28092bcf4809a6 --- Core/Common/src/Core.Common.Base/Service/Activity.cs (.../Activity.cs) (revision eeb8bcc69eda031ff6363caf83e8893e2abe9a04) +++ Core/Common/src/Core.Common.Base/Service/Activity.cs (.../Activity.cs) (revision 5e6503b31c813b6f1c4d4dfbab28092bcf4809a6) @@ -59,30 +59,38 @@ public IList LogMessages { get; private set; } /// - /// This method runs the by sequentially making calls to and . + /// This method runs the . /// public void Run() { - Initialize(); - - if (Status == ActivityStatus.Failed) + try { - log.ErrorFormat(Resources.Activity_Run_Initialization_of_0_has_failed, Name); - return; - } + Status = ActivityStatus.Executing; - if (Status == ActivityStatus.Cancelled) + OnExecute(); + + if (Status == ActivityStatus.Failed || + Status == ActivityStatus.Cancelled) + { + // keep this status + return; + } + } + catch (Exception e) { - log.WarnFormat(Resources.Activity_Run_Execution_of_0_has_been_canceled, Name); + Status = ActivityStatus.Failed; + log.Error(e.Message); return; } - Execute(); - if (Status == ActivityStatus.Failed) { log.ErrorFormat(Resources.Activity_Run_Execution_of_0_has_failed, Name); + + return; } + + Status = ActivityStatus.Executed; } /// @@ -106,62 +114,6 @@ } /// - /// This method initializes an . - /// - protected void Initialize() - { - ChangeState(OnInitialize, ActivityStatus.Initializing, ActivityStatus.Initialized); - } - - /// - /// This method executes an that successfully initialized. - /// Successfully ran activities can be identified by a not equal to or . - /// - protected void Execute() - { - if (Status == ActivityStatus.Finished || Status == ActivityStatus.Cancelled || Status == ActivityStatus.Failed || Status == ActivityStatus.None) - { - throw new InvalidOperationException(string.Format(Resources.Activity_Execute_Activity_is_0_Initialize_must_be_called_before_Execute, Status)); - } - - if (Status != ActivityStatus.Executed && Status != ActivityStatus.Initialized) - { - throw new InvalidOperationException(string.Format(Resources.Activity_Execute_Can_t_call_Execute_for_activity_in_0_state, Status)); - } - - try - { - Status = ActivityStatus.Executing; - - OnExecute(); - - if (Status == ActivityStatus.Failed || - Status == ActivityStatus.Cancelled) - { - // keep this status - return; - } - } - catch (Exception e) - { - Status = ActivityStatus.Failed; - log.Error(e.Message); - return; - } - - Status = ActivityStatus.Executed; - } - - /// - /// Initializes internal state to prepare for execution. After calling this method, - /// will be set to if - /// no error has occurred. - /// - /// Set to - /// when an error has occurred while performing the initialization. - protected abstract void OnInitialize(); - - /// /// Executes one step. This method will be called multiple times to allow for multiple /// execution steps. After calling this method, will be set to /// if no error has occurred. Index: Core/Common/src/Core.Common.Base/Service/ActivityStatus.cs =================================================================== diff -u -r1f79b34c12554e2b9878f6296168d18232cc9852 -r5e6503b31c813b6f1c4d4dfbab28092bcf4809a6 --- Core/Common/src/Core.Common.Base/Service/ActivityStatus.cs (.../ActivityStatus.cs) (revision 1f79b34c12554e2b9878f6296168d18232cc9852) +++ Core/Common/src/Core.Common.Base/Service/ActivityStatus.cs (.../ActivityStatus.cs) (revision 5e6503b31c813b6f1c4d4dfbab28092bcf4809a6) @@ -11,16 +11,6 @@ None, /// - /// Activity is being initialized. - /// - Initializing, - - /// - /// Activity has been initialized and ready for execution. - /// - Initialized, - - /// /// Activity is currently executing. /// Executing, Index: Core/Common/src/Core.Common.Base/Service/FileImportActivity.cs =================================================================== diff -u -r55ad1d69b06d380c225f26750cf93631f5851ada -r5e6503b31c813b6f1c4d4dfbab28092bcf4809a6 --- Core/Common/src/Core.Common.Base/Service/FileImportActivity.cs (.../FileImportActivity.cs) (revision 55ad1d69b06d380c225f26750cf93631f5851ada) +++ Core/Common/src/Core.Common.Base/Service/FileImportActivity.cs (.../FileImportActivity.cs) (revision 5e6503b31c813b6f1c4d4dfbab28092bcf4809a6) @@ -44,11 +44,6 @@ } } - protected override void OnInitialize() - { - shouldCancel = false; - } - protected override void OnExecute() { foreach (var fileName in files) @@ -60,6 +55,8 @@ break; } } + + shouldCancel = false; } protected override void OnCancel() Index: Core/Common/test/Core.Common.Base.Test/Service/ActivityTest.cs =================================================================== diff -u -r6016a9db20f1833086b35bc6aedcb2b0a3efe19d -r5e6503b31c813b6f1c4d4dfbab28092bcf4809a6 --- Core/Common/test/Core.Common.Base.Test/Service/ActivityTest.cs (.../ActivityTest.cs) (revision 6016a9db20f1833086b35bc6aedcb2b0a3efe19d) +++ Core/Common/test/Core.Common.Base.Test/Service/ActivityTest.cs (.../ActivityTest.cs) (revision 5e6503b31c813b6f1c4d4dfbab28092bcf4809a6) @@ -35,10 +35,6 @@ private class SimpleActivity : Activity { - protected override void OnInitialize() - { - } - protected override void OnExecute() { } Index: Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationActivity.cs =================================================================== diff -u -reeb8bcc69eda031ff6363caf83e8893e2abe9a04 -r5e6503b31c813b6f1c4d4dfbab28092bcf4809a6 --- Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationActivity.cs (.../PipingCalculationActivity.cs) (revision eeb8bcc69eda031ff6363caf83e8893e2abe9a04) +++ Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationActivity.cs (.../PipingCalculationActivity.cs) (revision 5e6503b31c813b6f1c4d4dfbab28092bcf4809a6) @@ -27,21 +27,17 @@ } } - protected override void OnInitialize() + protected override void OnExecute() { if (!PipingCalculationService.Validate(calculation)) { Status = ActivityStatus.Failed; + return; } - else - { - LogMessages.Clear(); - calculation.Output = null; - } - } - protected override void OnExecute() - { + LogMessages.Clear(); + calculation.Output = null; + PipingCalculationService.Calculate(calculation); } Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs =================================================================== diff -u -r1f79b34c12554e2b9878f6296168d18232cc9852 -r5e6503b31c813b6f1c4d4dfbab28092bcf4809a6 --- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs (.../PipingCalculationActivityTest.cs) (revision 1f79b34c12554e2b9878f6296168d18232cc9852) +++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs (.../PipingCalculationActivityTest.cs) (revision 5e6503b31c813b6f1c4d4dfbab28092bcf4809a6) @@ -33,42 +33,18 @@ } [Test] - public void Initialize_ValidPipingCalculationWithOutput_LogValidationStartAndEndedAndClearOutput() + public void Run_InvalidPipingCalculationWithOutput_LogValidationStartAndEndWithErrors() { // Setup - var validPipingCalculation = PipingCalculationFactory.CreateCalculationWithValidInput(); - validPipingCalculation.Output = new TestPipingOutput(); - - var activity = new PipingCalculationTestActivity(validPipingCalculation); - - // Call - Action call = () => activity.PerformInitialize(); - - // Assert - TestHelper.AssertLogMessages(call, messages => - { - var msgs = messages.ToArray(); - Assert.AreEqual(2, msgs.Length); - StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", validPipingCalculation.Name), msgs.First()); - StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", validPipingCalculation.Name), msgs.Last()); - }); - Assert.AreEqual(ActivityStatus.Initialized, activity.Status); - Assert.IsNull(validPipingCalculation.Output); - } - - [Test] - public void Initialize_InvalidPipingCalculationWithOutput_LogValidationStartAndEndWithErrors() - { - // Setup var originalOutput = new TestPipingOutput(); var invalidPipingCalculation = PipingCalculationFactory.CreateCalculationWithInvalidData(); invalidPipingCalculation.Output = originalOutput; - var activity = new PipingCalculationTestActivity(invalidPipingCalculation); + var activity = new PipingCalculationActivity(invalidPipingCalculation); // Call - Action call = () => activity.PerformInitialize(); + Action call = () => activity.Run(); // Assert TestHelper.AssertLogMessages(call, messages => @@ -88,32 +64,34 @@ } [Test] - public void Execute_ValidPipingCalculationAndInitialized_PerformPipingCalculationAndLogStartAndEnd() + public void Run_ValidPipingCalculation_PerformPipingValidationAndCalculationAndLogStartAndEnd() { // Setup var validPipingCalculation = PipingCalculationFactory.CreateCalculationWithValidInput(); validPipingCalculation.Output = null; - var activity = new PipingCalculationTestActivity(validPipingCalculation); - activity.PerformInitialize(); + var activity = new PipingCalculationActivity(validPipingCalculation); + activity.Run(); // Call - Action call = () => activity.PerformExecute(); + Action call = () => activity.Run(); // Assert TestHelper.AssertLogMessages(call, messages => { - var msgs = messages.ToArray(); - Assert.AreEqual(2, msgs.Length); - StringAssert.StartsWith(String.Format("Berekening van '{0}' gestart om: ", validPipingCalculation.Name), msgs.First()); - StringAssert.StartsWith(String.Format("Berekening van '{0}' beëindigd om: ", validPipingCalculation.Name), msgs.Last()); + var msgs = messages.ToList(); + Assert.AreEqual(4, msgs.Count); + StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", validPipingCalculation.Name), msgs[0]); + StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", validPipingCalculation.Name), msgs[1]); + StringAssert.StartsWith(String.Format("Berekening van '{0}' gestart om: ", validPipingCalculation.Name), msgs[2]); + StringAssert.StartsWith(String.Format("Berekening van '{0}' beëindigd om: ", validPipingCalculation.Name), msgs[3]); }); Assert.AreEqual(ActivityStatus.Executed, activity.Status); Assert.IsNotNull(validPipingCalculation.Output); } [Test] - public void OnFinish_ValidPipingCalculationAndExecuted_NotifyObserversOfPipingCalculation() + public void Finish_ValidPipingCalculationAndRan_NotifyObserversOfPipingCalculation() { // Setup var mocks = new MockRepository(); @@ -125,30 +103,15 @@ validPipingCalculation.Output = null; validPipingCalculation.Attach(observerMock); - var activity = new PipingCalculationTestActivity(validPipingCalculation); - activity.PerformInitialize(); - activity.PerformExecute(); + var activity = new PipingCalculationActivity(validPipingCalculation); + activity.Run(); + // Call activity.Finish(); // Assert mocks.VerifyAll(); } - - private class PipingCalculationTestActivity : PipingCalculationActivity - { - public PipingCalculationTestActivity(PipingCalculation calculation) : base(calculation) { } - - public void PerformInitialize() - { - Initialize(); - } - - public void PerformExecute() - { - Execute(); - } - } } } \ No newline at end of file