Refactoring and adding tests

Author: ENikS

tests/Unity.Diagnostic/Issues.cs

@@ -1,103 +1,23 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System;
 using Unity;
-using Unity.Builder;
-using Unity.Extension;
-using Unity.Specification.Diagnostic.Issues.GitHub;
-using Unity.Strategies;
 
-namespace GitHub
+namespace Issues
 {
     [TestClass]
-    public class Container : Unity.Specification.Diagnostic.Issues.GitHub.SpecificationTests
+    public class GitHub : Unity.Specification.Diagnostic.Issues.GitHub.SpecificationTests
     {
         public override IUnityContainer GetContainer()
         {
-            return new UnityContainer().AddExtension(new ForceCompillation())
-                                       .AddExtension(new Diagnostic())
-                                       .AddExtension(new SpyExtension(new SpyStrategy(), UnityBuildStage.Initialization));
+            return new UnityContainer().AddNewExtension<Diagnostic>();
         }
     }
 
-    internal class SpyExtension : UnityContainerExtension
-    {
-        private BuilderStrategy strategy;
-        private UnityBuildStage stage;
-        private object policy;
-        private Type policyType;
-
-        public SpyExtension(BuilderStrategy strategy, UnityBuildStage stage)
-        {
-            this.strategy = strategy;
-            this.stage = stage;
-        }
-
-        public SpyExtension(BuilderStrategy strategy, UnityBuildStage stage, object policy, Type policyType)
-        {
-            this.strategy = strategy;
-            this.stage = stage;
-            this.policy = policy;
-            this.policyType = policyType;
-        }
-
-        protected override void Initialize()
-        {
-            Context.Strategies.Add(this.strategy, this.stage);
-
-            if (this.policy != null)
-            {
-                Context.Policies.Set(null, null, this.policyType, this.policy);
-            }
-        }
-    }
-
-    internal class SpyStrategy : BuilderStrategy
-    {
-        private object existing = null;
-        private bool buildUpWasCalled = false;
-
-        public override void PreBuildUp(ref BuilderContext context)
-        {
-            this.buildUpWasCalled = true;
-            this.existing = context.Existing;
-
-            this.UpdateSpyPolicy(ref context);
-        }
-
-        public override void PostBuildUp(ref BuilderContext context)
-        {
-            this.existing = context.Existing;
-        }
-
-        public object Existing
-        {
-            get { return this.existing; }
-        }
-
-        public bool BuildUpWasCalled
-        {
-            get { return this.buildUpWasCalled; }
-        }
-
-        private void UpdateSpyPolicy(ref BuilderContext context)
-        {
-            SpyPolicy policy = (SpyPolicy)context.Get(null, null, typeof(SpyPolicy));
-
-            if (policy != null)
-            {
-                policy.WasSpiedOn = true;
-            }
-        }
-    }
-
-    internal class SpyPolicy
+    [TestClass]
+    public class CodePlex : Unity.Specification.Issues.Codeplex.SpecificationTests
     {
-        private bool wasSpiedOn;
-
-        public bool WasSpiedOn
+        public override IUnityContainer GetContainer()
         {
-            get { return wasSpiedOn; }
-            set { wasSpiedOn = value; }
+            return new UnityContainer().AddNewExtension<Diagnostic>();
         }
     }
 }

tests/Unity.Specification/Issues.cs

@@ -0,0 +1,23 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Unity;
+
+namespace Issues
+{
+    [TestClass]
+    public class GitHub : Unity.Specification.Issues.GitHub.SpecificationTests
+    {
+        public override IUnityContainer GetContainer()
+        {
+            return new UnityContainer();
+        }
+    }
+
+    [TestClass]
+    public class CodePlex : Unity.Specification.Issues.Codeplex.SpecificationTests
+    {
+        public override IUnityContainer GetContainer()
+        {
+            return new UnityContainer();
+        }
+    }
+}