Test outcome none mapping (#219)

* Added new outcome to the public UnitTestOutcome enum, added mapping for the UnitTestOutcome.NotRunnable. * Updated unit tests.
microsoft · Jul 10, 2017 · cf5a8b5 · cf5a8b5
1 parent 110a8c1
commit cf5a8b5
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 6 deletions.
diff --git a/src/Adapter/MSTest.CoreAdapter/Extensions/UnitTestOutcomeExtensions.cs b/src/Adapter/MSTest.CoreAdapter/Extensions/UnitTestOutcomeExtensions.cs
@@ -40,6 +40,10 @@ public static UnitTestOutcome ToUnitTestOutcome(this UTF.UnitTestOutcome framewo
                     outcome = UnitTestOutcome.Timeout;
                     break;
 
+                case UTF.UnitTestOutcome.NotRunnable:
+                    outcome = UnitTestOutcome.NotRunnable;
+                    break;
+
                 case UTF.UnitTestOutcome.Unknown:
                 default:
                     outcome = UnitTestOutcome.Error;

diff --git a/src/Adapter/MSTest.CoreAdapter/Helpers/UnitTestOutcomeHelper.cs b/src/Adapter/MSTest.CoreAdapter/Helpers/UnitTestOutcomeHelper.cs
@@ -25,12 +25,15 @@ internal static TestOutcome ToTestOutcome(UnitTestOutcome unitTestOutcome, bool
 
                 case UnitTestOutcome.Failed:
                 case UnitTestOutcome.Error:
-                case UnitTestOutcome.NotRunnable:
                 case UnitTestOutcome.Timeout:
                     return TestOutcome.Failed;
 
+                case UnitTestOutcome.NotRunnable:
+                    return TestOutcome.None;
+
                 case UnitTestOutcome.Ignored:
                     return TestOutcome.Skipped;
+
                 case UnitTestOutcome.Inconclusive:
                     {
                         if (mapInconclusiveToFailed)

diff --git a/src/TestFramework/MSTest.Core/UnitTestOutcome.cs b/src/TestFramework/MSTest.Core/UnitTestOutcome.cs
@@ -48,6 +48,11 @@ public enum UnitTestOutcome : int
         /// <summary>
         /// Test is in an unknown state
         /// </summary>
-        Unknown
+        Unknown,
+
+        /// <summary>
+        /// Test cannot be executed.
+        /// </summary>
+        NotRunnable
     }
 }
diff --git a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Helpers/UnitTestOutcomeHelperTests.cs b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Helpers/UnitTestOutcomeHelperTests.cs
@@ -41,10 +41,10 @@ public void UniTestHelperToTestOutcomeForUnitTestOutcomeErrorShouldReturnTestOut
         }
 
         [TestMethod]
-        public void UniTestHelperToTestOutcomeForUnitTestOutcomeNotRunnableShouldReturnTestOutcomeFailed()
+        public void UniTestHelperToTestOutcomeForUnitTestOutcomeNotRunnableShouldReturnTestOutcomeNone()
         {
             var resultOutcome = UnitTestOutcomeHelper.ToTestOutcome(UnitTestOutcome.NotRunnable, mapInconclusiveToFailed: false);
-            Assert.AreEqual(TestOutcome.Failed, resultOutcome);
+            Assert.AreEqual(TestOutcome.None, resultOutcome);
         }
 
         [TestMethod]

diff --git a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/ObjectModel/UnitTestResultTests.cs b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/ObjectModel/UnitTestResultTests.cs
@@ -176,10 +176,10 @@ public void UniTestHelperToTestOutcomeForUnitTestOutcomeErrorShouldReturnTestOut
         }
 
         [TestMethod]
-        public void UniTestHelperToTestOutcomeForUnitTestOutcomeNotRunnableShouldReturnTestOutcomeFailed()
+        public void UniTestHelperToTestOutcomeForUnitTestOutcomeNotRunnableShouldReturnTestOutcomeNone()
         {
             var resultOutcome = UnitTestOutcomeHelper.ToTestOutcome(UnitTestOutcome.NotRunnable, false);
-            Assert.AreEqual(TestOutcome.Failed, resultOutcome);
+            Assert.AreEqual(TestOutcome.None, resultOutcome);
         }
 
         [TestMethod]