From 8ede66e16667f441e17fb8a952534cf5b8891401 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomas=20Hellstr=C3=B6m?= Date: Thu, 2 May 2024 20:46:36 +0200 Subject: [PATCH] Fixed new warnings introduced in new version of roslyn --- .../Internal/AppScopedHaContextProviderTest.cs | 6 +++--- .../Internal/EntityStateCacheTest.cs | 12 ++++++------ .../Internal/QueuedObservabeTest.cs | 10 +++++----- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/HassModel/NetDaemon.HassModel.Tests/Internal/AppScopedHaContextProviderTest.cs b/src/HassModel/NetDaemon.HassModel.Tests/Internal/AppScopedHaContextProviderTest.cs index c1cc1aa00..a6c337e59 100644 --- a/src/HassModel/NetDaemon.HassModel.Tests/Internal/AppScopedHaContextProviderTest.cs +++ b/src/HassModel/NetDaemon.HassModel.Tests/Internal/AppScopedHaContextProviderTest.cs @@ -24,7 +24,7 @@ public sealed class AppScopedHaContextProviderTest : IDisposable }; [Fact] - public async void TestCallService() + public async Task TestCallService() { var haContext = await CreateTargetAsync(); @@ -48,7 +48,7 @@ public async void TestCallService() } [Fact] - public async void TestCallServiceWithFloor() + public async Task TestCallServiceWithFloor() { var haContext = await CreateTargetAsync(); @@ -72,7 +72,7 @@ public async void TestCallServiceWithFloor() } [Fact] - public async void TestCallServiceWithLabel() + public async Task TestCallServiceWithLabel() { var haContext = await CreateTargetAsync(); diff --git a/src/HassModel/NetDaemon.HassModel.Tests/Internal/EntityStateCacheTest.cs b/src/HassModel/NetDaemon.HassModel.Tests/Internal/EntityStateCacheTest.cs index 46dafb679..c0d2e0ce5 100644 --- a/src/HassModel/NetDaemon.HassModel.Tests/Internal/EntityStateCacheTest.cs +++ b/src/HassModel/NetDaemon.HassModel.Tests/Internal/EntityStateCacheTest.cs @@ -11,7 +11,7 @@ namespace NetDaemon.HassModel.Tests.Internal; public class EntityStateCacheTest { [Fact] - public async void StateChangeEventIsFirstStoredInCacheThanForwarded() + public async Task StateChangeEventIsFirstStoredInCacheThanForwarded() { var entityId = "sensor.test"; @@ -36,7 +36,7 @@ public async void StateChangeEventIsFirstStoredInCacheThanForwarded() n.SubscribeToHomeAssistantEventsAsync(It.IsAny(), It.IsAny())) .ReturnsAsync(testSubject ); - + var serviceColletion = new ServiceCollection(); _ = serviceColletion.AddTransient>(_ => testSubject); var sp = serviceColletion.BuildServiceProvider(); @@ -83,7 +83,7 @@ public async void StateChangeEventIsFirstStoredInCacheThanForwarded() } [Fact] - public async void AllEntityIds_returnsInitialPlusChangedEntities() + public async Task AllEntityIds_returnsInitialPlusChangedEntities() { // Arrange using var testSubject = new Subject(); @@ -103,12 +103,12 @@ public async void AllEntityIds_returnsInitialPlusChangedEntities() }); var serviceColletion = new ServiceCollection(); - + _hassConnectionMock.Setup(n => n.SubscribeToHomeAssistantEventsAsync(It.IsAny(), It.IsAny())) .ReturnsAsync(testSubject ); - + var sp = serviceColletion.BuildServiceProvider(); using var cache = new EntityStateCache(haRunnerMock.Object, sp); @@ -140,4 +140,4 @@ public async void AllEntityIds_returnsInitialPlusChangedEntities() // Assert cache.AllEntityIds.Should().BeEquivalentTo("sensor.sensor1", "sensor.sensor2"); } -} \ No newline at end of file +} diff --git a/src/HassModel/NetDaemon.HassModel.Tests/Internal/QueuedObservabeTest.cs b/src/HassModel/NetDaemon.HassModel.Tests/Internal/QueuedObservabeTest.cs index 80389f0da..f5e8757f0 100644 --- a/src/HassModel/NetDaemon.HassModel.Tests/Internal/QueuedObservabeTest.cs +++ b/src/HassModel/NetDaemon.HassModel.Tests/Internal/QueuedObservabeTest.cs @@ -8,7 +8,7 @@ namespace NetDaemon.HassModel.Tests.Internal; public class QueuedObservabeTest { [Fact] - public async void EventsSouldbeforwarded() + public async Task EventsSouldbeforwarded() { var source = new Subject(); @@ -28,7 +28,7 @@ public async void EventsSouldbeforwarded() } [Fact] - public async void SubscribersShouldNotBlockEachOther() + public async Task SubscribersShouldNotBlockEachOther() { var source = new Subject(); @@ -90,11 +90,11 @@ public async Task WhenScopeIsDisposedSubscribersAreDetached() await Task.WhenAll(waitTasks); await scoped1.DisposeAsync(); - + var waitTask2 = scope2ObserverMock.WaitForInvocationAndVerify(o => o.OnNext("Event2")); testSubject.OnNext("Event2"); await waitTask2; - + scope1AObserverMock.Verify(o => o.OnNext("Event2"), Times.Never, "Event should not reach Observer of disposed scope"); scope1BObserverMock.Verify(o => o.OnNext("Event2"), Times.Never, "Event should not reach Observer of disposed scope"); scope2ObserverMock.Verify(o => o.OnNext("Event2"), Times.Once); @@ -115,7 +115,7 @@ public async Task TestQueuedObservableShouldHaveFinishedTasksOnDispose() queue.Subscribe(subscriber.Object); // It is not enough that DisposeAsync waits on task - // since it can be aborted by the cancellation token + // since it can be aborted by the cancellation token var waitOnCallTask = subscriber.WaitForInvocation(n => n.OnNext(1)); source.OnNext(1); await waitOnCallTask;