fix tests

Author: Behnam-Emamian

Client.Tests/BaseTest.cs

@@ -4,17 +4,30 @@ namespace ICTAce.FileHub.Client.Tests;
 
 public abstract class BaseTest : IDisposable
 {
+    private const string TestBaseUrl = "https://localhost:5001/";
     private bool _disposed;
 
-    protected BunitContext TestContext { get; private set; }
-    protected Alias TestAlias { get; private set; }
-    protected Site TestSite { get; private set; }
-    protected Page TestPage { get; private set; }
+    protected BunitContext TestContext { get; private set; } = null!;
+    protected Alias TestAlias { get; private set; } = null!;
+    protected Site TestSite { get; private set; } = null!;
+    protected Page TestPage { get; private set; } = null!;
 
     protected BaseTest()
+    {
+        InitializeTestContext();
+        RegisterServices();
+        InitializeCommonTestData();
+    }
+
+    private void InitializeTestContext()
     {
         TestContext = new();
         TestContext.JSInterop.Mode = JSRuntimeMode.Loose;
+        SetupJsInterop();
+    }
+
+    private void SetupJsInterop()
+    {
         TestContext.JSInterop.Setup<bool>("Oqtane.Interop.formValid", _ => true).SetResult(true);
         TestContext.JSInterop.Setup<bool>("formValid", _ => true).SetResult(true);
         TestContext.JSInterop.SetupVoid("Oqtane.Interop.setElementAttribute", _ => true);
@@ -31,7 +44,10 @@ protected BaseTest()
         TestContext.JSInterop.SetupVoid("Oqtane.Interop.includeMeta", _ => true);
         TestContext.JSInterop.Setup<int>("Oqtane.Interop.getScrollPosition", _ => true).SetResult(0);
         TestContext.JSInterop.SetupVoid("Oqtane.Interop.scrollTo", _ => true);
+    }
 
+    private void RegisterServices()
+    {
         TestContext.Services.AddLocalization();
         TestContext.Services.AddSingleton<Microsoft.Extensions.Localization.IStringLocalizerFactory, MockStringLocalizerFactory>();
 
@@ -65,17 +81,14 @@ protected BaseTest()
         TestContext.Services.AddScoped<IServiceScopeFactory>(sp => sp.GetRequiredService<IServiceScopeFactory>());
 
         // Add HttpClient for Blazor components
-        TestContext.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri("https://localhost:5001/") });
+        TestContext.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(TestBaseUrl) });
 
         // Add PageState mock for cascading parameter
         TestContext.Services.AddScoped(_ => new Mocks.PageState
         {
             Action = "Index",
             QueryString = []
         });
-
-        // Initialize common test data
-        InitializeCommonTestData();
     }
 
     private void InitializeCommonTestData()
@@ -97,7 +110,9 @@ private void InitializeCommonTestData()
             LogoFileId = null,
             FaviconFileId = null,
             DefaultThemeType = "Test.Theme",
+#pragma warning disable CS0618 // Type or member is obsolete - Required for Oqtane compatibility
             DefaultLayoutType = "Test.Layout",
+#pragma warning restore CS0618
             DefaultContainerType = "Test.Container",
         };
 
@@ -119,11 +134,11 @@ private void InitializeCommonTestData()
         };
     }
 
