xunit v3 upgrade

f2calv · f2calv · commit fe02fd59f22b · 2026-06-12T15:23:31.000+02:00
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -15,22 +15,22 @@
     <PackageVersion Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.5.1" />
     <PackageVersion Include="Azure.Identity" Version="1.21.0" />
     <PackageVersion Include="Azure.ResourceManager.Dns" Version="1.1.1" />
-    <PackageVersion Include="CasCap.Api.Azure.Auth" Version="1.4.13" />
-    <PackageVersion Include="CasCap.Api.Azure.Storage" Version="1.4.13" />
+    <PackageVersion Include="CasCap.Api.Azure.Auth" Version="1.5.0" />
+    <PackageVersion Include="CasCap.Api.Azure.Storage" Version="1.5.0" />
     <PackageVersion Include="CasCap.Common.Abstractions" Version="4.10.1" />
-    <PackageVersion Include="CasCap.Common.AI" Version="4.11.9" />
-    <PackageVersion Include="CasCap.Common.Caching" Version="4.11.9" />
-    <PackageVersion Include="CasCap.Common.Configuration" Version="4.11.9" />
-    <PackageVersion Include="CasCap.Common.Extensions" Version="4.11.9" />
-    <PackageVersion Include="CasCap.Common.Extensions.Diagnostics.HealthChecks" Version="4.11.9" />
-    <PackageVersion Include="CasCap.Common.Logging" Version="4.11.9" />
-    <PackageVersion Include="CasCap.Common.Logging.Serilog" Version="4.11.9" />
-    <PackageVersion Include="CasCap.Common.Net" Version="4.11.9" />
-    <PackageVersion Include="CasCap.Common.OpenTelemetry" Version="4.11.9" />
-    <PackageVersion Include="CasCap.Common.Serialization.Json" Version="4.11.9" />
-    <PackageVersion Include="CasCap.Common.Serialization.MessagePack" Version="4.11.9" />
-    <PackageVersion Include="CasCap.Common.Services" Version="4.11.9" />
-    <PackageVersion Include="CasCap.Common.Testing" Version="4.11.9" />
+    <PackageVersion Include="CasCap.Common.AI" Version="4.12.0" />
+    <PackageVersion Include="CasCap.Common.Caching" Version="4.12.0" />
+    <PackageVersion Include="CasCap.Common.Configuration" Version="4.12.0" />
+    <PackageVersion Include="CasCap.Common.Extensions" Version="4.12.0" />
+    <PackageVersion Include="CasCap.Common.Extensions.Diagnostics.HealthChecks" Version="4.12.0" />
+    <PackageVersion Include="CasCap.Common.Logging" Version="4.12.0" />
+    <PackageVersion Include="CasCap.Common.Logging.Serilog" Version="4.12.0" />
+    <PackageVersion Include="CasCap.Common.Net" Version="4.12.0" />
+    <PackageVersion Include="CasCap.Common.OpenTelemetry" Version="4.12.0" />
+    <PackageVersion Include="CasCap.Common.Serialization.Json" Version="4.12.0" />
+    <PackageVersion Include="CasCap.Common.Serialization.MessagePack" Version="4.12.0" />
+    <PackageVersion Include="CasCap.Common.Services" Version="4.12.0" />
+    <PackageVersion Include="CasCap.Common.Testing" Version="4.12.0" />
     <PackageVersion Include="ILGPU" Version="1.5.3" />
     <PackageVersion Include="Iot.Device.Bindings" Version="4.2.0" />
     <PackageVersion Include="LibreHardwareMonitorLib" Version="0.9.6" />
@@ -62,28 +62,28 @@
     <PackageVersion Include="OllamaSharp" Version="5.4.25" />
     <PackageVersion Include="OpenWiz" Version="1.1.0" />
     <!--<PackageVersion Include="OpenAI" Version="2.8.0" />-->
-    <PackageVersion Include="OpenTelemetry" Version="1.15.3" />
+    <PackageVersion Include="OpenTelemetry" Version="1.16.0" />
     <PackageVersion Include="OpenTelemetry.Api" Version="1.15.3" />
     <PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.15.3" />
     <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
     <PackageVersion Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.15.0-beta.1" />
