From 1c15b9cfb18711fd490b92bc8d404ff377eed9f7 Mon Sep 17 00:00:00 2001
From: WaffleSouffle <wafflesouffle@gmail.com>
Date: Tue, 29 Mar 2016 09:33:22 +0100
Subject: [PATCH] Fixes #290 - inheriting from generic class's nested class at
 ref cdd8d63.

---
 .../ExampleSpecifications.cs                  | 28 +++++++++++++++++++
 .../Model/ContextTests.cs                     | 18 ++++++++++++
 .../Factories/ContextFactory.cs               | 27 +++++++++++++++++-
 3 files changed, 72 insertions(+), 1 deletion(-)

diff --git a/Source/Machine.Specifications.Tests/ExampleSpecifications.cs b/Source/Machine.Specifications.Tests/ExampleSpecifications.cs
index 3a93965ce..1a3ad8101 100644
--- a/Source/Machine.Specifications.Tests/ExampleSpecifications.cs
+++ b/Source/Machine.Specifications.Tests/ExampleSpecifications.cs
@@ -242,4 +242,32 @@ public void Reset()
     {
     }
   }
+
+  public class OuterNonGenericContext
+  {
+    public class Nested
+    { }
+  }
+  
+  public class OuterGenericContext<T1, T2, T3>
+  {
+    public class NestedBase<TN1, TN2> : OuterGenericContext<TN1, string, TN2>
+    {}
+
+    public class Nested : NestedBase<char, bool>
+    {}
+  }
+
+  public class ContextInheritingFromNestedGeneric : OuterGenericContext<int, string, float>.Nested, IFakeContext
+  {
+    public static bool ItInvoked;
+
+    It should_be_invoked = () =>
+      ItInvoked = true;
+
+    public void Reset()
+    {
+        ItInvoked = false;
+    }
+  }
 }
diff --git a/Source/Machine.Specifications.Tests/Model/ContextTests.cs b/Source/Machine.Specifications.Tests/Model/ContextTests.cs
index d43ec9356..1f53a5d4e 100644
--- a/Source/Machine.Specifications.Tests/Model/ContextTests.cs
+++ b/Source/Machine.Specifications.Tests/Model/ContextTests.cs
@@ -129,4 +129,22 @@ public void ShouldCleanup()
       ContextWithSingleSpecification.CleanupInvoked.Should().BeTrue();
     }
   }
+
+  [TestFixture]
+  public class InheritingFromNestedGenericTests : With<ContextInheritingFromNestedGeneric>
+  {
+      IEnumerable<Result> results;
+
+      public override void BeforeEachTest()
+      {
+          base.BeforeEachTest();
+          results = Run(context);
+      }
+
+      [Test]
+      public void ShouldInvokeIt()
+      {
+          ContextInheritingFromNestedGeneric.ItInvoked.Should().BeTrue();
+      }
+  }
 }
diff --git a/Source/Machine.Specifications/Factories/ContextFactory.cs b/Source/Machine.Specifications/Factories/ContextFactory.cs
index 57cfa08d6..3f86493a9 100644
--- a/Source/Machine.Specifications/Factories/ContextFactory.cs
+++ b/Source/Machine.Specifications/Factories/ContextFactory.cs
@@ -193,7 +193,32 @@ static void CollectDetailsOf<T>(Type target, Func<object> instanceResolver, ICol
                 CollectDetailsOf(target.BaseType, () => instance, items, ensureMaximumOfOne, attributeFullName);
             }
 
-            CollectDetailsOf(target.DeclaringType, () => Activator.CreateInstance(target.DeclaringType), items, ensureMaximumOfOne, attributeFullName);
+            CollectDetailsOf(target.DeclaringType, () => CreateDeclaringTypeInstance(target),
+              items, ensureMaximumOfOne, attributeFullName);
+        }
+
+        static object CreateDeclaringTypeInstance(Type target)
+        {
+            var instantiatingType = target.DeclaringType;
+            object declaringTypeInstance = null;
+            if (instantiatingType != typeof(object))
+            {
+                if (instantiatingType.IsGenericType)
+                {
+                    var genericTypeDefinition = target.GetGenericTypeDefinition();
+                    if (genericTypeDefinition == null)
+                    {
+                        throw new InvalidOperationException(string.Format("Unable to get generic type definition for {0}", target));
+                    }
+                    var genericArgs = target.GetGenericArguments().ToArray();
+                    if (genericArgs.Length != 0)
+                    {
+                        instantiatingType = genericTypeDefinition.MakeGenericType(genericArgs);
+                    }
+                  }
+                declaringTypeInstance = Activator.CreateInstance(instantiatingType);
+            }
+            return declaringTypeInstance;
         }
 
         static bool IsStatic(Type target)