From a3de5b041c43f8e4b3c66f87c5be649acbeaf664 Mon Sep 17 00:00:00 2001 From: Markus Ewald Date: Sun, 1 Feb 2009 20:54:01 +0000 Subject: [PATCH] Fixed some minor deviations from the coding conventions in the ProgressTracker class git-svn-id: file:///srv/devel/repo-conversion/nusu@119 d2e56fa2-650e-0410-a79f-9358c0239efd --- Source/Tracking/ProgressTracker.Test.cs | 38 +++++++++++-------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/Source/Tracking/ProgressTracker.Test.cs b/Source/Tracking/ProgressTracker.Test.cs index a33b604..79ec785 100644 --- a/Source/Tracking/ProgressTracker.Test.cs +++ b/Source/Tracking/ProgressTracker.Test.cs @@ -40,13 +40,13 @@ namespace Nuclex.Support.Tracking { /// Called when the tracked progress changes /// Progress tracker whose progress has changed - /// Contains the new progress achieved - void ProgressChanged(object sender, ProgressReportEventArgs e); + /// Contains the new progress achieved + void ProgressChanged(object sender, ProgressReportEventArgs arguments); /// Called when the progress tracker's idle state changes /// Progress tracker whose idle state has changed - /// Contains the new idle state of the tracker - void IdleStateChanged(object sender, IdleStateEventArgs e); + /// Contains the new idle state of the tracker + void IdleStateChanged(object sender, IdleStateEventArgs arguments); } @@ -54,10 +54,10 @@ namespace Nuclex.Support.Tracking { #region class ProgressUpdateEventArgsMatcher - /// Compares two ProgressUpdateEventArgsInstances for NMock validation + /// Compares two ProgressUpdateEventArgs instances private class ProgressReportEventArgsMatcher : Matcher { - /// Initializes a new ProgressUpdateEventArgsMatcher + /// Initializes a new ProgressUpdateEventArgsMatcher /// Expected progress update event arguments public ProgressReportEventArgsMatcher(ProgressReportEventArgs expected) { this.expected = expected; @@ -140,14 +140,14 @@ namespace Nuclex.Support.Tracking { #region class EvilTransaction /// - /// Transaction that tries to emulate a thread given a progress report at + /// Transaction that tries to emulate a thread giving a progress report at /// a very inconvenient time ;) /// private class EvilTransaction : Transaction, IProgressReporter { /// will be triggered to report when progress has been achieved public event EventHandler AsyncProgressChanged { - add {} + add { } remove { // Send a progress update right when the subscriber is trying to unsubscribe value(this, new ProgressReportEventArgs(0.5f)); @@ -175,19 +175,15 @@ namespace Nuclex.Support.Tracking { // Step 1 { - Expect.Once.On(mockedSubscriber). - Method("IdleStateChanged"). - WithAnyArguments(); + Expect.Once.On(mockedSubscriber).Method("IdleStateChanged").WithAnyArguments(); // Since the progress is already at 0, these redundant reports are optional - Expect.Between(0, 2).On(mockedSubscriber). - Method("ProgressChanged"). - With( - new Matcher[] { + Expect.Between(0, 2).On(mockedSubscriber).Method("ProgressChanged").With( + new Matcher[] { new NMock2.Matchers.TypeMatcher(typeof(ProgressTracker)), new ProgressReportEventArgsMatcher(new ProgressReportEventArgs(0.0f)) } - ); + ); tracker.Track(test1); tracker.Track(test2); @@ -195,14 +191,12 @@ namespace Nuclex.Support.Tracking { // Step 2 { - Expect.Once.On(mockedSubscriber). - Method("ProgressChanged"). - With( - new Matcher[] { + Expect.Once.On(mockedSubscriber).Method("ProgressChanged").With( + new Matcher[] { new NMock2.Matchers.TypeMatcher(typeof(ProgressTracker)), new ProgressReportEventArgsMatcher(new ProgressReportEventArgs(0.25f)) } - ); + ); test1.ChangeProgress(0.5f); } @@ -311,7 +305,7 @@ namespace Nuclex.Support.Tracking { public void TestSoleEndedTransaction() { using(ProgressTracker tracker = new ProgressTracker()) { IProgressTrackerSubscriber mockedSubscriber = mockSubscriber(tracker); - + Expect.Never.On(mockedSubscriber).Method("IdleStateChanged").WithAnyArguments(); Expect.Never.On(mockedSubscriber).Method("ProgressChanged").WithAnyArguments();