Revert "combine tests"

This reverts commit 86e0b15.

Author: robertcoltheart

Machine.Specifications.Runner.VisualStudio.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29209.62
+# Visual Studio 15
+VisualStudioVersion = 15.0.26228.4
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{405D88EB-F3ED-4B4C-B758-4EA98692F96F}"
 	ProjectSection(SolutionItems) = preProject
@@ -15,6 +15,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Machine.Specifications.Runn
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Machine.Specifications.Runner.VisualStudio.Specs", "src\Machine.Specifications.Runner.VisualStudio.Specs\Machine.Specifications.Runner.VisualStudio.Specs.csproj", "{28A8C30C-7C6C-402B-86E2-D54A20748564}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleSpecs", "src\SampleSpecs\SampleSpecs.csproj", "{64E9F680-210D-4A69-BF87-13BA3E0FD3B7}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -29,6 +31,10 @@ Global
 		{28A8C30C-7C6C-402B-86E2-D54A20748564}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{28A8C30C-7C6C-402B-86E2-D54A20748564}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{28A8C30C-7C6C-402B-86E2-D54A20748564}.Release|Any CPU.Build.0 = Release|Any CPU
+		{64E9F680-210D-4A69-BF87-13BA3E0FD3B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{64E9F680-210D-4A69-BF87-13BA3E0FD3B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{64E9F680-210D-4A69-BF87-13BA3E0FD3B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{64E9F680-210D-4A69-BF87-13BA3E0FD3B7}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/Machine.Specifications.Runner.VisualStudio.Specs/CompileContext.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using Machine.Fakes;
 using Machine.Specifications;
 using Machine.VSTestAdapter.Configuration;
@@ -20,36 +21,34 @@ public class When_adapter_runs_tests : WithFakes
   </MSpec>
 </RunSettings>";
 
-        static MSpecTestAdapter adapter;
+        static MSpecTestAdapter Adapter;
 
-        Establish establish = () =>
-        {
-            The<IRunSettings>()
-                .WhenToldTo(runSettings => runSettings.SettingsXml)
-                .Return(ConfigurationXml);
+        Establish establish = () => {
+            The<IRunSettings>().WhenToldTo(runSettings => runSettings.SettingsXml).Return(ConfigurationXml);
+            The<IRunContext>().WhenToldTo(context => context.RunSettings).Return(The<IRunSettings>());
+
+            Adapter = new MSpecTestAdapter(An<ISpecificationDiscoverer>(), The<ISpecificationExecutor>());
+        };
+
+
+        Because of = () => {
+            Adapter.RunTests(new[] { "dll" }, The<IRunContext>(), An<IFrameworkHandle>());
+        };
 
-            The<IRunContext>()
-                .WhenToldTo(context => context.RunSettings)
-                .Return(The<IRunSettings>());
 
-            adapter = new MSpecTestAdapter(An<ISpecificationDiscoverer>(), The<ISpecificationExecutor>());
+        It should_pick_up_DisableFullTestNameInIDE = () => {
+            The<ISpecificationExecutor>().WasToldTo(d => d.RunAssembly("dll",
+                                                                       Param<Settings>.Matches(s => s.DisableFullTestNameInIDE == true),
+                                                                       Param<Uri>.IsAnything,
+                                                                       Param<IFrameworkHandle>.IsAnything));
         };
 
-        Because of = () =>
-            adapter.RunTests(new[] { "dll" }, The<IRunContext>(), An<IFrameworkHandle>());
-
-        It should_pick_up_DisableFullTestNameInIDE = () =>
-            The<ISpecificationExecutor>()
-                .WasToldTo(d => d.RunAssembly("dll",
-                    Param<Settings>.Matches(s => s.DisableFullTestNameInIDE),
-                    Param<Uri>.IsAnything,
-                    Param<IFrameworkHandle>.IsAnything));
-
-        It should_pick_up_DisableFullTestNameInOutput = () =>
-            The<ISpecificationExecutor>()
-                .WasToldTo(d => d.RunAssembly("dll",
-                    Param<Settings>.Matches(s => s.DisableFullTestNameInOutput),
-                    Param<Uri>.IsAnything,
-                    Param<IFrameworkHandle>.IsAnything));
+        It should_pick_up_DisableFullTestNameInOutput = () => {
+            The<ISpecificationExecutor>().WasToldTo(d => d.RunAssembly("dll",
+                                                                       Param<Settings>.Matches(s => s.DisableFullTestNameInOutput == true),
+                                                                       Param<Uri>.IsAnything,
+                                                                       Param<IFrameworkHandle>.IsAnything));
+        };
+        
     }
 }

src/Machine.Specifications.Runner.VisualStudio.Specs/Configuration/When_adapter_runs_tests.cs

@@ -1,4 +1,6 @@
-using Machine.Specifications;
+using System;
+using System.Linq;
+using Machine.Specifications;
 using Machine.VSTestAdapter.Configuration;
 
 namespace Machine.VSTestAdapter.Specs.Configuration
@@ -9,10 +11,13 @@ public class When_parsing_configuration_and_mspec_section_is_missing
         static Settings Settings;
         static string ConfigurationXml = "<RunSettings></RunSettings>";
 
-        Because of = () =>
+        Because of = () => {
             Settings = Settings.Parse(ConfigurationXml);
+        };
 
-        It should_default_to_DisplayFullTestName_off = () =>
+        It should_default_to_DisplayFullTestName_off = () => {
             Settings.DisableFullTestNameInOutput.ShouldBeFalse();
+        };
+        
     }
 }