-    <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.15.3" />
+    <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.16.0" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.2" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.15.1" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.Process" Version="1.15.0-beta.1" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.15.1" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.15.0-beta.1" />
     <PackageVersion Include="PeterPuff.BuderusKm200Reader" Version="1.1.0" />
     <PackageVersion Include="SolarCalculator" Version="3.6.1" />
-    <PackageVersion Include="Spectre.Console" Version="0.56.0" />
-    <PackageVersion Include="Spectre.Console.ImageSharp" Version="0.56.0" />
-    <PackageVersion Include="Spectre.Console.Json" Version="0.56.0" />
+    <PackageVersion Include="Spectre.Console" Version="0.57.0" />
+    <PackageVersion Include="Spectre.Console.ImageSharp" Version="0.57.0" />
+    <PackageVersion Include="Spectre.Console.Json" Version="0.57.0" />
     <PackageVersion Include="Swashbuckle.AspNetCore" Version="10.2.1" />
     <PackageVersion Include="Tiveria.Home.Knx" Version="2.0.81" />
     <!--<PackageVersion Include="UnifiApi" Version="1.0.0.17" />-->
     <PackageVersion Include="coverlet.collector" Version="10.0.1" />
     <PackageVersion Include="coverlet.msbuild" Version="10.0.1" />
-    <PackageVersion Include="xunit" Version="2.9.3" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
+    <PackageVersion Include="xunit.v3" Version="3.2.2" />
   </ItemGroup>
 </Project>
diff --git a/src/CasCap.Api.Buderus.Tests/BuderusKm200ClientServiceTests.cs b/src/CasCap.Api.Buderus.Tests/BuderusKm200ClientServiceTests.cs
@@ -113,7 +113,7 @@ public async Task SetDataPoint_DhwSetTemperature_Roundtrip()
         _output.WriteLine($"Original {datapointId} = {original.Value} {original.UnitOfMeasure}");
 
         // Write the same value back (no-op from the device's perspective)
-        var success = await svc.SetDataPoint(datapointId, original.Value!);
+        var success = await svc.SetDataPoint(datapointId, original.Value!, TestContext.Current.CancellationToken);
         Assert.True(success, $"SetDataPoint returned false for '{datapointId}'");
 
         // Confirm the value is unchanged
@@ -134,7 +134,7 @@ public async Task SetDataPoint_HeatingCircuit2NormalTemp_Roundtrip()
         Assert.Equal(1, original.Writeable);
         _output.WriteLine($"Original {datapointId} = {original.Value} {original.UnitOfMeasure}");
 
-        var success = await svc.SetDataPoint(datapointId, original.Value!);
+        var success = await svc.SetDataPoint(datapointId, original.Value!, TestContext.Current.CancellationToken);
         Assert.True(success, $"SetDataPoint returned false for '{datapointId}'");
 
         var after = await svc.GetDataPoint(datapointId);
@@ -156,7 +156,7 @@ public async Task SetDataPoint_DhwOperationMode_Roundtrip()
         _output.WriteLine($"Original {datapointId} = {original.Value}");
 
         // Write the same value back
-        var success = await svc.SetDataPoint(datapointId, original.Value!);
+        var success = await svc.SetDataPoint(datapointId, original.Value!, TestContext.Current.CancellationToken);
         Assert.True(success, $"SetDataPoint returned false for '{datapointId}'");
 
         var after = await svc.GetDataPoint(datapointId);
