Kept AssemblyLocater singleton instead of using delegates

Signed-off-by: Martin Pekurny <mpekurny@paychex.com>
getgauge · Dec 12, 2024 · f90cfee · f90cfee
1 parent f0c5c0b
commit f90cfee
Show file tree

Hide file tree

Showing 12 changed files with 124 additions and 104 deletions.
diff --git a/integration-test/ExecuteStepProcessorTests.cs b/integration-test/ExecuteStepProcessorTests.cs
@@ -27,9 +27,10 @@ public async Task ShouldExecuteMethodFromRequest()
         var serviceProvider = new ServiceCollection().BuildServiceProvider();
         var reflectionWrapper = new ReflectionWrapper();
         var activatorWrapper = new ActivatorWrapper(serviceProvider);
-        var gaugeLoadContext = new GaugeLoadContext(() => { return AssemblyLocater.GetTestAssembly(_fileProvider); }, _loggerFactory.CreateLogger<GaugeLoadContext>());
-        var assemblyLoader = new AssemblyLoader(gaugeLoadContext, reflectionWrapper, activatorWrapper, new StepRegistry(),
-            _loggerFactory.CreateLogger<AssemblyLoader>(), (logger) => { return AssemblyLocater.GetAssembliesReferencingGaugeLib(_fileProvider, logger); });
+        var assemblyLocater = new AssemblyLocater(_fileProvider, _loggerFactory.CreateLogger<AssemblyLocater>());
+        var gaugeLoadContext = new GaugeLoadContext(assemblyLocater, _loggerFactory.CreateLogger<GaugeLoadContext>());
+        var assemblyLoader = new AssemblyLoader(assemblyLocater, gaugeLoadContext, reflectionWrapper, activatorWrapper, new StepRegistry(),
+            _loggerFactory.CreateLogger<AssemblyLoader>());
         var dataStoreFactory = new DataStoreFactory(assemblyLoader, activatorWrapper);
         var tableFormatter = new TableFormatter(assemblyLoader, activatorWrapper);
         var executionInfoMapper = new ExecutionInfoMapper(assemblyLoader, activatorWrapper, dataStoreFactory, tableFormatter);
@@ -84,11 +85,10 @@ public async Task ShouldCaptureScreenshotOnFailure()
         var serviceProvider = new ServiceCollection().BuildServiceProvider();
         var reflectionWrapper = new ReflectionWrapper();
         var activatorWrapper = new ActivatorWrapper(serviceProvider);
-        var gaugeLoadContext = new GaugeLoadContext(() => { return AssemblyLocater.GetTestAssembly(_fileProvider); },
-            _loggerFactory.CreateLogger<GaugeLoadContext>());
-        var assemblyLoader = new AssemblyLoader(gaugeLoadContext, reflectionWrapper,
-            activatorWrapper, new StepRegistry(), _loggerFactory.CreateLogger<AssemblyLoader>(),
-            (logger) => { return AssemblyLocater.GetAssembliesReferencingGaugeLib(_fileProvider, logger); });
+        var assemblyLocater = new AssemblyLocater(_fileProvider, _loggerFactory.CreateLogger<AssemblyLocater>());
+        var gaugeLoadContext = new GaugeLoadContext(assemblyLocater, _loggerFactory.CreateLogger<GaugeLoadContext>());
+        var assemblyLoader = new AssemblyLoader(assemblyLocater, gaugeLoadContext, reflectionWrapper,
+            activatorWrapper, new StepRegistry(), _loggerFactory.CreateLogger<AssemblyLoader>());
         var hookRegistry = new HookRegistry(assemblyLoader);
         var dataStoreFactory = new DataStoreFactory(assemblyLoader, activatorWrapper);
         var tableFormatter = new TableFormatter(assemblyLoader, activatorWrapper);

diff --git a/integration-test/ExecutionOrchestratorTests.cs b/integration-test/ExecutionOrchestratorTests.cs
@@ -26,11 +26,10 @@ public async Task RecoverableIsTrueOnExceptionThrownWhenContinueOnFailure()
         var serviceProvider = new ServiceCollection().BuildServiceProvider();
         var reflectionWrapper = new ReflectionWrapper();
         var activatorWrapper = new ActivatorWrapper(serviceProvider);
