Refactoring

Author: ENikS

tests/Microsoft.DependencyInjection.Tests.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Specification.Tests" Version="1.1.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Specification.Tests" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />

tests/UnityDependencyInjectionTests.cs

@@ -1,6 +1,10 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Specification;
+using Microsoft.Extensions.DependencyInjection.Specification.Fakes;
+using Xunit;
 
 namespace Unity.Microsoft.DependencyInjection.Tests
 {
@@ -10,5 +14,34 @@ protected override IServiceProvider CreateServiceProvider(IServiceCollection ser
         {
             return ServiceProvider.ConfigureServices(serviceCollection);
         }
+
+        [Fact]
+        public void Disposes_InReverseOrderOfCreation()
+        {
+            TestServiceCollection serviceCollection = new TestServiceCollection();
+            ServiceCollectionServiceExtensions.AddSingleton<FakeDisposeCallback>(serviceCollection);
+            ServiceCollectionServiceExtensions.AddTransient<IFakeOuterService, FakeDisposableCallbackOuterService>(serviceCollection);
+            ServiceCollectionServiceExtensions.AddSingleton<IFakeMultipleService, FakeDisposableCallbackInnerService>(serviceCollection);
+            ServiceCollectionServiceExtensions.AddScoped<IFakeMultipleService, FakeDisposableCallbackInnerService>(serviceCollection);
+            ServiceCollectionServiceExtensions.AddTransient<IFakeMultipleService, FakeDisposableCallbackInnerService>(serviceCollection);
+            ServiceCollectionServiceExtensions.AddSingleton<IFakeService, FakeDisposableCallbackInnerService>(serviceCollection);
+            IServiceProvider provider1 = this.CreateServiceProvider(serviceCollection);
+            FakeDisposeCallback callback = ServiceProviderServiceExtensions.GetService<FakeDisposeCallback>(provider1);
+            IFakeOuterService service = ServiceProviderServiceExtensions.GetService<IFakeOuterService>(provider1);
+            ((IDisposable)provider1).Dispose();
+            Assert.Equal<object>(service, callback.Disposed[0]);
+            Assert.Equal<IFakeMultipleService>(Enumerable.Reverse<IFakeMultipleService>(service.MultipleServices), 
+                                               Enumerable.OfType<IFakeMultipleService>(Enumerable.Take<object>(Enumerable.Skip<object>((IEnumerable<object>)callback.Disposed, 1), 3)));
+            Assert.Equal<object>(service.SingleService, callback.Disposed[4]);
+        }
+
+        internal class TestServiceCollection : List<ServiceDescriptor>, 
+                                               IServiceCollection, 
+                                               IList<ServiceDescriptor>, 
+                                               ICollection<ServiceDescriptor>, 
+                                               IEnumerable<ServiceDescriptor>
+        {
+        }
+
     }
 }