Fix benchmarking and only use Base if we didn't actually get a result

westermo · Aug 30, 2024 · 42bfbe4 · 42bfbe4
1 parent f6ea6c2
commit 42bfbe4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/Benchmarking/Benchmarks/Program.cs b/Benchmarking/Benchmarks/Program.cs
@@ -12,7 +12,7 @@ namespace Benchmarks;
 [JsonExporterAttribute.FullCompressed]
 public class ResolveBenchmarks
 {
-    private readonly IContainer m_container = new DependencyInjectionContainer(default, default, default!);
+    private readonly IContainer m_container = new DependencyInjectionContainer(default, default, new NonInjectedClass());
 
     [Benchmark]
     public ChainA ResolveChain() => m_container.Resolve<ChainA>();

diff --git a/FactoryGenerator/FactoryGenerator.cs b/FactoryGenerator/FactoryGenerator.cs
@@ -496,7 +496,7 @@ public bool TryResolve(Type type, out object? resolved)
             resolved = factory();
             return true;
         }}
-        if(Base is not null)
+        else if(Base is not null)
         {{
             return Base.TryResolve(type, out resolved);
         }}
@@ -516,7 +516,7 @@ public bool TryResolve<T>(out T? resolved)
                 return true;
             }}
         }}
-        if(Base is not null)
+        else if(Base is not null)
         {{
             return Base.TryResolve<T>(out resolved);
         }}

diff --git a/Tests/FactoryGenerator.Tests/InjectionDetectionTests.cs b/Tests/FactoryGenerator.Tests/InjectionDetectionTests.cs
@@ -225,6 +225,7 @@ public void ContainerMayCreateItself()
         var newContainer = new DependencyInjectionContainer(m_container);
         var resolved = m_container.Resolve<IEnumerable<IArray>>();
         resolved.Count().ShouldBe(6);
+        var nonInjected = m_container.Resolve<Inherited.NonInjectedClass>();
     }
     [Fact]
     public void HierarchicalContainersResolveArraysProperly()