src/Machine.Specifications.Runner.VisualStudio.Specs/Configuration/When_parsing_configuration_and_mspec_section_is_missing.cs

@@ -6,6 +6,9 @@
 
 namespace Machine.VSTestAdapter.Specs.Discovery.BuiltIn
 {
+
+      
+
     public class When_discovering_specs_using_behaviors : With_DiscoverySetup<BuiltInSpecificationDiscoverer>
     {
         It should_pick_up_the_behavior = () => {
@@ -26,4 +29,4 @@ public class When_discovering_specs_using_behaviors : With_DiscoverySetup<BuiltI
             discoveredSpec.BehaviorFieldType.ShouldEqual("SampleSpecs.SampleBehavior");
         };
     }
-}
+}

src/Machine.Specifications.Runner.VisualStudio.Specs/Discovery/BuiltIn/When_discovering_behaviors.cs

@@ -6,6 +6,7 @@
 
 namespace Machine.VSTestAdapter.Specs.Discovery.BuiltIn
 {
+
     public class When_discovering_specs : With_DiscoverySetup<BuiltInSpecificationDiscoverer>
     {
         It should_find_spec = () => {
@@ -35,4 +36,4 @@ public class When_discovering_specs : With_DiscoverySetup<BuiltInSpecificationDi
             discoveredSpec.CodeFilePath.ShouldBeNull();
         };
     }
-}
+}

src/Machine.Specifications.Runner.VisualStudio.Specs/Discovery/BuiltIn/When_discovering_specs.cs

@@ -4,35 +4,26 @@
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using SampleSpecs;
 using System.Reflection;