@@ -170,7 +170,7 @@ public async Task SetDataPoint_DhwOperationMode_Roundtrip()
     public async Task SetDataPoint_ReadOnlyDatapoint_ReturnsFalse()
     {
         // /dhwCircuits/dhw1/actualTemp is not writeable (writeable=0)
-        var success = await svc.SetDataPoint("/dhwCircuits/dhw1/actualTemp", "50");
+        var success = await svc.SetDataPoint("/dhwCircuits/dhw1/actualTemp", "50", TestContext.Current.CancellationToken);
 
         Assert.False(success, "SetDataPoint should return false for a read-only datapoint");
         _output.WriteLine("Correctly rejected write to read-only datapoint");
diff --git a/src/CasCap.Api.Buderus.Tests/CasCap.Api.Buderus.Tests.csproj b/src/CasCap.Api.Buderus.Tests/CasCap.Api.Buderus.Tests.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+    <OutputType>Exe</OutputType>
     <TargetFramework>net10.0</TargetFramework>
     <RootNamespace>CasCap.Tests</RootNamespace>
     <IsPackable>false</IsPackable>
@@ -37,7 +38,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.v3" />
     <PackageReference Include="xunit.runner.visualstudio">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/src/CasCap.Api.Buderus.Tests/GlobalUsings.cs b/src/CasCap.Api.Buderus.Tests/GlobalUsings.cs
@@ -6,4 +6,3 @@
 global using Microsoft.Extensions.DependencyInjection;
 global using Microsoft.Extensions.Hosting;
 global using Xunit;
-global using Xunit.Abstractions;
diff --git a/src/CasCap.Api.DoorBird.Tests/CasCap.Api.DoorBird.Tests.csproj b/src/CasCap.Api.DoorBird.Tests/CasCap.Api.DoorBird.Tests.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+    <OutputType>Exe</OutputType>
     <TargetFramework>net10.0</TargetFramework>
     <RootNamespace>CasCap.Tests</RootNamespace>
     <IsPackable>false</IsPackable>
@@ -38,7 +39,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.v3" />
     <PackageReference Include="xunit.runner.visualstudio">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/src/CasCap.Api.DoorBird.Tests/GlobalUsings.cs b/src/CasCap.Api.DoorBird.Tests/GlobalUsings.cs
@@ -7,4 +7,3 @@
 global using Microsoft.Extensions.Hosting;
 global using Microsoft.Extensions.Hosting.Internal;
 global using Xunit;
-global using Xunit.Abstractions;
diff --git a/src/CasCap.Api.Fronius.Tests/CasCap.Api.Fronius.Tests.csproj b/src/CasCap.Api.Fronius.Tests/CasCap.Api.Fronius.Tests.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+    <OutputType>Exe</OutputType>
     <TargetFramework>net10.0</TargetFramework>
     <RootNamespace>CasCap.Tests</RootNamespace>
     <IsPackable>false</IsPackable>
@@ -37,7 +38,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.v3" />
     <PackageReference Include="xunit.runner.visualstudio">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/src/CasCap.Api.Fronius.Tests/FroniusClientServiceTests.cs b/src/CasCap.Api.Fronius.Tests/FroniusClientServiceTests.cs
@@ -75,7 +75,7 @@ public async Task GetMeterRealtimeData_ReturnsData()
     public async Task GetStorageRealtimeData_ReturnsData()
     {
         // Debug: fetch raw JSON to inspect the response shape
-        var rawResponse = await svc.Client.GetStringAsync("solar_api/v1/GetStorageRealtimeData.cgi?Scope=System");
+        var rawResponse = await svc.Client.GetStringAsync("solar_api/v1/GetStorageRealtimeData.cgi?Scope=System", TestContext.Current.CancellationToken);
         _output.WriteLine($"Raw response: {rawResponse}");
 
         var result = await svc.GetStorageRealtimeData();
diff --git a/src/CasCap.Api.Fronius.Tests/GlobalUsings.cs b/src/CasCap.Api.Fronius.Tests/GlobalUsings.cs
@@ -5,4 +5,3 @@
 global using Microsoft.Extensions.DependencyInjection;
 global using Microsoft.Extensions.Hosting;
 global using Xunit;
-global using Xunit.Abstractions;
diff --git a/src/CasCap.Api.Knx.Tests/CasCap.Api.Knx.Tests.csproj b/src/CasCap.Api.Knx.Tests/CasCap.Api.Knx.Tests.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+    <OutputType>Exe</OutputType>
     <TargetFramework>net10.0</TargetFramework>
     <RootNamespace>CasCap.Tests</RootNamespace>
     <IsPackable>false</IsPackable>
@@ -37,7 +38,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.v3" />
     <PackageReference Include="xunit.runner.visualstudio">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/src/CasCap.Api.Knx.Tests/CemiDecodingTests.cs b/src/CasCap.Api.Knx.Tests/CemiDecodingTests.cs
@@ -17,7 +17,7 @@ public async Task DecodeCemiFrames_FromAzureTableStorage()
         var cemiAzTablesSink = (KnxSinkAzureTablesCemiService)_serviceProvider
             .GetRequiredKeyedService<IEventSink<KnxEvent>>("AzureTablesCemi");
 
-        await _knxGroupAddressLookupSvc.GetLookup();
+        await _knxGroupAddressLookupSvc.GetLookup(TestContext.Current.CancellationToken);
 
         var serializer = new CemiLDataSerializer();
         var cemiEntities = await cemiAzTablesSink.GetCemiReadingEntities(CancellationToken.None);
diff --git a/src/CasCap.Api.Knx.Tests/ChannelKnxTelegramBrokerTests.cs b/src/CasCap.Api.Knx.Tests/ChannelKnxTelegramBrokerTests.cs
@@ -11,7 +11,7 @@ public async Task PublishAsync_And_SubscribeAsync_RoundTrips_Single_Item()
         var broker = new ChannelKnxTelegramBroker<string>();
         var expected = "hello";
 
-        await broker.PublishAsync(expected);
+        await broker.PublishAsync(expected, TestContext.Current.CancellationToken);
 
         using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(2));
         await foreach (var item in broker.SubscribeAsync(cts.Token))
@@ -28,7 +28,7 @@ public async Task SubscribeAsync_Yields_Items_In_Order()
         var expected = new[] { 1, 2, 3 };
 
         foreach (var value in expected)
-            await broker.PublishAsync(value);
+            await broker.PublishAsync(value, TestContext.Current.CancellationToken);
 
         var received = new List<int>();
         using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(2));
