Merge branch 'master' of https://github.com/unitycontainer/container into v5.x

Author: ENikS

src/Extensions/DiagnosticExtensions.cs

@@ -12,7 +12,7 @@ public static class DiagnosticExtensions
         /// <para>This extension method adds <see cref="Diagnostic"/> extension to the 
         /// container and enables extended validation for all container's operations.</para>
         /// <para>This method will only work if the calling code is built with DEBUG
-        /// symbol defined. In other word in you building in Debug mode. Condigional 
+        /// symbol defined. In other word in you building in Debug mode. Conditional 
         /// methods can not return any values, so fluent notation can not be used with 
         /// this method.</para>
         /// </remarks>
@@ -39,7 +39,7 @@ public static void EnableDebugDiagnostic(this UnityContainer container)
         /// <remarks>
         /// <para>This extension method adds <see cref="Diagnostic"/> extension to the 
         /// container and enables extended validation for all container's operations.</para>
-        /// <para>This method works regardles of build mode. In other word, it will 
+        /// <para>This method works regardless of the build mode. In other word, it will 
         /// always enable validation. This method could be used with fluent notation.</para>
         /// </remarks>
         /// <example>

src/Strategies/BuildPlanStrategy.cs

@@ -41,7 +41,9 @@ public override bool RequiredToBuildType(IUnityContainer container, Type type, I
         public override void PreBuildUp(ref BuilderContext context)
         {
             // Get resolver if already created
-            var resolver = context.Registration.Get<ResolveDelegate<BuilderContext>>();
+            var resolver = context.Registration.Get<ResolveDelegate<BuilderContext>>() ?? (ResolveDelegate<BuilderContext>) 
+                                   GetGeneric(ref context, typeof(ResolveDelegate<BuilderContext>));
+
             if (null == resolver)
             {
                 // Check if can create at all
@@ -59,9 +61,9 @@ public override void PreBuildUp(ref BuilderContext context)
 
                 // Get resolver factory
                 var factory = context.Registration.Get<ResolveDelegateFactory>() ?? (ResolveDelegateFactory)(
-                               context.Get(context.Type, UnityContainer.All, typeof(ResolveDelegateFactory)) ??
-                               GetGeneric(ref context, typeof(ResolveDelegateFactory)) ?? 
-                               context.Get(null, null, typeof(ResolveDelegateFactory)));
+                              context.Get(context.Type, UnityContainer.All, typeof(ResolveDelegateFactory)) ??
+                              GetGeneric(ref context, typeof(ResolveDelegateFactory)) ?? 
+                              context.Get(null, null, typeof(ResolveDelegateFactory)));
 
                 // Create plan 
                 if (null != factory)

tests/Unity.Diagnostic/BuildUp.cs

@@ -1,11 +1,10 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Unity;
-using Unity.Extension;
 
-namespace Compiled.BuildUp
+namespace Compiled
 {
     [TestClass]
-    public class Validation : Unity.Specification.Diagnostic.BuildUp.SpecificationTests
+    public class BuildUp : Unity.Specification.Diagnostic.BuildUp.SpecificationTests
     {
         public override IUnityContainer GetContainer()
         {
@@ -15,10 +14,10 @@ public override IUnityContainer GetContainer()
     }
 }
 
-namespace Resolved.BuildUp
+namespace Resolved
 {
     [TestClass]
-    public class Validation : Unity.Specification.Diagnostic.BuildUp.SpecificationTests
+    public class BuildUp : Unity.Specification.Diagnostic.BuildUp.SpecificationTests
     {
         public override IUnityContainer GetContainer()
         {

tests/Unity.Diagnostic/Exceptions.cs

@@ -1,8 +1,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Unity;
-using Unity.Extension;
 
-namespace Compiled.Exceptions
+namespace Compiled
 {
 
     [TestClass]
@@ -16,7 +15,7 @@ public override IUnityContainer GetContainer()
     }
 }
 
-namespace Resolved.Exceptions
+namespace Resolved
 {
 
     [TestClass]

tests/Unity.Diagnostic/Field.cs

@@ -2,11 +2,11 @@
 using Unity;
 using Unity.Extension;
 
-namespace Compiled.Field
+namespace Compiled
 {
 
     [TestClass]
-    public class Validation : Unity.Specification.Diagnostic.Field.Validation.SpecificationTests
+    public class Field : Unity.Specification.Diagnostic.Field.Validation.SpecificationTests
     {
         public override IUnityContainer GetContainer()
         {
@@ -16,11 +16,11 @@ public override IUnityContainer GetContainer()
     }
 }
 
-namespace Resolved.Field
+namespace Resolved
 {
 
     [TestClass]
-    public class Validation : Unity.Specification.Diagnostic.Field.Validation.SpecificationTests
+    public class Field : Unity.Specification.Diagnostic.Field.Validation.SpecificationTests
     {
         public override IUnityContainer GetContainer()
         {

tests/Unity.Diagnostic/Hierarchical.cs

@@ -1,10 +1,10 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Unity;
 
-namespace Compiled.Hierarchical
+namespace Compiled
 {
     [TestClass]
-    public class Container : Unity.Specification.Diagnostic.Hierarchical.SpecificationTests
+    public class Hierarchical : Unity.Specification.Diagnostic.Hierarchical.SpecificationTests
     {
         public override IUnityContainer GetContainer()
         {
@@ -14,10 +14,10 @@ public override IUnityContainer GetContainer()
     }
 }
 
-namespace Resolved.Hierarchical
+namespace Resolved
 {
     [TestClass]
-    public class Container : Unity.Specification.Diagnostic.Hierarchical.SpecificationTests
+    public class Hierarchical : Unity.Specification.Diagnostic.Hierarchical.SpecificationTests
     {
         public override IUnityContainer GetContainer()
         {

tests/Unity.Diagnostic/Override.cs

@@ -0,0 +1,30 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Unity;
+
+namespace Compiled
+{
+
+    [TestClass]
+    public class Override : Unity.Specification.Diagnostic.Override.SpecificationTests
+    {
+        public override IUnityContainer GetContainer()
+        {
+            return new UnityContainer(UnityContainer.BuildStrategy.Compiled)
+                .AddExtension(new Diagnostic());
+        }
+    }
+}
+
+namespace Resolved
+{
+
+    [TestClass]
+    public class Override : Unity.Specification.Diagnostic.Override.SpecificationTests
+    {
+        public override IUnityContainer GetContainer()
+        {
+            return new UnityContainer(UnityContainer.BuildStrategy.Resolved)
+                .AddExtension(new Diagnostic());
+        }
+    }
+}

tests/Unity.Diagnostic/Property.cs

@@ -1,12 +1,11 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Unity;
-using Unity.Extension;
 
-namespace Compiled.Property
+namespace Compiled
 {
 
     [TestClass]
-    public class Validation : Unity.Specification.Diagnostic.Property.Validation.SpecificationTests
+    public class Property : Unity.Specification.Diagnostic.Property.Validation.SpecificationTests
     {
         public override IUnityContainer GetContainer()
         {
@@ -16,11 +15,11 @@ public override IUnityContainer GetContainer()
     }
 }
 
-namespace Resolved.Property
+namespace Resolved
 {
 
     [TestClass]
-    public class Validation : Unity.Specification.Diagnostic.Property.Validation.SpecificationTests
+    public class Property : Unity.Specification.Diagnostic.Property.Validation.SpecificationTests
     {
         public override IUnityContainer GetContainer()
         {