From 6bd2e088fc6cedfeeee01c0cc43dfdd10aaa73c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Domeradzki?= Date: Fri, 8 Aug 2025 19:37:57 +0200 Subject: [PATCH] Misc --- ArchiSteamFarm.Tests/IGitHubPluginUpdates.cs | 5 ++- ArchiSteamFarm.Tests/SteamChatMessage.cs | 33 +++++++++++--------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/ArchiSteamFarm.Tests/IGitHubPluginUpdates.cs b/ArchiSteamFarm.Tests/IGitHubPluginUpdates.cs index 0063f0bab..c598854ee 100644 --- a/ArchiSteamFarm.Tests/IGitHubPluginUpdates.cs +++ b/ArchiSteamFarm.Tests/IGitHubPluginUpdates.cs @@ -22,6 +22,7 @@ // limitations under the License. using System; +using System.Threading; using System.Threading.Tasks; using ArchiSteamFarm.Core; using ArchiSteamFarm.Localization; @@ -43,6 +44,8 @@ internal sealed class IGitHubPluginUpdates { private readonly TestContext TestContext; + private CancellationToken CancellationToken => TestContext.CancellationTokenSource.Token; + [UsedImplicitly] public IGitHubPluginUpdates(TestContext testContext) { ArgumentNullException.ThrowIfNull(testContext); @@ -57,7 +60,7 @@ internal sealed class IGitHubPluginUpdates { typeof(ASF).GetProperty(nameof(ASF.WebBrowser))?.SetValue(null, webBrowser); - ReleaseResponse? response = await GitHubService.GetLatestRelease(Repository, cancellationToken: TestContext.CancellationTokenSource.Token).ConfigureAwait(false); + ReleaseResponse? response = await GitHubService.GetLatestRelease(Repository, cancellationToken: CancellationToken).ConfigureAwait(false); if (response == null) { Assert.Inconclusive(Strings.FormatWarningFailedWithError(nameof(response))); diff --git a/ArchiSteamFarm.Tests/SteamChatMessage.cs b/ArchiSteamFarm.Tests/SteamChatMessage.cs index d781a88a5..e8e18bd75 100644 --- a/ArchiSteamFarm.Tests/SteamChatMessage.cs +++ b/ArchiSteamFarm.Tests/SteamChatMessage.cs @@ -25,6 +25,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; +using System.Threading; using System.Threading.Tasks; using JetBrains.Annotations; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -37,6 +38,8 @@ namespace ArchiSteamFarm.Tests; internal sealed class SteamChatMessage { private readonly TestContext TestContext; + private CancellationToken CancellationToken => TestContext.CancellationTokenSource.Token; + [UsedImplicitly] public SteamChatMessage(TestContext testContext) { ArgumentNullException.ThrowIfNull(testContext); @@ -51,7 +54,7 @@ internal sealed class SteamChatMessage { const string emoji = "😎"; const string message = $"{emoji}{emoji}{emoji}{emoji}"; - List output = await GetMessageParts(message, prefix, true).ToListAsync(TestContext.CancellationTokenSource.Token).ConfigureAwait(false); + List output = await GetMessageParts(message, prefix, true).ToListAsync(CancellationToken).ConfigureAwait(false); Assert.HasCount(4, output); @@ -68,7 +71,7 @@ internal sealed class SteamChatMessage { internal async Task DoesntSkipEmptyNewlines() { string message = $"asdf{Environment.NewLine}{Environment.NewLine}asdf"; - List output = await GetMessageParts(message).ToListAsync(TestContext.CancellationTokenSource.Token).ConfigureAwait(false); + List output = await GetMessageParts(message).ToListAsync(CancellationToken).ConfigureAwait(false); Assert.HasCount(1, output); Assert.AreEqual(message, output.First()); @@ -86,7 +89,7 @@ internal sealed class SteamChatMessage { string longSequence = new('a', longLineLength - 1); string message = $"{longSequence}{emoji}"; - List output = await GetMessageParts(message, isAccountLimited: isAccountLimited).ToListAsync(TestContext.CancellationTokenSource.Token).ConfigureAwait(false); + List output = await GetMessageParts(message, isAccountLimited: isAccountLimited).ToListAsync(CancellationToken).ConfigureAwait(false); Assert.HasCount(2, output); @@ -99,7 +102,7 @@ internal sealed class SteamChatMessage { const string message = "abcdef["; const string escapedMessage = @"abcdef\["; - List output = await GetMessageParts(message).ToListAsync(TestContext.CancellationTokenSource.Token).ConfigureAwait(false); + List output = await GetMessageParts(message).ToListAsync(CancellationToken).ConfigureAwait(false); Assert.HasCount(1, output); Assert.AreEqual(escapedMessage, output.First()); @@ -115,7 +118,7 @@ internal sealed class SteamChatMessage { string longLine = new('a', longLineLength - 2); string message = $@"{longLine}\"; - List output = await GetMessageParts(message, isAccountLimited: isAccountLimited).ToListAsync(TestContext.CancellationTokenSource.Token).ConfigureAwait(false); + List output = await GetMessageParts(message, isAccountLimited: isAccountLimited).ToListAsync(CancellationToken).ConfigureAwait(false); Assert.HasCount(1, output); Assert.AreEqual($@"{message}\", output.First()); @@ -131,7 +134,7 @@ internal sealed class SteamChatMessage { string longLine = new('a', longLineLength - 1); string message = $"{longLine}["; - List output = await GetMessageParts(message, isAccountLimited: isAccountLimited).ToListAsync(TestContext.CancellationTokenSource.Token).ConfigureAwait(false); + List output = await GetMessageParts(message, isAccountLimited: isAccountLimited).ToListAsync(CancellationToken).ConfigureAwait(false); Assert.HasCount(2, output); @@ -143,7 +146,7 @@ internal sealed class SteamChatMessage { internal async Task NoNeedForAnySplittingWithNewlines() { string message = $"abcdef{Environment.NewLine}ghijkl{Environment.NewLine}mnopqr"; - List output = await GetMessageParts(message).ToListAsync(TestContext.CancellationTokenSource.Token).ConfigureAwait(false); + List output = await GetMessageParts(message).ToListAsync(CancellationToken).ConfigureAwait(false); Assert.HasCount(1, output); Assert.AreEqual(message, output.First()); @@ -153,7 +156,7 @@ internal sealed class SteamChatMessage { internal async Task NoNeedForAnySplittingWithoutNewlines() { const string message = "abcdef"; - List output = await GetMessageParts(message).ToListAsync(TestContext.CancellationTokenSource.Token).ConfigureAwait(false); + List output = await GetMessageParts(message).ToListAsync(CancellationToken).ConfigureAwait(false); Assert.HasCount(1, output); Assert.AreEqual(message, output.First()); @@ -167,7 +170,7 @@ internal sealed class SteamChatMessage { const string message = @"[b]bold[/b] \n"; const string escapedMessage = @"\[b]bold\[/b] \\n"; - List output = await GetMessageParts(message).ToListAsync(TestContext.CancellationTokenSource.Token).ConfigureAwait(false); + List output = await GetMessageParts(message).ToListAsync(CancellationToken).ConfigureAwait(false); Assert.HasCount(1, output); Assert.AreEqual(escapedMessage, output.First()); @@ -180,7 +183,7 @@ internal sealed class SteamChatMessage { const string message = "asdf"; - List output = await GetMessageParts(message, prefix).ToListAsync(TestContext.CancellationTokenSource.Token).ConfigureAwait(false); + List output = await GetMessageParts(message, prefix).ToListAsync(CancellationToken).ConfigureAwait(false); Assert.HasCount(1, output); Assert.AreEqual($"{escapedPrefix}{message}", output.First()); @@ -196,7 +199,7 @@ internal sealed class SteamChatMessage { string longLine = new('a', longLineLength); string message = $"{longLine}{longLine}{longLine}{longLine}"; - List output = await GetMessageParts(message, isAccountLimited: isAccountLimited).ToListAsync(TestContext.CancellationTokenSource.Token).ConfigureAwait(false); + List output = await GetMessageParts(message, isAccountLimited: isAccountLimited).ToListAsync(CancellationToken).ConfigureAwait(false); Assert.HasCount(4, output); @@ -270,7 +273,7 @@ internal sealed class SteamChatMessage { 1/1 ботов уже имеют игру app/304930 | Unturned. """; - List output = await GetMessageParts(message, prefix).ToListAsync(TestContext.CancellationTokenSource.Token).ConfigureAwait(false); + List output = await GetMessageParts(message, prefix).ToListAsync(CancellationToken).ConfigureAwait(false); Assert.HasCount(2, output); @@ -314,7 +317,7 @@ internal sealed class SteamChatMessage { string newlinePart = newlinePartBuilder.ToString(); string message = $"{newlinePart}{Environment.NewLine}{newlinePart}{Environment.NewLine}{newlinePart}{Environment.NewLine}{newlinePart}"; - List output = await GetMessageParts(message, isAccountLimited: isAccountLimited).ToListAsync(TestContext.CancellationTokenSource.Token).ConfigureAwait(false); + List output = await GetMessageParts(message, isAccountLimited: isAccountLimited).ToListAsync(CancellationToken).ConfigureAwait(false); Assert.HasCount(4, output); @@ -330,7 +333,7 @@ internal sealed class SteamChatMessage { const string message = "asdf"; - await Assert.ThrowsExactlyAsync(async () => await GetMessageParts(message, prefix).ToListAsync(TestContext.CancellationTokenSource.Token).ConfigureAwait(false)).ConfigureAwait(false); + await Assert.ThrowsExactlyAsync(async () => await GetMessageParts(message, prefix).ToListAsync(CancellationToken).ConfigureAwait(false)).ConfigureAwait(false); } [TestMethod] @@ -339,7 +342,7 @@ internal sealed class SteamChatMessage { const string message = "asdf"; - await Assert.ThrowsExactlyAsync(async () => await GetMessageParts(message, prefix).ToListAsync(TestContext.CancellationTokenSource.Token).ConfigureAwait(false)).ConfigureAwait(false); + await Assert.ThrowsExactlyAsync(async () => await GetMessageParts(message, prefix).ToListAsync(CancellationToken).ConfigureAwait(false)).ConfigureAwait(false); } } #pragma warning restore CA1812 // False positive, the class is used during MSTest