[Bug] Fix execution of Establish and Cleanup when running specific tests (#87)

* [Bug] Fix execution of Establish and Cleanup when running specific tests

* add tests

* tidy

* tidy

* rename

Author: robertcoltheart

Source/Machine.VSTestAdapter.Specs/Execution/When_cleaning_up_a_context.cs

@@ -0,0 +1,32 @@
+using System.Linq;
+using Machine.Fakes;
+using Machine.Specifications;
+using Machine.VSTestAdapter.Helpers;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+
+namespace Machine.VSTestAdapter.Specs.Execution
+{
+    public class When_cleaning_up_a_context : With_MultipleSpecExecutionSetup
+    {
+        Establish context = () =>
+            SpecificationsToRun = new[]
+            {
+                new VisualStudioTestIdentifier("SampleSpecs.CleanupSpec", "should_not_increment_cleanup"),
+                new VisualStudioTestIdentifier("SampleSpecs.CleanupSpec", "should_have_no_cleanups")
+            };
+
+        It should_tell_visual_studio_it_passed = () => 
+        {
+            The<IFrameworkHandle>()
+                .WasToldTo(x => x.RecordEnd(
+                    Param<TestCase>.Matches(y => SpecificationsToRun.Contains(y.ToVisualStudioTestIdentifier())), 
+                    Param<TestOutcome>.Matches(y => y == TestOutcome.Passed)))
+                .Twice();
+
+            The<IFrameworkHandle>()
+                .WasToldTo(x =>x.RecordResult(Param<TestResult>.Matches(y => y.Outcome == TestOutcome.Passed)))
+                .Twice();
+        };
+    }
+}

Source/Machine.VSTestAdapter.Specs/Execution/With_MultipleSpecExecutionSetup.cs

@@ -0,0 +1,27 @@
+using System;
+using System.IO;
+using Machine.Fakes;
+using Machine.Specifications;
+using Machine.VSTestAdapter.Configuration;
+using Machine.VSTestAdapter.Execution;
+using Machine.VSTestAdapter.Helpers;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+
+namespace Machine.VSTestAdapter.Specs.Execution
+{
+    public abstract class With_MultipleSpecExecutionSetup : WithFakes
+    {
+        protected static ISpecificationExecutor Executor;
+        protected static string AssemblyPath;
+        protected static VisualStudioTestIdentifier[] SpecificationsToRun;
+
+        Establish context = () => 
+        {
+            Executor = new SpecificationExecutor();
+            AssemblyPath = Path.Combine(Helper.GetTestDirectory(), "SampleSpecs.dll");
+        };
+
+        Because of = () => 
+            Executor.RunAssemblySpecifications(AssemblyPath, SpecificationsToRun, The<Settings>(), new Uri("bla://executor"), The<IFrameworkHandle>());
+    }
+}

Source/Machine.VSTestAdapter/Execution/TestExecutor.cs

@@ -2,12 +2,8 @@
 using Machine.Specifications.Runner.Impl;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
 using System.Linq;
 using System.Reflection;
-using Machine.Specifications.Explorers;
-using Machine.Specifications.Model;
 using Machine.Specifications;
 using Machine.VSTestAdapter.Helpers;
 
@@ -48,7 +44,6 @@ private DefaultRunner CreateRunner(Assembly assembly,ISpecificationRunListener s
             return new DefaultRunner(listener, RunOptions.Default);
         }
 
-
         public void RunTestsInAssembly(string pathToAssembly, IEnumerable<VisualStudioTestIdentifier> specsToRun, ISpecificationRunListener specificationRunListener)
         {
             DefaultRunner mspecRunner = null;
@@ -59,34 +54,19 @@ public void RunTestsInAssembly(string pathToAssembly, IEnumerable<VisualStudioTe
                 assemblyToRun = AssemblyHelper.Load(pathToAssembly);
                 mspecRunner = CreateRunner(assemblyToRun, specificationRunListener);
 
-                IEnumerable<Context> specificationContexts = new AssemblyExplorer().FindContextsIn(assemblyToRun) ?? Enumerable.Empty<Context>();
-                Dictionary<string, Context> contextMap = specificationContexts.ToDictionary(c => c.Type.FullName, StringComparer.Ordinal);
+                var specsByContext = specsToRun.GroupBy(x => x.ContainerTypeFullName);
 
-                // We use explicit assembly start and end to wrap the RunMember loop
                 mspecRunner.StartRun(assemblyToRun);
 
-                foreach (VisualStudioTestIdentifier test in specsToRun)
+                foreach (var specs in specsByContext)
                 {
-                    Context context = contextMap[test.ContainerTypeFullName];
-                    if (context == null)
-                        continue;
-
-                    Specification specification = context.Specifications.SingleOrDefault(spec => spec.FieldInfo.Name.Equals(test.FieldName, StringComparison.Ordinal));
-                    
-                    if (specification is BehaviorSpecification)
-                    {
-                        // MSpec doesn't expose any way to run an an "It" coming from a "[Behavior]", so we have to do some trickery
-                        VisualStudioTestIdentifier listenFor = specification.ToVisualStudioTestIdentifier(context);
-                        DefaultRunner behaviorRunner = new DefaultRunner(new SingleBehaviorTestRunListenerWrapper(specificationRunListener, listenFor), RunOptions.Default);
-                        behaviorRunner.RunMember(assemblyToRun, context.Type.GetTypeInfo());
-                    } 
-                    else 
-                    {
-                        mspecRunner.RunMember(assemblyToRun, specification.FieldInfo);
-                    }
+                    var fields = specs.Select(x => x.FieldName);
 
+                    mspecRunner.RunType(assemblyToRun, assemblyToRun.GetType(specs.Key), fields.ToArray());
                 }
-            } catch (Exception e) {
+            }
+            catch (Exception e)
+            {
                 specificationRunListener.OnFatalError(new ExceptionResult(e));
             }
             finally

Source/SampleSpecs/CleanupSpec.cs

@@ -0,0 +1,20 @@
+using Machine.Specifications;
+
+namespace SampleSpecs
+{
+    public class CleanupSpec
+    {
+        static int cleanup_count;
+
+        Because of = () => { };
+
+        Cleanup after = () =>
+            cleanup_count++;
+
+        It should_not_increment_cleanup = () =>
+            cleanup_count.ShouldEqual(0);
+
+        It should_have_no_cleanups = () =>
+            cleanup_count.ShouldEqual(0);
+    }
+}