-        var gaugeLoadContext = new GaugeLoadContext(() => { return AssemblyLocater.GetTestAssembly(_fileProvider); },
-            _loggerFactory.CreateLogger<GaugeLoadContext>());
-        var assemblyLoader = new AssemblyLoader(gaugeLoadContext, reflectionWrapper,
-            activatorWrapper, new StepRegistry(), _loggerFactory.CreateLogger<AssemblyLoader>(),
-            (logger) => { return AssemblyLocater.GetAssembliesReferencingGaugeLib(_fileProvider, logger); });
+        var assemblyLocater = new AssemblyLocater(_fileProvider, _loggerFactory.CreateLogger<AssemblyLocater>());
+        var gaugeLoadContext = new GaugeLoadContext(assemblyLocater, _loggerFactory.CreateLogger<GaugeLoadContext>());
+        var assemblyLoader = new AssemblyLoader(assemblyLocater, gaugeLoadContext, reflectionWrapper,
+            activatorWrapper, new StepRegistry(), _loggerFactory.CreateLogger<AssemblyLoader>());
         var hookRegistry = new HookRegistry(assemblyLoader);
         var dataStoreFactory = new DataStoreFactory(assemblyLoader, activatorWrapper);
         var tableFormatter = new TableFormatter(assemblyLoader, activatorWrapper);
@@ -52,11 +51,10 @@ public async Task ShouldCreateTableFromTargetType()
         var serviceProvider = new ServiceCollection().BuildServiceProvider();
         var reflectionWrapper = new ReflectionWrapper();
         var activatorWrapper = new ActivatorWrapper(serviceProvider);
-        var gaugeLoadContext = new GaugeLoadContext(() => { return AssemblyLocater.GetTestAssembly(_fileProvider); },
-            _loggerFactory.CreateLogger<GaugeLoadContext>());
-        var assemblyLoader = new AssemblyLoader(gaugeLoadContext, reflectionWrapper,
-            activatorWrapper, new StepRegistry(), _loggerFactory.CreateLogger<AssemblyLoader>(),
-            (logger) => { return AssemblyLocater.GetAssembliesReferencingGaugeLib(_fileProvider, logger); });
+        var assemblyLocater = new AssemblyLocater(_fileProvider, _loggerFactory.CreateLogger<AssemblyLocater>());
+        var gaugeLoadContext = new GaugeLoadContext(assemblyLocater, _loggerFactory.CreateLogger<GaugeLoadContext>());
+        var assemblyLoader = new AssemblyLoader(assemblyLocater, gaugeLoadContext, reflectionWrapper,
+            activatorWrapper, new StepRegistry(), _loggerFactory.CreateLogger<AssemblyLoader>());
         var hookRegistry = new HookRegistry(assemblyLoader);
         var dataStoreFactory = new DataStoreFactory(assemblyLoader, activatorWrapper);
         var tableFormatter = new TableFormatter(assemblyLoader, activatorWrapper);
@@ -80,11 +78,10 @@ public async Task ShouldExecuteMethodAndReturnResult()
         var serviceProvider = new ServiceCollection().BuildServiceProvider();
         var reflectionWrapper = new ReflectionWrapper();
         var activatorWrapper = new ActivatorWrapper(serviceProvider);
-        var gaugeLoadContext = new GaugeLoadContext(() => { return AssemblyLocater.GetTestAssembly(_fileProvider); },
-            _loggerFactory.CreateLogger<GaugeLoadContext>());
-        var assemblyLoader = new AssemblyLoader(gaugeLoadContext, reflectionWrapper,
-            activatorWrapper, new StepRegistry(), _loggerFactory.CreateLogger<AssemblyLoader>(),
-            (logger) => { return AssemblyLocater.GetAssembliesReferencingGaugeLib(_fileProvider, logger); });
+        var assemblyLocater = new AssemblyLocater(_fileProvider, _loggerFactory.CreateLogger<AssemblyLocater>());
+        var gaugeLoadContext = new GaugeLoadContext(assemblyLocater, _loggerFactory.CreateLogger<GaugeLoadContext>());
+        var assemblyLoader = new AssemblyLoader(assemblyLocater, gaugeLoadContext, reflectionWrapper,
+            activatorWrapper, new StepRegistry(), _loggerFactory.CreateLogger<AssemblyLoader>());
         var hookRegistry = new HookRegistry(assemblyLoader);
         var dataStoreFactory = new DataStoreFactory(assemblyLoader, activatorWrapper);
         var tableFormatter = new TableFormatter(assemblyLoader, activatorWrapper);
@@ -107,11 +104,10 @@ public async Task ShouldGetPendingMessages()
         var serviceProvider = new ServiceCollection().BuildServiceProvider();
         var reflectionWrapper = new ReflectionWrapper();
         var activatorWrapper = new ActivatorWrapper(serviceProvider);
