fix(tests): bind WebAPI fixtures to ConfigState (#10608)

This commit is contained in:
Miheichev Aleksandr Sergeevich
2026-11-16 06:04:53 +00:00
committed by GitHub
parent c374f26d28
commit f3d349b0a7
3 changed files with 13 additions and 15 deletions
@@ -1,4 +1,3 @@
using System.Reflection;
using System.Text.Json.Nodes; using System.Text.Json.Nodes;
using ServiceLib.Services.CoreConfig; using ServiceLib.Services.CoreConfig;
using v2rayN.WebAPI.Contracts; using v2rayN.WebAPI.Contracts;
@@ -157,8 +156,7 @@ public class SniffingSettingsIntegrationTests
internal static void BindAppManagerConfig(Config config) internal static void BindAppManagerConfig(Config config)
{ {
var field = typeof(AppManager).GetField("_config", BindingFlags.Instance | BindingFlags.NonPublic); ConfigState.Instance.SetCurrent(config);
field?.SetValue(AppManager.Instance, config);
} }
private static ProfileItem CreateVmessNode(ECoreType coreType) private static ProfileItem CreateVmessNode(ECoreType coreType)
@@ -12,16 +12,16 @@ public class SubscriptionCreationTests
public async Task EmptyUrlSubscriptionIsCreatedAndReturnedWithAnEmptyUrl() public async Task EmptyUrlSubscriptionIsCreatedAndReturnedWithAnEmptyUrl()
{ {
var previousLocalData = Environment.GetEnvironmentVariable(Global.LocalAppData); var previousLocalData = Environment.GetEnvironmentVariable(Global.LocalAppData);
var manager = AppManager.Instance; var state = ConfigState.Instance;
var configField = typeof(AppManager).GetField("_config", BindingFlags.Instance | BindingFlags.NonPublic) var configField = typeof(ConfigState).GetField("_current", BindingFlags.Instance | BindingFlags.NonPublic)
?? throw new MissingFieldException(typeof(AppManager).FullName, "_config"); ?? throw new MissingFieldException(typeof(ConfigState).FullName, "_current");
var previousConfig = configField.GetValue(manager); var previousConfig = configField.GetValue(state);
var config = new Config(); var config = new Config();
SubItem? saved = null; SubItem? saved = null;
try try
{ {
Environment.SetEnvironmentVariable(Global.LocalAppData, "0"); Environment.SetEnvironmentVariable(Global.LocalAppData, "0");
configField.SetValue(manager, config); state.SetCurrent(config);
SQLiteHelper.Instance.CreateTable<SubItem>(); SQLiteHelper.Instance.CreateTable<SubItem>();
var runtime = new V2rayRuntime(null!, null!, null!, null!, null!); var runtime = new V2rayRuntime(null!, null!, null!, null!, null!);
var result = await runtime.AddSubscriptionAsync(new SubscriptionInput( var result = await runtime.AddSubscriptionAsync(new SubscriptionInput(
@@ -71,7 +71,7 @@ public class SubscriptionCreationTests
} }
finally finally
{ {
configField.SetValue(manager, previousConfig); configField.SetValue(state, previousConfig);
Environment.SetEnvironmentVariable(Global.LocalAppData, previousLocalData); Environment.SetEnvironmentVariable(Global.LocalAppData, previousLocalData);
} }
} }
@@ -152,9 +152,9 @@ public class UpdatePreReleaseSettingsTests
private sealed class RuntimeFixture : IDisposable private sealed class RuntimeFixture : IDisposable
{ {
private readonly FieldInfo _configField = typeof(AppManager) private readonly FieldInfo _configField = typeof(ConfigState)
.GetField("_config", BindingFlags.Instance | BindingFlags.NonPublic) .GetField("_current", BindingFlags.Instance | BindingFlags.NonPublic)
?? throw new MissingFieldException(typeof(AppManager).FullName, "_config"); ?? throw new MissingFieldException(typeof(ConfigState).FullName, "_current");
private readonly object? _previousConfig; private readonly object? _previousConfig;
private readonly string? _previousLocalData; private readonly string? _previousLocalData;
private readonly string _configPath; private readonly string _configPath;
@@ -166,7 +166,7 @@ public class UpdatePreReleaseSettingsTests
public RuntimeFixture() public RuntimeFixture()
{ {
_previousConfig = _configField.GetValue(AppManager.Instance); _previousConfig = _configField.GetValue(ConfigState.Instance);
_previousLocalData = Environment.GetEnvironmentVariable(Global.LocalAppData); _previousLocalData = Environment.GetEnvironmentVariable(Global.LocalAppData);
// ConfigHandler writes only into the test build directory, never user data. // ConfigHandler writes only into the test build directory, never user data.
_configPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "guiConfigs", Global.ConfigFileName); _configPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "guiConfigs", Global.ConfigFileName);
@@ -179,7 +179,7 @@ public class UpdatePreReleaseSettingsTests
} }
} }
Environment.SetEnvironmentVariable(Global.LocalAppData, "0"); Environment.SetEnvironmentVariable(Global.LocalAppData, "0");
_configField.SetValue(AppManager.Instance, Config); ConfigState.Instance.SetCurrent(Config);
} }
public async Task<Config> ReadSavedConfigAsync() => public async Task<Config> ReadSavedConfigAsync() =>
@@ -208,7 +208,7 @@ public class UpdatePreReleaseSettingsTests
} }
finally finally
{ {
_configField.SetValue(AppManager.Instance, _previousConfig); _configField.SetValue(ConfigState.Instance, _previousConfig);
Environment.SetEnvironmentVariable(Global.LocalAppData, _previousLocalData); Environment.SetEnvironmentVariable(Global.LocalAppData, _previousLocalData);
} }
} }