-using Machine.VSTestAdapter.Specs.Fixtures;
 
 namespace Machine.VSTestAdapter.Specs.Discovery
 {
     public class When_DisableFullTestNameInIDE_is_off : WithFakes
     {
-        static CompileContext compiler;
-        static Assembly assembly;
 
-        Establish context = () =>
-        {
-            compiler = new CompileContext();
-
-            var assemblyPath = compiler.Compile(SampleFixture.Code);
-            assembly = Assembly.LoadFile(assemblyPath);
+        Because of = () => {
+            The<MSpecTestAdapter>().DiscoverTests(new[] { typeof(When_something).GetTypeInfo().Assembly.Location },
+                                                      An<IDiscoveryContext>(),
+                                                      An<IMessageLogger>(),
+                                                      The<ITestCaseDiscoverySink>());
         };
 
-        Because of = () =>
-            The<MSpecTestAdapter>()
-                .DiscoverTests(new[] {assembly.GetType("SampleSpecs.When_something").GetTypeInfo().Assembly.Location},
-                    An<IDiscoveryContext>(),
-                    An<IMessageLogger>(),
-                    The<ITestCaseDiscoverySink>());
-
 
-        It should_use_full_type_and_field_name_for_display_name = () =>
+        It should_use_full_type_and_field_name_for_display_name = () => {
             The<ITestCaseDiscoverySink>()
                 .WasToldTo(d => d.SendTestCase(Param<TestCase>.Matches(t => t.DisplayName.Equals("When something it should pass", StringComparison.Ordinal))))
                 .OnlyOnce();
+        };        
     }
 }

src/Machine.Specifications.Runner.VisualStudio.Specs/Discovery/When_DisableFullTestNameInIDE_is_off.cs

@@ -1,18 +1,19 @@
 using System;
+using System.Linq;
 using Machine.Fakes;
 using Machine.Specifications;
 using Machine.VSTestAdapter.Helpers;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using SampleSpecs;
 using System.Reflection;
-using Machine.VSTestAdapter.Specs.Fixtures;
 
 namespace Machine.VSTestAdapter.Specs.Discovery
 {
     public class When_DisableFullTestNameInIDE_is_on : WithFakes
     {
-        const string ConfigurationXml = @"<RunSettings>
+        static string ConfigurationXml = @"<RunSettings>
   <RunConfiguration>
     <MaxCpuCount>0</MaxCpuCount>
   </RunConfiguration>
@@ -21,43 +22,26 @@ public class When_DisableFullTestNameInIDE_is_on : WithFakes
   </MSpec>
 </RunSettings>";
 
-        static CompileContext compiler;
-        static Assembly assembly;
-
-        Establish context = () =>
-        {
-            compiler = new CompileContext();
-
-            var assemblyPath = compiler.Compile(SampleFixture.Code);
-            assembly = Assembly.LoadFile(assemblyPath);
+        Establish establish = () => {
+            The<IRunSettings>().WhenToldTo(runSettings => runSettings.SettingsXml).Return(ConfigurationXml);
+            The<IDiscoveryContext>().WhenToldTo(context => context.RunSettings).Return(The<IRunSettings>());
         };
 
-        Establish establish = () =>
-        {
-            The<IRunSettings>()
-                .WhenToldTo(runSettings => runSettings.SettingsXml)
-                .Return(ConfigurationXml);
 
-            The<IDiscoveryContext>()
-                .WhenToldTo(context => context.RunSettings)
-                .Return(The<IRunSettings>());
+        Because of = () => {
+            The<MSpecTestAdapter>().DiscoverTests(new[] { typeof(StandardSpec).GetTypeInfo().Assembly.Location },
+                                  The<IDiscoveryContext>(),
+                                  An<IMessageLogger>(),
+                                  The<ITestCaseDiscoverySink>());
         };
 
-        Because of = () =>
-            The<MSpecTestAdapter>().DiscoverTests(new[] {assembly.GetType("SampleSpecs.StandardSpec").GetTypeInfo().Assembly.Location},
-                The<IDiscoveryContext>(),
-                An<IMessageLogger>(),
-                The<ITestCaseDiscoverySink>());
-
 
-        It should_use_test_name_as_display_name = () =>
-        {
+        It should_use_test_name_as_display_name = () => {
             var specId = new VisualStudioTestIdentifier("SampleSpecs.StandardSpec", "should_pass");
 
             The<ITestCaseDiscoverySink>()
-                .WasToldTo(d => d.SendTestCase(Param<TestCase>.Matches(t =>
-                    t.ToVisualStudioTestIdentifier().Equals(specId) &&
-                    t.DisplayName.Equals("should pass", StringComparison.Ordinal))))
+                .WasToldTo(d => d.SendTestCase(Param<TestCase>.Matches(t => t.ToVisualStudioTestIdentifier().Equals(specId) && 
+                                                                       t.DisplayName.Equals("should pass", StringComparison.Ordinal))))
                 .OnlyOnce();
         };        
     }