Add switch test

src/coverlet.core/Instrumentation/InstrumenterResult.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Runtime.Serialization;
 
 namespace Coverlet.Core.Instrumentation
@@ -17,6 +18,7 @@ public class Line
         public int Hits;
     }
 
+    [DebuggerDisplay("Line = {Number} Offset = {Offset} EndOffset = {EndOffset} Path = {Path} Ordinal = {Ordinal} Hits = {Hits}")]
     [DataContract]
     public class Branch : Line
     {
@@ -30,6 +32,7 @@ public class Branch : Line
         public uint Ordinal;
     }
 
+    [DebuggerDisplay("line = {Line} Ordinal = {Ordinal}")]
     // Implements IEquatable because is used by dictionary key https://docs.microsoft.com/en-us/dotnet/api/system.iequatable-1?view=netcore-2.2#remarks
     [DataContract]
     public class BranchKey : IEquatable<BranchKey>

test/coverlet.core.tests/CoverageTests.cs

@@ -62,7 +62,7 @@ public void TestCoverageWithTestAssembly()
         }
 
         [Fact]
-        public void Condition_If()
+        public void SelectionStatements_If()
         {
             // We need to pass file name to remote process where it save instrumentation result
             // Similar to msbuild input/output
@@ -73,7 +73,7 @@ public void Condition_If()
                 RemoteExecutor.Invoke(async pathSerialize =>
                 {
                     // Run load and call a delegate passing class as dynamic to simplify method call
-                    CoveragePrepareResult coveragePrepareResult = await TestInstrumentationHelper.Run<Conditions>(instance =>
+                    CoveragePrepareResult coveragePrepareResult = await TestInstrumentationHelper.Run<SelectionStatements>(instance =>
                     {
                         // We call method to trigger coverage hits
                         instance.If(true);
@@ -91,7 +91,7 @@ public void Condition_If()
                 CoverageResult result = TestInstrumentationHelper.GetCoverageResult(path);
 
                 // Asserts on doc/lines/branches
-                result.Document("Instrumentation.cs")
+                result.Document("Instrumentation.SelectionStatements.cs")
                       // (line, hits)
                       .AssertLinesCovered((11, 1), (15, 0))
                       // (line,ordinal,hits)
@@ -106,5 +106,35 @@ public void Condition_If()
                 File.Delete(path);
             }
         }
+
+        [Fact]
+        public void SelectionStatements_Switch()
+        {
+            string path = Path.GetTempFileName();
+            try
+            {
+                RemoteExecutor.Invoke(async pathSerialize =>
+                {
+                    CoveragePrepareResult coveragePrepareResult = await TestInstrumentationHelper.Run<SelectionStatements>(instance =>
+                    {
+                        instance.Switch(1);
+                        return Task.CompletedTask;
+                    }, pathSerialize);
+                    return 0;
+                }, path).Dispose();
+
+                CoverageResult result = TestInstrumentationHelper.GetCoverageResult(path);
+
+                result.Document("Instrumentation.SelectionStatements.cs")
+                      .AssertLinesCovered(BuildConfiguration.Release, (24, 1), (26, 0), (28, 0))
+                      .AssertBranchesCovered(BuildConfiguration.Release, (24, 1, 1))
+                      .AssertLinesCovered(BuildConfiguration.Debug, (20, 1), (21, 1), (24, 1), (30, 1))
+                      .AssertBranchesCovered(BuildConfiguration.Debug, (21, 0, 0), (21, 1, 1), (21, 2, 0), (21, 3, 0));
+            }
+            finally
+            {
+                File.Delete(path);
+            }
+        }
     }
 }

test/coverlet.core.tests/InstrumenterHelper.cs

@@ -18,6 +18,13 @@
 
 namespace Coverlet.Core.Tests
 {
+    [Flags]
+    public enum BuildConfiguration
+    {
+        Debug = 1,
+        Release = 2
+    }
+
     public static class TestInstrumentationAssert
     {
         public static Document Document(this CoverageResult coverageResult, string docName)
@@ -42,12 +49,24 @@ public static Document Document(this CoverageResult coverageResult, string docNa
         }
 
         public static Document AssertBranchesCovered(this Document document, params (int line, int ordinal, int hits)[] lines)
+        {
+            return AssertBranchesCovered(document, BuildConfiguration.Debug | BuildConfiguration.Release, lines);
+        }
+
+        public static Document AssertBranchesCovered(this Document document, BuildConfiguration configuration, params (int line, int ordinal, int hits)[] lines)
         {
             if (document is null)
             {
                 throw new ArgumentNullException(nameof(document));
             }
 
+            BuildConfiguration buildConfiguration = GetAssemblyBuildConfiguration();
+
+            if ((buildConfiguration & configuration) != buildConfiguration)
+            {
+                return document;
+            }
+
             List<string> branchesToCover = new List<string>(lines.Select(b => $"[line {b.line} ordinal {b.ordinal}]"));
             foreach (KeyValuePair<BranchKey, Branch> branch in document.Branches)
             {
@@ -77,12 +96,24 @@ public static Document AssertBranchesCovered(this Document document, params (int
         }
 
         public static Document AssertLinesCovered(this Document document, params (int line, int hits)[] lines)
+        {
+            return AssertLinesCovered(document, BuildConfiguration.Debug | BuildConfiguration.Release, lines);
+        }
+
+        public static Document AssertLinesCovered(this Document document, BuildConfiguration configuration, params (int line, int hits)[] lines)
         {
             if (document is null)
             {
                 throw new ArgumentNullException(nameof(document));
             }
 
+            BuildConfiguration buildConfiguration = GetAssemblyBuildConfiguration();
+
+            if ((buildConfiguration & configuration) != buildConfiguration)
+            {
+                return document;
+            }
+
             List<int> linesToCover = new List<int>(lines.Select(l => l.line));
             foreach (KeyValuePair<int, Line> line in document.Lines)
             {
@@ -106,6 +137,23 @@ public static Document AssertLinesCovered(this Document document, params (int li
 
             return document;
         }
+
+        private static BuildConfiguration GetAssemblyBuildConfiguration()
+        {
+            var configurationAttribute = Assembly.GetExecutingAssembly().GetCustomAttribute<AssemblyConfigurationAttribute>();
+            if (configurationAttribute.Configuration.Equals("Debug", StringComparison.InvariantCultureIgnoreCase))
+            {
+                return Tests.BuildConfiguration.Debug;
+            }
+            else if (configurationAttribute.Configuration.Equals("Release", StringComparison.InvariantCultureIgnoreCase))
+            {
+                return Tests.BuildConfiguration.Release;
+            }
+            else
+            {
+                throw new NotSupportedException($"Build configuration '{configurationAttribute.Configuration}' not supported");
+            }
+        }
     }
 
     public static class TestInstrumentationHelper

test/coverlet.core.tests/Samples/Instrumentation.SelectionStatements.cs

@@ -0,0 +1,32 @@
+// Remember to use full name because adding new using directives change line numbers
+
+namespace Coverlet.Core.Samples.Tests
+{
+    public class SelectionStatements
+    {
+        public int If(bool condition)
+        {
+            if (condition)
+            {
+                return 1;
+            }
+            else
+            {
+                return 0;
+            }
+        }
+
+        public int Switch(int caseSwitch)
+        {
+            switch (caseSwitch)
+            {
+                case 1:
+                    return 1;
+                case 2:
+                    return 2;
+                default:
+                    return 0;
+            }
+        }
+    }
+}