-        var gaugeLoadContext = new GaugeLoadContext(() => { return AssemblyLocater.GetTestAssembly(_fileProvider); },
-            _loggerFactory.CreateLogger<GaugeLoadContext>());
-        var assemblyLoader = new AssemblyLoader(gaugeLoadContext, reflectionWrapper,
-            activatorWrapper, new StepRegistry(), _loggerFactory.CreateLogger<AssemblyLoader>(),
-            (logger) => { return AssemblyLocater.GetAssembliesReferencingGaugeLib(_fileProvider, logger); });
+        var assemblyLocater = new AssemblyLocater(_fileProvider, _loggerFactory.CreateLogger<AssemblyLocater>());
+        var gaugeLoadContext = new GaugeLoadContext(assemblyLocater, _loggerFactory.CreateLogger<GaugeLoadContext>());
+        var assemblyLoader = new AssemblyLoader(assemblyLocater, gaugeLoadContext, reflectionWrapper,
+            activatorWrapper, new StepRegistry(), _loggerFactory.CreateLogger<AssemblyLoader>());
         var hookRegistry = new HookRegistry(assemblyLoader);
         var dataStoreFactory = new DataStoreFactory(assemblyLoader, activatorWrapper);
         var tableFormatter = new TableFormatter(assemblyLoader, activatorWrapper);
@@ -135,11 +131,10 @@ public async Task ShouldGetStacktraceForAggregateException()
         var serviceProvider = new ServiceCollection().BuildServiceProvider();
         var reflectionWrapper = new ReflectionWrapper();
         var activatorWrapper = new ActivatorWrapper(serviceProvider);
-        var gaugeLoadContext = new GaugeLoadContext(() => { return AssemblyLocater.GetTestAssembly(_fileProvider); },
-            _loggerFactory.CreateLogger<GaugeLoadContext>());
-        var assemblyLoader = new AssemblyLoader(gaugeLoadContext, reflectionWrapper,
-            activatorWrapper, new StepRegistry(), _loggerFactory.CreateLogger<AssemblyLoader>(),
-            (logger) => { return AssemblyLocater.GetAssembliesReferencingGaugeLib(_fileProvider, logger); });
+        var assemblyLocater = new AssemblyLocater(_fileProvider, _loggerFactory.CreateLogger<AssemblyLocater>());
+        var gaugeLoadContext = new GaugeLoadContext(assemblyLocater, _loggerFactory.CreateLogger<GaugeLoadContext>());
+        var assemblyLoader = new AssemblyLoader(assemblyLocater, gaugeLoadContext, reflectionWrapper,
+            activatorWrapper, new StepRegistry(), _loggerFactory.CreateLogger<AssemblyLoader>());
         var hookRegistry = new HookRegistry(assemblyLoader);
         var dataStoreFactory = new DataStoreFactory(assemblyLoader, activatorWrapper);
         var tableFormatter = new TableFormatter(assemblyLoader, activatorWrapper);
@@ -163,11 +158,10 @@ public void ShouldGetStepTextsForMethod()
         var serviceProvider = new ServiceCollection().BuildServiceProvider();
         var reflectionWrapper = new ReflectionWrapper();
         var activatorWrapper = new ActivatorWrapper(serviceProvider);
-        var gaugeLoadContext = new GaugeLoadContext(() => { return AssemblyLocater.GetTestAssembly(_fileProvider); },
-            _loggerFactory.CreateLogger<GaugeLoadContext>());
-        var assemblyLoader = new AssemblyLoader(gaugeLoadContext, reflectionWrapper,
-            activatorWrapper, new StepRegistry(), _loggerFactory.CreateLogger<AssemblyLoader>(),
-            (logger) => { return AssemblyLocater.GetAssembliesReferencingGaugeLib(_fileProvider, logger); });
+        var assemblyLocater = new AssemblyLocater(_fileProvider, _loggerFactory.CreateLogger<AssemblyLocater>());
+        var gaugeLoadContext = new GaugeLoadContext(assemblyLocater, _loggerFactory.CreateLogger<GaugeLoadContext>());
+        var assemblyLoader = new AssemblyLoader(assemblyLocater, gaugeLoadContext, reflectionWrapper,
+            activatorWrapper, new StepRegistry(), _loggerFactory.CreateLogger<AssemblyLoader>());
         var registry = assemblyLoader.GetStepRegistry();
         var gaugeMethod = registry.MethodFor("and an alias");
         var stepTexts = gaugeMethod.Aliases.ToList();
