Skip to content

Commit 94e529e

Browse files
committed
Clarify Event semantics for TestRunCompleted
1 parent 5971ac1 commit 94e529e

File tree

3 files changed

+18
-8
lines changed

3 files changed

+18
-8
lines changed

Rubberduck.Core/UI/UnitTesting/TestExplorerModel.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ public TestExplorerModel(IVBE vbe, ITestEngine testEngine)
2020
_vbe = vbe;
2121
this.testEngine = testEngine;
2222

23-
testEngine.TestsRefreshed += RefreshTests;
23+
testEngine.TestsRefreshed += HandleTestsRefreshed;
2424
testEngine.TestRunCompleted += HandleRunCompletion;
2525
testEngine.TestCompleted += HandleTestCompletion;
2626
_dispatcher = Dispatcher.CurrentDispatcher;
2727
}
2828

29-
private void HandleRunCompletion(object sender, long time)
29+
private void HandleRunCompletion(object sender, TestRunCompletedEventArgs e)
3030
{
31-
TotalDuration = time;
31+
TotalDuration = e.Duration;
3232
ExecutedCount = Tests.Count(t => t.Result.Outcome != TestOutcome.Unknown);
3333
}
3434

@@ -50,7 +50,7 @@ private void HandleTestCompletion(object sender, TestCompletedEventArgs e)
5050
RefreshProgressBarColor();
5151
}
5252

53-
private void RefreshTests(object sender, EventArgs args)
53+
private void HandleTestsRefreshed(object sender, EventArgs args)
5454
{
5555
Tests.Clear();
5656
foreach (var test in testEngine.Tests.Select(test => new TestMethodViewModel(test)))
@@ -130,7 +130,7 @@ public void Dispose()
130130
if (testEngine != null)
131131
{
132132
testEngine.TestCompleted -= HandleTestCompletion;
133-
testEngine.TestsRefreshed -= RefreshTests;
133+
testEngine.TestsRefreshed -= HandleTestsRefreshed;
134134
testEngine.TestRunCompleted -= HandleRunCompletion;
135135
}
136136
}

Rubberduck.UnitTesting/UnitTesting/ITestEngine.cs

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace Rubberduck.UnitTesting
66
public interface ITestEngine
77
{
88
event EventHandler<TestCompletedEventArgs> TestCompleted;
9-
event EventHandler<long> TestRunCompleted;
9+
event EventHandler<TestRunCompletedEventArgs> TestRunCompleted;
1010
event EventHandler TestsRefreshed;
1111

1212
IEnumerable<TestMethod> Tests { get; }
@@ -30,4 +30,14 @@ public TestCompletedEventArgs(TestMethod test, TestResult result)
3030
Result = result;
3131
}
3232
}
33+
34+
public class TestRunCompletedEventArgs : EventArgs
35+
{
36+
public long Duration { get; }
37+
38+
public TestRunCompletedEventArgs(long duration)
39+
{
40+
Duration = duration;
41+
}
42+
}
3343
}

Rubberduck.UnitTesting/UnitTesting/TestEngine.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ private void StateChangedHandler(object sender, ParserStateEventArgs e)
9999
}
100100

101101
public event EventHandler<TestCompletedEventArgs> TestCompleted;
102-
public event EventHandler<long> TestRunCompleted;
102+
public event EventHandler<TestRunCompletedEventArgs> TestRunCompleted;
103103
public event EventHandler TestsRefreshed;
104104

105105
private void OnTestCompleted(TestMethod test, TestResult result)
@@ -268,7 +268,7 @@ private void RunWhileSuspended(IEnumerable<TestMethod> tests)
268268
Logger.Error(ex, "Unexpected expection while running unit tests; unit tests will be aborted");
269269
}
270270
overallTime.Stop();
271-
TestRunCompleted?.Invoke(this, overallTime.ElapsedMilliseconds);
271+
TestRunCompleted?.Invoke(this, new TestRunCompletedEventArgs(overallTime.ElapsedMilliseconds));
272272
}
273273

274274
private TestResult RunTestMethod(ITypeLibWrapper typeLib, TestMethod test)

0 commit comments

Comments
 (0)