Merge pull request #18 from pfpack/release/v1.3.0-preview.1.0.0

release/v1.3.0-preview.1.0.0

Author: pmosk

README.md

@@ -1,2 +1,2 @@
 # PrimeFuncPack Dependency Registry
-PrimeFuncPack Dependency Registry is a library for .NET providing the dependency registrar targeted to both usual services and dependency trees build by PrimeFuncPack Dependency to register the dependencies in the .NET dependency injection mechanism.
+PrimeFuncPack Dependency Registry is a library for .NET providing the dependency registrar targeted to both usual services and dependency trees built by PrimeFuncPack Dependency to register the dependencies in the .NET dependency injection mechanism.

docs/dependency-registry/README.md

@@ -0,0 +1,2 @@
+# PrimeFuncPack Dependency Registry
+PrimeFuncPack Dependency Registry is a library for .NET providing the dependency registrar targeted to both usual services and dependency trees built by PrimeFuncPack Dependency to register the dependencies in the .NET dependency injection mechanism.

src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistrar.T/DependencyRegistrarTypedTest.cs

@@ -0,0 +1,5 @@
+namespace PrimeFuncPack.DependencyRegistry.Tests;
+
+public sealed partial class DependencyRegistrarTypedTest
+{
+}

src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistrar.T/Test.Factory.cs

@@ -0,0 +1,30 @@
+using System;
+using PrimeFuncPack.UnitTest;
+using Xunit;
+using static PrimeFuncPack.UnitTest.TestData;
+
+namespace PrimeFuncPack.DependencyRegistry.Tests;
+
+partial class DependencyRegistrarTypedTest
+{
+    [Fact]
+    public void Create_ServicesAreNull_ExpectArgumentNullException()
+    {
+        var ex = Assert.Throws<ArgumentNullException>(
+            () => _ = DependencyRegistrar<RefType>.Create(null!, _ => PlusFifteenIdRefType));
+
+        Assert.Equal("services", ex.ParamName);
+    }
+
+    [Fact]
+    public void Create_ResolverIsNull_ExpectArgumentNullException()
+    {
+        var mockServices = MockServiceCollection.CreateMock();
+        var sourceServices = mockServices.Object;
+
+        var ex = Assert.Throws<ArgumentNullException>(
+            () => _ = DependencyRegistrar<RecordType>.Create(sourceServices, null!));
+
+        Assert.Equal("resolver", ex.ParamName);
+    }
+}

src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistrar.T/Test.RegisterScoped.cs

@@ -0,0 +1,49 @@
+using System;
+using Microsoft.Extensions.DependencyInjection;
+using Moq;
+using PrimeFuncPack.UnitTest;
+using Xunit;
+using static PrimeFuncPack.UnitTest.TestData;
+
+namespace PrimeFuncPack.DependencyRegistry.Tests;
+
+partial class DependencyRegistrarTypedTest
+{
+    [Theory]
+    [InlineData(null)]
+    [InlineData(SomeString)]
+    public void RegisterScoped_ExpectSourceServices(string regService)
+    {
+        var mockServices = MockServiceCollection.CreateMock();
+        var sourceServices = mockServices.Object;
+
+        var registrar = DependencyRegistrar<string>.Create(sourceServices, _ => regService);
+
+        var actualServices = registrar.RegisterScoped();
+        Assert.Same(sourceServices, actualServices);
+    }
+
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public void RegisterScoped_ExpectCallAddScopedOnce(bool isNotNull)
+    {
+        RefType regService = isNotNull ? ZeroIdRefType : null!;
+        var mockServices = MockServiceCollection.CreateMock(
+            sd =>
+            {
+                Assert.Equal(typeof(RefType), sd.ServiceType);
+                Assert.Equal(ServiceLifetime.Scoped, sd.Lifetime);
+                Assert.NotNull(sd.ImplementationFactory);
+
+                var actualService = sd.ImplementationFactory!.Invoke(Mock.Of<IServiceProvider>());
+                Assert.Equal(regService, actualService);
+            });
+
+        var sourceServices = mockServices.Object;
+        var registrar = DependencyRegistrar<RefType>.Create(sourceServices, _ => regService);
+
+        _ = registrar.RegisterScoped();
+        mockServices.Verify(s => s.Add(It.IsAny<ServiceDescriptor>()), Times.Once);
+    }
+}

src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistrar.T/Test.RegisterSingleton.cs

