Tidy and cleanup tests (#94)

* combine tests

* appveyor

* still broken

* fixes

Author: robertcoltheart

Machine.Specifications.Runner.VisualStudio.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26228.4
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29209.62
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{405D88EB-F3ED-4B4C-B758-4EA98692F96F}"
 	ProjectSection(SolutionItems) = preProject
@@ -15,8 +15,6 @@ 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
@@ -31,10 +29,6 @@ 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

appveyor.yml

@@ -7,6 +7,8 @@ environment:
 build_script:
   - ps: .\build.ps1
 
+skip_branch_with_pr: true
+
 test: off
 
 artifacts:

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

@@ -0,0 +1,74 @@
+using System;
+using System.IO;
+using System.Linq;
+using Machine.Specifications;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace Machine.VSTestAdapter.Specs
+{
+    public class CompileContext : IDisposable
+    {
+        private readonly string _directory = Path.GetDirectoryName(typeof(CompileContext).Assembly.Location);
+
+        public string Compile(string code)
+        {
+            var filename = Path.Combine(_directory, Guid.NewGuid() + ".dll");
+
+            var result = CSharpCompilation.Create(Path.GetFileNameWithoutExtension(filename))
+                .WithOptions(
+                    new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary))
+                .AddReferences(
+                    MetadataReference.CreateFromFile(typeof(object).Assembly.Location),
+#if NETCOREAPP
+                    GetReference("System.Runtime"),
+#endif
+                    MetadataReference.CreateFromFile(typeof(Establish).Assembly.Location),
+                    MetadataReference.CreateFromFile(typeof(ShouldExtensionMethods).Assembly.Location))
+                .AddSyntaxTrees(CSharpSyntaxTree.ParseText(code))
+                .Emit(filename, Path.ChangeExtension(filename, "pdb"));
+
+            if (!result.Success)
+                throw new InvalidOperationException();
+     
+            return filename;
+        }
+
+        public void Dispose()
+        {
+            var files = Directory.GetFiles(_directory, "*.dll")
+                .Concat(Directory.GetFiles(_directory, "*.pdb"))
+                .Where(x => Guid.TryParse(Path.GetFileNameWithoutExtension(x), out _));
+
+            foreach (var file in files)
+            {
+                SafeDelete(file);
+            }
+        }
+
+#if NETCOREAPP
+        private MetadataReference GetReference(string name)
+        {
+            var references = AppContext.GetData("TRUSTED_PLATFORM_ASSEMBLIES")
+                .ToString()
+                .Split(Path.PathSeparator);
+
+            return references
+                .Where(x => Path.GetFileNameWithoutExtension(x) == name)
+                .Select(x => MetadataReference.CreateFromFile(x))
+                .First();
+        }
+#endif
+
+        private void SafeDelete(string filename)
+        {
+            try
+            {
+                File.Delete(filename);
+            }
+            catch
+            {
+            }
+        }
+    }
+}

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

@@ -1,5 +1,4 @@
 using System;
-using System.Linq;
 using Machine.Fakes;
 using Machine.Specifications;
 using Machine.VSTestAdapter.Configuration;
@@ -21,34 +20,36 @@ 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);
-            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>());
-        };
+        Establish establish = () =>
+        {
+            The<IRunSettings>()
+                .WhenToldTo(runSettings => runSettings.SettingsXml)
+                .Return(ConfigurationXml);
 
+            The<IRunContext>()
+                .WhenToldTo(context => context.RunSettings)
+                .Return(The<IRunSettings>());
 
-        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));
+            adapter = new MSpecTestAdapter(An<ISpecificationDiscoverer>(), The<ISpecificationExecutor>());
         };
 
-        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));
-        };
-        
+        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));
     }
 }

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

@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-using Machine.Specifications;
+using Machine.Specifications;
 using Machine.VSTestAdapter.Configuration;
 
 namespace Machine.VSTestAdapter.Specs.Configuration
@@ -11,13 +9,10 @@ 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/Discovery/BuiltIn/When_discovering_behaviors.cs

