(#1308) Add tests

jibedoubleve · jibedoubleve · commit 0989606c1f34 · 2026-03-12T21:35:12.000+01:00
diff --git a/src/Infra/Lanceur.Infra.Win32/Services/SteamLibraryService.cs b/src/Infra/Lanceur.Infra.Win32/Services/SteamLibraryService.cs
@@ -13,7 +13,7 @@ public partial class SteamLibraryService : ISteamLibraryService
 {
     #region Fields
 
-    private DateTime _lastCacheUpdate = DateTime.Now;
+    private DateTime _lastCacheUpdate = DateTime.MinValue;
 
     private readonly ILogger<SteamLibraryService> _logger;
     private readonly IMemoryCache _memoryCache;
@@ -79,6 +79,7 @@ private IEnumerable<string> GetLibraryPaths()
             entry => {
                 entry.AbsoluteExpirationRelativeToNow = 10.Seconds();
                 var libraries = new List<string>();
+                
                 foreach (Match m in KeyValuePattern().Matches(File.ReadAllText(vdf)))
                 {
                     _logger.LogDebug("Found library path: {LibraryPath}", m.Groups[1].Value);
diff --git a/src/Infra/Lanceur.Infra/Stores/EverythingStore.cs b/src/Infra/Lanceur.Infra/Stores/EverythingStore.cs
@@ -18,7 +18,6 @@ public class EverythingStore : StoreBase, IStoreService
 
     private readonly IEverythingApi _everythingApi;
     private readonly ILogger<EverythingStore> _logger;
-    private readonly ISection<StoreSection> _settings;
 
     #endregion
 
@@ -28,13 +27,11 @@ public EverythingStore(
         IStoreOrchestrationFactory orchestrationFactory,
         ILogger<EverythingStore> logger,
         IEverythingApi everythingApi,
-        ISection<StoreSection> settings,
         ISection<StoreSection> storeSettings
     ) : base(orchestrationFactory, storeSettings)
     {
         _logger = logger;
         _everythingApi = everythingApi;
-        _settings = settings;
     }
 
     #endregion
@@ -59,7 +56,7 @@ public IEnumerable<QueryResult> Search(Cmdline cmdline)
             return DisplayQueryResult.SingleFromResult("Enter text to search with Everything tool...");
         }
 
-        var query = $"{cmdline.Parameters} {_settings.Value.EverythingQuerySuffix}";
+        var query = $"{cmdline.Parameters} {StoreSettings.Value.EverythingQuerySuffix}";
         _logger.LogTrace("Everything query: {Query}", query);
 
         var result = _everythingApi.Search(query);
diff --git a/src/Infra/Lanceur.Infra/Stores/StoreBase.cs b/src/Infra/Lanceur.Infra/Stores/StoreBase.cs
@@ -15,21 +15,21 @@ protected StoreBase(
         IStoreOrchestrationFactory orchestrationFactory,
         ISection<StoreSection> storeSettings)
     {
+        ArgumentNullException.ThrowIfNull(orchestrationFactory);
+        ArgumentNullException.ThrowIfNull(storeSettings);
+
         StoreSettings = storeSettings;
-        StoreOrchestrationFactory
-            = orchestrationFactory ??
-              throw new ArgumentException(
-                  $"The {typeof(IStoreOrchestrationFactory)} should be configured in the IOC container."
-              );
+        StoreOrchestrationFactory = orchestrationFactory;
     }
 
     #endregion
 
     #region Properties
 
     /// <summary>
-    ///     Returns the default shortcut defined for the macro. If no shortcut defined, then empty string
-    ///     is returned
+    ///     Returns the effective shortcut for this store. If a user-defined override is configured,
+    ///     it takes precedence over the default shortcut defined via <see cref="StoreAttribute" />.
+    ///     Returns an empty string if neither is defined.
     /// </summary>
     protected string DefaultShortcut
     {
diff --git a/src/Tests/Lanceur.Tests.Tools/Extensions/StoreExtensions.cs b/src/Tests/Lanceur.Tests.Tools/Extensions/StoreExtensions.cs
@@ -1,6 +1,7 @@
 using System.Web.Bookmarks;
 using Everything.Wrapper;
 using Lanceur.Core;
+using Lanceur.Core.Configuration;
 using Lanceur.Core.Configuration.Configurations;
 using Lanceur.Core.Configuration.Sections;
 using Lanceur.Core.Repositories;
@@ -14,39 +15,50 @@ namespace Lanceur.Tests.Tools.Extensions;
 
 public static class StoreExtensions
 {
-    extension(IServiceCollection serviceCollection)
-    {
-        #region Methods
+    #region Methods
 
-        public IServiceCollection AddStoreServicesConfiguration(ApplicationSettings? configuration = null)
-        {
-            serviceCollection
-                .AddConfigurationSections()
-                .AddMockSingleton<IConfigurationFacade>((_, i) => {
-                        i.Application.Returns(
-                            configuration ??
-                            new ApplicationSettings { Caching = new CachingSection(0, 0), Stores = new StoreSection() }
-                        );
-                        return i;
-                    }
-                );
-            return serviceCollection;
-        }
+    public static IServiceCollection AddStoreServicesConfiguration(
+        this IServiceCollection serviceCollection,
+        ApplicationSettings? configuration = null)
+    {
+        serviceCollection
+            .AddConfigurationSections()
+            .AddMockSingleton<IConfigurationFacade>((_, i) => {
+                    i.Application.Returns(
+                        configuration ??
+                        new ApplicationSettings { Caching = new CachingSection(0, 0), Stores = new StoreSection() }
+                    );
+                    return i;
+                }
+            );
+        return serviceCollection;
+    }
 
-        public IServiceCollection AddStoreServicesMockContext()
-        {
-            serviceCollection
-                .AddMockSingleton<IAliasRepository>()
-                .AddMockSingleton<IFeatureFlagService>()
-                .AddMockSingleton<IBookmarkRepositoryFactory>()
-                .AddMockSingleton<ICalculatorService>()
-                .AddMockSingleton<AssemblySource>()
-                .AddMockSingleton<ISteamLibraryService>()
-                .AddMockSingleton<IAliasManagementService>()
-                .AddMockSingleton<IEverythingApi>();
-            return serviceCollection;
-        }
+    public static IServiceCollection AddStoreServicesMockContext(
+        this IServiceCollection serviceCollection,
+        Func<IServiceProvider, ISection<StoreSection>, ISection<StoreSection>> configurator)
+    {
+        serviceCollection
+            .AddMockSingleton<IAliasRepository>()
+            .AddMockSingleton<IFeatureFlagService>()
+            .AddMockSingleton<IBookmarkRepositoryFactory>()
+            .AddMockSingleton<ICalculatorService>()
+            .AddMockSingleton<AssemblySource>()
+            .AddMockSingleton<ISteamLibraryService>()
+            .AddMockSingleton<IAliasManagementService>()
+            .AddMockSingleton<IEverythingApi>()
+            .AddMockSingleton(configurator);
+        return serviceCollection;
+    }
 
-        #endregion
+    public static IServiceCollection AddStoreServicesMockContext(this IServiceCollection serviceCollection)
+    {
+        serviceCollection.AddStoreServicesMockContext((_, i) => {
+            i.Value.Returns(new StoreSection());
+            return i;
+        });
+        return serviceCollection;
     }
+
+    #endregion
 }
diff --git a/src/Tests/Lanceur.Tests.Tools/ViewModelTester.cs b/src/Tests/Lanceur.Tests.Tools/ViewModelTester.cs
@@ -47,6 +47,7 @@ out TViewModel viewModel
                                                            .AddSingleton<IEnigma, Enigma>()
                                                            .AddSingleton(new LoggingLevelSwitch(LogEventLevel.Verbose))
                                                            .AddReservedAliases(typeof(AddAlias))
+                                                           .AddMockSingleton<IStoreShortcutService>()
                                                            .AddDatabase(connectionManager);
 
             var serviceProvider = ConfigureServices(serviceCollection, visitors).BuildServiceProvider();
diff --git a/src/Tests/Lanceur.Tests/Services/SearchServiceTest.cs b/src/Tests/Lanceur.Tests/Services/SearchServiceTest.cs
@@ -2,6 +2,8 @@
 using System.Data.SQLite;
 using Dapper;
 using Lanceur.Core;
+using Lanceur.Core.Configuration;
+using Lanceur.Core.Configuration.Sections;
 using Lanceur.Core.Managers;
 using Lanceur.Core.Models;
 using Lanceur.Core.Repositories;
@@ -113,7 +115,8 @@ public async Task When_macro_is_misconfigured_Then_it_is_excluded_from_result()
                          .AddSingleton<IDbConnection, SQLiteConnection>()
                          .AddSingleton<SearchService>()
                          .AddSingleton<AssemblySource>()
-                         .AddSingleton<IDbActionFactory, DbActionFactory>();
+                         .AddSingleton<IDbActionFactory, DbActionFactory>()
+                         .AddStoreServicesMockContext();
 
         serviceCollection.TryAddEnumerable(ServiceDescriptor.Singleton<IStoreService, AliasStore>());
         serviceCollection.AddTestOutputHelper(OutputHelper);
@@ -269,8 +272,9 @@ public async Task When_there_is_result_with_exact_match_Then_it_is_moved_on_top_
                               .Returns(true);
                   return orchestrator;
               }
-          );
-        sc.TryAddEnumerable(ServiceDescriptor.Singleton<IStoreService, AliasStore>());
+          )
+          .AddStoreServicesConfiguration()
+          .TryAddEnumerable(ServiceDescriptor.Singleton<IStoreService, AliasStore>());
 
         var serviceProvider = sc.BuildServiceProvider();
 
diff --git a/src/Tests/Lanceur.Tests/Stores/IoCForStoresShould.cs b/src/Tests/Lanceur.Tests/Stores/IoCForStoresShould.cs
@@ -1,3 +1,4 @@
+using Everything.Wrapper;
 using Lanceur.Core.Configuration;
 using Lanceur.Core.Configuration.Configurations;
 using Lanceur.Core.Configuration.Sections;
@@ -14,6 +15,7 @@
 using Lanceur.Tests.Tools.SQL;
 using Lanceur.Ui.Core.Extensions;
 using Microsoft.Extensions.DependencyInjection;
+using NSubstitute;
 using Shouldly;
 using Xunit;
 
@@ -52,7 +54,7 @@ public void RegisterAllStores()
     [Theory]
     [InlineData(null, "pp hello world")] // null override, then use the default one
     [InlineData("^pp.*", ": hello world")]
-    public void UseDefaultShortcutWhenNoOverride(string aliasOverride, string cmdlineString)
+    public void UseDefaultShortcutWhenNoOverride(string? aliasOverride, string cmdlineString)
     {
         // arrange 
         var cfgOverride = aliasOverride is null
@@ -77,9 +79,22 @@ public void UseDefaultShortcutWhenNoOverride(string aliasOverride, string cmdlin
                               .AddSingleton<IStoreService, EverythingStore>()
                               .AddSingleton<IStoreOrchestrationFactory, StoreOrchestrationFactory>()
                               .AddSingleton<ISearchServiceOrchestrator, SearchServiceOrchestrator>()
-                              .AddStoreServicesMockContext()
                               .AddStoreServicesConfiguration(cfgOverride)
                               .AddTestOutputHelper(OutputHelper)
+                              .AddStoreServicesMockContext((_, i) => {
+                                  i.Value.Returns(new StoreSection
+                                  {
+                                      StoreShortcuts =
+                                      [
+                                          new StoreShortcut
+                                          {
+                                              AliasOverride = aliasOverride,
+                                              StoreType = typeof(EverythingStore).FullName
+                                          }
+                                      ]
+                                  });
+                                  return i;
+                              })
                               .BuildServiceProvider();
 
         // act
@@ -89,14 +104,16 @@ public void UseDefaultShortcutWhenNoOverride(string aliasOverride, string cmdlin
         var orchestrator = serviceProvider.GetService<ISearchServiceOrchestrator>()!;
 
         // assert
+        OutputHelper.WriteLine($"Alive pattern: '{store.StoreOrchestration.AlivePattern}'");
+        OutputHelper.WriteLine($"Cmdline      : {cmdlineString}");
         orchestrator.IsAlive(store, Cmdline.Parse(cmdlineString))
                     .ShouldBeFalse();
     }
 
     [Theory]
     [InlineData(null, ": hello world")] // null override, then use the default one
     [InlineData("^pp.*", "pp hello world")]
-    public void UseOverridenShortcutWhenConfigured(string aliasOverride, string cmdlineString)
+    public void UseOverridenShortcutWhenConfigured(string? aliasOverride, string cmdlineString)
     {
         // arrange 
         var cfgOverride = aliasOverride is null
@@ -121,7 +138,17 @@ public void UseOverridenShortcutWhenConfigured(string aliasOverride, string cmdl
                               .AddSingleton<IStoreService, EverythingStore>()
                               .AddSingleton<IStoreOrchestrationFactory, StoreOrchestrationFactory>()
                               .AddSingleton<ISearchServiceOrchestrator, SearchServiceOrchestrator>()
-                              .AddStoreServicesMockContext()
+                              .AddStoreServicesMockContext((_, i) => {
+                                  i.Value.Returns(new StoreSection()
+                                  {
+                                      StoreShortcuts = [new StoreShortcut
+                                      {
+                                          StoreType = typeof(EverythingStore).FullName,
+                                          AliasOverride = aliasOverride
+                                      }]
+                                  });
+                                  return i;
+                              })
                               .AddStoreServicesConfiguration(cfgOverride)
                               .BuildServiceProvider();
 
@@ -157,19 +184,23 @@ public void UseOverridenShortcutWhenUpdated()
         var orchestrator = serviceProvider.GetService<ISearchServiceOrchestrator>()!;
         var configuration = serviceProvider.GetService<IConfigurationFacade>()!;
 
-        // At this point, there's no configuration, we used the default config (hardcoded)
-        orchestrator.IsAlive(store, Cmdline.Parse(cmdlineString1)).ShouldBeTrue("Default values should be used");
-
-        // Let's update the configuration and check whether it is taken into account
-        UpdateConfiguration(aliasOverride1);
-        orchestrator.IsAlive(store, Cmdline.Parse(cmdlineString2))
-                    .ShouldBeTrue("When updating from default values to new value");
-
-        // Let's do this again to be sure the update can be done multiple times
-        UpdateConfiguration(aliasOverride2);
-        orchestrator.IsAlive(store, Cmdline.Parse(cmdlineString3))
-                    .ShouldBeTrue("When updating from some values to updated values");
-
+        orchestrator.ShouldSatisfyAllConditions(
+            o =>
+                // "At this point, there's no configuration, we used the default config (hardcoded)"
+                o.IsAlive(store, Cmdline.Parse(cmdlineString1))
+                 .ShouldBeTrue("Default values should be used"),
+            o => {
+                // Let's update the configuration and check whether it is taken into account
+                UpdateConfiguration(aliasOverride1);
+                o.IsAlive(store, Cmdline.Parse(cmdlineString2))
+                 .ShouldBeTrue("When updating from default values to new value");
+            },
+            o => {
+                // Let's do this again to be sure the update can be done multiple times
+                UpdateConfiguration(aliasOverride2);
+                o.IsAlive(store, Cmdline.Parse(cmdlineString3))
+                 .ShouldBeTrue("When updating from some values to updated values");
+            });
         return;
 
         IServiceProvider ConfigureServices()
@@ -180,8 +211,7 @@ IServiceProvider ConfigureServices()
                                     .AddSingleton<IStoreService, EverythingStore>()
                                     .AddSingleton<IStoreOrchestrationFactory, StoreOrchestrationFactory>()
                                     .AddSingleton<ISearchServiceOrchestrator, SearchServiceOrchestrator>()
-                                    .AddStoreServicesMockContext()
-                                    .AddTestOutputHelper(OutputHelper);
+                                    .AddMockSingleton<IEverythingApi>(); // Real ISection<StoreSection> needed — don't use AddStoreServicesMockContext()
 
             serviceCollection.AddConfiguration() // Real configuration facility (not mocked)
                              .AddConfigurationSections()
@@ -193,7 +223,11 @@ void UpdateConfiguration(string aliasOverride)
         {
             configuration.Application.Stores.StoreShortcuts =
             [
-                new StoreShortcut { StoreType = typeof(EverythingStore).ToString(), AliasOverride = aliasOverride }
+                new StoreShortcut
+                {
+                    StoreType = typeof(EverythingStore).ToString(),
+                    AliasOverride = aliasOverride
+                }
             ];
             configuration.Save();
         }
diff --git a/src/Tests/Lanceur.Tests/Stores/ReservedKeywordsStoreTest.cs b/src/Tests/Lanceur.Tests/Stores/ReservedKeywordsStoreTest.cs
@@ -1,6 +1,8 @@
 ﻿using System.Web.Bookmarks;
 using Lanceur.Core;
+using Lanceur.Core.Configuration;
 using Lanceur.Core.Configuration.Configurations;
+using Lanceur.Core.Configuration.Sections;
 using Lanceur.Core.Managers;
 using Lanceur.Core.Models;
 using Lanceur.Core.Repositories;
@@ -52,6 +54,7 @@ private ReservedAliasStore GetStore(IAliasRepository aliasRepository, Type? type
                                       return i;
                                   }
                               )
+                              .AddMockSingleton<ISection<StoreSection>>()
                               .AddSingleton<ReservedAliasStore>()
                               .AddReservedAliases(type)
                               .AddMockSingleton<IUserDialogueService>()
diff --git a/src/Tests/Lanceur.Tests/Stores/SteamGameStoreTest.cs b/src/Tests/Lanceur.Tests/Stores/SteamGameStoreTest.cs
@@ -1,3 +1,5 @@
+using Lanceur.Core.Configuration;
+using Lanceur.Core.Configuration.Sections;
 using Lanceur.Core.Managers;
 using Lanceur.Core.Models;
 using Lanceur.Core.Services;
@@ -33,6 +35,7 @@ private SteamGameStore GetStore(ISteamLibraryService steamService, IAliasManagem
                  .AddSingleton(steamService)
                  .AddSingleton(managementService)
                  .AddSingleton<SteamGameStore>()
+                 .AddMockSingleton<ISection<StoreSection>>()
                  .AddMockSingleton<IFeatureFlagService>((_, i)=> {
                      i.IsEnabled(Arg.Any<string>()).Returns(true);
                      return i;
diff --git a/src/Tests/Lanceur.Tests/Stores/StoreShortcutServiceTest.cs b/src/Tests/Lanceur.Tests/Stores/StoreShortcutServiceTest.cs
diff --git a/src/Tests/Lanceur.Tests/Stores/StoresOrchestrationTest.cs b/src/Tests/Lanceur.Tests/Stores/StoresOrchestrationTest.cs

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public partial class SteamLibraryService : ISteamLibraryService`
`13`	`13`	`{`
`14`	`14`	`#region Fields`
`15`	`15`
`16`		`- private DateTime _lastCacheUpdate = DateTime.Now;`
	`16`	`+ private DateTime _lastCacheUpdate = DateTime.MinValue;`
`17`	`17`
`18`	`18`	`private readonly ILogger<SteamLibraryService> _logger;`
`19`	`19`	`private readonly IMemoryCache _memoryCache;`
`@@ -79,6 +79,7 @@ private IEnumerable<string> GetLibraryPaths()`
`79`	`79`	`entry => {`
`80`	`80`	`entry.AbsoluteExpirationRelativeToNow = 10.Seconds();`
`81`	`81`	`var libraries = new List<string>();`
	`82`	`+`
`82`	`83`	`foreach (Match m in KeyValuePattern().Matches(File.ReadAllText(vdf)))`
`83`	`84`	`{`
`84`	`85`	`_logger.LogDebug("Found library path: {LibraryPath}", m.Groups[1].Value);`