diff --git a/test/Autofac.Test/Features/Decorators/DecoratorTests.cs b/test/Autofac.Test/Features/Decorators/DecoratorTests.cs index 46ea10a73..31caefbd0 100644 --- a/test/Autofac.Test/Features/Decorators/DecoratorTests.cs +++ b/test/Autofac.Test/Features/Decorators/DecoratorTests.cs @@ -104,7 +104,7 @@ public void DecoratedInstancePerDependencyRegistrationCanIncludeOtherServices() Assert.NotSame(serviceInstance, decoratedServiceInstance); } - [Fact(Skip = "Issue #963")] + [Fact] public void DecoratedInstancePerLifetimeScopeRegistrationCanIncludeOtherServices() { var builder = new ContainerBuilder(); @@ -128,10 +128,10 @@ public void DecoratedInstancePerLifetimeScopeRegistrationCanIncludeOtherServices var decoratedServiceInstance = container.Resolve(); Assert.IsType(decoratedServiceInstance); - Assert.Same(serviceInstance, decoratedServiceInstance); + Assert.Same(serviceInstance, decoratedServiceInstance.Decorated); } - [Fact(Skip = "Issue #963")] + [Fact] public void DecoratedSingleInstanceRegistrationCanIncludeOtherServices() { var builder = new ContainerBuilder(); @@ -149,8 +149,13 @@ public void DecoratedSingleInstanceRegistrationCanIncludeOtherServices() Assert.NotNull(decoratedServiceRegistration); Assert.Same(serviceRegistration, decoratedServiceRegistration); - Assert.IsType(container.Resolve()); - Assert.IsType(container.Resolve()); + var serviceInstance = container.Resolve(); + Assert.IsType(serviceInstance); + + var decoratedServiceInstance = container.Resolve(); + Assert.IsType(decoratedServiceInstance); + + Assert.Same(serviceInstance, decoratedServiceInstance.Decorated); } [Fact] diff --git a/test/Autofac.Test/Features/Decorators/OpenGenericDecoratorTests.cs b/test/Autofac.Test/Features/Decorators/OpenGenericDecoratorTests.cs index bd8b9edf8..68eb787f2 100644 --- a/test/Autofac.Test/Features/Decorators/OpenGenericDecoratorTests.cs +++ b/test/Autofac.Test/Features/Decorators/OpenGenericDecoratorTests.cs @@ -222,7 +222,7 @@ public void DecoratedInstancePerDependencyRegistrationCanIncludeOtherServices() Assert.NotSame(serviceInstance, decoratedServiceInstance); } - [Fact(Skip = "Issue #963")] + [Fact] public void DecoratedInstancePerLifetimeScopeRegistrationCanIncludeOtherServices() { var builder = new ContainerBuilder(); @@ -241,15 +241,15 @@ public void DecoratedInstancePerLifetimeScopeRegistrationCanIncludeOtherServices Assert.Same(serviceRegistration, decoratedServiceRegistration); var serviceInstance = container.Resolve>(); - Assert.IsType>(serviceInstance); + Assert.IsType>(serviceInstance); var decoratedServiceInstance = container.Resolve>(); Assert.IsType>(decoratedServiceInstance); - Assert.Same(serviceInstance, decoratedServiceInstance); + Assert.Same(serviceInstance, decoratedServiceInstance.Decorated); } - [Fact(Skip = "Issue #963")] + [Fact] public void DecoratedSingleInstanceRegistrationCanIncludeOtherServices() { var builder = new ContainerBuilder(); @@ -268,12 +268,12 @@ public void DecoratedSingleInstanceRegistrationCanIncludeOtherServices() Assert.Same(serviceRegistration, decoratedServiceRegistration); var serviceInstance = container.Resolve>(); - Assert.IsType>(serviceInstance); + Assert.IsType>(serviceInstance); var decoratedServiceInstance = container.Resolve>(); Assert.IsType>(decoratedServiceInstance); - Assert.Same(serviceInstance, decoratedServiceInstance); + Assert.Same(serviceInstance, decoratedServiceInstance.Decorated); } [Fact]