@@ -6,17 +6,14 @@
 
 namespace Machine.VSTestAdapter.Specs.Discovery.BuiltIn
 {
-
-      
-
     public class When_discovering_specs_using_behaviors : With_DiscoverySetup<BuiltInSpecificationDiscoverer>
     {
         It should_pick_up_the_behavior = () => {
             MSpecTestCase discoveredSpec = Results.SingleOrDefault(x => "sample_behavior_test".Equals(x.SpecificationName, StringComparison.Ordinal) && 
                                                                           "BehaviorSampleSpec".Equals(x.ClassName, StringComparison.Ordinal));
             discoveredSpec.ShouldNotBeNull();
 
-            discoveredSpec.LineNumber.ShouldEqual(14);
+            discoveredSpec.LineNumber.ShouldEqual(10);
             discoveredSpec.CodeFilePath.EndsWith("BehaviorSample.cs", StringComparison.Ordinal);
         };
 
@@ -29,4 +26,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_specs.cs

@@ -6,28 +6,30 @@
 
 namespace Machine.VSTestAdapter.Specs.Discovery.BuiltIn
 {
-
     public class When_discovering_specs : With_DiscoverySetup<BuiltInSpecificationDiscoverer>
     {
-        It should_find_spec = () => {
+        It should_find_spec = () =>
+        {
             MSpecTestCase discoveredSpec = Results.SingleOrDefault(x => "should_pass".Equals(x.SpecificationName, StringComparison.Ordinal) && 
                                                                           "StandardSpec".Equals(x.ClassName, StringComparison.Ordinal));
             discoveredSpec.ShouldNotBeNull();
 
-            discoveredSpec.LineNumber.ShouldEqual(14);
+            discoveredSpec.LineNumber.ShouldEqual(79);
             discoveredSpec.CodeFilePath.EndsWith("StandardSpec.cs", StringComparison.Ordinal);
         };
 
-        It should_find_empty_spec = () => {
+        It should_find_empty_spec = () =>
+        {
             MSpecTestCase discoveredSpec = Results.SingleOrDefault(x => "should_be_ignored".Equals(x.SpecificationName, StringComparison.Ordinal) && 
                                                                           "StandardSpec".Equals(x.ClassName, StringComparison.Ordinal));
             discoveredSpec.ShouldNotBeNull();
 
-            discoveredSpec.LineNumber.ShouldEqual(20);
+            discoveredSpec.LineNumber.ShouldEqual(83);
             discoveredSpec.CodeFilePath.EndsWith("StandardSpec.cs", StringComparison.Ordinal);
         };
 
-        It should_find_ignored_spec_but_will_not_find_line_number = () => {
+        It should_find_ignored_spec_but_will_not_find_line_number = () =>
+        {
             MSpecTestCase discoveredSpec = Results.SingleOrDefault(x => "not_implemented".Equals(x.SpecificationName, StringComparison.Ordinal) && 
                                                                           "StandardSpec".Equals(x.ClassName, StringComparison.Ordinal));
             discoveredSpec.ShouldNotBeNull();
@@ -36,4 +38,4 @@ public class When_discovering_specs : With_DiscoverySetup<BuiltInSpecificationDi
             discoveredSpec.CodeFilePath.ShouldBeNull();
         };
     }
-}
+}

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

@@ -16,8 +16,8 @@ public class When_discovering_specs_in_nested_types : With_DiscoverySetup<BuiltI
 
             discoveredSpec.ContextDisplayName.ShouldEqual("Parent NestedSpec");
 
-            discoveredSpec.LineNumber.ShouldEqual(14);
+            discoveredSpec.LineNumber.ShouldEqual(70);
             discoveredSpec.CodeFilePath.EndsWith("NestedSpecSample.cs", StringComparison.Ordinal);
         };
     }
-}
+}

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

@@ -14,8 +14,8 @@ public class When_discovering_specs_with_custom_act_assert_delegates : With_Disc
                                                                           "CustomActAssertDelegateSpec".Equals(x.ClassName, StringComparison.Ordinal));
             discoveredSpec.ShouldNotBeNull();
 
-            discoveredSpec.LineNumber.ShouldEqual(31);
+            discoveredSpec.LineNumber.ShouldEqual(63);
             discoveredSpec.CodeFilePath.EndsWith("CustomActAssertDelegateSpec.cs", StringComparison.Ordinal);
         };
     }
-}
+}

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

@@ -4,26 +4,35 @@
 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;
 
-        Because of = () => {
-            The<MSpecTestAdapter>().DiscoverTests(new[] { typeof(When_something).GetTypeInfo().Assembly.Location },
-                                                      An<IDiscoveryContext>(),
-                                                      An<IMessageLogger>(),
-                                                      The<ITestCaseDiscoverySink>());
+        Establish context = () =>
+        {
+            compiler = new CompileContext();
+
+            var assemblyPath = compiler.Compile(SampleFixture.Code);
+            assembly = Assembly.LoadFile(assemblyPath);
         };
 
+        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();
-        };        
     }
 }