From f3d349b0a7e2320eb3b27b300f45f61925fbe8c5 Mon Sep 17 00:00:00 2001 From: Miheichev Aleksandr Sergeevich Date: Mon, 16 Nov 2026 06:04:53 +0000 Subject: [PATCH] fix(tests): bind WebAPI fixtures to ConfigState (#10608) --- .../Tests/SniffingSettingsIntegrationTests.cs | 4 +--- .../v2rayN.WebAPI/Tests/SubscriptionCreationTests.cs | 12 ++++++------ .../Tests/UpdatePreReleaseSettingsTests.cs | 12 ++++++------ 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/v2rayN/v2rayN.WebAPI/Tests/SniffingSettingsIntegrationTests.cs b/v2rayN/v2rayN.WebAPI/Tests/SniffingSettingsIntegrationTests.cs index e99f1753..272a9eeb 100644 --- a/v2rayN/v2rayN.WebAPI/Tests/SniffingSettingsIntegrationTests.cs +++ b/v2rayN/v2rayN.WebAPI/Tests/SniffingSettingsIntegrationTests.cs @@ -1,4 +1,3 @@ -using System.Reflection; using System.Text.Json.Nodes; using ServiceLib.Services.CoreConfig; using v2rayN.WebAPI.Contracts; @@ -157,8 +156,7 @@ public class SniffingSettingsIntegrationTests internal static void BindAppManagerConfig(Config config) { - var field = typeof(AppManager).GetField("_config", BindingFlags.Instance | BindingFlags.NonPublic); - field?.SetValue(AppManager.Instance, config); + ConfigState.Instance.SetCurrent(config); } private static ProfileItem CreateVmessNode(ECoreType coreType) diff --git a/v2rayN/v2rayN.WebAPI/Tests/SubscriptionCreationTests.cs b/v2rayN/v2rayN.WebAPI/Tests/SubscriptionCreationTests.cs index d8081ca5..1ff2245c 100644 --- a/v2rayN/v2rayN.WebAPI/Tests/SubscriptionCreationTests.cs +++ b/v2rayN/v2rayN.WebAPI/Tests/SubscriptionCreationTests.cs @@ -12,16 +12,16 @@ public class SubscriptionCreationTests public async Task EmptyUrlSubscriptionIsCreatedAndReturnedWithAnEmptyUrl() { var previousLocalData = Environment.GetEnvironmentVariable(Global.LocalAppData); - var manager = AppManager.Instance; - var configField = typeof(AppManager).GetField("_config", BindingFlags.Instance | BindingFlags.NonPublic) - ?? throw new MissingFieldException(typeof(AppManager).FullName, "_config"); - var previousConfig = configField.GetValue(manager); + var state = ConfigState.Instance; + var configField = typeof(ConfigState).GetField("_current", BindingFlags.Instance | BindingFlags.NonPublic) + ?? throw new MissingFieldException(typeof(ConfigState).FullName, "_current"); + var previousConfig = configField.GetValue(state); var config = new Config(); SubItem? saved = null; try { Environment.SetEnvironmentVariable(Global.LocalAppData, "0"); - configField.SetValue(manager, config); + state.SetCurrent(config); SQLiteHelper.Instance.CreateTable(); var runtime = new V2rayRuntime(null!, null!, null!, null!, null!); var result = await runtime.AddSubscriptionAsync(new SubscriptionInput( @@ -71,7 +71,7 @@ public class SubscriptionCreationTests } finally { - configField.SetValue(manager, previousConfig); + configField.SetValue(state, previousConfig); Environment.SetEnvironmentVariable(Global.LocalAppData, previousLocalData); } } diff --git a/v2rayN/v2rayN.WebAPI/Tests/UpdatePreReleaseSettingsTests.cs b/v2rayN/v2rayN.WebAPI/Tests/UpdatePreReleaseSettingsTests.cs index 23727ced..6f945b69 100644 --- a/v2rayN/v2rayN.WebAPI/Tests/UpdatePreReleaseSettingsTests.cs +++ b/v2rayN/v2rayN.WebAPI/Tests/UpdatePreReleaseSettingsTests.cs @@ -152,9 +152,9 @@ public class UpdatePreReleaseSettingsTests private sealed class RuntimeFixture : IDisposable { - private readonly FieldInfo _configField = typeof(AppManager) - .GetField("_config", BindingFlags.Instance | BindingFlags.NonPublic) - ?? throw new MissingFieldException(typeof(AppManager).FullName, "_config"); + private readonly FieldInfo _configField = typeof(ConfigState) + .GetField("_current", BindingFlags.Instance | BindingFlags.NonPublic) + ?? throw new MissingFieldException(typeof(ConfigState).FullName, "_current"); private readonly object? _previousConfig; private readonly string? _previousLocalData; private readonly string _configPath; @@ -166,7 +166,7 @@ public class UpdatePreReleaseSettingsTests public RuntimeFixture() { - _previousConfig = _configField.GetValue(AppManager.Instance); + _previousConfig = _configField.GetValue(ConfigState.Instance); _previousLocalData = Environment.GetEnvironmentVariable(Global.LocalAppData); // ConfigHandler writes only into the test build directory, never user data. _configPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "guiConfigs", Global.ConfigFileName); @@ -179,7 +179,7 @@ public class UpdatePreReleaseSettingsTests } } Environment.SetEnvironmentVariable(Global.LocalAppData, "0"); - _configField.SetValue(AppManager.Instance, Config); + ConfigState.Instance.SetCurrent(Config); } public async Task ReadSavedConfigAsync() => @@ -208,7 +208,7 @@ public class UpdatePreReleaseSettingsTests } finally { - _configField.SetValue(AppManager.Instance, _previousConfig); + _configField.SetValue(ConfigState.Instance, _previousConfig); Environment.SetEnvironmentVariable(Global.LocalAppData, _previousLocalData); } }