Refactor SimpleContainer tests and improve code quality

vb2ae · vb2ae · commit a4db14351453 · 2024-12-21T09:36:10.000-05:00
Refactored SimpleContainerTests.cs into multiple files for better modularity and readability. Updated SimpleContainer.cs for performance and readability improvements. Added new test files for various aspects of SimpleContainer functionality. Created new service files to support tests. These changes enhance the structure, readability, and maintainability of the codebase.
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 HasHandler_returns_false_when_handler_does_not_exist()
+        {
+            Assert.False(new SimpleContainer().HasHandler(typeof(object), null));
+            Assert.False(new SimpleContainer().HasHandler(null, "Object"));
+        }
+
+        [Fact]
+        public void HasHandler_returns_true_when_handler_exists()
+        {
+            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 GetInstance_ShouldReturnNullIfNoHandler()
+        {
+            var container = new SimpleContainer();
+
+            var resolvedInstance = container.GetInstance(typeof(ITestService), null);
+
+            Assert.Null(resolvedInstance);
+        }
+
+        [Fact]
+        public void HasHandler_ShouldReturnTrueIfHandlerExists()
+        {
+            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 HasHandler_ShouldReturnFalseIfHandlerDoesNotExist()
+        {
+            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 Singleton_instances_are_the_same_across_parent_and_child()
+        {
+            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 The_child_container_returned_contains_parent_entries()
+        {
+            var container = new SimpleContainer();
+            container.PerRequest<object>();
+            var childContainer = container.CreateChildContainer();
+
+            Assert.NotNull(childContainer.GetInstance(typeof(object), null));
+        }
+
+        [Fact]
+        public void The_child_container_returned_is_not_the_same_instance_as_its_parent()
+        {
+            var container = new SimpleContainer();
+            var childContainer = container.CreateChildContainer();
+
+            Assert.NotSame(container, childContainer);
+        }
+
+
+
+        [Fact]
+        public void CreateChildContainer_ShouldCreateChildContainer()
+        {
+            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 An_instance_is_returned_for_the_type_specified_if_found()
+        {
+            var container = new SimpleContainer();
+            container.PerRequest<object>();
+
+            Assert.NotNull(container.GetInstance(typeof(object), null));
+        }
+
+        [Fact]
+        public void Instances_can_be_found_by_name_only()
+        {
+            var container = new SimpleContainer();
+            container.RegisterPerRequest(typeof(object), "AnObject", typeof(object));
+
+            Assert.NotNull(container.GetInstance(null, "AnObject"));
+        }
+
+        [Fact]
+        public void Null_is_returned_when_no_instance_is_found()
+        {
+            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
@@ -0,0 +1,105 @@
+﻿using System.Linq;
+using Caliburn.Micro.Core.Tests.Services;
+using Xunit;
+
+namespace Caliburn.Micro.Core.Tests
+{
+    public class SimpleContainerRegisteringInstances
+    {
+        [Fact]
+        public void RegisterInstance_ShouldRegisterInstance()
+        {
+            var container = new SimpleContainer();
+            var instance = new TestService();
+
+            container.RegisterInstance(typeof(ITestService), null, instance);
+
+            var resolvedInstance = container.GetInstance(typeof(ITestService), null);
+
+            Assert.NotNull(resolvedInstance);
+            Assert.Equal(instance, resolvedInstance);
+        }
+
+        [Fact]
+        public void RegisterPerRequest_ShouldRegisterPerRequest()
+        {
+            var container = new SimpleContainer();
+
+            container.RegisterPerRequest(typeof(ITestService), null, typeof(TestService));
+
+            var instance1 = container.GetInstance(typeof(ITestService), null);
+            var instance2 = container.GetInstance(typeof(ITestService), null);
+
+            Assert.NotNull(instance1);
+            Assert.NotNull(instance2);
+            Assert.NotEqual(instance1, instance2);
+        }
+
+        [Fact]
+        public void RegisterSingleton_ShouldRegisterSingleton()
+        {
+            var container = new SimpleContainer();
+
+            container.RegisterSingleton(typeof(ITestService), null, typeof(TestService));
+
+            var instance1 = container.GetInstance(typeof(ITestService), null);
+            var instance2 = container.GetInstance(typeof(ITestService), null);
+
+            Assert.NotNull(instance1);
+            Assert.NotNull(instance2);
+            Assert.Equal(instance1, instance2);
+        }
+
+        [Fact]
+        public void Instances_registed_Singleton_return_the_same_instance_for_each_call()
+        {
+            var container = new SimpleContainer();
+            container.Singleton<object>();
+
+            var instanceA = container.GetInstance(typeof(object), null);
+            var instanceB = container.GetInstance(typeof(object), null);
+
+            Assert.Same(instanceA, instanceB);
+        }
+
+        [Fact]
+        public void Instances_registered_PerRequest_returns_a_different_instance_for_each_call()
+        {
+            var container = new SimpleContainer();
+            container.PerRequest<object>();
+
+            var instanceA = container.GetInstance(typeof(object), null);
+            var instanceB = container.GetInstance(typeof(object), null);
+
+            Assert.NotSame(instanceA, instanceB);
+        }
+
+        [Fact]
+        public void Instances_registered_with_different_keys_get_all_instances_return_all()
+        {
+            var container = new SimpleContainer();
+            container.RegisterInstance(typeof(object), "test", new object());
+            container.RegisterInstance(typeof(object), "test", new object());
+
+            var results = container.GetAllInstances<object>("test");
+
+            Assert.Equal(2, results.Count());
+        }
+
+
+        [Fact]
+        public void UnregisterHandler_ShouldUnregisterHandler()
+        {
+            var container = new SimpleContainer();
+            var instance = new TestService();
+
+            container.RegisterInstance(typeof(ITestService), null, instance);
+            container.UnregisterHandler(typeof(ITestService), null);
+
+            var resolvedInstance = container.GetInstance(typeof(ITestService), null);
+
+            Assert.Null(resolvedInstance);
+        }
+
+    }
+}
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

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