@@ -70,7 +70,7 @@ public async Task PublishAsync_Multiple_Consumers_Not_Supported_SingleReader()
         // so only one subscriber should consume items.
         var broker = new ChannelKnxTelegramBroker<int>();
 
-        await broker.PublishAsync(42);
+        await broker.PublishAsync(42, TestContext.Current.CancellationToken);
 
         using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(2));
         await foreach (var item in broker.SubscribeAsync(cts.Token))
diff --git a/src/CasCap.Api.Knx.Tests/GlobalUsings.cs b/src/CasCap.Api.Knx.Tests/GlobalUsings.cs
@@ -9,4 +9,3 @@
 global using System.Diagnostics;
 global using System.Xml.Linq;
 global using Xunit;
-global using Xunit.Abstractions;
diff --git a/src/CasCap.Api.Knx.Tests/GroupAddressTests.cs b/src/CasCap.Api.Knx.Tests/GroupAddressTests.cs
@@ -32,7 +32,7 @@ public async Task ParseGroupAddressNamingConvention()
     {
         var address_errors = new List<KnxGroupAddressParsed>();
         var i = 0;
-        var gaLookup = await _knxGroupAddressLookupSvc.GetLookup();
+        var gaLookup = await _knxGroupAddressLookupSvc.GetLookup(TestContext.Current.CancellationToken);
         foreach (var kvp in gaLookup)
         {
             var kga = kvp.Value;
@@ -84,10 +84,10 @@ public async Task DeserializedGroupAddressCountMatchesXml()
     {
         var path = _serviceProvider.GetRequiredService<IOptions<KnxConfig>>().Value.GroupAddressXmlFilePath;
 
-        var deserialized = await KnxGroupAddressLookupService.DeserializeGroupAddressesFromFile(path);
+        var deserialized = await KnxGroupAddressLookupService.DeserializeGroupAddressesFromFile(path, TestContext.Current.CancellationToken);
 
         //count GroupAddress elements directly from the raw XML
-        var xml = await File.ReadAllTextAsync(path);
+        var xml = await File.ReadAllTextAsync(path, TestContext.Current.CancellationToken);
         var xDoc = XDocument.Parse(xml);
         XNamespace ns = "http://knx.org/xml/ga-export/01";
         var xmlElementCount = xDoc.Descendants(ns + "GroupAddress").Count();
@@ -99,8 +99,8 @@ public async Task DeserializedGroupAddressCountMatchesXml()
     [Fact]
     public async Task GroupedAddressesContainAllChildren()
     {
-        var gaLookup = await _knxGroupAddressLookupSvc.GetLookup();
-        var groups = await _knxGroupAddressLookupSvc.GetGroupAddressesGrouped();
+        var gaLookup = await _knxGroupAddressLookupSvc.GetLookup(TestContext.Current.CancellationToken);
+        var groups = await _knxGroupAddressLookupSvc.GetGroupAddressesGrouped(TestContext.Current.CancellationToken);
 
         var totalChildren = groups.Sum(g => g.Children.Count);
         _output.WriteLine($"Groups: {groups.Count}, Children: {totalChildren}, Lookup: {gaLookup.Count}");
diff --git a/src/CasCap.Api.Miele.Tests/CasCap.Api.Miele.Tests.csproj b/src/CasCap.Api.Miele.Tests/CasCap.Api.Miele.Tests.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+    <OutputType>Exe</OutputType>
     <TargetFramework>net10.0</TargetFramework>
     <RootNamespace>CasCap.Tests</RootNamespace>
     <IsPackable>false</IsPackable>
@@ -30,7 +31,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.v3" />
     <PackageReference Include="xunit.runner.visualstudio">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/src/CasCap.Api.Miele.Tests/GlobalUsings.cs b/src/CasCap.Api.Miele.Tests/GlobalUsings.cs
@@ -10,4 +10,3 @@
 global using Microsoft.Extensions.Options;
 global using System.Net.Http.Headers;
 global using Xunit;
-global using Xunit.Abstractions;
diff --git a/src/CasCap.Api.SignalCli.Tests/CasCap.Api.SignalCli.Tests.csproj b/src/CasCap.Api.SignalCli.Tests/CasCap.Api.SignalCli.Tests.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+    <OutputType>Exe</OutputType>
     <TargetFramework>net10.0</TargetFramework>
     <RootNamespace>CasCap.Tests</RootNamespace>
     <IsPackable>false</IsPackable>
@@ -38,7 +39,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.v3" />
     <PackageReference Include="xunit.runner.visualstudio">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/src/CasCap.Api.SignalCli.Tests/GlobalUsings.cs b/src/CasCap.Api.SignalCli.Tests/GlobalUsings.cs
@@ -11,4 +11,3 @@
 global using Microsoft.Extensions.Logging;
 global using Microsoft.Extensions.Options;
 global using Xunit;
-global using Xunit.Abstractions;
diff --git a/src/CasCap.Api.SignalCli.Tests/Tests/Integration/SignalCliJsonRpcClientServiceTests.cs b/src/CasCap.Api.SignalCli.Tests/Tests/Integration/SignalCliJsonRpcClientServiceTests.cs
@@ -17,7 +17,7 @@ public void Transport_DefaultsToJsonRpc()
     public async Task ConnectAsync_EstablishesWebSocket()
     {
         await using var jsonRpcSvc = CreateJsonRpcService();
-        await jsonRpcSvc.ConnectAsync();
+        await jsonRpcSvc.ConnectAsync(TestContext.Current.CancellationToken);
         _output.WriteLine("WebSocket connected successfully");
     }
 
@@ -34,14 +34,14 @@ public async Task ReceiveAsync_ReturnsBufferedMessages()
             Number = _config.PhoneNumber,
             Recipients = [_config.PhoneNumber]
         };
-        var sendResult = await notifier.SendAsync(msg);
+        var sendResult = await notifier.SendAsync(msg, TestContext.Current.CancellationToken);
         Assert.NotNull(sendResult);
         _output.WriteLine($"Sent message, timestamp={sendResult.Timestamp}");
 
         // Allow time for WebSocket delivery
-        await Task.Delay(2000);
+        await Task.Delay(2000, TestContext.Current.CancellationToken);
 
-        var messages = await notifier.ReceiveAsync(_config.PhoneNumber);
+        var messages = await notifier.ReceiveAsync(_config.PhoneNumber, TestContext.Current.CancellationToken);
         _output.WriteLine($"Received {messages?.Length ?? 0} message(s)");
         Assert.NotNull(messages);
     }
@@ -52,7 +52,7 @@ public async Task ListGroupsAsync_DelegatesToRestClient()
         await using var jsonRpcSvc = CreateJsonRpcService();
         var notifier = (INotifier)jsonRpcSvc;
 
-        var groups = await notifier.ListGroupsAsync(_config.PhoneNumber);
+        var groups = await notifier.ListGroupsAsync(_config.PhoneNumber, TestContext.Current.CancellationToken);
         Assert.NotNull(groups);
         _output.WriteLine($"Groups={groups.Length}");
     }
diff --git a/src/CasCap.Api.SignalCli.Tests/Tests/Integration/SignalCliRestClientServiceTests.cs b/src/CasCap.Api.SignalCli.Tests/Tests/Integration/SignalCliRestClientServiceTests.cs
@@ -71,7 +71,7 @@ public async Task SendMessage_ToGroup_ReturnsTimestamp()
     {
         // Flush pending envelopes so signal-cli processes group membership
         // changes (e.g. a member accepting an invite) before we read state.
-        var pending = await _svc.ReceiveMessages(_config.PhoneNumber);
+        var pending = await _svc.ReceiveMessages(_config.PhoneNumber, TestContext.Current.CancellationToken);
         _output.WriteLine($"FlushedMessages={pending?.Length ?? 0}");
 
         var groups = await _svc.ListGroups(_config.PhoneNumber);
@@ -225,7 +225,7 @@ public async Task HideTypingIndicator_ReturnsTrue()
     [Fact]
     public async Task ReceiveMessages_ReturnsMessages()
     {
-        var result = await _svc.ReceiveMessages(_config.PhoneNumber);
+        var result = await _svc.ReceiveMessages(_config.PhoneNumber, TestContext.Current.CancellationToken);
         Assert.NotNull(result);
         _output.WriteLine($"ReceivedMessages={result.Length}");
         foreach (var msg in result)
diff --git a/src/CasCap.App.Tests/Api/HealthTests.cs b/src/CasCap.App.Tests/Api/HealthTests.cs
diff --git a/src/CasCap.App.Tests/Api/SystemControllerTests.cs b/src/CasCap.App.Tests/Api/SystemControllerTests.cs
diff --git a/src/CasCap.App.Tests/CasCap.App.Tests.csproj b/src/CasCap.App.Tests/CasCap.App.Tests.csproj
diff --git a/src/CasCap.App.Tests/GlobalUsings.cs b/src/CasCap.App.Tests/GlobalUsings.cs
diff --git a/src/CasCap.App.Tests/Infrastructure/WebApiTestBase.cs b/src/CasCap.App.Tests/Infrastructure/WebApiTestBase.cs
diff --git a/src/CasCap.App.Tests/Misc/AIAgentExtensionsTests.cs b/src/CasCap.App.Tests/Misc/AIAgentExtensionsTests.cs
diff --git a/src/CasCap.App.Tests/Misc/LlamaCppApiClientTests.cs b/src/CasCap.App.Tests/Misc/LlamaCppApiClientTests.cs

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public async Task GetMeterRealtimeData_ReturnsData()`
`75`	`75`	`public async Task GetStorageRealtimeData_ReturnsData()`
`76`	`76`	`{`
`77`	`77`	`// Debug: fetch raw JSON to inspect the response shape`
`78`		`- var rawResponse = await svc.Client.GetStringAsync("solar_api/v1/GetStorageRealtimeData.cgi?Scope=System");`
	`78`	`+ var rawResponse = await svc.Client.GetStringAsync("solar_api/v1/GetStorageRealtimeData.cgi?Scope=System", TestContext.Current.CancellationToken);`
`79`	`79`	`_output.WriteLine($"Raw response: {rawResponse}");`
`80`	`80`
`81`	`81`	`var result = await svc.GetStorageRealtimeData();`