@@ -183,11 +177,10 @@ public async Task SuccessIsFalseOnSerializableExceptionThrown()
         const string expectedMessage = "I am a custom serializable exception";
         var reflectionWrapper = new ReflectionWrapper();
         var activatorWrapper = new ActivatorWrapper(serviceProvider);
-        var gaugeLoadContext = new GaugeLoadContext(() => { return AssemblyLocater.GetTestAssembly(_fileProvider); },
-            _loggerFactory.CreateLogger<GaugeLoadContext>());
-        var assemblyLoader = new AssemblyLoader(gaugeLoadContext, reflectionWrapper,
-            activatorWrapper, new StepRegistry(), _loggerFactory.CreateLogger<AssemblyLoader>(),
-            (logger) => { return AssemblyLocater.GetAssembliesReferencingGaugeLib(_fileProvider, logger); });
+        var assemblyLocater = new AssemblyLocater(_fileProvider, _loggerFactory.CreateLogger<AssemblyLocater>());
+        var gaugeLoadContext = new GaugeLoadContext(assemblyLocater, _loggerFactory.CreateLogger<GaugeLoadContext>());
+        var assemblyLoader = new AssemblyLoader(assemblyLocater, gaugeLoadContext, reflectionWrapper,
+            activatorWrapper, new StepRegistry(), _loggerFactory.CreateLogger<AssemblyLoader>());
         var hookRegistry = new HookRegistry(assemblyLoader);
         var dataStoreFactory = new DataStoreFactory(assemblyLoader, activatorWrapper);
         var tableFormatter = new TableFormatter(assemblyLoader, activatorWrapper);
@@ -213,11 +206,10 @@ public async Task SuccessIsFalseOnUnserializableExceptionThrown()
         const string expectedMessage = "I am a custom exception";
         var reflectionWrapper = new ReflectionWrapper();
         var activatorWrapper = new ActivatorWrapper(serviceProvider);
-        var gaugeLoadContext = new GaugeLoadContext(() => { return AssemblyLocater.GetTestAssembly(_fileProvider); },
-            _loggerFactory.CreateLogger<GaugeLoadContext>());
-        var assemblyLoader = new AssemblyLoader(gaugeLoadContext, reflectionWrapper,
-            activatorWrapper, new StepRegistry(), _loggerFactory.CreateLogger<AssemblyLoader>(),
-            (logger) => { return AssemblyLocater.GetAssembliesReferencingGaugeLib(_fileProvider, logger); });
+        var assemblyLocater = new AssemblyLocater(_fileProvider, _loggerFactory.CreateLogger<AssemblyLocater>());
+        var gaugeLoadContext = new GaugeLoadContext(assemblyLocater, _loggerFactory.CreateLogger<GaugeLoadContext>());
+        var assemblyLoader = new AssemblyLoader(assemblyLocater, gaugeLoadContext, reflectionWrapper,
+            activatorWrapper, new StepRegistry(), _loggerFactory.CreateLogger<AssemblyLoader>());
         var hookRegistry = new HookRegistry(assemblyLoader);
         var dataStoreFactory = new DataStoreFactory(assemblyLoader, activatorWrapper);
         var tableFormatter = new TableFormatter(assemblyLoader, activatorWrapper);