@@ -0,0 +1,50 @@
+using System;
+using Microsoft.Extensions.DependencyInjection;
+using Moq;
+using PrimeFuncPack.UnitTest;
+using Xunit;
+using static PrimeFuncPack.UnitTest.TestData;
+
+namespace PrimeFuncPack.DependencyRegistry.Tests;
+
+partial class DependencyRegistrarTypedTest
+{
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public void RegisterSingleton_ExpectSourceServices(bool isNotNull)
+    {
+        var mockServices = MockServiceCollection.CreateMock();
+        var sourceServices = mockServices.Object;
+
+        object regService = isNotNull ? new object() : null!;
+        var registrar = DependencyRegistrar<object>.Create(sourceServices, _ => regService);
+
+        var actualServices = registrar.RegisterSingleton();
+        Assert.Same(sourceServices, actualServices);
+    }
+
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public void RegisterSingleton_ExpectCallAddSingletonOnce(bool isNotNull)
+    {
+        RecordType regService = isNotNull ? PlusFifteenIdLowerSomeStringNameRecord : null!;
+        var mockServices = MockServiceCollection.CreateMock(
+            sd =>
+            {
+                Assert.Equal(typeof(RecordType), sd.ServiceType);
+                Assert.Equal(ServiceLifetime.Singleton, sd.Lifetime);
+                Assert.NotNull(sd.ImplementationFactory);
+
+                var actualService = sd.ImplementationFactory!.Invoke(Mock.Of<IServiceProvider>());
+                Assert.Equal(regService, actualService);
+            });
+
+        var sourceServices = mockServices.Object;
+        var registrar = DependencyRegistrar<RecordType>.Create(sourceServices, _ => regService);
+
+        _ = registrar.RegisterSingleton();
+        mockServices.Verify(s => s.Add(It.IsAny<ServiceDescriptor>()), Times.Once);
+    }
+}

src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistrar.T/Test.RegisterTransient.cs

@@ -0,0 +1,50 @@
+using System;
+using Microsoft.Extensions.DependencyInjection;
+using Moq;
+using PrimeFuncPack.UnitTest;
+using Xunit;
+using static PrimeFuncPack.UnitTest.TestData;
+
+namespace PrimeFuncPack.DependencyRegistry.Tests;
+
+partial class DependencyRegistrarTypedTest
+{
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public void RegisterTransient_ExpectSourceServices(bool isNotNull)
+    {
+        var mockServices = MockServiceCollection.CreateMock();
+        var sourceServices = mockServices.Object;
+
+        RecordType regService = isNotNull ? PlusFifteenIdSomeStringNameRecord : null!;
+        var registrar = DependencyRegistrar<RecordType>.Create(sourceServices, _ => regService);
+
+        var actualServices = registrar.RegisterTransient();
+        Assert.Same(sourceServices, actualServices);
+    }
+
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public void RegisterTransient_ExpectCallAddTransientOnce(bool isNotNull)
+    {
+        RefType regService = isNotNull ? MinusFifteenIdRefType : null!;
+        var mockServices = MockServiceCollection.CreateMock(
+            sd =>
+            {
+                Assert.Equal(typeof(RefType), sd.ServiceType);
+                Assert.Equal(ServiceLifetime.Transient, sd.Lifetime);
+                Assert.NotNull(sd.ImplementationFactory);
+
+                var actualService = sd.ImplementationFactory!.Invoke(Mock.Of<IServiceProvider>());
+                Assert.Equal(regService, actualService);
+            });
+
+        var sourceServices = mockServices.Object;
+        var registrar = DependencyRegistrar<RefType>.Create(sourceServices, _ => regService);
+
+        _ = registrar.RegisterTransient();
+        mockServices.Verify(s => s.Add(It.IsAny<ServiceDescriptor>()), Times.Once);
+    }
+}

src/dependency-registry/DependencyRegistry/DependencyRegistrar.T/DependencyRegistrar.T.cs

@@ -17,5 +17,11 @@ internal DependencyRegistrar(IServiceCollection services, Func<IServiceProvider,
             this.services = services;
             this.resolver = resolver;
         }
+
+        public static DependencyRegistrar<T> Create(IServiceCollection services, Func<IServiceProvider, T> resolver)
+            =>
+            new(
+                services ?? throw new ArgumentNullException(nameof(services)),
+                resolver ?? throw new ArgumentNullException(nameof(resolver)));
     }
 }

src/dependency-registry/DependencyRegistry/DependencyRegistry.csproj

@@ -7,19 +7,25 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <PackageProjectUrl>https://github.com/pfpack/pfpack-dependency-registry</PackageProjectUrl>
     <Authors>Andrei Sergeev, Pavel Moskovoy</Authors>
     <Copyright>Copyright © 2020-2021 Andrei Sergeev, Pavel Moskovoy</Copyright>
-    <Description>PrimeFuncPack Dependency Registry is a library for .NET providing the dependency registrar targeted to both usual services and dependency trees build by PrimeFuncPack Dependency to register the dependencies in the .NET dependency injection mechanism.</Description>
+    <Description>PrimeFuncPack Dependency Registry is a library for .NET providing the dependency registrar targeted to both usual services and dependency trees built by PrimeFuncPack Dependency to register the dependencies in the .NET dependency injection mechanism.</Description>
     <RootNamespace>PrimeFuncPack</RootNamespace>
     <AssemblyName>PrimeFuncPack.DependencyRegistry</AssemblyName>
-    <Version>1.2.1</Version>
+    <Version>1.3.0-preview.1.0.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
     <None Include="..\..\..\LICENSE">
       <Pack>True</Pack>
       <PackagePath></PackagePath>
     </None>
+    <None Include="..\..\..\docs\dependency-registry\README.md">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
   </ItemGroup>
 
   <ItemGroup>