Merge pull request #26 from z4kn4fein/dev

Version increase on PR
z4kn4fein · Jun 9, 2017 · e206ce2 · e206ce2
2 parents b97129e + 6191997
commit e206ce2
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 3 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -7,9 +7,6 @@ deploy:
 
 skip_tags: true
 
-pull_requests:
-  do_not_increment_build_number: true
-
 image: Visual Studio 2017
 
 configuration: Release

diff --git a/src/stashbox.tests/DecoratorTests.cs b/src/stashbox.tests/DecoratorTests.cs
@@ -481,6 +481,30 @@ public void DecoratorTests_RemapDecorator_V2()
             }
         }
 
+        [TestMethod]
+        public void DecoratorTests_RemapDecorator_WithConfig()
+        {
+            using (var container = new StashboxContainer())
+            {
+                container.RegisterType<ITest1, Test1>();
+                container.RegisterDecorator<ITest1, TestDecorator1>();
+                container.RegisterDecorator<ITest1, TestDecorator2>();
+
+                var test = container.Resolve<ITest1>();
+
+                Assert.IsInstanceOfType(test, typeof(TestDecorator2));
+                Assert.IsInstanceOfType(test.Test, typeof(TestDecorator1));
+                Assert.IsInstanceOfType(test.Test.Test, typeof(Test1));
+
+                container.ReMapDecorator(typeof(ITest1), typeof(TestDecorator3), context => context.WithoutDisposalTracking());
+
+                test = container.Resolve<ITest1>();
+
+                Assert.IsInstanceOfType(test, typeof(TestDecorator3));
+                Assert.IsInstanceOfType(test.Test, typeof(Test1));
+            }
+        }
+
         [TestMethod]
         public void DecoratorTests_Service_ImplementationType()
         {

diff --git a/src/stashbox.tests/ReMapTests.cs b/src/stashbox.tests/ReMapTests.cs
@@ -183,6 +183,30 @@ public void ReMapTests_DependencyResolve()
             Assert.IsInstanceOfType(test22.Test1, typeof(Test11));
         }
 
+        [TestMethod]
+        public void ReMapTests_DependencyResolve_WithoutService()
+        {
+            IStashboxContainer container = new StashboxContainer();
+            container.RegisterSingleton<Test11>();
+            container.RegisterType<Test3>();
+
+            var inst = container.Resolve<Test3>();
+
+            var dep = inst.Test1;
+
+            Assert.IsNotNull(dep);
+            Assert.IsInstanceOfType(dep, typeof(Test11));
+
+            container.ReMap<Test11>();
+
+            inst = container.Resolve<Test3>();
+
+            Assert.IsNotNull(inst.Test1);
+            Assert.IsInstanceOfType(inst.Test1, typeof(Test11));
+
+            Assert.AreNotSame(dep, inst.Test1);
+        }
+
         [TestMethod]
         public void ReMapTests_DependencyResolve_Fluent()
         {
@@ -228,5 +252,15 @@ public Test2(ITest1 test1)
                 this.Test1 = test1;
             }
         }
+
+        public class Test3
+        {
+            public Test11 Test1 { get; }
+
+            public Test3(Test11 test1)
+            {
+                this.Test1 = test1;
+            }
+        }
     }
 }