Display line numbers and code file for .Net Core tests. Fixes #329

Author: ivanz

.gitignore

@@ -14,6 +14,7 @@ TestResults
 *.suo
 *.user
 *.sln.docstates
+/.vs/
 
 # Build results
 [Dd]ebug/

Source/Machine.VSTestAdapter.Specs/Discovery/BuiltIn/When_discovering_behaviors.cs

@@ -16,10 +16,8 @@ public class When_discovering_specs_using_behaviors : With_DiscoverySetup<BuiltI
                                                                           "BehaviorSampleSpec".Equals(x.ClassName, StringComparison.Ordinal));
             discoveredSpec.ShouldNotBeNull();
 
-#if !NETSTANDARD
             discoveredSpec.LineNumber.ShouldEqual(14);
             discoveredSpec.CodeFilePath.EndsWith("BehaviorSample.cs", StringComparison.Ordinal);
-#endif
         };
     }
 }

Source/Machine.VSTestAdapter.Specs/Discovery/BuiltIn/When_discovering_specs.cs

@@ -14,32 +14,26 @@ public class When_discovering_specs : With_DiscoverySetup<BuiltInSpecificationDi
                                                                           "StandardSpec".Equals(x.ClassName, StringComparison.Ordinal));
             discoveredSpec.ShouldNotBeNull();
 
-#if !NETSTANDARD
             discoveredSpec.LineNumber.ShouldEqual(14);
             discoveredSpec.CodeFilePath.EndsWith("StandardSpec.cs", StringComparison.Ordinal);
-#endif
         };
 
         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();
 
-#if !NETSTANDARD
             discoveredSpec.LineNumber.ShouldEqual(20);
             discoveredSpec.CodeFilePath.EndsWith("StandardSpec.cs", StringComparison.Ordinal);
-#endif
         };
 
         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();
 
-#if !NETSTANDARD
             discoveredSpec.LineNumber.ShouldEqual(0);
             discoveredSpec.CodeFilePath.ShouldBeNull();
-#endif
         };
     }
 }

Source/Machine.VSTestAdapter.Specs/Discovery/BuiltIn/When_discovering_specs_in_nested_types.cs

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

Source/Machine.VSTestAdapter.Specs/Discovery/BuiltIn/When_discovering_specs_with_custom_act_assert_delegates.cs

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

Source/Machine.VSTestAdapter.Specs/Machine.VSTestAdapter.Specs.csproj

@@ -5,10 +5,6 @@
     <AssemblyName>Machine.VSTestAdapter.Specs</AssemblyName>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)'=='netcoreapp1.1'">
-    <DefineConstants>NETSTANDARD</DefineConstants>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="Machine.Fakes.Moq" Version="2.8.0" />
     <PackageReference Include="Machine.Specifications" Version="0.11.0" />

Source/Machine.VSTestAdapter/Discovery/BuiltIn/SourceCodeLocationFinder.cs

@@ -1,29 +1,23 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-#if !NETSTANDARD
 using Mono.Cecil;
 using Mono.Cecil.Cil;