diff --git a/integration-test/ExternalReferenceTests.cs b/integration-test/ExternalReferenceTests.cs
@@ -35,11 +35,10 @@ public async Task ShouldGetStepsFromReference(string referenceType, string stepT
         var fileProvider = new PhysicalFileProvider(Path.Combine(testProjectPath, "gauge_bin"));
 
         var serviceProvider = new ServiceCollection().BuildServiceProvider();
-        var gaugeLoadContext = new GaugeLoadContext(() => { return AssemblyLocater.GetTestAssembly(fileProvider); },
-            _loggerFactory.CreateLogger<GaugeLoadContext>());
-        var assemblyLoader = new AssemblyLoader(gaugeLoadContext, new ReflectionWrapper(),
-            new ActivatorWrapper(serviceProvider), new StepRegistry(), _loggerFactory.CreateLogger<AssemblyLoader>(),
-            (logger) => { return AssemblyLocater.GetAssembliesReferencingGaugeLib(fileProvider, logger); });
+        var assemblyLocater = new AssemblyLocater(fileProvider, _loggerFactory.CreateLogger<AssemblyLocater>());
+        var gaugeLoadContext = new GaugeLoadContext(assemblyLocater, _loggerFactory.CreateLogger<GaugeLoadContext>());
+        var assemblyLoader = new AssemblyLoader(assemblyLocater, gaugeLoadContext, new ReflectionWrapper(),
+            new ActivatorWrapper(serviceProvider), new StepRegistry(), _loggerFactory.CreateLogger<AssemblyLoader>());
 
         var stepValidationProcessor = new StepValidationProcessor(assemblyLoader.GetStepRegistry());
         var message = new StepValidateRequest
@@ -68,11 +67,10 @@ public async Task ShouldRegisterScreenshotWriterFromReference(string referenceTy
         var serviceProvider = new ServiceCollection().BuildServiceProvider();
         var reflectionWrapper = new ReflectionWrapper();
         var activatorWrapper = new ActivatorWrapper(serviceProvider);
-        var gaugeLoadContext = new GaugeLoadContext(() => { return AssemblyLocater.GetTestAssembly(fileProvider); },
-            _loggerFactory.CreateLogger<GaugeLoadContext>());
-        var assemblyLoader = new AssemblyLoader(gaugeLoadContext, reflectionWrapper,
-            activatorWrapper, new StepRegistry(), _loggerFactory.CreateLogger<AssemblyLoader>(),
-            (logger) => { return AssemblyLocater.GetAssembliesReferencingGaugeLib(fileProvider, logger); });
+        var assemblyLocater = new AssemblyLocater(fileProvider, _loggerFactory.CreateLogger<AssemblyLocater>());
+        var gaugeLoadContext = new GaugeLoadContext(assemblyLocater, _loggerFactory.CreateLogger<GaugeLoadContext>());
+        var assemblyLoader = new AssemblyLoader(assemblyLocater, gaugeLoadContext, reflectionWrapper,
+            activatorWrapper, new StepRegistry(), _loggerFactory.CreateLogger<AssemblyLoader>());
         var hookRegistry = new HookRegistry(assemblyLoader);
         var dataStoreFactory = new DataStoreFactory(assemblyLoader, activatorWrapper);
         var tableFormatter = new TableFormatter(assemblyLoader, activatorWrapper);

diff --git a/src/Constants.cs b/src/Constants.cs
@@ -1,8 +1,5 @@
 namespace Gauge.Dotnet;
 
-public delegate string GetTestAssembly();
-public delegate IEnumerable<string> GetAssembliesReferencingGaugeLib(ILogger logger);
-
 public static class Constants
 {
     public static string GaugeLibAssemblyName => "Gauge.CSharp.Lib";

diff --git a/src/Loaders/AssemblyLoader.cs b/src/Loaders/AssemblyLoader.cs
@@ -26,8 +26,8 @@ public class AssemblyLoader : IAssemblyLoader
     private readonly IStepRegistry _registry;
     private readonly ILogger<AssemblyLoader> _logger;
 
-    public AssemblyLoader(IGaugeLoadContext gaugeLoadContext, IReflectionWrapper reflectionWrapper, IActivatorWrapper activatorWrapper,
-        IStepRegistry registry, ILogger<AssemblyLoader> logger, GetAssembliesReferencingGaugeLib getAssembliesReferencingGaugeLib)
+    public AssemblyLoader(IAssemblyLocater assemblyLocater, IGaugeLoadContext gaugeLoadContext, IReflectionWrapper reflectionWrapper, IActivatorWrapper activatorWrapper,
+        IStepRegistry registry, ILogger<AssemblyLoader> logger)
     {
         _reflectionWrapper = reflectionWrapper;
         _activatorWrapper = activatorWrapper;
@@ -37,7 +37,7 @@ public AssemblyLoader(IGaugeLoadContext gaugeLoadContext, IReflectionWrapper ref
         _gaugeLoadContext = gaugeLoadContext;
         _targetLibAssembly = _gaugeLoadContext.LoadFromAssemblyName(new AssemblyName(GaugeLibAssemblyName));
         VerifyTargetAssemblyVersion();
-        ScanAndLoad(getAssembliesReferencingGaugeLib.Invoke(_logger));
+        ScanAndLoad(assemblyLocater.GetAssembliesReferencingGaugeLib());
         var assembliesReferencingGaugeLib = _gaugeLoadContext.GetLoadedAssembliesReferencingGaugeLib().ToList();
         _logger.LogDebug("Number of AssembliesReferencingGaugeLib : {AssembliesReferencingGaugeLibCount}", assembliesReferencingGaugeLib.Count);
         SetDefaultTypes();