Merge pull request #959 from Caliburn-Micro/958-fix-code-scanning-alert-missed-opportunity-to-use-where

vb2ae · web-flow · commit 51cb9f697b01 · 2025-06-26T19:10:11.000-04:00
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -6,6 +6,6 @@
 version: 2
 updates:
   - package-ecosystem: "nuget" # See documentation for possible values
-    directory: "/" # Location of package manifests
+    directory: "/src" # Location of package manifests
     schedule:
       interval: "weekly"
diff --git a/src/Caliburn.Micro.Core.Tests/Services/Component.cs b/src/Caliburn.Micro.Core.Tests/Services/Component.cs
@@ -0,0 +1,9 @@
+﻿namespace Caliburn.Micro.Core.Tests.Services
+{
+    internal class Component : IComponent
+    {
+        public IDependency1 Dependency1 { get; set; }
+        public NonInterfaceDependency NonInterfaceDependency { get; set; }
+    }
+}
+
diff --git a/src/Caliburn.Micro.Core.Tests/Services/Dependency1.cs b/src/Caliburn.Micro.Core.Tests/Services/Dependency1.cs
@@ -0,0 +1,11 @@
+﻿using System.Collections.Generic;
+
+namespace Caliburn.Micro.Core.Tests.Services
+{
+    internal class Dependency1 : IDependency1
+    {
+        public IDependency2 Dependency2 { get; set; }
+        public IList<IEnumerableDependency> EnumerableDependencies { get; set; }
+    }
+}
+
diff --git a/src/Caliburn.Micro.Core.Tests/Services/Dependency2.cs b/src/Caliburn.Micro.Core.Tests/Services/Dependency2.cs
@@ -0,0 +1,4 @@
+﻿namespace Caliburn.Micro.Core.Tests.Services
+{
+    internal class Dependency2 : IDependency2 { }
+}
diff --git a/src/Caliburn.Micro.Core.Tests/Services/EnumerableDependency1.cs b/src/Caliburn.Micro.Core.Tests/Services/EnumerableDependency1.cs
@@ -0,0 +1,8 @@
+﻿namespace Caliburn.Micro.Core.Tests.Services
+{
+    internal class EnumerableDependency1 : IEnumerableDependency
+    {
+        public IDependency2 Dependency2 { get; set; }
+    }
+}
+
diff --git a/src/Caliburn.Micro.Core.Tests/Services/EnumerableDependency2.cs b/src/Caliburn.Micro.Core.Tests/Services/EnumerableDependency2.cs
@@ -0,0 +1,5 @@
+﻿namespace Caliburn.Micro.Core.Tests.Services
+{
+    internal class EnumerableDependency2 : IEnumerableDependency { }
+
+}
diff --git a/src/Caliburn.Micro.Core.Tests/Services/IComponent.cs b/src/Caliburn.Micro.Core.Tests/Services/IComponent.cs
@@ -0,0 +1,5 @@
+﻿namespace Caliburn.Micro.Core.Tests.Services
+{
+    internal interface IComponent { }
+
+}
diff --git a/src/Caliburn.Micro.Core.Tests/Services/IDependency1.cs b/src/Caliburn.Micro.Core.Tests/Services/IDependency1.cs
@@ -0,0 +1,4 @@
+﻿namespace Caliburn.Micro.Core.Tests.Services
+{
+    internal interface IDependency1 { }
+}
diff --git a/src/Caliburn.Micro.Core.Tests/Services/IDependency2.cs b/src/Caliburn.Micro.Core.Tests/Services/IDependency2.cs
@@ -0,0 +1,4 @@
+﻿namespace Caliburn.Micro.Core.Tests.Services
+{
+    internal interface IDependency2 { }
+}
diff --git a/src/Caliburn.Micro.Core.Tests/Services/IEnumerableDependency.cs b/src/Caliburn.Micro.Core.Tests/Services/IEnumerableDependency.cs
@@ -0,0 +1,4 @@
+﻿namespace Caliburn.Micro.Core.Tests.Services
+{
+    internal interface IEnumerableDependency { }
+}
diff --git a/src/Caliburn.Micro.Core.Tests/Services/ITestService.cs b/src/Caliburn.Micro.Core.Tests/Services/ITestService.cs
@@ -0,0 +1,4 @@
+﻿namespace Caliburn.Micro.Core.Tests.Services
+{
+    internal interface ITestService { }
+}
diff --git a/src/Caliburn.Micro.Core.Tests/Services/NonInterfaceDependency.cs b/src/Caliburn.Micro.Core.Tests/Services/NonInterfaceDependency.cs
@@ -0,0 +1,4 @@
+﻿namespace Caliburn.Micro.Core.Tests.Services
+{
+    internal class NonInterfaceDependency { }
+}
diff --git a/src/Caliburn.Micro.Core.Tests/Services/SecondDependency1.cs b/src/Caliburn.Micro.Core.Tests/Services/SecondDependency1.cs
@@ -0,0 +1,4 @@
+﻿namespace Caliburn.Micro.Core.Tests.Services
+{
+    internal class SecondDependency1 : Dependency1 { }
+}
diff --git a/src/Caliburn.Micro.Core.Tests/Services/SingleEmptyConstructorType.cs b/src/Caliburn.Micro.Core.Tests/Services/SingleEmptyConstructorType.cs
@@ -0,0 +1,10 @@
+﻿namespace Caliburn.Micro.Core.Tests.Services
+{
+    public class SingleEmptyConstructorType
+    {
+        public SingleEmptyConstructorType()
+        {
+
+        }
+    }
+}
diff --git a/src/Caliburn.Micro.Core.Tests/Services/SingleIntConstructor.cs b/src/Caliburn.Micro.Core.Tests/Services/SingleIntConstructor.cs
@@ -0,0 +1,13 @@
+﻿namespace Caliburn.Micro.Core.Tests.Services
+{
+    public class SingleIntConstructor
+    {
+        public int Value { get; private set; }
+
+        public SingleIntConstructor(int x)
+        {
+            this.Value = x;
+        }
+    }
+
+}
diff --git a/src/Caliburn.Micro.Core.Tests/Services/SingleNonEmptyConstructorType.cs b/src/Caliburn.Micro.Core.Tests/Services/SingleNonEmptyConstructorType.cs
@@ -0,0 +1,9 @@
+﻿namespace Caliburn.Micro.Core.Tests.Services
+{
+    public class SingleNonEmptyConstructorType
+    {
+        public SingleNonEmptyConstructorType(SingleEmptyConstructorType type)
+        {
+        }
+    }
+}
diff --git a/src/Caliburn.Micro.Core.Tests/Services/TestService.cs b/src/Caliburn.Micro.Core.Tests/Services/TestService.cs
@@ -0,0 +1,5 @@
+﻿namespace Caliburn.Micro.Core.Tests.Services
+{
+    internal class TestService : ITestService { }
+    internal class AnotherTestService : ITestService { }
+}
diff --git a/src/Caliburn.Micro.Core.Tests/Services/TestServiceWithDependency.cs b/src/Caliburn.Micro.Core.Tests/Services/TestServiceWithDependency.cs
@@ -0,0 +1,7 @@
+﻿namespace Caliburn.Micro.Core.Tests.Services
+{
+    internal class TestServiceWithDependency
+    {
+        public ITestService Dependency { get; set; }
+    }
+}
diff --git a/src/Caliburn.Micro.Core.Tests/Services/TwoConstructors.cs b/src/Caliburn.Micro.Core.Tests/Services/TwoConstructors.cs
@@ -0,0 +1,18 @@
+﻿namespace Caliburn.Micro.Core.Tests.Services
+{
+    public class TwoConstructors
+    {
+        public int Value { get; set; }
+
+        public TwoConstructors()
+        {
+            Value = 42;
+        }
+
+        public TwoConstructors(int value)
+        {
+            Value = value;
+        }
+    }
+
+}
diff --git a/src/Caliburn.Micro.Core.Tests/SimpleContainerCheckingForHandler.cs b/src/Caliburn.Micro.Core.Tests/SimpleContainerCheckingForHandler.cs
@@ -0,0 +1,58 @@
+﻿using Caliburn.Micro.Core.Tests.Services;
+using Xunit;
+
+namespace Caliburn.Micro.Core.Tests
+{
+    public class SimpleContainerCheckingForHandler
+    {
+        [Fact]
+        public void HasHandlerReturnsFalseWhenHandlerDoesNotExist()
+        {
+            Assert.False(new SimpleContainer().HasHandler(typeof(object), null));
+            Assert.False(new SimpleContainer().HasHandler(null, "Object"));
+        }
+
+        [Fact]
+        public void HasHandlerReturnsTrueWhenHandlerExists()
+        {
+            var container = new SimpleContainer();
+            container.RegisterPerRequest(typeof(object), "Object", typeof(object));
+
+            Assert.True(container.HasHandler(typeof(object), null));
+            Assert.True(container.HasHandler(null, "Object"));
+        }
+
+        [Fact]
+        public void GetInstanceShouldReturnNullIfNoHandler()
+        {
+            var container = new SimpleContainer();
+
+            var resolvedInstance = container.GetInstance(typeof(ITestService), null);
+
+            Assert.Null(resolvedInstance);
+        }
+
+        [Fact]
+        public void HasHandlerShouldReturnTrueIfHandlerExists()
+        {
+            var container = new SimpleContainer();
+            var instance = new TestService();
+
+            container.RegisterInstance(typeof(ITestService), null, instance);
+
+            var hasHandler = container.HasHandler(typeof(ITestService), null);
+
+            Assert.True(hasHandler);
+        }
+
+        [Fact]
+        public void HasHandlerShouldReturnFalseIfHandlerDoesNotExist()
+        {
+            var container = new SimpleContainer();
+
+            var hasHandler = container.HasHandler(typeof(ITestService), null);
+
+            Assert.False(hasHandler);
+        }
+    }
+}
diff --git a/src/Caliburn.Micro.Core.Tests/SimpleContainerCreatingAChildContainer.cs b/src/Caliburn.Micro.Core.Tests/SimpleContainerCreatingAChildContainer.cs
@@ -0,0 +1,51 @@
+﻿using Xunit;
+
+namespace Caliburn.Micro.Core.Tests
+{
+    public class SimpleContainerCreatingAChildContainer
+    {
+        [Fact]
+        public void SingletonInstancesAreTheSameAcrossParentAndChild()
+        {
+            var container = new SimpleContainer();
+            container.Singleton<object>();
+            var childContainer = container.CreateChildContainer();
+
+            var parentInstance = container.GetInstance(typeof(object), null);
+            var childInstance = childContainer.GetInstance(typeof(object), null);
+
+            Assert.Same(parentInstance, childInstance);
+        }
+
+        [Fact]
+        public void TheChildContainerReturnedContainsParentEntries()
+        {
+            var container = new SimpleContainer();
+            container.PerRequest<object>();
+            var childContainer = container.CreateChildContainer();
+
+            Assert.NotNull(childContainer.GetInstance(typeof(object), null));
+        }
+
+        [Fact]
+        public void TheChildContainerReturnedIsNotTheSameInstanceAsItsParent()
+        {
+            var container = new SimpleContainer();
+            var childContainer = container.CreateChildContainer();
+
+            Assert.NotSame(container, childContainer);
+        }
+
+
+
+        [Fact]
+        public void CreateChildContainerShouldCreateChildContainer()
+        {
+            var container = new SimpleContainer();
+            var childContainer = container.CreateChildContainer();
+
+            Assert.NotNull(childContainer);
+            Assert.NotEqual(container, childContainer);
+        }
+    }
+}
diff --git a/src/Caliburn.Micro.Core.Tests/SimpleContainerGettingASingleInstance.cs b/src/Caliburn.Micro.Core.Tests/SimpleContainerGettingASingleInstance.cs
@@ -0,0 +1,31 @@
+﻿using Xunit;
+
+namespace Caliburn.Micro.Core.Tests
+{
+    public class SimpleContainerGettingASingleInstance
+    {
+        [Fact]
+        public void AnInstanceIsReturnedForTheTypeSpecifiedIfFound()
+        {
+            var container = new SimpleContainer();
+            container.PerRequest<object>();
+
+            Assert.NotNull(container.GetInstance(typeof(object), null));
+        }
+
+        [Fact]
+        public void InstancesCanBeFoundByNameOnly()
+        {
+            var container = new SimpleContainer();
+            container.RegisterPerRequest(typeof(object), "AnObject", typeof(object));
+
+            Assert.NotNull(container.GetInstance(null, "AnObject"));
+        }
+
+        [Fact]
+        public void NullIsReturnedWhenNoInstanceIsFound()
+        {
+            Assert.Null(new SimpleContainer().GetInstance(typeof(object), null));
+        }
+    }
+}
diff --git a/src/Caliburn.Micro.Core.Tests/SimpleContainerRegisteringInstances.cs b/src/Caliburn.Micro.Core.Tests/SimpleContainerRegisteringInstances.cs
diff --git a/src/Caliburn.Micro.Core.Tests/SimpleContainerTests.cs b/src/Caliburn.Micro.Core.Tests/SimpleContainerTests.cs
diff --git a/src/Caliburn.Micro.Core.Tests/SimpleContainer_Find_Constructor.cs b/src/Caliburn.Micro.Core.Tests/SimpleContainer_Find_Constructor.cs
diff --git a/src/Caliburn.Micro.Core.Tests/SimpleContainer_Recursive.cs b/src/Caliburn.Micro.Core.Tests/SimpleContainer_Recursive.cs
diff --git a/src/Caliburn.Micro.Core/SimpleContainer.cs b/src/Caliburn.Micro.Core/SimpleContainer.cs
diff --git a/src/Caliburn.Micro.Platform.Core/Caliburn.Micro.Platform.Core.csproj b/src/Caliburn.Micro.Platform.Core/Caliburn.Micro.Platform.Core.csproj

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +namespace Caliburn.Micro.Core.Tests.Services
 +{
 +    internal class Dependency2 : IDependency2 { }
 +}