-#endif
 
 namespace Machine.VSTestAdapter.Discovery.BuiltIn
 {
     public class SourceCodeLocationFinder
     {
-#if !NETSTANDARD
         private readonly Lazy<AssemblyDefinition> assemblyDefinition;
-#endif
 
         public SourceCodeLocationFinder(string assemblyFilePath)
         {
-#if !NETSTANDARD
             assemblyDefinition = new Lazy<AssemblyDefinition>(() => { return LoadAssembly(assemblyFilePath); });
-#endif
         }
 
         public SourceCodeLocationInfo GetFieldLocation(string fullTypeName, string fieldName)
         {
-#if !NETSTANDARD
             TypeDefinition type = Assembly.MainModule.GetType(HandleNestedTypeName(fullTypeName));
             if (type == null)
                 return null;
@@ -33,12 +27,8 @@ public SourceCodeLocationInfo GetFieldLocation(string fullTypeName, string field
                 return null;
 
             return GetFieldLocationCore(type, fieldName);
-#else
-            return null;
-#endif
         }
 
-#if !NETSTANDARD
         private AssemblyDefinition LoadAssembly(string assemblyFilePath)
         {
             return AssemblyDefinition.ReadAssembly(assemblyFilePath, new ReaderParameters() {
@@ -67,28 +57,31 @@ private SourceCodeLocationInfo GetFieldLocationCore(TypeDefinition type, string
             if (!type.HasMethods)
                 return null;
 
-
             MethodDefinition constructorDefinition = type.Methods
                 .SingleOrDefault(x => x.IsConstructor && !x.Parameters.Any() && x.Name.EndsWith(".ctor", StringComparison.Ordinal));
 
             if (!constructorDefinition.HasBody)
                 return null;
 
+            if (constructorDefinition.DebugInformation == null)
+                return null;
+
+
             Instruction instruction = constructorDefinition.Body.Instructions
                 .Where(x => x.Operand != null &&
                             x.Operand.GetType().IsAssignableFrom(typeof(FieldDefinition)) &&
                             ((MemberReference)x.Operand).Name == fieldFullName).SingleOrDefault();
 
             while (instruction != null)
             {
-                const int PdbHiddenLine = 0xFEEFEE;
+                SequencePoint sequencePoint = constructorDefinition.DebugInformation?.GetSequencePoint(instruction);
 
-                if (instruction.SequencePoint != null && instruction.SequencePoint.StartLine != PdbHiddenLine)
+                if (sequencePoint != null && !sequencePoint.IsHidden)
                 {
                     return new SourceCodeLocationInfo()
                     {
-                        CodeFilePath = instruction.SequencePoint.Document.Url,
-                        LineNumber = instruction.SequencePoint.StartLine
+                        CodeFilePath = sequencePoint.Document.Url,
+                        LineNumber = sequencePoint.StartLine
                     };
                 }
 
@@ -97,7 +90,6 @@ private SourceCodeLocationInfo GetFieldLocationCore(TypeDefinition type, string
 
             return null;
         }
-#endif
     }
 
     public class SourceCodeLocationInfo

Source/Machine.VSTestAdapter/Machine.VSTestAdapter.csproj

@@ -23,6 +23,10 @@
     <DefineConstants>NETSTANDARD</DefineConstants>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Mono.Cecil" Version="[0.10-*, 0.11)"/>
+  </ItemGroup>
+
   <ItemGroup Condition="'$(TargetFramework)'==$(_TargetDotNet)">
     <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="[15.0.0,16)">
       <PrivateAssets>All</PrivateAssets> <!-- Only a reference during build/dev time -->
@@ -32,14 +36,11 @@
       <!-- Only a reference during build/dev time -->
     </PackageReference>
   </ItemGroup>
-
+  
   <ItemGroup Condition="'$(TargetFramework)'=='$(_TargetDotNetFramework)'">
     <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="[11.0.0,16.0.0)">
       <PrivateAssets>All</PrivateAssets> <!-- Only a reference during build/dev time -->
     </PackageReference>
-    <PackageReference Include="Mono.Cecil" Version="[0.9.6.1, 0.10)">
-      <PrivateAssets>All</PrivateAssets> <!-- Only a reference during build/dev time -->
-    </PackageReference>
     <PackageReference Include="Machine.Specifications" Version="[0.11.0, 1.0)">
       <PrivateAssets>All</PrivateAssets> <!-- Only a reference during build/dev time -->
     </PackageReference>

appveyor.yml

@@ -1,5 +1,5 @@
 environment:
-  nuget_version: '2.2.3'
+  nuget_version: '2.3.0'
   nuget_prerelease: false
  # vsix_version: '2.1.0'
   assembly_version: '2.1.0'
@@ -9,7 +9,7 @@ version: '$(nuget_version)+{build}'
 deploy:
   - provider: GitHub
     description: |
-      * Fixed test discovery for "old-style" .csproj.
+      * Display line numbers and code file for .Net Core tests (#329)
 
     on:
       appveyor_repo_tag: true