diff --git a/Source/Scheduling/QueueOperation.cs b/Source/Scheduling/QueueOperation.cs index 18279c3..79edaed 100644 --- a/Source/Scheduling/QueueOperation.cs +++ b/Source/Scheduling/QueueOperation.cs @@ -29,11 +29,11 @@ namespace Nuclex.Support.Scheduling { /// /// Type of the child operations the QueueOperation will contain /// - public class QueueOperation : Operation + public class QueueOperation : Operation, IProgressReporter where OperationType : Operation { /// will be triggered to report when progress has been achieved - public event EventHandler AsyncProgressUpdated; + public event EventHandler AsyncProgressChanged; /// Initializes a new queue operation with default weights /// Child operations to execute in this operation @@ -114,7 +114,7 @@ namespace Nuclex.Support.Scheduling { /// Progression's ProgressUpdateEventArgs class. /// protected virtual void OnAsyncProgressChanged(ProgressReportEventArgs eventArguments) { - EventHandler copy = AsyncProgressUpdated; + EventHandler copy = AsyncProgressChanged; if(copy != null) copy(this, eventArguments); } diff --git a/Source/Tracking/ProgressTracker.Test.cs b/Source/Tracking/ProgressTracker.Test.cs index aacaf66..5a11df0 100644 --- a/Source/Tracking/ProgressTracker.Test.cs +++ b/Source/Tracking/ProgressTracker.Test.cs @@ -41,7 +41,7 @@ namespace Nuclex.Support.Tracking { /// Called when the progression tracker's progress changes /// Progression tracker whose progress has changed /// Contains the new progress achieved - void ProgressUpdated(object sender, ProgressReportEventArgs e); + void ProgressChanged(object sender, ProgressReportEventArgs e); /// Called when the progression tracker's idle state changes /// Progression tracker whose idle state has changed @@ -55,11 +55,11 @@ namespace Nuclex.Support.Tracking { #region class ProgressUpdateEventArgsMatcher /// Compares two ProgressUpdateEventArgsInstances for NMock validation - private class ProgressUpdateEventArgsMatcher : Matcher { + private class ProgressReportEventArgsMatcher : Matcher { /// Initializes a new ProgressUpdateEventArgsMatcher /// Expected progress update event arguments - public ProgressUpdateEventArgsMatcher(ProgressReportEventArgs expected) { + public ProgressReportEventArgsMatcher(ProgressReportEventArgs expected) { this.expected = expected; } @@ -94,7 +94,7 @@ namespace Nuclex.Support.Tracking { #region class TestProgression /// Progression used for testing in this unit test - private class TestProgression : Waitable { + private class TestProgression : Waitable, IProgressReporter { /// will be triggered to report when progress has been achieved public event EventHandler AsyncProgressChanged; @@ -157,11 +157,11 @@ namespace Nuclex.Support.Tracking { WithAnyArguments(); Expect.Exactly(2).On(mockedSubscriber). - Method("ProgressUpdated"). + Method("ProgressChanged"). With( new Matcher[] { new NMock2.Matchers.TypeMatcher(typeof(ProgressTracker)), - new ProgressUpdateEventArgsMatcher(new ProgressReportEventArgs(0.0f)) + new ProgressReportEventArgsMatcher(new ProgressReportEventArgs(0.0f)) } ); @@ -171,11 +171,11 @@ namespace Nuclex.Support.Tracking { tracker.Track(test2); Expect.Once.On(mockedSubscriber). - Method("ProgressUpdated"). + Method("ProgressChanged"). With( new Matcher[] { new NMock2.Matchers.TypeMatcher(typeof(ProgressTracker)), - new ProgressUpdateEventArgsMatcher(new ProgressReportEventArgs(0.25f)) + new ProgressReportEventArgsMatcher(new ProgressReportEventArgs(0.25f)) } ); @@ -203,11 +203,11 @@ namespace Nuclex.Support.Tracking { WithAnyArguments(); Expect.Exactly(2).On(mockedSubscriber). - Method("ProgressUpdated"). + Method("ProgressChanged"). With( new Matcher[] { new NMock2.Matchers.TypeMatcher(typeof(ProgressTracker)), - new ProgressUpdateEventArgsMatcher(new ProgressReportEventArgs(0.0f)) + new ProgressReportEventArgsMatcher(new ProgressReportEventArgs(0.0f)) } ); @@ -217,22 +217,22 @@ namespace Nuclex.Support.Tracking { tracker.Track(test2); Expect.Once.On(mockedSubscriber). - Method("ProgressUpdated"). + Method("ProgressChanged"). With( new Matcher[] { new NMock2.Matchers.TypeMatcher(typeof(ProgressTracker)), - new ProgressUpdateEventArgsMatcher(new ProgressReportEventArgs(0.25f)) + new ProgressReportEventArgsMatcher(new ProgressReportEventArgs(0.25f)) } ); test1.ChangeProgress(0.5f); Expect.Once.On(mockedSubscriber). - Method("ProgressUpdated"). + Method("ProgressChanged"). With( new Matcher[] { new NMock2.Matchers.TypeMatcher(typeof(ProgressTracker)), - new ProgressUpdateEventArgsMatcher(new ProgressReportEventArgs(0.75f)) + new ProgressReportEventArgsMatcher(new ProgressReportEventArgs(0.75f)) } ); @@ -242,11 +242,11 @@ namespace Nuclex.Support.Tracking { test2.End(); Expect.Once.On(mockedSubscriber). - Method("ProgressUpdated"). + Method("ProgressChanged"). With( new Matcher[] { new NMock2.Matchers.TypeMatcher(typeof(ProgressTracker)), - new ProgressUpdateEventArgsMatcher(new ProgressReportEventArgs(1.0f)) + new ProgressReportEventArgsMatcher(new ProgressReportEventArgs(1.0f)) } ); @@ -289,11 +289,11 @@ namespace Nuclex.Support.Tracking { WithAnyArguments(); Expect.Once.On(mockedSubscriber). - Method("ProgressUpdated"). + Method("ProgressChanged"). With( new Matcher[] { new NMock2.Matchers.TypeMatcher(typeof(ProgressTracker)), - new ProgressUpdateEventArgsMatcher(new ProgressReportEventArgs(0.0f)) + new ProgressReportEventArgsMatcher(new ProgressReportEventArgs(0.0f)) } ); @@ -301,22 +301,22 @@ namespace Nuclex.Support.Tracking { tracker.Track(test1); Expect.Once.On(mockedSubscriber). - Method("ProgressUpdated"). + Method("ProgressChanged"). With( new Matcher[] { new NMock2.Matchers.TypeMatcher(typeof(ProgressTracker)), - new ProgressUpdateEventArgsMatcher(new ProgressReportEventArgs(0.5f)) + new ProgressReportEventArgsMatcher(new ProgressReportEventArgs(0.5f)) } ); tracker.Track(Waitable.EndedDummy); Expect.Once.On(mockedSubscriber). - Method("ProgressUpdated"). + Method("ProgressChanged"). With( new Matcher[] { new NMock2.Matchers.TypeMatcher(typeof(ProgressTracker)), - new ProgressUpdateEventArgsMatcher(new ProgressReportEventArgs(1.0f)) + new ProgressReportEventArgsMatcher(new ProgressReportEventArgs(1.0f)) } ); @@ -359,7 +359,7 @@ namespace Nuclex.Support.Tracking { new EventHandler(mockedSubscriber.IdleStateChanged); tracker.AsyncProgressChanged += - new EventHandler(mockedSubscriber.ProgressUpdated); + new EventHandler(mockedSubscriber.ProgressChanged); return mockedSubscriber; } diff --git a/Source/Tracking/SetProgression.Test.cs b/Source/Tracking/SetProgression.Test.cs index 0228dd9..696b074 100644 --- a/Source/Tracking/SetProgression.Test.cs +++ b/Source/Tracking/SetProgression.Test.cs @@ -220,7 +220,7 @@ namespace Nuclex.Support.Tracking { ISetProgressionSubscriber mockedSubscriber = mockSubscriber(testSetProgression); Expect.Exactly(2).On(mockedSubscriber). - Method("ProgressUpdated"). + Method("ProgressChanged"). WithAnyArguments(); Expect.Once.On(mockedSubscriber).