-    protected Mocks.PageState CreatePageState(string action, Dictionary<string, string>? queryString = null)
+    protected Mocks.PageState CreatePageState(string action, IDictionary<string, string>? queryString = null)
     => new Mocks.PageState
     {
         Action = action,
-        QueryString = queryString ?? [],
+        QueryString = queryString ?? new Dictionary<string, string>(StringComparer.Ordinal),
         Page = TestPage,
         Alias = TestAlias,
         Site = TestSite,
@@ -159,8 +174,8 @@ protected Module CreateModuleState(int moduleId = 1, int pageId = 1, string titl
             PackageName = "ICTAce.FileHub",
             SiteId = 1
         },
-        PermissionList = new List<Permission>
-        {
+        PermissionList =
+        [
             new Permission
             {
                 PermissionName = "View",
@@ -181,8 +196,8 @@ protected Module CreateModuleState(int moduleId = 1, int pageId = 1, string titl
                 UserId = null,
                 IsAuthorized = true
             }
-        },
-        Settings = new()
+        ],
+        Settings = new Dictionary<string, string>(StringComparer.Ordinal)
     };
 
     protected virtual void Dispose(bool disposing)

Client.Tests/GlobalSetup.cs

@@ -0,0 +1,4 @@
+// Licensed to ICTAce under the MIT license.
+
+// You can use attributes at the assembly level to apply to all tests in the assembly
+[assembly: System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]

Client.Tests/Mocks/MockSettingService.cs

@@ -11,8 +11,8 @@ namespace ICTAce.FileHub.Client.Tests.Mocks;
 /// </summary>
 public class MockSettingService : ISettingService
 {
-    private readonly Dictionary<string, Dictionary<int, Dictionary<string, string>>> _settings = new();
-    private readonly List<Setting> _settingsList = new();
+    private readonly Dictionary<string, Dictionary<int, Dictionary<string, string>>> _settings = new(StringComparer.Ordinal);
+    private readonly List<Setting> _settingsList = [];
     private int _nextId = 1;
 
     public Task<Dictionary<string, string>> GetModuleSettingsAsync(int moduleId)
@@ -45,22 +45,22 @@ public Task<Dictionary<string, string>> GetSettingsAsync(string entityName, int
         if (_settings.TryGetValue(entityName, out var entitySettings)
             && entitySettings.TryGetValue(entityId, out var settings))
         {
-            return Task.FromResult(new Dictionary<string, string>(settings));
+            return Task.FromResult(new Dictionary<string, string>(settings, StringComparer.Ordinal));
         }
-        return Task.FromResult(new Dictionary<string, string>());
+        return Task.FromResult(new Dictionary<string, string>(StringComparer.Ordinal));
     }
 
     public Task<List<Setting>> GetSettingsAsync(string entityName, int entityId, string settingName)
     {
         var matchingSettings = _settingsList
-            .Where(s => s.EntityName == entityName && s.EntityId == entityId && s.SettingName == settingName)
+            .Where(s => string.Equals(s.EntityName, entityName, StringComparison.Ordinal) && s.EntityId == entityId && string.Equals(s.SettingName, settingName, StringComparison.Ordinal))
             .ToList();
         return Task.FromResult(matchingSettings);
     }
 
     public Task<Setting> GetSettingAsync(int entityId, string settingName)
     {
-        var setting = _settingsList.FirstOrDefault(s => s.EntityId == entityId && s.SettingName == settingName);
+        var setting = _settingsList.FirstOrDefault(s => s.EntityId == entityId && string.Equals(s.SettingName, settingName, StringComparison.Ordinal));
         return Task.FromResult(setting ?? null!);
     }
 
@@ -128,8 +128,8 @@ public Task AddOrUpdateSettingAsync(string entityName, int entityId, string sett
         EnsureEntity(entityName, entityId);
         _settings[entityName][entityId][settingName] = settingValue;
 
-        var existing = _settingsList.FirstOrDefault(s => s.EntityName == entityName
-            && s.EntityId == entityId && s.SettingName == settingName);
+        var existing = _settingsList.FirstOrDefault(s => string.Equals(s.EntityName, entityName, StringComparison.Ordinal)
+            && s.EntityId == entityId && string.Equals(s.SettingName, settingName, StringComparison.Ordinal));
         if (existing != null)
         {
             existing.SettingValue = settingValue;
@@ -336,3 +336,4 @@ private void EnsureEntity(string entityName, int entityId)
         }
     }
 }
+

Directory.Build.props

@@ -65,3 +65,5 @@
   </ItemGroup>
 
 </Project>
+
+

EndToEnd.Tests/GlobalUsings.cs

@@ -1,7 +1,6 @@
 // Licensed to ICTAce under the MIT license.
 
 global using System.Diagnostics;
-global using System.Text.RegularExpressions;
 global using Microsoft.Playwright;
 global using TUnit.Assertions.Extensions;
 global using TUnit.Core;