From 4fb08902897ea3b353d4da293d6a3fa9bf33ac81 Mon Sep 17 00:00:00 2001 From: Vagisha Nidhi Date: Mon, 29 Apr 2019 10:17:20 +0530 Subject: [PATCH 1/2] Setting MapNotRunnableToFailed to true by default --- .../MSTest.CoreAdapter/MSTestSettings.cs | 2 +- .../Helpers/UnitTestOutcomeHelperTests.cs | 4 ++-- .../MSTestSettingsTests.cs | 10 +++++----- .../ObjectModel/UnitTestResultTests.cs | 18 +++++++++++++++++- 4 files changed, 25 insertions(+), 9 deletions(-) diff --git a/src/Adapter/MSTest.CoreAdapter/MSTestSettings.cs b/src/Adapter/MSTest.CoreAdapter/MSTestSettings.cs index d6e679820a..5f2d5b1602 100644 --- a/src/Adapter/MSTest.CoreAdapter/MSTestSettings.cs +++ b/src/Adapter/MSTest.CoreAdapter/MSTestSettings.cs @@ -51,7 +51,7 @@ public MSTestSettings() { this.CaptureDebugTraces = true; this.MapInconclusiveToFailed = false; - this.MapNotRunnableToFailed = false; + this.MapNotRunnableToFailed = true; this.EnableBaseClassTestMethodsFromOtherAssemblies = true; this.ForcedLegacyMode = false; this.TestSettingsFile = null; diff --git a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Helpers/UnitTestOutcomeHelperTests.cs b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Helpers/UnitTestOutcomeHelperTests.cs index 8c7f4c89bd..fa67711828 100644 --- a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Helpers/UnitTestOutcomeHelperTests.cs +++ b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Helpers/UnitTestOutcomeHelperTests.cs @@ -54,10 +54,10 @@ public void UniTestHelperToTestOutcomeForUnitTestOutcomeErrorShouldReturnTestOut } [TestMethod] - public void UniTestHelperToTestOutcomeForUnitTestOutcomeNotRunnableShouldReturnTestOutcomeNone() + public void UniTestHelperToTestOutcomeForUnitTestOutcomeNotRunnableShouldReturnTestOutcomeFailed() { var resultOutcome = UnitTestOutcomeHelper.ToTestOutcome(UnitTestOutcome.NotRunnable, this.adapterSettings); - Assert.AreEqual(TestOutcome.None, resultOutcome); + Assert.AreEqual(TestOutcome.Failed, resultOutcome); } [TestMethod] diff --git a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/MSTestSettingsTests.cs b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/MSTestSettingsTests.cs index 36f292f1c2..d1bea068e7 100644 --- a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/MSTestSettingsTests.cs +++ b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/MSTestSettingsTests.cs @@ -65,7 +65,7 @@ public void MapInconclusiveToFailedIsByDefaultFalseWhenNotSpecified() } [TestMethod] - public void MapNotRunnableToFailedIsByDefaultFalseWhenNotSpecified() + public void MapNotRunnableToFailedIsByDefaultTrueWhenNotSpecified() { string runSettingxml = @" @@ -75,7 +75,7 @@ public void MapNotRunnableToFailedIsByDefaultFalseWhenNotSpecified() MSTestSettings adapterSettings = MSTestSettings.GetSettings(runSettingxml, MSTestSettings.SettingsNameAlias); - Assert.AreEqual(adapterSettings.MapNotRunnableToFailed, false); + Assert.AreEqual(adapterSettings.MapNotRunnableToFailed, true); } [TestMethod] @@ -887,7 +887,7 @@ public void PopulateSettingsShouldInitializeDefaultAdapterSettingsWhenDiscoveryC MSTestSettings adapterSettings = MSTestSettings.CurrentSettings; Assert.AreEqual(adapterSettings.CaptureDebugTraces, true); Assert.AreEqual(adapterSettings.MapInconclusiveToFailed, false); - Assert.AreEqual(adapterSettings.MapNotRunnableToFailed, false); + Assert.AreEqual(adapterSettings.MapNotRunnableToFailed, true); Assert.AreEqual(adapterSettings.EnableBaseClassTestMethodsFromOtherAssemblies, true); } @@ -899,7 +899,7 @@ public void PopulateSettingsShouldInitializeDefaultSettingsWhenRunSettingsIsNull MSTestSettings adapterSettings = MSTestSettings.CurrentSettings; Assert.AreEqual(adapterSettings.CaptureDebugTraces, true); Assert.AreEqual(adapterSettings.MapInconclusiveToFailed, false); - Assert.AreEqual(adapterSettings.MapNotRunnableToFailed, false); + Assert.AreEqual(adapterSettings.MapNotRunnableToFailed, true); Assert.AreEqual(adapterSettings.EnableBaseClassTestMethodsFromOtherAssemblies, true); } @@ -912,7 +912,7 @@ public void PopulateSettingsShouldInitializeDefaultSettingsWhenRunSettingsXmlIsE MSTestSettings adapterSettings = MSTestSettings.CurrentSettings; Assert.AreEqual(adapterSettings.CaptureDebugTraces, true); Assert.AreEqual(adapterSettings.MapInconclusiveToFailed, false); - Assert.AreEqual(adapterSettings.MapNotRunnableToFailed, false); + Assert.AreEqual(adapterSettings.MapNotRunnableToFailed, true); Assert.AreEqual(adapterSettings.EnableBaseClassTestMethodsFromOtherAssemblies, true); } diff --git a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/ObjectModel/UnitTestResultTests.cs b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/ObjectModel/UnitTestResultTests.cs index ef6db77911..60f5cc1dcc 100644 --- a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/ObjectModel/UnitTestResultTests.cs +++ b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/ObjectModel/UnitTestResultTests.cs @@ -292,11 +292,12 @@ public void UniTestHelperToTestOutcomeForUnitTestOutcomeErrorShouldReturnTestOut } [TestMethod] - public void UniTestHelperToTestOutcomeForUnitTestOutcomeNotRunnableShouldReturnTestOutcomeNoneWhenNotSpecified() + public void UniTestHelperToTestOutcomeForUnitTestOutcomeNotRunnableShouldReturnTestOutcomeNoneWhenSpecified() { string runSettingxml = @" + false "; @@ -306,6 +307,21 @@ public void UniTestHelperToTestOutcomeForUnitTestOutcomeNotRunnableShouldReturnT Assert.AreEqual(TestOutcome.None, resultOutcome); } + [TestMethod] + public void UniTestHelperToTestOutcomeForUnitTestOutcomeNotRunnableShouldReturnTestOutcomeFailedWhenNotSpecified() + { + string runSettingxml = + @" + + + "; + + var adapterSettings = MSTestSettings.GetSettings(runSettingxml, MSTestSettings.SettingsNameAlias); + + var resultOutcome = UnitTestOutcomeHelper.ToTestOutcome(UnitTestOutcome.NotRunnable, adapterSettings); + Assert.AreEqual(TestOutcome.Failed, resultOutcome); + } + [TestMethod] public void UniTestHelperToTestOutcomeForUnitTestOutcomeTimeoutShouldReturnTestOutcomeFailed() { From 0714ab74cc5cedf97b4acadf89036edfb7932d33 Mon Sep 17 00:00:00 2001 From: Vagisha Nidhi Date: Mon, 29 Apr 2019 14:11:45 +0530 Subject: [PATCH 2/2] Review comments addressed --- .../ObjectModel/UnitTestResultTests.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/ObjectModel/UnitTestResultTests.cs b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/ObjectModel/UnitTestResultTests.cs index 60f5cc1dcc..945a7e276e 100644 --- a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/ObjectModel/UnitTestResultTests.cs +++ b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/ObjectModel/UnitTestResultTests.cs @@ -292,7 +292,7 @@ public void UniTestHelperToTestOutcomeForUnitTestOutcomeErrorShouldReturnTestOut } [TestMethod] - public void UniTestHelperToTestOutcomeForUnitTestOutcomeNotRunnableShouldReturnTestOutcomeNoneWhenSpecified() + public void UnitTestHelperToTestOutcomeForUnitTestOutcomeNotRunnableShouldReturnTestOutComeNoneWhenSpecifiedInAdapterSettings() { string runSettingxml = @" @@ -308,7 +308,7 @@ public void UniTestHelperToTestOutcomeForUnitTestOutcomeNotRunnableShouldReturnT } [TestMethod] - public void UniTestHelperToTestOutcomeForUnitTestOutcomeNotRunnableShouldReturnTestOutcomeFailedWhenNotSpecified() + public void UnitTestHelperToTestOutcomeForUnitTestOutcomeNotRunnableShouldReturnTestOutcomeFailedByDefault() { string runSettingxml = @"