Skip to content

Commit b112409

Browse files
TolikPylypchukTolikPylypchuk
committed
Fix tests so that they can run on Microsoft.Testing.Platform
1 parent 86fa845 commit b112409

14 files changed

+288
-168
lines changed

‎SharpHook.R3/R3GlobalHook.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ public sealed class R3GlobalHook : BasicGlobalHookBase, IR3GlobalHook
2626
/// </summary>
2727
/// <param name="globalHookType">The global hook type.</param>
2828
/// <param name="defaultTimeProvider">
29-
/// The default time provider for observables, or <see langword="null" /> to use the default one (as defined in
30-
/// <see cref="ObservableSystem.DefaultTimeProvider" />).
29+
/// The default time provider for observables, or <see langword="null" /> to use the default one as defined in
30+
/// <see cref="ObservableSystem.DefaultTimeProvider" />.
3131
/// </param>
3232
/// <param name="globalHookProvider">
3333
/// The underlying global hook provider, or <see langword="null" /> to use the default one.

‎SharpHook.R3/R3GlobalHookAdapter.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ public sealed class R3GlobalHookAdapter : IGlobalHook, IR3GlobalHook
3333
/// </summary>
3434
/// <param name="hook">The hook to adapt.</param>
3535
/// <param name="defaultTimeProvider">
36-
/// The default time provider for observables, or <see langword="null" /> to use the default one
37-
/// (as defined in <see cref="ObservableSystem.DefaultTimeProvider" />).
36+
/// The default time provider for observables, or <see langword="null" /> to use the default one as defined in
37+
/// <see cref="ObservableSystem.DefaultTimeProvider" />.
3838
/// </param>
3939
public R3GlobalHookAdapter(IGlobalHook hook, TimeProvider? defaultTimeProvider = null)
4040
{

‎SharpHook.R3/SharpHook.R3.xml‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎SharpHook.Tests/EventLoopGlobalHookTests.cs‎

Lines changed: 28 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public void IsRunning(GlobalHookType globalHookType)
88
// Arrange
99

1010
var provider = new TestProvider();
11-
var hook = new EventLoopGlobalHook(globalHookType: globalHookType, globalHookProvider: provider);
11+
var hook = new EventLoopGlobalHook(globalHookType, provider, runAsyncOnBackgroundThread: true);
1212

1313
// Act + Assert
1414

@@ -33,7 +33,7 @@ public void IsDisposed(GlobalHookType globalHookType)
3333
// Arrange
3434

3535
var provider = new TestProvider();
36-
var hook = new EventLoopGlobalHook(globalHookType: globalHookType, globalHookProvider: provider);
36+
var hook = new EventLoopGlobalHook(globalHookType, provider, runAsyncOnBackgroundThread: true);
3737

3838
// Act + Assert
3939

@@ -55,7 +55,7 @@ public void HookEnabled(GlobalHookType globalHookType, DateTimeAfterEpoch dateTi
5555
EventMask = t => mask
5656
};
5757

58-
var hook = new EventLoopGlobalHook(globalHookType: globalHookType, globalHookProvider: provider);
58+
var hook = new EventLoopGlobalHook(globalHookType, provider, runAsyncOnBackgroundThread: true);
5959

6060
object? actualSender = null;
6161
HookEventArgs? actualEventArgs = null;
@@ -95,7 +95,7 @@ public void HookDisabled(GlobalHookType globalHookType, DateTimeAfterEpoch dateT
9595
EventMask = t => mask
9696
};
9797

98-
var hook = new EventLoopGlobalHook(globalHookType: globalHookType, globalHookProvider: provider);
98+
var hook = new EventLoopGlobalHook(globalHookType, provider, runAsyncOnBackgroundThread: true);
9999

100100
object? actualSender = null;
101101
HookEventArgs? actualEventArgs = null;
@@ -136,7 +136,7 @@ public async Task KeyPressed(
136136
// Arrange
137137

138138
var provider = new TestProvider();
139-
using var hook = new EventLoopGlobalHook(globalHookType: globalHookType, globalHookProvider: provider);
139+
using var hook = new EventLoopGlobalHook(globalHookType, provider, runAsyncOnBackgroundThread: true);
140140

141141
var e = new UioHookEvent
142142
{
@@ -206,7 +206,7 @@ public async Task KeyReleased(
206206
// Arrange
207207

208208
var provider = new TestProvider();
209-
using var hook = new EventLoopGlobalHook(globalHookType: globalHookType, globalHookProvider: provider);
209+
using var hook = new EventLoopGlobalHook(globalHookType, provider, runAsyncOnBackgroundThread: true);
210210

211211
var e = new UioHookEvent
212212
{
@@ -277,7 +277,7 @@ public async Task KeyTyped(
277277
// Arrange
278278

279279
var provider = new TestProvider();
280-
using var hook = new EventLoopGlobalHook(globalHookType: globalHookType, globalHookProvider: provider);
280+
using var hook = new EventLoopGlobalHook(globalHookType, provider, runAsyncOnBackgroundThread: true);
281281

282282
var e = new UioHookEvent
283283
{
@@ -349,7 +349,7 @@ public async Task MousePressed(
349349
// Arrange
350350

351351
var provider = new TestProvider();
352-
using var hook = new EventLoopGlobalHook(globalHookType: globalHookType, globalHookProvider: provider);
352+
using var hook = new EventLoopGlobalHook(globalHookType, provider, runAsyncOnBackgroundThread: true);
353353

354354
var e = new UioHookEvent
355355
{
@@ -423,7 +423,7 @@ public async Task MouseReleased(
423423
// Arrange
424424

425425
var provider = new TestProvider();
426-
using var hook = new EventLoopGlobalHook(globalHookType: globalHookType, globalHookProvider: provider);
426+
using var hook = new EventLoopGlobalHook(globalHookType, provider, runAsyncOnBackgroundThread: true);
427427

428428
var e = new UioHookEvent
429429
{
@@ -497,7 +497,7 @@ public async Task MouseClicked(
497497
// Arrange
498498

499499
var provider = new TestProvider();
500-
using var hook = new EventLoopGlobalHook(globalHookType: globalHookType, globalHookProvider: provider);
500+
using var hook = new EventLoopGlobalHook(globalHookType, provider, runAsyncOnBackgroundThread: true);
501501

502502
var e = new UioHookEvent
503503
{
@@ -569,7 +569,7 @@ public async Task MouseMoved(
569569
// Arrange
570570

571571
var provider = new TestProvider();
572-
using var hook = new EventLoopGlobalHook(globalHookType: globalHookType, globalHookProvider: provider);
572+
using var hook = new EventLoopGlobalHook(globalHookType, provider, runAsyncOnBackgroundThread: true);
573573

574574
var e = new UioHookEvent
575575
{
@@ -637,7 +637,7 @@ public async Task MouseDragged(
637637
// Arrange
638638

639639
var provider = new TestProvider();
640-
using var hook = new EventLoopGlobalHook(globalHookType: globalHookType, globalHookProvider: provider);
640+
using var hook = new EventLoopGlobalHook(globalHookType, provider, runAsyncOnBackgroundThread: true);
641641

642642
var e = new UioHookEvent
643643
{
@@ -709,7 +709,7 @@ public async Task MouseWheel(
709709
// Arrange
710710

711711
var provider = new TestProvider();
712-
using var hook = new EventLoopGlobalHook(globalHookType: globalHookType, globalHookProvider: provider);
712+
using var hook = new EventLoopGlobalHook(globalHookType, provider, runAsyncOnBackgroundThread: true);
713713

714714
var e = new UioHookEvent
715715
{
@@ -784,7 +784,7 @@ public void RunFail(GlobalHookType globalHookType, FailedUioHookResult result)
784784
RunResult = result.Value
785785
};
786786

787-
var hook = new EventLoopGlobalHook(globalHookType: globalHookType, globalHookProvider: provider);
787+
using var hook = new EventLoopGlobalHook(globalHookType, provider, runAsyncOnBackgroundThread: true);
788788

789789
// Act + Assert
790790

@@ -802,7 +802,7 @@ public async Task RunAsyncFail(GlobalHookType globalHookType, FailedUioHookResul
802802
RunResult = result.Value
803803
};
804804

805-
var hook = new EventLoopGlobalHook(globalHookType: globalHookType, globalHookProvider: provider);
805+
using var hook = new EventLoopGlobalHook(globalHookType, provider, runAsyncOnBackgroundThread: true);
806806

807807
// Act + Assert
808808

@@ -816,7 +816,7 @@ public void RunRunning(GlobalHookType globalHookType)
816816
// Arrange
817817

818818
var provider = new TestProvider();
819-
using var hook = new EventLoopGlobalHook(globalHookType: globalHookType, globalHookProvider: provider);
819+
using var hook = new EventLoopGlobalHook(globalHookType, provider, runAsyncOnBackgroundThread: true);
820820

821821
this.RunHookAndWaitForStart(hook, provider);
822822

@@ -831,7 +831,7 @@ public async Task RunAsyncRunning(GlobalHookType globalHookType)
831831
// Arrange
832832

833833
var provider = new TestProvider();
834-
using var hook = new EventLoopGlobalHook(globalHookType: globalHookType, globalHookProvider: provider);
834+
using var hook = new EventLoopGlobalHook(globalHookType, provider, runAsyncOnBackgroundThread: true);
835835

836836
this.RunHookAndWaitForStart(hook, provider);
837837

@@ -845,7 +845,7 @@ public void RunDisposed(GlobalHookType globalHookType)
845845
{
846846
// Arrange
847847

848-
var hook = new SimpleGlobalHook(globalHookType);
848+
var hook = new EventLoopGlobalHook(globalHookType);
849849
hook.Dispose();
850850

851851
// Act + Assert
@@ -858,7 +858,7 @@ public async Task RunAsyncDisposed(GlobalHookType globalHookType)
858858
{
859859
// Arrange
860860

861-
var hook = new SimpleGlobalHook(globalHookType);
861+
var hook = new EventLoopGlobalHook(globalHookType);
862862
hook.Dispose();
863863

864864
// Act + Assert
@@ -876,22 +876,27 @@ public void StopFail(GlobalHookType globalHookType, FailedUioHookResult result)
876876
StopResult = result.Value
877877
};
878878

879-
var hook = new EventLoopGlobalHook(globalHookType: globalHookType, globalHookProvider: provider);
879+
var hook = new EventLoopGlobalHook(globalHookType, provider, runAsyncOnBackgroundThread: true);
880880

881881
this.RunHookAndWaitForStart(hook, provider);
882882

883883
// Act + Assert
884884

885885
var exception = Assert.Throws<HookException>(hook.Stop);
886886
Assert.Equal(result.Value, exception.Result);
887+
888+
// Clean up
889+
890+
provider.StopResult = UioHookResult.Success;
891+
this.DisposeHookAndWaitForStop(hook);
887892
}
888893

889894
[Property(DisplayName = "Stop should throw if the hook is disposed")]
890895
public void StopDisposed(GlobalHookType globalHookType)
891896
{
892897
// Arrange
893898

894-
var hook = new EventLoopGlobalHook(globalHookType: globalHookType);
899+
var hook = new EventLoopGlobalHook(globalHookType);
895900
hook.Dispose();
896901

897902
// Act + Assert
@@ -909,7 +914,7 @@ public void DisposeFail(GlobalHookType globalHookType, FailedUioHookResult resul
909914
StopResult = result.Value
910915
};
911916

912-
var hook = new EventLoopGlobalHook(globalHookType: globalHookType, globalHookProvider: provider);
917+
var hook = new EventLoopGlobalHook(globalHookType, provider, runAsyncOnBackgroundThread: true);
913918

914919
this.RunHookAndWaitForStart(hook, provider);
915920

@@ -939,8 +944,7 @@ public void DisposeDisposed(GlobalHookType globalHookType)
939944
[Property(DisplayName = "EventLoopGlobalHook should not throw if the provider is null")]
940945
public void ProviderNull(GlobalHookType globalHookType)
941946
{
942-
var exception = Record.Exception(() =>
943-
new EventLoopGlobalHook(globalHookType: globalHookType, globalHookProvider: null));
947+
var exception = Record.Exception(() => new EventLoopGlobalHook(globalHookType, globalHookProvider: null));
944948

945949
Assert.Null(exception);
946950
}

0 commit comments

Comments
 (0)