diff --git a/GoogleTestAdapter/Common/Common.csproj b/GoogleTestAdapter/Common/Common.csproj index 282df41da..da9cdc636 100644 --- a/GoogleTestAdapter/Common/Common.csproj +++ b/GoogleTestAdapter/Common/Common.csproj @@ -62,6 +62,7 @@ + diff --git a/GoogleTestAdapter/Common/MissingTestsReportMode.cs b/GoogleTestAdapter/Common/MissingTestsReportMode.cs new file mode 100644 index 000000000..ae30030ca --- /dev/null +++ b/GoogleTestAdapter/Common/MissingTestsReportMode.cs @@ -0,0 +1,31 @@ +using System.Collections.Generic; +using System.ComponentModel; + +namespace GoogleTestAdapter.Common +{ + [TypeConverter(typeof(MissingTestsReportModeConverter))] + public enum MissingTestsReportMode + { + DoNotReport, + ReportAsNotFound, + ReportAsSkipped, + ReportAsFailed + } + + public class MissingTestsReportModeConverter : EnumConverterBase + { + public const string DoNotReport = "Do not report"; + public const string ReportAsNotFound = "Report as not found"; + public const string ReportAsSkipped = "Report as skipped"; + public const string ReportAsFailed = "Report as failed"; + + public MissingTestsReportModeConverter() : base(new Dictionary + { + { MissingTestsReportMode.DoNotReport, DoNotReport}, + { MissingTestsReportMode.ReportAsNotFound, ReportAsNotFound}, + { MissingTestsReportMode.ReportAsSkipped, ReportAsSkipped}, + { MissingTestsReportMode.ReportAsFailed, ReportAsFailed}, + }) {} + } + +} \ No newline at end of file diff --git a/GoogleTestAdapter/Core.Tests/GoogleTestDiscovererTests.cs b/GoogleTestAdapter/Core.Tests/GoogleTestDiscovererTests.cs index 75a978889..19698fa9e 100644 --- a/GoogleTestAdapter/Core.Tests/GoogleTestDiscovererTests.cs +++ b/GoogleTestAdapter/Core.Tests/GoogleTestDiscovererTests.cs @@ -169,7 +169,7 @@ public void GetTestsFromExecutable_SampleTestsDebugWithExitCodeTest_FindsTestsWi var exitCodeTestCase = testCases.Single(tc => tc.FullyQualifiedName == finalName); exitCodeTestCase.DisplayName.Should().Be(finalName); exitCodeTestCase.Source.Should().Be(TestResources.Tests_DebugX86); - exitCodeTestCase.CodeFilePath.Should().Contain(@"sampletests\tests\main.cpp"); + exitCodeTestCase.CodeFilePath.Should().ContainEquivalentOf(@"sampletests\tests\main.cpp"); exitCodeTestCase.LineNumber.Should().Be(8); MockLogger.Verify(l => l.DebugInfo(It.Is(msg => msg.Contains("Exit code") && msg.Contains("ignored"))), Times.Once); @@ -445,12 +445,12 @@ private IList FindTests(string location, int expectedNrOfTestCases = T TestCase testCase = testCases.Single(tc => tc.FullyQualifiedName == "TheFixture.AddFails"); testCase.DisplayName.Should().Be("TheFixture.AddFails"); - testCase.CodeFilePath.Should().EndWith(@"sampletests\tests\fixturetests.cpp"); + testCase.CodeFilePath.Should().EndWithEquivalent(@"sampletests\tests\fixturetests.cpp"); testCase.LineNumber.Should().Be(11); testCase = testCases.Single(tc => tc.FullyQualifiedName == "Arr/TypeParameterizedTests/1.CanDefeatMath"); testCase.DisplayName.Should().Be("Arr/TypeParameterizedTests/1.CanDefeatMath"); - testCase.CodeFilePath.Should().EndWith(@"sampletests\tests\typeparameterizedtests.cpp"); + testCase.CodeFilePath.Should().EndWithEquivalent(@"sampletests\tests\typeparameterizedtests.cpp"); testCase.LineNumber.Should().Be(56); return testCases; @@ -465,11 +465,11 @@ private void FindExternallyLinkedTests(string location) string expectedCodeFilePath = Path.GetFullPath($@"{TestResources.SampleTestsSolutionDir}dlldependentproject\dlltests.cpp").ToLower(); testCases[0].DisplayName.Should().Be("Passing.InvokeFunction"); - testCases[0].CodeFilePath.Should().Be(expectedCodeFilePath); + testCases[0].CodeFilePath.Should().BeEquivalentTo(expectedCodeFilePath); testCases[0].LineNumber.Should().Be(5); testCases[1].DisplayName.Should().Be("Failing.InvokeFunction"); - testCases[1].CodeFilePath.Should().Be(expectedCodeFilePath); + testCases[1].CodeFilePath.Should().BeEquivalentTo(expectedCodeFilePath); testCases[1].LineNumber.Should().Be(10); } diff --git a/GoogleTestAdapter/Core/Runners/SequentialTestRunner.cs b/GoogleTestAdapter/Core/Runners/SequentialTestRunner.cs index 07047c2bd..a6e6a4ab5 100644 --- a/GoogleTestAdapter/Core/Runners/SequentialTestRunner.cs +++ b/GoogleTestAdapter/Core/Runners/SequentialTestRunner.cs @@ -161,7 +161,7 @@ private IEnumerable TryRunTests(string executable, string workingDir arguments.TestCases .Except(streamingParser.TestResults.Select(tr => tr.TestCase)) .Where(tc => !tc.IsExitCodeTestCase); - var testResults = new TestResultCollector(_logger, _threadName) + var testResults = new TestResultCollector(_logger, _threadName, _settings) .CollectTestResults(remainingTestCases, executable, resultXmlFile, consoleOutput, streamingParser.CrashedTestCase); testResults = testResults.OrderBy(tr => tr.TestCase.FullyQualifiedName).ToList(); diff --git a/GoogleTestAdapter/Core/Runners/TestResultCollector.cs b/GoogleTestAdapter/Core/Runners/TestResultCollector.cs index f88ee7641..8961f9207 100644 --- a/GoogleTestAdapter/Core/Runners/TestResultCollector.cs +++ b/GoogleTestAdapter/Core/Runners/TestResultCollector.cs @@ -3,19 +3,29 @@ using System.Linq; using GoogleTestAdapter.Common; using GoogleTestAdapter.Model; +using GoogleTestAdapter.Settings; using GoogleTestAdapter.TestResults; namespace GoogleTestAdapter.Runners { public class TestResultCollector { + private static readonly IReadOnlyList TestsNotRunCauses = new List + { + "A test run is repeated, but tests have changed in the meantime", + "A test dependency has been removed or changed without Visual Studio noticing" + }; + private readonly ILogger _logger; + private readonly SettingsWrapper _settings; + private readonly string _threadName; - public TestResultCollector(ILogger logger, string threadName) + public TestResultCollector(ILogger logger, string threadName, SettingsWrapper settings) { _logger = logger; _threadName = threadName; + _settings = settings; } public List CollectTestResults(IEnumerable testCasesRun, string testExecutable, string resultXmlFile, List consoleOutput, TestCase crashedTestCase) @@ -42,7 +52,7 @@ public List CollectTestResults(IEnumerable testCasesRun, s if (crashedTestCase != null) CreateMissingResults(remainingTestCases, crashedTestCase, testResults); else - ReportSuspiciousTestCases(remainingTestCases); + ReportSuspiciousTestCases(remainingTestCases, testResults); } return testResults; @@ -84,25 +94,55 @@ private void CreateMissingResults(TestCase[] testCases, TestCase crashedTestCase var errorStackTrace = ErrorMessageParser.CreateStackTraceEntry("crash suspect", crashedTestCase.CodeFilePath, crashedTestCase.LineNumber.ToString()); - foreach (TestCase testCase in testCases) - { - testResults.Add(new TestResult(testCase) - { - ComputerName = Environment.MachineName, - Outcome = TestOutcome.Skipped, - ErrorMessage = errorMessage, - ErrorStackTrace = errorStackTrace - }); - } + testResults.AddRange(testCases.Select(testCase => + CreateTestResult(testCase, TestOutcome.Skipped, errorMessage, errorStackTrace))); if (testCases.Length > 0) _logger.DebugInfo($"{_threadName}Created {testCases.Length} test results for tests which were neither found in result XML file nor in console output"); } - private void ReportSuspiciousTestCases(TestCase[] testCases) + private void ReportSuspiciousTestCases(TestCase[] testCases, List testResults) { + string causesAsString = $" - possible causes:{Environment.NewLine}{string.Join(Environment.NewLine, TestsNotRunCauses.Select(s => $"- {s}"))}"; string testCasesAsString = string.Join(Environment.NewLine, testCases.Select(tc => tc.DisplayName)); - _logger.DebugWarning( - $"{_threadName}{testCases.Length} test cases seem to not have been run - are you repeating a test run, but tests have changed in the meantime? Test cases:{Environment.NewLine}{testCasesAsString}"); + + _logger.DebugWarning($"{_threadName}{testCases.Length} test cases seem to not have been run{causesAsString}"); + _logger.VerboseInfo($"{_threadName}Test cases:{Environment.NewLine}{testCasesAsString}"); + + TestOutcome? testOutcome = GetTestOutcomeOfMissingTests(); + if (testOutcome.HasValue) + { + string errorMessage = $"Test case has not been run{causesAsString}"; + testResults.AddRange(testCases.Select(tc => CreateTestResult(tc, testOutcome.Value, errorMessage, null))); + } + } + + private TestOutcome? GetTestOutcomeOfMissingTests() + { + switch (_settings.MissingTestsReportMode) + { + case MissingTestsReportMode.DoNotReport: + return null; + case MissingTestsReportMode.ReportAsFailed: + return TestOutcome.Failed; + case MissingTestsReportMode.ReportAsSkipped: + return TestOutcome.Skipped; + case MissingTestsReportMode.ReportAsNotFound: + return TestOutcome.NotFound; + default: + throw new InvalidOperationException($"Unknown {nameof(MissingTestsReportMode)}: {_settings.MissingTestsReportMode}"); + } + } + + private TestResult CreateTestResult(TestCase testCase, TestOutcome outcome, string errorMessage, string errorStackTrace) + { + return new TestResult(testCase) + { + ComputerName = Environment.MachineName, + Outcome = outcome, + ErrorMessage = errorMessage, + ErrorStackTrace = errorStackTrace + + }; } } diff --git a/GoogleTestAdapter/Core/Settings/IGoogleTestAdapterSettings.cs b/GoogleTestAdapter/Core/Settings/IGoogleTestAdapterSettings.cs index 771a18a45..3e4ed43da 100644 --- a/GoogleTestAdapter/Core/Settings/IGoogleTestAdapterSettings.cs +++ b/GoogleTestAdapter/Core/Settings/IGoogleTestAdapterSettings.cs @@ -53,6 +53,7 @@ public interface IGoogleTestAdapterSettings bool? KillProcessesOnCancel { get; set; } bool? SkipOriginCheck { get; set; } string ExitCodeTestCase { get; set; } + MissingTestsReportMode? MissingTestsReportMode { get; set; } bool? UseNewTestExecutionFramework { get; set; } DebuggerKind? DebuggerKind { get; set; } @@ -100,6 +101,7 @@ public static void GetUnsetValuesFrom(this IGoogleTestAdapterSettings self, IGoo self.KillProcessesOnCancel = self.KillProcessesOnCancel ?? other.KillProcessesOnCancel; self.SkipOriginCheck = self.SkipOriginCheck ?? other.SkipOriginCheck; self.ExitCodeTestCase = self.ExitCodeTestCase ?? other.ExitCodeTestCase; + self.MissingTestsReportMode = self.MissingTestsReportMode ?? other.MissingTestsReportMode; self.UseNewTestExecutionFramework = self.UseNewTestExecutionFramework ?? other.UseNewTestExecutionFramework; self.DebuggerKind = self.DebuggerKind ?? other.DebuggerKind; diff --git a/GoogleTestAdapter/Core/Settings/RunSettings.cs b/GoogleTestAdapter/Core/Settings/RunSettings.cs index a6623232a..ae50352ae 100644 --- a/GoogleTestAdapter/Core/Settings/RunSettings.cs +++ b/GoogleTestAdapter/Core/Settings/RunSettings.cs @@ -115,6 +115,9 @@ public RunSettings(string projectRegex) public string ExitCodeTestCase { get; set; } public bool ShouldSerializeExitCodeTestCase() { return ExitCodeTestCase != null; } + public MissingTestsReportMode? MissingTestsReportMode { get; set; } + public bool ShouldSerializeMissingTestsReportMode() { return MissingTestsReportMode != null; } + public virtual bool? UseNewTestExecutionFramework { get; set; } public bool ShouldSerializeUseNewTestExecutionFramework() { return UseNewTestExecutionFramework != null; } diff --git a/GoogleTestAdapter/Core/Settings/SettingsWrapper.cs b/GoogleTestAdapter/Core/Settings/SettingsWrapper.cs index 7fde7dbff..f3c80e05a 100644 --- a/GoogleTestAdapter/Core/Settings/SettingsWrapper.cs +++ b/GoogleTestAdapter/Core/Settings/SettingsWrapper.cs @@ -452,6 +452,15 @@ public virtual int MaxNrOfThreads } } + public const string OptionMissingTestsReportMode = "Behavior for missing test results"; + public const string OptionMissingTestsReportModeDescription = + "If a test can not be run (e.g. because a dependency has been removed since discovery without VS noticing), this option allows to configure how that test will be reported to the VS test framework." + + "\nDefault: " + MissingTestsReportModeConverter.ReportAsNotFound; + public const MissingTestsReportMode OptionMissingTestsReportModeDefaultValue = MissingTestsReportMode.ReportAsNotFound; + + public virtual MissingTestsReportMode MissingTestsReportMode => + _currentSettings.MissingTestsReportMode ?? OptionMissingTestsReportModeDefaultValue; + #endregion #region TestDiscoveryOptionsPage diff --git a/GoogleTestAdapter/DiaResolver.Tests/DiaResolverTests.cs b/GoogleTestAdapter/DiaResolver.Tests/DiaResolverTests.cs index 2b7889c35..c85e70c11 100644 --- a/GoogleTestAdapter/DiaResolver.Tests/DiaResolverTests.cs +++ b/GoogleTestAdapter/DiaResolver.Tests/DiaResolverTests.cs @@ -34,7 +34,7 @@ public void GetFunctions_X86_EverythingMatches_ResultSizeIsCorrect() TestResources.LoadTests_ReleaseX86, "*", TestMetadata.VersionUnderTest == VsVersion.VS2017 ? 628 : 728, - 90); + 88); } [TestMethod] diff --git a/GoogleTestAdapter/Packaging.GTA/VsPackage.nuspec b/GoogleTestAdapter/Packaging.GTA/VsPackage.nuspec index bfb2282ee..83bc51853 100644 --- a/GoogleTestAdapter/Packaging.GTA/VsPackage.nuspec +++ b/GoogleTestAdapter/Packaging.GTA/VsPackage.nuspec @@ -2,7 +2,7 @@ GoogleTestAdapter - 0.16.1 + 0.17.0 Google Test Adapter Christian Soltenborn Christian Soltenborn diff --git a/GoogleTestAdapter/Resources/AllTestSettings.gta.runsettings b/GoogleTestAdapter/Resources/AllTestSettings.gta.runsettings index 12723c294..baf236924 100644 --- a/GoogleTestAdapter/Resources/AllTestSettings.gta.runsettings +++ b/GoogleTestAdapter/Resources/AllTestSettings.gta.runsettings @@ -32,6 +32,7 @@ true false + ReportAsFailed diff --git a/GoogleTestAdapter/TestAdapter.Tests/TestExecutorParallelTests.cs b/GoogleTestAdapter/TestAdapter.Tests/TestExecutorParallelTests.cs index 9f045ad91..e24103a4e 100644 --- a/GoogleTestAdapter/TestAdapter.Tests/TestExecutorParallelTests.cs +++ b/GoogleTestAdapter/TestAdapter.Tests/TestExecutorParallelTests.cs @@ -18,9 +18,9 @@ public class TestExecutorParallelTests : TestExecutorTestsBase public TestExecutorParallelTests() : base(true, Environment.ProcessorCount) { } - protected override void CheckMockInvocations(int nrOfPassedTests, int nrOfFailedTests, int nrOfUnexecutedTests, int nrOfSkippedTests) + protected override void CheckMockInvocations(int nrOfPassedTests, int nrOfFailedTests, int nrOfUnexecutedTests, int nrOfSkippedTests, int nrOfNotFoundTests) { - base.CheckMockInvocations(nrOfPassedTests, nrOfFailedTests, nrOfUnexecutedTests, nrOfSkippedTests); + base.CheckMockInvocations(nrOfPassedTests, nrOfFailedTests, nrOfUnexecutedTests, nrOfSkippedTests, nrOfNotFoundTests); if (nrOfPassedTests > 0) { @@ -38,6 +38,14 @@ protected override void CheckMockInvocations(int nrOfPassedTests, int nrOfFailed Times.AtLeast(nrOfFailedTests)); } + if (nrOfNotFoundTests > 0) + { + MockFrameworkHandle.Verify(h => h.RecordResult(It.Is(tr => tr.Outcome == TestOutcome.NotFound)), + Times.AtLeast(nrOfNotFoundTests)); + MockFrameworkHandle.Verify(h => h.RecordEnd(It.IsAny(), It.Is(to => to == TestOutcome.NotFound)), + Times.AtLeast(nrOfNotFoundTests)); + } + MockFrameworkHandle.Verify(h => h.RecordResult(It.Is(tr => tr.Outcome == TestOutcome.Skipped)), Times.AtMost(nrOfSkippedTests)); MockFrameworkHandle.Verify(h => h.RecordEnd(It.IsAny(), It.Is(to => to == TestOutcome.Skipped)), diff --git a/GoogleTestAdapter/TestAdapter.Tests/TestExecutorSequentialTests.cs b/GoogleTestAdapter/TestAdapter.Tests/TestExecutorSequentialTests.cs index caae3bcec..52652a73d 100644 --- a/GoogleTestAdapter/TestAdapter.Tests/TestExecutorSequentialTests.cs +++ b/GoogleTestAdapter/TestAdapter.Tests/TestExecutorSequentialTests.cs @@ -23,9 +23,9 @@ public class TestExecutorSequentialTests : TestExecutorTestsBase public TestExecutorSequentialTests() : base(false, 1) { } - protected override void CheckMockInvocations(int nrOfPassedTests, int nrOfFailedTests, int nrOfUnexecutedTests, int nrOfSkippedTests) + protected override void CheckMockInvocations(int nrOfPassedTests, int nrOfFailedTests, int nrOfUnexecutedTests, int nrOfSkippedTests, int nrOfNotFoundTests) { - base.CheckMockInvocations(nrOfPassedTests, nrOfFailedTests, nrOfUnexecutedTests, nrOfSkippedTests); + base.CheckMockInvocations(nrOfPassedTests, nrOfFailedTests, nrOfUnexecutedTests, nrOfSkippedTests, nrOfNotFoundTests); MockFrameworkHandle.Verify(h => h.RecordResult(It.Is(tr => tr.Outcome == TestOutcome.Passed)), Times.Exactly(nrOfPassedTests)); @@ -41,6 +41,11 @@ protected override void CheckMockInvocations(int nrOfPassedTests, int nrOfFailed Times.Exactly(nrOfSkippedTests)); MockFrameworkHandle.Verify(h => h.RecordEnd(It.IsAny(), It.Is(to => to == TestOutcome.Skipped)), Times.Exactly(nrOfSkippedTests)); + + MockFrameworkHandle.Verify(h => h.RecordResult(It.Is(tr => tr.Outcome == TestOutcome.NotFound)), + Times.Exactly(nrOfNotFoundTests)); + MockFrameworkHandle.Verify(h => h.RecordEnd(It.IsAny(), It.Is(to => to == TestOutcome.NotFound)), + Times.Exactly(nrOfNotFoundTests)); } diff --git a/GoogleTestAdapter/TestAdapter.Tests/TestExecutorSequentialTests_FrameworkDebugging.cs b/GoogleTestAdapter/TestAdapter.Tests/TestExecutorSequentialTests_FrameworkDebugging.cs index c2cb1910d..8a8db5284 100644 --- a/GoogleTestAdapter/TestAdapter.Tests/TestExecutorSequentialTests_FrameworkDebugging.cs +++ b/GoogleTestAdapter/TestAdapter.Tests/TestExecutorSequentialTests_FrameworkDebugging.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; +using GoogleTestAdapter.Common; using GoogleTestAdapter.Helpers; using GoogleTestAdapter.ProcessExecution; using GoogleTestAdapter.Tests.Common; @@ -12,6 +13,7 @@ namespace GoogleTestAdapter.TestAdapter { [TestClass] + // ReSharper disable once InconsistentNaming public class TestExecutorSequentialTests_FrameworkDebugging : TestExecutorSequentialTests { [TestInitialize] @@ -59,27 +61,112 @@ protected override void SetUpMockFrameworkHandle() [TestCategory(Integration)] public override void RunTests_CrashingX64Tests_CorrectTestResults() { - // test crashes, no info available if debugged via framework + MockOptions.Setup(o => o.MissingTestsReportMode).Returns(MissingTestsReportMode.DoNotReport); + RunAndVerifyTests(TestResources.CrashingTests_ReleaseX64, 0, 0, 0); } + [TestMethod] + [TestCategory(Integration)] + public void RunTests_CrashingX64Tests_CorrectTestResults_ReportAsFailed() + { + MockOptions.Setup(o => o.MissingTestsReportMode).Returns(MissingTestsReportMode.ReportAsFailed); + + RunAndVerifyTests(TestResources.CrashingTests_ReleaseX64, 0, 6, 0); + } + + [TestMethod] + [TestCategory(Integration)] + public void RunTests_CrashingX64Tests_CorrectTestResults_ReportAsSkipped() + { + MockOptions.Setup(o => o.MissingTestsReportMode).Returns(MissingTestsReportMode.ReportAsSkipped); + + RunAndVerifyTests(TestResources.CrashingTests_ReleaseX64, 0, 0, 0, 6); + } + + [TestMethod] + [TestCategory(Integration)] + public void RunTests_CrashingX64Tests_CorrectTestResults_ReportAsNotFound() + { + RunAndVerifyTests(TestResources.CrashingTests_ReleaseX64, 0, 0, 0, nrOfNotFoundTests: 6); + } + [TestMethod] [TestCategory(Integration)] public override void RunTests_CrashingX86Tests_CorrectTestResults() { - // test crashes, no info available if debugged via framework + MockOptions.Setup(o => o.MissingTestsReportMode).Returns(MissingTestsReportMode.DoNotReport); + RunAndVerifyTests(TestResources.CrashingTests_ReleaseX86, 0, 0, 0); } + [TestMethod] + [TestCategory(Integration)] + public void RunTests_CrashingX86Tests_CorrectTestResults_ReportAsFailed() + { + MockOptions.Setup(o => o.MissingTestsReportMode).Returns(MissingTestsReportMode.ReportAsFailed); + + RunAndVerifyTests(TestResources.CrashingTests_ReleaseX86, 0, 6, 0); + } + + [TestMethod] + [TestCategory(Integration)] + public void RunTests_CrashingX86Tests_CorrectTestResults_ReportAsSkipped() + { + MockOptions.Setup(o => o.MissingTestsReportMode).Returns(MissingTestsReportMode.ReportAsSkipped); + + RunAndVerifyTests(TestResources.CrashingTests_ReleaseX86, 0, 0, 0, 6); + } + + [TestMethod] + [TestCategory(Integration)] + public void RunTests_CrashingX86Tests_CorrectTestResults_ReportAsNotFound() + { + RunAndVerifyTests(TestResources.CrashingTests_ReleaseX86, 0, 0, 0, nrOfNotFoundTests: 6); + } + [TestMethod] [TestCategory(Integration)] public override void RunTests_HardCrashingX86Tests_CorrectTestResults() + { + MockOptions.Setup(o => o.MissingTestsReportMode).Returns(MissingTestsReportMode.DoNotReport); + + TestExecutor executor = new TestExecutor(TestEnvironment.Logger, TestEnvironment.Options, MockDebuggerAttacher.Object); + executor.RunTests(TestResources.CrashingTests_DebugX86.Yield(), MockRunContext.Object, MockFrameworkHandle.Object); + + CheckMockInvocations(0, 0, 0, 0, 0); + } + + [TestMethod] + [TestCategory(Integration)] + public void RunTests_HardCrashingX86Tests_CorrectTestResults_ReportAsFailed() + { + MockOptions.Setup(o => o.MissingTestsReportMode).Returns(MissingTestsReportMode.ReportAsFailed); + TestExecutor executor = new TestExecutor(TestEnvironment.Logger, TestEnvironment.Options, MockDebuggerAttacher.Object); + executor.RunTests(TestResources.CrashingTests_DebugX86.Yield(), MockRunContext.Object, MockFrameworkHandle.Object); + + CheckMockInvocations(0, 6, 0, 0, 0); + } + + [TestMethod] + [TestCategory(Integration)] + public void RunTests_HardCrashingX86Tests_CorrectTestResults_ReportAsSkipped() + { + MockOptions.Setup(o => o.MissingTestsReportMode).Returns(MissingTestsReportMode.ReportAsSkipped); + TestExecutor executor = new TestExecutor(TestEnvironment.Logger, TestEnvironment.Options, MockDebuggerAttacher.Object); + executor.RunTests(TestResources.CrashingTests_DebugX86.Yield(), MockRunContext.Object, MockFrameworkHandle.Object); + + CheckMockInvocations(0, 0, 0, 6, 0); + } + + [TestMethod] + [TestCategory(Integration)] + public void RunTests_HardCrashingX86Tests_CorrectTestResults_ReportAsNotFound() { TestExecutor executor = new TestExecutor(TestEnvironment.Logger, TestEnvironment.Options, MockDebuggerAttacher.Object); executor.RunTests(TestResources.CrashingTests_DebugX86.Yield(), MockRunContext.Object, MockFrameworkHandle.Object); - // test crashes, no info available if debugged via framework - CheckMockInvocations(0, 0, 0, 0); + CheckMockInvocations(0, 0, 0, 0, 6); } #region Method stubs for code coverage diff --git a/GoogleTestAdapter/TestAdapter.Tests/TestExecutorTestsBase.cs b/GoogleTestAdapter/TestAdapter.Tests/TestExecutorTestsBase.cs index 9a3769850..394487265 100644 --- a/GoogleTestAdapter/TestAdapter.Tests/TestExecutorTestsBase.cs +++ b/GoogleTestAdapter/TestAdapter.Tests/TestExecutorTestsBase.cs @@ -38,7 +38,7 @@ protected TestExecutorTestsBase(bool parallelTestExecution, int maxNrOfThreads) } - protected virtual void CheckMockInvocations(int nrOfPassedTests, int nrOfFailedTests, int nrOfUnexecutedTests, int nrOfSkippedTests) + protected virtual void CheckMockInvocations(int nrOfPassedTests, int nrOfFailedTests, int nrOfUnexecutedTests, int nrOfSkippedTests, int nrOfNotFoundTests) { MockFrameworkHandle.Verify(h => h.RecordResult(It.Is(tr => tr.Outcome == VsTestOutcome.None)), Times.Exactly(nrOfUnexecutedTests)); @@ -187,7 +187,7 @@ public virtual void RunTests_HardCrashingX86Tests_CorrectTestResults() TestExecutor executor = new TestExecutor(TestEnvironment.Logger, TestEnvironment.Options, MockDebuggerAttacher.Object); executor.RunTests(TestResources.CrashingTests_DebugX86.Yield(), MockRunContext.Object, MockFrameworkHandle.Object); - CheckMockInvocations(1, 2, 0, 3); + CheckMockInvocations(1, 2, 0, 3, 0); } [TestMethod] @@ -306,8 +306,8 @@ public virtual void RunTests_WithoutPathExtension_ExecutionFails() Utils.DeleteDirectory(baseDir).Should().BeTrue(); } } - - protected void RunAndVerifyTests(string executable, int nrOfPassedTests, int nrOfFailedTests, int nrOfUnexecutedTests, int nrOfSkippedTests = 0, bool checkNoErrorsLogged = true) + + protected void RunAndVerifyTests(string executable, int nrOfPassedTests, int nrOfFailedTests, int nrOfUnexecutedTests, int nrOfSkippedTests = 0, int nrOfNotFoundTests = 0, bool checkNoErrorsLogged = true) { TestExecutor executor = new TestExecutor(TestEnvironment.Logger, TestEnvironment.Options, MockDebuggerAttacher.Object); executor.RunTests(executable.Yield(), MockRunContext.Object, MockFrameworkHandle.Object); @@ -318,7 +318,7 @@ protected void RunAndVerifyTests(string executable, int nrOfPassedTests, int nrO MockLogger.Verify(l => l.DebugError(It.IsAny()), Times.Never); } - CheckMockInvocations(nrOfPassedTests, nrOfFailedTests, nrOfUnexecutedTests, nrOfSkippedTests); + CheckMockInvocations(nrOfPassedTests, nrOfFailedTests, nrOfUnexecutedTests, nrOfSkippedTests, nrOfNotFoundTests); } [TestMethod] diff --git a/GoogleTestAdapter/TestAdapter/GoogleTestAdapterSettings.xsd b/GoogleTestAdapter/TestAdapter/GoogleTestAdapterSettings.xsd index 67ecdd6b3..78ddcfd85 100644 --- a/GoogleTestAdapter/TestAdapter/GoogleTestAdapterSettings.xsd +++ b/GoogleTestAdapter/TestAdapter/GoogleTestAdapterSettings.xsd @@ -137,6 +137,15 @@ + + + + + + + + + Only for internal use diff --git a/GoogleTestAdapter/Tests.Common/Resources/Trx2TestRun.xslt b/GoogleTestAdapter/Tests.Common/Resources/Trx2TestRun.xslt index 49ffe6d23..eebd34769 100644 --- a/GoogleTestAdapter/Tests.Common/Resources/Trx2TestRun.xslt +++ b/GoogleTestAdapter/Tests.Common/Resources/Trx2TestRun.xslt @@ -27,6 +27,11 @@ { return Regex.Replace(text, "([0-9A-F]{8}){1,2} pointing to", "${MemoryLocation} pointing to", RegexOptions.IgnoreCase); } + + public string toLower(string text) + { + return text.ToLower(); + } ]]> @@ -73,7 +78,7 @@ - + diff --git a/GoogleTestAdapter/Tests.Common/TestsBase.cs b/GoogleTestAdapter/Tests.Common/TestsBase.cs index 6485e3268..2ae141d15 100644 --- a/GoogleTestAdapter/Tests.Common/TestsBase.cs +++ b/GoogleTestAdapter/Tests.Common/TestsBase.cs @@ -99,6 +99,8 @@ public static void SetupOptions(Mock mockOptions, ILogger logge mockOptions.Setup(o => o.KillProcessesOnCancel).Returns(SettingsWrapper.OptionKillProcessesOnCancelDefaultValue); mockOptions.Setup(o => o.SkipOriginCheck).Returns(SettingsWrapper.OptionSkipOriginCheckDefaultValue); mockOptions.Setup(o => o.ExitCodeTestCase).Returns(SettingsWrapper.OptionExitCodeTestCaseDefaultValue); + mockOptions.Setup(o => o.MissingTestsReportMode) + .Returns(SettingsWrapper.OptionMissingTestsReportModeDefaultValue); mockOptions.Setup(o => o.DebuggerKind).Returns(DebuggerKind.Native); diff --git a/GoogleTestAdapter/VsPackage.GTA/ReleaseNotes/History.cs b/GoogleTestAdapter/VsPackage.GTA/ReleaseNotes/History.cs index 0b0716afd..fe6116299 100644 --- a/GoogleTestAdapter/VsPackage.GTA/ReleaseNotes/History.cs +++ b/GoogleTestAdapter/VsPackage.GTA/ReleaseNotes/History.cs @@ -67,7 +67,8 @@ static History() { new Version(0, 14, 4), new DateTime(2019, 2, 24) }, { new Version(0, 15, 0), new DateTime(2019, 3, 9) }, { new Version(0, 16, 0), new DateTime(2019, 4, 28) }, - { new Version(0, 16, 1), new DateTime(2019, 5, 4) } + { new Version(0, 16, 1), new DateTime(2019, 5, 4) }, + { new Version(0, 17, 0), new DateTime(2019, 10, 6) } }; } } diff --git a/GoogleTestAdapter/VsPackage.GTA/Resources/ReleaseNotes/0.17.0.md b/GoogleTestAdapter/VsPackage.GTA/Resources/ReleaseNotes/0.17.0.md new file mode 100644 index 000000000..5f508f1c6 --- /dev/null +++ b/GoogleTestAdapter/VsPackage.GTA/Resources/ReleaseNotes/0.17.0.md @@ -0,0 +1,2 @@ +* enhancement: under certain circumstances, the VS test framework might show a test in the test explorer which can not be run any more. So far, GTA has dealed with this rare situation by logging an according warning in debug mode; the new option *Behavior for missing test results* allows to configure GTA such that it reports such tests to VS ([#295](https://github.com/csoltenborn/GoogleTestAdapter/issues/295), thanks to [Cornelius Stubbe](https://github.com/c-stubbe) for testing) +* donations: thanks to Nicholas - I really appreciate it! \ No newline at end of file diff --git a/GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj b/GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj index 019b2b0da..c9d496c12 100644 --- a/GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj +++ b/GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj @@ -235,6 +235,9 @@ PreserveNewest + + PreserveNewest + diff --git a/GoogleTestAdapter/VsPackage.Shared/GoogleTestExtensionOptionsPage.cs b/GoogleTestAdapter/VsPackage.Shared/GoogleTestExtensionOptionsPage.cs index ea1d09ac8..b3d0f78e1 100644 --- a/GoogleTestAdapter/VsPackage.Shared/GoogleTestExtensionOptionsPage.cs +++ b/GoogleTestAdapter/VsPackage.Shared/GoogleTestExtensionOptionsPage.cs @@ -278,6 +278,7 @@ private RunSettings GetRunSettingsFromOptionPages() ParallelTestExecution = _testExecutionOptions.EnableParallelTestExecution, MaxNrOfThreads = _testExecutionOptions.MaxNrOfThreads, DebuggerKind = _testExecutionOptions.DebuggerKind, + MissingTestsReportMode = _testExecutionOptions.MissingTestsReportMode, DebuggingNamedPipeId = _debuggingNamedPipeId, SolutionDir = solutionDir, diff --git a/GoogleTestAdapter/VsPackage.Shared/OptionsPages/TestExecutionOptionsDialogPage.cs b/GoogleTestAdapter/VsPackage.Shared/OptionsPages/TestExecutionOptionsDialogPage.cs index f233bb889..a28803a90 100644 --- a/GoogleTestAdapter/VsPackage.Shared/OptionsPages/TestExecutionOptionsDialogPage.cs +++ b/GoogleTestAdapter/VsPackage.Shared/OptionsPages/TestExecutionOptionsDialogPage.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.Linq; +using GoogleTestAdapter.Common; using GoogleTestAdapter.Helpers; using GoogleTestAdapter.ProcessExecution; using Microsoft.VisualStudio.Shell; @@ -163,6 +164,17 @@ public string ExitCodeTestCase } private string _exitCodeTestCase = SettingsWrapper.OptionExitCodeTestCaseDefaultValue; + [Category(SettingsWrapper.CategoryMiscName)] + [DisplayName(SettingsWrapper.OptionMissingTestsReportMode)] + [Description(SettingsWrapper.OptionMissingTestsReportModeDescription)] + [PropertyPageTypeConverter(typeof(MissingTestsReportModeConverter))] + public MissingTestsReportMode MissingTestsReportMode + { + get => _missingTestsReportMode; + set => SetAndNotify(ref _missingTestsReportMode, value); + } + private MissingTestsReportMode _missingTestsReportMode = SettingsWrapper.OptionMissingTestsReportModeDefaultValue; + #endregion } diff --git a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__HardCrashingSampleTests.xml b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__HardCrashingSampleTests.xml index 8bb6c2314..bb97979bb 100644 --- a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__HardCrashingSampleTests.xml +++ b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__HardCrashingSampleTests.xml @@ -5,7 +5,7 @@ reason is probably a crash of test Crashing.TheCrash - at crash suspect in $(Directory)\sampletests\crashingtests\crashingtests.cpp:line 21 + at crash suspect in $(directory)\sampletests\crashingtests\crashingtests.cpp:line 21 @@ -16,7 +16,7 @@ 1000 Add(10, 10) Which is: 20 - at crashingtests.cpp:12 in $(Directory)\sampletests\crashingtests\crashingtests.cpp:line 12 + at crashingtests.cpp:12 in $(directory)\sampletests\crashingtests\crashingtests.cpp:line 12 @@ -24,7 +24,7 @@ reason is probably a crash of test Crashing.TheCrash - at crash suspect in $(Directory)\sampletests\crashingtests\crashingtests.cpp:line 21 + at crash suspect in $(directory)\sampletests\crashingtests\crashingtests.cpp:line 21 @@ -33,7 +33,7 @@ reason is probably a crash of test Crashing.TheCrash - at crash suspect in $(Directory)\sampletests\crashingtests\crashingtests.cpp:line 21 + at crash suspect in $(directory)\sampletests\crashingtests\crashingtests.cpp:line 21 diff --git a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__HardCrashingSampleTests_Settings_Coverage_Isolation.xml b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__HardCrashingSampleTests_Settings_Coverage_Isolation.xml index 0c96ca7e4..d4595b048 100644 --- a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__HardCrashingSampleTests_Settings_Coverage_Isolation.xml +++ b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__HardCrashingSampleTests_Settings_Coverage_Isolation.xml @@ -8,7 +8,7 @@ 1000 Add(10, 10) Which is: 20 - at crashingtests.cpp:27 in $(Directory)\sampletests\crashingtests\crashingtests.cpp:line 27 + at crashingtests.cpp:27 in $(directory)\sampletests\crashingtests\crashingtests.cpp:line 27 @@ -19,7 +19,7 @@ 1000 Add(10, 10) Which is: 20 - at crashingtests.cpp:12 in $(Directory)\sampletests\crashingtests\crashingtests.cpp:line 12 + at crashingtests.cpp:12 in $(directory)\sampletests\crashingtests\crashingtests.cpp:line 12 @@ -27,7 +27,7 @@ reason is probably a crash of test Crashing.TheCrash - at crash suspect in $(Directory)\sampletests\crashingtests\crashingtests.cpp:line 21 + at crash suspect in $(directory)\sampletests\crashingtests\crashingtests.cpp:line 21 @@ -35,7 +35,7 @@ reason is probably a crash of test Crashing.TheCrash - at crash suspect in $(Directory)\sampletests\crashingtests\crashingtests.cpp:line 21 + at crash suspect in $(directory)\sampletests\crashingtests\crashingtests.cpp:line 21 diff --git a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests170_Settings_Coverage_Type_EQ_Small.xml b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests170_Settings_Coverage_Type_EQ_Small.xml index 01b933f15..21a1566dd 100644 --- a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests170_Settings_Coverage_Type_EQ_Small.xml +++ b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests170_Settings_Coverage_Type_EQ_Small.xml @@ -8,7 +8,7 @@ Value of: GetParam().s Actual: "!" Expected: "" - at parameterizedtests.cpp:30 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 30 + at parameterizedtests.cpp:30 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 30 @@ -18,7 +18,7 @@ Expected: "" Value of: GetParam().i Actual: -1 Expected: 1 - at parameterizedtests.cpp:29 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 29 + at parameterizedtests.cpp:29 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 29 @@ -29,7 +29,7 @@ Expected: 1 Value of: GetParam().s Actual: "!" Expected: "" - at parameterizedtests.cpp:35 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 35 + at parameterizedtests.cpp:35 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 35 @@ -39,7 +39,7 @@ Expected: "" Value of: GetParam().i Actual: -1 Expected: 1 - at parameterizedtests.cpp:34 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 34 + at parameterizedtests.cpp:34 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 34 @@ -52,8 +52,8 @@ Expected: 1 #2 - Value of: GetParam().s Actual: "_" Expected: "" - at #1 - parameterizedtests.cpp:29 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 29 -at #2 - parameterizedtests.cpp:30 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 30 + at #1 - parameterizedtests.cpp:29 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 29 +at #2 - parameterizedtests.cpp:30 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 30 @@ -66,8 +66,8 @@ Expected: 1 #2 - Value of: GetParam().s Actual: "_" Expected: "" - at #1 - parameterizedtests.cpp:34 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 34 -at #2 - parameterizedtests.cpp:35 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 35 + at #1 - parameterizedtests.cpp:34 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 34 +at #2 - parameterizedtests.cpp:35 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 35 diff --git a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests170_Settings_DisplayName_EQ_TestMath_AddPassesWithTraits_OR_Type_EQ_Small.xml b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests170_Settings_DisplayName_EQ_TestMath_AddPassesWithTraits_OR_Type_EQ_Small.xml index a06afcc6b..dfb89625c 100644 --- a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests170_Settings_DisplayName_EQ_TestMath_AddPassesWithTraits_OR_Type_EQ_Small.xml +++ b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests170_Settings_DisplayName_EQ_TestMath_AddPassesWithTraits_OR_Type_EQ_Small.xml @@ -8,7 +8,7 @@ Value of: GetParam().s Actual: "!" Expected: "" - at parameterizedtests.cpp:30 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 30 + at parameterizedtests.cpp:30 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 30 @@ -18,7 +18,7 @@ Expected: "" Value of: GetParam().i Actual: -1 Expected: 1 - at parameterizedtests.cpp:29 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 29 + at parameterizedtests.cpp:29 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 29 @@ -29,7 +29,7 @@ Expected: 1 Value of: GetParam().s Actual: "!" Expected: "" - at parameterizedtests.cpp:35 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 35 + at parameterizedtests.cpp:35 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 35 @@ -39,7 +39,7 @@ Expected: "" Value of: GetParam().i Actual: -1 Expected: 1 - at parameterizedtests.cpp:34 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 34 + at parameterizedtests.cpp:34 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 34 @@ -52,8 +52,8 @@ Expected: 1 #2 - Value of: GetParam().s Actual: "_" Expected: "" - at #1 - parameterizedtests.cpp:29 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 29 -at #2 - parameterizedtests.cpp:30 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 30 + at #1 - parameterizedtests.cpp:29 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 29 +at #2 - parameterizedtests.cpp:30 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 30 @@ -66,8 +66,8 @@ Expected: 1 #2 - Value of: GetParam().s Actual: "_" Expected: "" - at #1 - parameterizedtests.cpp:34 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 34 -at #2 - parameterizedtests.cpp:35 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 35 + at #1 - parameterizedtests.cpp:34 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 34 +at #2 - parameterizedtests.cpp:35 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 35 diff --git a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests170_SolutionProjectSettings_Coverage_Isolation.xml b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests170_SolutionProjectSettings_Coverage_Isolation.xml index 5928a68e2..f94ca1595 100644 --- a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests170_SolutionProjectSettings_Coverage_Isolation.xml +++ b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests170_SolutionProjectSettings_Coverage_Isolation.xml @@ -10,7 +10,7 @@ Actual: false Expected: true Test failed: Something is wrong - at apicreatedtests.cpp:40 in $(Directory)\sampletests\tests\apicreatedtests.cpp:line 40 + at apicreatedtests.cpp:40 in $(directory)\sampletests\tests\apicreatedtests.cpp:line 40 @@ -18,7 +18,7 @@ Test failed: Something is wrong Expected: (this->container[0] + this->container[1]) != (this->container[2]), actual: 3 vs 3 - at typeparameterizedtests.cpp:57 in $(Directory)\sampletests\tests\typeparameterizedtests.cpp:line 57 + at typeparameterizedtests.cpp:57 in $(directory)\sampletests\tests\typeparameterizedtests.cpp:line 57 @@ -27,7 +27,7 @@ Test failed: Something is wrong Expected: (this->container[0] + this->container[1]) != (this->container[2]), actual: 3 vs 3 - at typeparameterizedtests.cpp:65 in $(Directory)\sampletests\tests\typeparameterizedtests.cpp:line 65 + at typeparameterizedtests.cpp:65 in $(directory)\sampletests\tests\typeparameterizedtests.cpp:line 65 @@ -35,7 +35,7 @@ Test failed: Something is wrong Expected: (this->container[0] + this->container[1]) != (this->container[2]), actual: 3 vs 3 - at typeparameterizedtests.cpp:61 in $(Directory)\sampletests\tests\typeparameterizedtests.cpp:line 61 + at typeparameterizedtests.cpp:61 in $(directory)\sampletests\tests\typeparameterizedtests.cpp:line 61 @@ -49,7 +49,7 @@ Test failed: Something is wrong Expected: ("") != (TEST_DIRECTORY.c_str()), actual: "" vs "" - at basictests.cpp:24 in $(Directory)\sampletests\tests\basictests.cpp:line 24 + at basictests.cpp:24 in $(directory)\sampletests\tests\basictests.cpp:line 24 @@ -60,7 +60,7 @@ Test failed: Something is wrong Value of: GetParam().s Actual: "!" Expected: "" - at parameterizedtests.cpp:25 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 25 + at parameterizedtests.cpp:25 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 25 @@ -70,7 +70,7 @@ Expected: "" Value of: GetParam().i Actual: -1 Expected: 1 - at parameterizedtests.cpp:24 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 24 + at parameterizedtests.cpp:24 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 24 @@ -81,7 +81,7 @@ Expected: 1 Value of: GetParam().s Actual: "!" Expected: "" - at parameterizedtests.cpp:30 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 30 + at parameterizedtests.cpp:30 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 30 @@ -91,7 +91,7 @@ Expected: "" Value of: GetParam().i Actual: -1 Expected: 1 - at parameterizedtests.cpp:29 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 29 + at parameterizedtests.cpp:29 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 29 @@ -102,7 +102,7 @@ Expected: 1 Value of: GetParam().s Actual: "!" Expected: "" - at parameterizedtests.cpp:35 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 35 + at parameterizedtests.cpp:35 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 35 @@ -112,7 +112,7 @@ Expected: "" Value of: GetParam().i Actual: -1 Expected: 1 - at parameterizedtests.cpp:34 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 34 + at parameterizedtests.cpp:34 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 34 @@ -123,7 +123,7 @@ Expected: 1 Value of: GetParam().s Actual: "!" Expected: "" - at parameterizedtests.cpp:40 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 40 + at parameterizedtests.cpp:40 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 40 @@ -133,7 +133,7 @@ Expected: "" Value of: GetParam().i Actual: -1 Expected: 1 - at parameterizedtests.cpp:39 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 39 + at parameterizedtests.cpp:39 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 39 @@ -150,10 +150,10 @@ Expected: "This is another a stupid choice for a method name" #4 - Value of: ::main() Actual: 0 Expected: 1 - at #1 - mainmethodtest.cpp:7 in $(Directory)\sampletests\tests\mainmethodtest.cpp:line 7 -at #2 - mainmethodtest.cpp:23 in $(Directory)\sampletests\tests\mainmethodtest.cpp:line 23 -at #3 - mainmethodtest.cpp:16 in $(Directory)\sampletests\tests\mainmethodtest.cpp:line 16 -at #4 - mainmethodtest.cpp:24 in $(Directory)\sampletests\tests\mainmethodtest.cpp:line 24 + at #1 - mainmethodtest.cpp:7 in $(directory)\sampletests\tests\mainmethodtest.cpp:line 7 +at #2 - mainmethodtest.cpp:23 in $(directory)\sampletests\tests\mainmethodtest.cpp:line 23 +at #3 - mainmethodtest.cpp:16 in $(directory)\sampletests\tests\mainmethodtest.cpp:line 16 +at #4 - mainmethodtest.cpp:24 in $(directory)\sampletests\tests\mainmethodtest.cpp:line 24 @@ -164,8 +164,8 @@ at #4 - mainmethodtest.cpp:24 in $(Directory)\sampletests\tests\mainmethodtest.c Expected: 3 #2 - Value of: 5 Expected: 4 - at #1 - scopedtracestests.cpp:33 in $(Directory)\sampletests\tests\scopedtracestests.cpp:line 33 -at #2 - scopedtracestests.cpp:34 in $(Directory)\sampletests\tests\scopedtracestests.cpp:line 34 + at #1 - scopedtracestests.cpp:33 in $(directory)\sampletests\tests\scopedtracestests.cpp:line 33 +at #2 - scopedtracestests.cpp:34 in $(directory)\sampletests\tests\scopedtracestests.cpp:line 34 @@ -175,7 +175,7 @@ at #2 - scopedtracestests.cpp:34 in $(Directory)\sampletests\tests\scopedtracest Value of: i Actual: 1 Expected: 0 - at main.cpp:46 in $(Directory)\sampletests\tests\main.cpp:line 46 + at main.cpp:46 in $(directory)\sampletests\tests\main.cpp:line 46 @@ -185,7 +185,7 @@ Expected: 0 Value of: i Actual: 1 Expected: 0 - at scopedtracestests.cpp:12 in $(Directory)\sampletests\tests\scopedtracestests.cpp:line 12 + at scopedtracestests.cpp:12 in $(directory)\sampletests\tests\scopedtracestests.cpp:line 12 @@ -200,9 +200,9 @@ Expected: 0 #3 - Value of: i Actual: 1 Expected: 0 - at #1 - scopedtracestests.cpp:49 in $(Directory)\sampletests\tests\scopedtracestests.cpp:line 49 -at #2 - scopedtracestests.cpp:12 in $(Directory)\sampletests\tests\scopedtracestests.cpp:line 12 -at #3 - main.cpp:46 in $(Directory)\sampletests\tests\main.cpp:line 46 + at #1 - scopedtracestests.cpp:49 in $(directory)\sampletests\tests\scopedtracestests.cpp:line 49 +at #2 - scopedtracestests.cpp:12 in $(directory)\sampletests\tests\scopedtracestests.cpp:line 12 +at #3 - main.cpp:46 in $(directory)\sampletests\tests\main.cpp:line 46 @@ -212,8 +212,8 @@ at #3 - main.cpp:46 in $(Directory)\sampletests\tests\main.cpp:line 46Value of: i Actual: 1 Expected: 0 - at scopedtracestests.cpp:12 in $(Directory)\sampletests\tests\scopedtracestests.cpp:line 12 -at -->HelperMethod in $(Directory)\sampletests\tests\scopedtracestests.cpp:line 17 + at scopedtracestests.cpp:12 in $(directory)\sampletests\tests\scopedtracestests.cpp:line 12 +at -->helpermethod in $(directory)\sampletests\tests\scopedtracestests.cpp:line 17 @@ -223,8 +223,8 @@ at -->HelperMethod in $(Directory)\sampletests\tests\scopedtracestests.cpp:li Value of: i Actual: 1 Expected: 0 - at scopedtracestests.cpp:12 in $(Directory)\sampletests\tests\scopedtracestests.cpp:line 12 -at -->TestMethod in $(Directory)\sampletests\tests\scopedtracestests.cpp:line 56 + at scopedtracestests.cpp:12 in $(directory)\sampletests\tests\scopedtracestests.cpp:line 12 +at -->testmethod in $(directory)\sampletests\tests\scopedtracestests.cpp:line 56 @@ -234,9 +234,9 @@ at -->TestMethod in $(Directory)\sampletests\tests\scopedtracestests.cpp:line Value of: i Actual: 1 Expected: 0 - at scopedtracestests.cpp:12 in $(Directory)\sampletests\tests\scopedtracestests.cpp:line 12 -at -->HelperMethod in $(Directory)\sampletests\tests\scopedtracestests.cpp:line 17 -at -->TestMethod in $(Directory)\sampletests\tests\scopedtracestests.cpp:line 76 + at scopedtracestests.cpp:12 in $(directory)\sampletests\tests\scopedtracestests.cpp:line 12 +at -->helpermethod in $(directory)\sampletests\tests\scopedtracestests.cpp:line 17 +at -->testmethod in $(directory)\sampletests\tests\scopedtracestests.cpp:line 76 @@ -248,11 +248,11 @@ at -->TestMethod in $(Directory)\sampletests\tests\scopedtracestests.cpp:line Expected: 0 #2 - Value of: 1 Expected: 0 - at #1 - scopedtracestests.cpp:12 in $(Directory)\sampletests\tests\scopedtracestests.cpp:line 12 -at -->HelperMethod in $(Directory)\sampletests\tests\scopedtracestests.cpp:line 17 -at -->TestMethod in $(Directory)\sampletests\tests\scopedtracestests.cpp:line 82 -at #2 - scopedtracestests.cpp:84 in $(Directory)\sampletests\tests\scopedtracestests.cpp:line 84 -at -->TestMethod in $(Directory)\sampletests\tests\scopedtracestests.cpp:line 82 + at #1 - scopedtracestests.cpp:12 in $(directory)\sampletests\tests\scopedtracestests.cpp:line 12 +at -->helpermethod in $(directory)\sampletests\tests\scopedtracestests.cpp:line 17 +at -->testmethod in $(directory)\sampletests\tests\scopedtracestests.cpp:line 82 +at #2 - scopedtracestests.cpp:84 in $(directory)\sampletests\tests\scopedtracestests.cpp:line 84 +at -->testmethod in $(directory)\sampletests\tests\scopedtracestests.cpp:line 82 @@ -261,7 +261,7 @@ at -->TestMethod in $(Directory)\sampletests\tests\scopedtracestests.cpp:line Value of: 2 Expected: 1 - at scopedtracestests.cpp:23 in $(Directory)\sampletests\tests\scopedtracestests.cpp:line 23 + at scopedtracestests.cpp:23 in $(directory)\sampletests\tests\scopedtracestests.cpp:line 23 @@ -270,7 +270,7 @@ Expected: 1 Value of: 3 Expected: 2 - at scopedtracestests.cpp:28 in $(Directory)\sampletests\tests\scopedtracestests.cpp:line 28 + at scopedtracestests.cpp:28 in $(directory)\sampletests\tests\scopedtracestests.cpp:line 28 @@ -280,9 +280,9 @@ Expected: 2 Value of: i Actual: 1 Expected: 0 - at scopedtracestests.cpp:12 in $(Directory)\sampletests\tests\scopedtracestests.cpp:line 12 -at -->TestMethod Inner in $(Directory)\sampletests\tests\scopedtracestests.cpp:line 64 -at -->TestMethod Outer in $(Directory)\sampletests\tests\scopedtracestests.cpp:line 62 + at scopedtracestests.cpp:12 in $(directory)\sampletests\tests\scopedtracestests.cpp:line 12 +at -->testmethod inner in $(directory)\sampletests\tests\scopedtracestests.cpp:line 64 +at -->testmethod outer in $(directory)\sampletests\tests\scopedtracestests.cpp:line 62 @@ -301,7 +301,7 @@ Value of: 2 Expected: 1 after test 1 after test 2 - at basictests.cpp:136 in $(Directory)\sampletests\tests\basictests.cpp:line 136 + at basictests.cpp:136 in $(directory)\sampletests\tests\basictests.cpp:line 136 @@ -312,7 +312,7 @@ after test 2 Value of: 2 Expected: 1 after test - at basictests.cpp:151 in $(Directory)\sampletests\tests\basictests.cpp:line 151 + at basictests.cpp:151 in $(directory)\sampletests\tests\basictests.cpp:line 151 @@ -323,7 +323,7 @@ after test Value of: 2 Expected: 1 after test - at basictests.cpp:144 in $(Directory)\sampletests\tests\basictests.cpp:line 144 + at basictests.cpp:144 in $(directory)\sampletests\tests\basictests.cpp:line 144 @@ -337,7 +337,7 @@ Expected: 1 test output after test 1 after test 2 - at basictests.cpp:113 in $(Directory)\sampletests\tests\basictests.cpp:line 113 + at basictests.cpp:113 in $(directory)\sampletests\tests\basictests.cpp:line 113 @@ -349,7 +349,7 @@ Value of: 2 Expected: 1 test output after test - at basictests.cpp:128 in $(Directory)\sampletests\tests\basictests.cpp:line 128 + at basictests.cpp:128 in $(directory)\sampletests\tests\basictests.cpp:line 128 @@ -361,7 +361,7 @@ Value of: 2 Expected: 1 test output after test - at basictests.cpp:121 in $(Directory)\sampletests\tests\basictests.cpp:line 121 + at basictests.cpp:121 in $(directory)\sampletests\tests\basictests.cpp:line 121 @@ -374,8 +374,8 @@ Expected: 1 #2 - Value of: GetParam().s Actual: "_" Expected: "" - at #1 - parameterizedtests.cpp:24 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 24 -at #2 - parameterizedtests.cpp:25 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 25 + at #1 - parameterizedtests.cpp:24 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 24 +at #2 - parameterizedtests.cpp:25 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 25 @@ -388,8 +388,8 @@ Expected: 1 #2 - Value of: GetParam().s Actual: "_" Expected: "" - at #1 - parameterizedtests.cpp:29 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 29 -at #2 - parameterizedtests.cpp:30 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 30 + at #1 - parameterizedtests.cpp:29 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 29 +at #2 - parameterizedtests.cpp:30 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 30 @@ -402,8 +402,8 @@ Expected: 1 #2 - Value of: GetParam().s Actual: "_" Expected: "" - at #1 - parameterizedtests.cpp:34 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 34 -at #2 - parameterizedtests.cpp:35 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 35 + at #1 - parameterizedtests.cpp:34 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 34 +at #2 - parameterizedtests.cpp:35 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 35 @@ -416,8 +416,8 @@ Expected: 1 #2 - Value of: GetParam().s Actual: "_" Expected: "" - at #1 - parameterizedtests.cpp:39 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 39 -at #2 - parameterizedtests.cpp:40 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 40 + at #1 - parameterizedtests.cpp:39 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 39 +at #2 - parameterizedtests.cpp:40 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 40 @@ -430,7 +430,7 @@ at #2 - parameterizedtests.cpp:40 in $(Directory)\sampletests\tests\parameterize Actual: 5 Expected: GetParam().second Which is: 23 - at parameterizedtests.cpp:64 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 64 + at parameterizedtests.cpp:64 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 64 @@ -440,7 +440,7 @@ Which is: 23 Value of: sum Actual: '\x82' (-126) Expected: 130 - at typeparameterizedtests.cpp:90 in $(Directory)\sampletests\tests\typeparameterizedtests.cpp:line 90 + at typeparameterizedtests.cpp:90 in $(directory)\sampletests\tests\typeparameterizedtests.cpp:line 90 @@ -452,7 +452,7 @@ Expected: 130 Value of: Add(10, 10) Actual: 20 Expected: 1000 - at basictests.cpp:45 in $(Directory)\sampletests\tests\basictests.cpp:line 45 + at basictests.cpp:45 in $(directory)\sampletests\tests\basictests.cpp:line 45 @@ -472,7 +472,7 @@ Expected: 1000 Value of: Add(10, 10) Actual: 20 Expected: 1000 - at fixturetests.cpp:12 in $(Directory)\sampletests\tests\fixturetests.cpp:line 12 + at fixturetests.cpp:12 in $(directory)\sampletests\tests\fixturetests.cpp:line 12 @@ -493,7 +493,7 @@ Expected: 1000 Value of: 2 Expected: 1 - at umlauttests.cpp:25 in $(Directory)\sampletests\tests\umlauttests.cpp:line 25 + at umlauttests.cpp:25 in $(directory)\sampletests\tests\umlauttests.cpp:line 25 @@ -511,7 +511,7 @@ Expected: 1 Expected: (this->container[0] + this->container[1]) != (this->container[2]), actual: 3 vs 3 - at typeparameterizedtests.cpp:32 in $(Directory)\sampletests\tests\typeparameterizedtests.cpp:line 32 + at typeparameterizedtests.cpp:32 in $(directory)\sampletests\tests\typeparameterizedtests.cpp:line 32 @@ -520,7 +520,7 @@ Expected: 1 Expected: (this->container[0] + this->container[1]) != (this->container[2]), actual: 3 vs 3 - at typeparameterizedtests.cpp:40 in $(Directory)\sampletests\tests\typeparameterizedtests.cpp:line 40 + at typeparameterizedtests.cpp:40 in $(directory)\sampletests\tests\typeparameterizedtests.cpp:line 40 @@ -528,7 +528,7 @@ Expected: 1 Expected: (this->container[0] + this->container[1]) != (this->container[2]), actual: 3 vs 3 - at typeparameterizedtests.cpp:36 in $(Directory)\sampletests\tests\typeparameterizedtests.cpp:line 36 + at typeparameterizedtests.cpp:36 in $(directory)\sampletests\tests\typeparameterizedtests.cpp:line 36 @@ -536,7 +536,7 @@ Expected: 1 Expected: (this->container[0] + this->container[1]) != (this->container[2]), actual: 3 vs 3 - at typeparameterizedtests.cpp:32 in $(Directory)\sampletests\tests\typeparameterizedtests.cpp:line 32 + at typeparameterizedtests.cpp:32 in $(directory)\sampletests\tests\typeparameterizedtests.cpp:line 32 @@ -545,7 +545,7 @@ Expected: 1 Expected: (this->container[0] + this->container[1]) != (this->container[2]), actual: 3 vs 3 - at typeparameterizedtests.cpp:40 in $(Directory)\sampletests\tests\typeparameterizedtests.cpp:line 40 + at typeparameterizedtests.cpp:40 in $(directory)\sampletests\tests\typeparameterizedtests.cpp:line 40 @@ -553,7 +553,7 @@ Expected: 1 Expected: (this->container[0] + this->container[1]) != (this->container[2]), actual: 3 vs 3 - at typeparameterizedtests.cpp:36 in $(Directory)\sampletests\tests\typeparameterizedtests.cpp:line 36 + at typeparameterizedtests.cpp:36 in $(directory)\sampletests\tests\typeparameterizedtests.cpp:line 36 @@ -566,7 +566,7 @@ Expected: 1 Value of: 2 Expected: 1 - at umlauttests.cpp:9 in $(Directory)\sampletests\tests\umlauttests.cpp:line 9 + at umlauttests.cpp:9 in $(directory)\sampletests\tests\umlauttests.cpp:line 9 @@ -578,7 +578,7 @@ Expected: 1 Value of: theInstance.GetValue(1) Actual: 3 Expected: 2 - at umlauttests.cpp:94 in $(Directory)\sampletests\tests\umlauttests.cpp:line 94 + at umlauttests.cpp:94 in $(directory)\sampletests\tests\umlauttests.cpp:line 94 @@ -590,7 +590,7 @@ Expected: 2 Actual: "\xC4\xD6\xDC\xE4\xF6\xFC\xDF" Expected: "äöüßÄÖÜ" Which is: "\xE4\xF6\xFC\xDF\xC4\xD6\xDC" - at umlauttests.cpp:58 in $(Directory)\sampletests\tests\umlauttests.cpp:line 58 + at umlauttests.cpp:58 in $(directory)\sampletests\tests\umlauttests.cpp:line 58 @@ -598,7 +598,7 @@ Which is: "\xE4\xF6\xFC\xDF\xC4\xD6\xDC" Expected: (this->container[0] + this->container[1]) != (this->container[2]), actual: 3 vs 3 - at typeparameterizedtests.cpp:57 in $(Directory)\sampletests\tests\typeparameterizedtests.cpp:line 57 + at typeparameterizedtests.cpp:57 in $(directory)\sampletests\tests\typeparameterizedtests.cpp:line 57 @@ -607,7 +607,7 @@ Which is: "\xE4\xF6\xFC\xDF\xC4\xD6\xDC" Expected: (this->container[0] + this->container[1]) != (this->container[2]), actual: 3 vs 3 - at typeparameterizedtests.cpp:65 in $(Directory)\sampletests\tests\typeparameterizedtests.cpp:line 65 + at typeparameterizedtests.cpp:65 in $(directory)\sampletests\tests\typeparameterizedtests.cpp:line 65 @@ -615,7 +615,7 @@ Which is: "\xE4\xF6\xFC\xDF\xC4\xD6\xDC" Expected: (this->container[0] + this->container[1]) != (this->container[2]), actual: 3 vs 3 - at typeparameterizedtests.cpp:61 in $(Directory)\sampletests\tests\typeparameterizedtests.cpp:line 61 + at typeparameterizedtests.cpp:61 in $(directory)\sampletests\tests\typeparameterizedtests.cpp:line 61 diff --git a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_Coverage_Isolation_DisplayName_EQ_TestMath_AddPassesWithTraits_OR_Type_EQ_Small.xml b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_Coverage_Isolation_DisplayName_EQ_TestMath_AddPassesWithTraits_OR_Type_EQ_Small.xml index f60935cc1..9da565a32 100644 --- a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_Coverage_Isolation_DisplayName_EQ_TestMath_AddPassesWithTraits_OR_Type_EQ_Small.xml +++ b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_Coverage_Isolation_DisplayName_EQ_TestMath_AddPassesWithTraits_OR_Type_EQ_Small.xml @@ -9,7 +9,7 @@ "" GetParam().s Which is: "!" - at parameterizedtests.cpp:30 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 30 + at parameterizedtests.cpp:30 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 30 @@ -20,7 +20,7 @@ 1 GetParam().i Which is: -1 - at parameterizedtests.cpp:29 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 29 + at parameterizedtests.cpp:29 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 29 @@ -32,7 +32,7 @@ "" GetParam().s Which is: "!" - at parameterizedtests.cpp:35 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 35 + at parameterizedtests.cpp:35 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 35 @@ -43,7 +43,7 @@ 1 GetParam().i Which is: -1 - at parameterizedtests.cpp:34 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 34 + at parameterizedtests.cpp:34 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 34 @@ -58,8 +58,8 @@ "" GetParam().s Which is: "_" - at #1 - parameterizedtests.cpp:29 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 29 -at #2 - parameterizedtests.cpp:30 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 30 + at #1 - parameterizedtests.cpp:29 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 29 +at #2 - parameterizedtests.cpp:30 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 30 @@ -74,8 +74,8 @@ at #2 - parameterizedtests.cpp:30 in $(Directory)\sampletests\tests\parameterize "" GetParam().s Which is: "_" - at #1 - parameterizedtests.cpp:34 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 34 -at #2 - parameterizedtests.cpp:35 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 35 + at #1 - parameterizedtests.cpp:34 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 34 +at #2 - parameterizedtests.cpp:35 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 35 diff --git a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_Coverage_Isolation_Type_EQ_Small.xml b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_Coverage_Isolation_Type_EQ_Small.xml index ff03e58a1..12822405d 100644 --- a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_Coverage_Isolation_Type_EQ_Small.xml +++ b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_Coverage_Isolation_Type_EQ_Small.xml @@ -9,7 +9,7 @@ "" GetParam().s Which is: "!" - at parameterizedtests.cpp:30 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 30 + at parameterizedtests.cpp:30 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 30 @@ -20,7 +20,7 @@ 1 GetParam().i Which is: -1 - at parameterizedtests.cpp:29 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 29 + at parameterizedtests.cpp:29 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 29 @@ -32,7 +32,7 @@ "" GetParam().s Which is: "!" - at parameterizedtests.cpp:35 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 35 + at parameterizedtests.cpp:35 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 35 @@ -43,7 +43,7 @@ 1 GetParam().i Which is: -1 - at parameterizedtests.cpp:34 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 34 + at parameterizedtests.cpp:34 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 34 @@ -58,8 +58,8 @@ "" GetParam().s Which is: "_" - at #1 - parameterizedtests.cpp:29 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 29 -at #2 - parameterizedtests.cpp:30 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 30 + at #1 - parameterizedtests.cpp:29 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 29 +at #2 - parameterizedtests.cpp:30 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 30 @@ -74,8 +74,8 @@ at #2 - parameterizedtests.cpp:30 in $(Directory)\sampletests\tests\parameterize "" GetParam().s Which is: "_" - at #1 - parameterizedtests.cpp:34 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 34 -at #2 - parameterizedtests.cpp:35 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 35 + at #1 - parameterizedtests.cpp:34 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 34 +at #2 - parameterizedtests.cpp:35 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 35 diff --git a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_Settings_DisplayName_EQ_TestMath_AddPassesWithTraits_OR_Type_EQ_Small.xml b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_Settings_DisplayName_EQ_TestMath_AddPassesWithTraits_OR_Type_EQ_Small.xml index f8353aa21..8db78ad03 100644 --- a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_Settings_DisplayName_EQ_TestMath_AddPassesWithTraits_OR_Type_EQ_Small.xml +++ b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_Settings_DisplayName_EQ_TestMath_AddPassesWithTraits_OR_Type_EQ_Small.xml @@ -9,7 +9,7 @@ "" GetParam().s Which is: "!" - at parameterizedtests.cpp:30 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 30 + at parameterizedtests.cpp:30 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 30 @@ -20,7 +20,7 @@ 1 GetParam().i Which is: -1 - at parameterizedtests.cpp:29 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 29 + at parameterizedtests.cpp:29 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 29 @@ -32,7 +32,7 @@ "" GetParam().s Which is: "!" - at parameterizedtests.cpp:35 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 35 + at parameterizedtests.cpp:35 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 35 @@ -43,7 +43,7 @@ 1 GetParam().i Which is: -1 - at parameterizedtests.cpp:34 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 34 + at parameterizedtests.cpp:34 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 34 @@ -58,8 +58,8 @@ "" GetParam().s Which is: "_" - at #1 - parameterizedtests.cpp:29 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 29 -at #2 - parameterizedtests.cpp:30 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 30 + at #1 - parameterizedtests.cpp:29 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 29 +at #2 - parameterizedtests.cpp:30 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 30 @@ -74,8 +74,8 @@ at #2 - parameterizedtests.cpp:30 in $(Directory)\sampletests\tests\parameterize "" GetParam().s Which is: "_" - at #1 - parameterizedtests.cpp:34 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 34 -at #2 - parameterizedtests.cpp:35 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 35 + at #1 - parameterizedtests.cpp:34 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 34 +at #2 - parameterizedtests.cpp:35 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 35 diff --git a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_Settings_Type_EQ_Small.xml b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_Settings_Type_EQ_Small.xml index 2be9bf792..896cec327 100644 --- a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_Settings_Type_EQ_Small.xml +++ b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_Settings_Type_EQ_Small.xml @@ -9,7 +9,7 @@ "" GetParam().s Which is: "!" - at parameterizedtests.cpp:30 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 30 + at parameterizedtests.cpp:30 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 30 @@ -20,7 +20,7 @@ 1 GetParam().i Which is: -1 - at parameterizedtests.cpp:29 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 29 + at parameterizedtests.cpp:29 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 29 @@ -32,7 +32,7 @@ "" GetParam().s Which is: "!" - at parameterizedtests.cpp:35 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 35 + at parameterizedtests.cpp:35 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 35 @@ -43,7 +43,7 @@ 1 GetParam().i Which is: -1 - at parameterizedtests.cpp:34 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 34 + at parameterizedtests.cpp:34 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 34 @@ -58,8 +58,8 @@ "" GetParam().s Which is: "_" - at #1 - parameterizedtests.cpp:29 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 29 -at #2 - parameterizedtests.cpp:30 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 30 + at #1 - parameterizedtests.cpp:29 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 29 +at #2 - parameterizedtests.cpp:30 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 30 @@ -74,8 +74,8 @@ at #2 - parameterizedtests.cpp:30 in $(Directory)\sampletests\tests\parameterize "" GetParam().s Which is: "_" - at #1 - parameterizedtests.cpp:34 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 34 -at #2 - parameterizedtests.cpp:35 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 35 + at #1 - parameterizedtests.cpp:34 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 34 +at #2 - parameterizedtests.cpp:35 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 35 diff --git a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_SolutionProjectSettings_Coverage_Isolation.xml b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_SolutionProjectSettings_Coverage_Isolation.xml index 164d44c23..bb33fd36d 100644 --- a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_SolutionProjectSettings_Coverage_Isolation.xml +++ b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_SolutionProjectSettings_Coverage_Isolation.xml @@ -13,7 +13,7 @@ Actual: false Expected: true Test failed: Something is wrong - at apicreatedtests.cpp:40 in $(Directory)\sampletests\tests\apicreatedtests.cpp:line 40 + at apicreatedtests.cpp:40 in $(directory)\sampletests\tests\apicreatedtests.cpp:line 40 @@ -21,7 +21,7 @@ Test failed: Something is wrong Expected: (this->container[0] + this->container[1]) != (this->container[2]), actual: 3 vs 3 - at typeparameterizedtests.cpp:57 in $(Directory)\sampletests\tests\typeparameterizedtests.cpp:line 57 + at typeparameterizedtests.cpp:57 in $(directory)\sampletests\tests\typeparameterizedtests.cpp:line 57 @@ -30,7 +30,7 @@ Test failed: Something is wrong Expected: (this->container[0] + this->container[1]) != (this->container[2]), actual: 3 vs 3 - at typeparameterizedtests.cpp:65 in $(Directory)\sampletests\tests\typeparameterizedtests.cpp:line 65 + at typeparameterizedtests.cpp:65 in $(directory)\sampletests\tests\typeparameterizedtests.cpp:line 65 @@ -38,7 +38,7 @@ Test failed: Something is wrong Expected: (this->container[0] + this->container[1]) != (this->container[2]), actual: 3 vs 3 - at typeparameterizedtests.cpp:61 in $(Directory)\sampletests\tests\typeparameterizedtests.cpp:line 61 + at typeparameterizedtests.cpp:61 in $(directory)\sampletests\tests\typeparameterizedtests.cpp:line 61 @@ -52,7 +52,7 @@ Test failed: Something is wrong Expected: ("") != (TEST_DIRECTORY.c_str()), actual: "" vs "" - at basictests.cpp:24 in $(Directory)\sampletests\tests\basictests.cpp:line 24 + at basictests.cpp:24 in $(directory)\sampletests\tests\basictests.cpp:line 24 @@ -65,7 +65,7 @@ Test failed: Something is wrong "" GetParam().s Which is: "!" - at parameterizedtests.cpp:25 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 25 + at parameterizedtests.cpp:25 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 25 @@ -76,7 +76,7 @@ Test failed: Something is wrong 1 GetParam().i Which is: -1 - at parameterizedtests.cpp:24 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 24 + at parameterizedtests.cpp:24 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 24 @@ -88,7 +88,7 @@ Test failed: Something is wrong "" GetParam().s Which is: "!" - at parameterizedtests.cpp:30 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 30 + at parameterizedtests.cpp:30 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 30 @@ -99,7 +99,7 @@ Test failed: Something is wrong 1 GetParam().i Which is: -1 - at parameterizedtests.cpp:29 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 29 + at parameterizedtests.cpp:29 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 29 @@ -111,7 +111,7 @@ Test failed: Something is wrong "" GetParam().s Which is: "!" - at parameterizedtests.cpp:35 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 35 + at parameterizedtests.cpp:35 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 35 @@ -122,7 +122,7 @@ Test failed: Something is wrong 1 GetParam().i Which is: -1 - at parameterizedtests.cpp:34 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 34 + at parameterizedtests.cpp:34 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 34 @@ -134,7 +134,7 @@ Test failed: Something is wrong "" GetParam().s Which is: "!" - at parameterizedtests.cpp:40 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 40 + at parameterizedtests.cpp:40 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 40 @@ -145,7 +145,7 @@ Test failed: Something is wrong 1 GetParam().i Which is: -1 - at parameterizedtests.cpp:39 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 39 + at parameterizedtests.cpp:39 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 39 @@ -166,10 +166,10 @@ Test failed: Something is wrong 1 ::main() Which is: 0 - at #1 - mainmethodtest.cpp:7 in $(Directory)\sampletests\tests\mainmethodtest.cpp:line 7 -at #2 - mainmethodtest.cpp:23 in $(Directory)\sampletests\tests\mainmethodtest.cpp:line 23 -at #3 - mainmethodtest.cpp:16 in $(Directory)\sampletests\tests\mainmethodtest.cpp:line 16 -at #4 - mainmethodtest.cpp:24 in $(Directory)\sampletests\tests\mainmethodtest.cpp:line 24 + at #1 - mainmethodtest.cpp:7 in $(directory)\sampletests\tests\mainmethodtest.cpp:line 7 +at #2 - mainmethodtest.cpp:23 in $(directory)\sampletests\tests\mainmethodtest.cpp:line 23 +at #3 - mainmethodtest.cpp:16 in $(directory)\sampletests\tests\mainmethodtest.cpp:line 16 +at #4 - mainmethodtest.cpp:24 in $(directory)\sampletests\tests\mainmethodtest.cpp:line 24 @@ -182,8 +182,8 @@ at #4 - mainmethodtest.cpp:24 in $(Directory)\sampletests\tests\mainmethodtest.c #2 - Expected equality of these values: 4 5 - at #1 - scopedtracestests.cpp:33 in $(Directory)\sampletests\tests\scopedtracestests.cpp:line 33 -at #2 - scopedtracestests.cpp:34 in $(Directory)\sampletests\tests\scopedtracestests.cpp:line 34 + at #1 - scopedtracestests.cpp:33 in $(directory)\sampletests\tests\scopedtracestests.cpp:line 33 +at #2 - scopedtracestests.cpp:34 in $(directory)\sampletests\tests\scopedtracestests.cpp:line 34 @@ -194,7 +194,7 @@ at #2 - scopedtracestests.cpp:34 in $(Directory)\sampletests\tests\scopedtracest 0 i Which is: 1 - at main.cpp:46 in $(Directory)\sampletests\tests\main.cpp:line 46 + at main.cpp:46 in $(directory)\sampletests\tests\main.cpp:line 46 @@ -205,7 +205,7 @@ at #2 - scopedtracestests.cpp:34 in $(Directory)\sampletests\tests\scopedtracest 0 i Which is: 1 - at scopedtracestests.cpp:12 in $(Directory)\sampletests\tests\scopedtracestests.cpp:line 12 + at scopedtracestests.cpp:12 in $(directory)\sampletests\tests\scopedtracestests.cpp:line 12 @@ -223,9 +223,9 @@ at #2 - scopedtracestests.cpp:34 in $(Directory)\sampletests\tests\scopedtracest 0 i Which is: 1 - at #1 - scopedtracestests.cpp:49 in $(Directory)\sampletests\tests\scopedtracestests.cpp:line 49 -at #2 - scopedtracestests.cpp:12 in $(Directory)\sampletests\tests\scopedtracestests.cpp:line 12 -at #3 - main.cpp:46 in $(Directory)\sampletests\tests\main.cpp:line 46 + at #1 - scopedtracestests.cpp:49 in $(directory)\sampletests\tests\scopedtracestests.cpp:line 49 +at #2 - scopedtracestests.cpp:12 in $(directory)\sampletests\tests\scopedtracestests.cpp:line 12 +at #3 - main.cpp:46 in $(directory)\sampletests\tests\main.cpp:line 46 @@ -236,8 +236,8 @@ at #3 - main.cpp:46 in $(Directory)\sampletests\tests\main.cpp:line 46 - at scopedtracestests.cpp:12 in $(Directory)\sampletests\tests\scopedtracestests.cpp:line 12 -at -->HelperMethod in $(Directory)\sampletests\tests\scopedtracestests.cpp:line 17 + at scopedtracestests.cpp:12 in $(directory)\sampletests\tests\scopedtracestests.cpp:line 12 +at -->helpermethod in $(directory)\sampletests\tests\scopedtracestests.cpp:line 17 @@ -248,8 +248,8 @@ at -->HelperMethod in $(Directory)\sampletests\tests\scopedtracestests.cpp:li 0 i Which is: 1 - at scopedtracestests.cpp:12 in $(Directory)\sampletests\tests\scopedtracestests.cpp:line 12 -at -->TestMethod in $(Directory)\sampletests\tests\scopedtracestests.cpp:line 56 + at scopedtracestests.cpp:12 in $(directory)\sampletests\tests\scopedtracestests.cpp:line 12 +at -->testmethod in $(directory)\sampletests\tests\scopedtracestests.cpp:line 56 @@ -260,9 +260,9 @@ at -->TestMethod in $(Directory)\sampletests\tests\scopedtracestests.cpp:line 0 i Which is: 1 - at scopedtracestests.cpp:12 in $(Directory)\sampletests\tests\scopedtracestests.cpp:line 12 -at -->HelperMethod in $(Directory)\sampletests\tests\scopedtracestests.cpp:line 17 -at -->TestMethod in $(Directory)\sampletests\tests\scopedtracestests.cpp:line 76 + at scopedtracestests.cpp:12 in $(directory)\sampletests\tests\scopedtracestests.cpp:line 12 +at -->helpermethod in $(directory)\sampletests\tests\scopedtracestests.cpp:line 17 +at -->testmethod in $(directory)\sampletests\tests\scopedtracestests.cpp:line 76 @@ -276,11 +276,11 @@ at -->TestMethod in $(Directory)\sampletests\tests\scopedtracestests.cpp:line #2 - Expected equality of these values: 0 1 - at #1 - scopedtracestests.cpp:12 in $(Directory)\sampletests\tests\scopedtracestests.cpp:line 12 -at -->HelperMethod in $(Directory)\sampletests\tests\scopedtracestests.cpp:line 17 -at -->TestMethod in $(Directory)\sampletests\tests\scopedtracestests.cpp:line 82 -at #2 - scopedtracestests.cpp:84 in $(Directory)\sampletests\tests\scopedtracestests.cpp:line 84 -at -->TestMethod in $(Directory)\sampletests\tests\scopedtracestests.cpp:line 82 + at #1 - scopedtracestests.cpp:12 in $(directory)\sampletests\tests\scopedtracestests.cpp:line 12 +at -->helpermethod in $(directory)\sampletests\tests\scopedtracestests.cpp:line 17 +at -->testmethod in $(directory)\sampletests\tests\scopedtracestests.cpp:line 82 +at #2 - scopedtracestests.cpp:84 in $(directory)\sampletests\tests\scopedtracestests.cpp:line 84 +at -->testmethod in $(directory)\sampletests\tests\scopedtracestests.cpp:line 82 @@ -290,7 +290,7 @@ at -->TestMethod in $(Directory)\sampletests\tests\scopedtracestests.cpp:line Expected equality of these values: 1 2 - at scopedtracestests.cpp:23 in $(Directory)\sampletests\tests\scopedtracestests.cpp:line 23 + at scopedtracestests.cpp:23 in $(directory)\sampletests\tests\scopedtracestests.cpp:line 23 @@ -300,7 +300,7 @@ at -->TestMethod in $(Directory)\sampletests\tests\scopedtracestests.cpp:line Expected equality of these values: 2 3 - at scopedtracestests.cpp:28 in $(Directory)\sampletests\tests\scopedtracestests.cpp:line 28 + at scopedtracestests.cpp:28 in $(directory)\sampletests\tests\scopedtracestests.cpp:line 28 @@ -311,9 +311,9 @@ at -->TestMethod in $(Directory)\sampletests\tests\scopedtracestests.cpp:line 0 i Which is: 1 - at scopedtracestests.cpp:12 in $(Directory)\sampletests\tests\scopedtracestests.cpp:line 12 -at -->TestMethod Inner in $(Directory)\sampletests\tests\scopedtracestests.cpp:line 64 -at -->TestMethod Outer in $(Directory)\sampletests\tests\scopedtracestests.cpp:line 62 + at scopedtracestests.cpp:12 in $(directory)\sampletests\tests\scopedtracestests.cpp:line 12 +at -->testmethod inner in $(directory)\sampletests\tests\scopedtracestests.cpp:line 64 +at -->testmethod outer in $(directory)\sampletests\tests\scopedtracestests.cpp:line 62 @@ -333,7 +333,7 @@ Expected equality of these values: 2 after test 1 after test 2 - at basictests.cpp:136 in $(Directory)\sampletests\tests\basictests.cpp:line 136 + at basictests.cpp:136 in $(directory)\sampletests\tests\basictests.cpp:line 136 @@ -345,7 +345,7 @@ Expected equality of these values: 1 2 after test - at basictests.cpp:151 in $(Directory)\sampletests\tests\basictests.cpp:line 151 + at basictests.cpp:151 in $(directory)\sampletests\tests\basictests.cpp:line 151 @@ -357,7 +357,7 @@ Expected equality of these values: 1 2 after test - at basictests.cpp:144 in $(Directory)\sampletests\tests\basictests.cpp:line 144 + at basictests.cpp:144 in $(directory)\sampletests\tests\basictests.cpp:line 144 @@ -372,7 +372,7 @@ Expected equality of these values: test output after test 1 after test 2 - at basictests.cpp:113 in $(Directory)\sampletests\tests\basictests.cpp:line 113 + at basictests.cpp:113 in $(directory)\sampletests\tests\basictests.cpp:line 113 @@ -385,7 +385,7 @@ Expected equality of these values: 2 test output after test - at basictests.cpp:128 in $(Directory)\sampletests\tests\basictests.cpp:line 128 + at basictests.cpp:128 in $(directory)\sampletests\tests\basictests.cpp:line 128 @@ -398,7 +398,7 @@ Expected equality of these values: 2 test output after test - at basictests.cpp:121 in $(Directory)\sampletests\tests\basictests.cpp:line 121 + at basictests.cpp:121 in $(directory)\sampletests\tests\basictests.cpp:line 121 @@ -413,8 +413,8 @@ after test "" GetParam().s Which is: "_" - at #1 - parameterizedtests.cpp:24 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 24 -at #2 - parameterizedtests.cpp:25 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 25 + at #1 - parameterizedtests.cpp:24 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 24 +at #2 - parameterizedtests.cpp:25 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 25 @@ -429,8 +429,8 @@ at #2 - parameterizedtests.cpp:25 in $(Directory)\sampletests\tests\parameterize "" GetParam().s Which is: "_" - at #1 - parameterizedtests.cpp:29 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 29 -at #2 - parameterizedtests.cpp:30 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 30 + at #1 - parameterizedtests.cpp:29 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 29 +at #2 - parameterizedtests.cpp:30 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 30 @@ -445,8 +445,8 @@ at #2 - parameterizedtests.cpp:30 in $(Directory)\sampletests\tests\parameterize "" GetParam().s Which is: "_" - at #1 - parameterizedtests.cpp:34 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 34 -at #2 - parameterizedtests.cpp:35 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 35 + at #1 - parameterizedtests.cpp:34 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 34 +at #2 - parameterizedtests.cpp:35 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 35 @@ -461,8 +461,8 @@ at #2 - parameterizedtests.cpp:35 in $(Directory)\sampletests\tests\parameterize "" GetParam().s Which is: "_" - at #1 - parameterizedtests.cpp:39 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 39 -at #2 - parameterizedtests.cpp:40 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 40 + at #1 - parameterizedtests.cpp:39 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 39 +at #2 - parameterizedtests.cpp:40 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 40 @@ -476,7 +476,7 @@ at #2 - parameterizedtests.cpp:40 in $(Directory)\sampletests\tests\parameterize Which is: 23 strlen(GetParam().first) Which is: 5 - at parameterizedtests.cpp:64 in $(Directory)\sampletests\tests\parameterizedtests.cpp:line 64 + at parameterizedtests.cpp:64 in $(directory)\sampletests\tests\parameterizedtests.cpp:line 64 @@ -487,7 +487,7 @@ at #2 - parameterizedtests.cpp:40 in $(Directory)\sampletests\tests\parameterize 130 sum Which is: '\x82' (-126) - at typeparameterizedtests.cpp:90 in $(Directory)\sampletests\tests\typeparameterizedtests.cpp:line 90 + at typeparameterizedtests.cpp:90 in $(directory)\sampletests\tests\typeparameterizedtests.cpp:line 90 @@ -500,7 +500,7 @@ at #2 - parameterizedtests.cpp:40 in $(Directory)\sampletests\tests\parameterize 1000 Add(10, 10) Which is: 20 - at basictests.cpp:45 in $(Directory)\sampletests\tests\basictests.cpp:line 45 + at basictests.cpp:45 in $(directory)\sampletests\tests\basictests.cpp:line 45 @@ -521,7 +521,7 @@ at #2 - parameterizedtests.cpp:40 in $(Directory)\sampletests\tests\parameterize 1000 Add(10, 10) Which is: 20 - at fixturetests.cpp:12 in $(Directory)\sampletests\tests\fixturetests.cpp:line 12 + at fixturetests.cpp:12 in $(directory)\sampletests\tests\fixturetests.cpp:line 12 @@ -543,7 +543,7 @@ at #2 - parameterizedtests.cpp:40 in $(Directory)\sampletests\tests\parameterize Expected equality of these values: 1 2 - at umlauttests.cpp:25 in $(Directory)\sampletests\tests\umlauttests.cpp:line 25 + at umlauttests.cpp:25 in $(directory)\sampletests\tests\umlauttests.cpp:line 25 @@ -561,7 +561,7 @@ at #2 - parameterizedtests.cpp:40 in $(Directory)\sampletests\tests\parameterize Expected: (this->container[0] + this->container[1]) != (this->container[2]), actual: 3 vs 3 - at typeparameterizedtests.cpp:32 in $(Directory)\sampletests\tests\typeparameterizedtests.cpp:line 32 + at typeparameterizedtests.cpp:32 in $(directory)\sampletests\tests\typeparameterizedtests.cpp:line 32 @@ -570,7 +570,7 @@ at #2 - parameterizedtests.cpp:40 in $(Directory)\sampletests\tests\parameterize Expected: (this->container[0] + this->container[1]) != (this->container[2]), actual: 3 vs 3 - at typeparameterizedtests.cpp:40 in $(Directory)\sampletests\tests\typeparameterizedtests.cpp:line 40 + at typeparameterizedtests.cpp:40 in $(directory)\sampletests\tests\typeparameterizedtests.cpp:line 40 @@ -578,7 +578,7 @@ at #2 - parameterizedtests.cpp:40 in $(Directory)\sampletests\tests\parameterize Expected: (this->container[0] + this->container[1]) != (this->container[2]), actual: 3 vs 3 - at typeparameterizedtests.cpp:36 in $(Directory)\sampletests\tests\typeparameterizedtests.cpp:line 36 + at typeparameterizedtests.cpp:36 in $(directory)\sampletests\tests\typeparameterizedtests.cpp:line 36 @@ -586,7 +586,7 @@ at #2 - parameterizedtests.cpp:40 in $(Directory)\sampletests\tests\parameterize Expected: (this->container[0] + this->container[1]) != (this->container[2]), actual: 3 vs 3 - at typeparameterizedtests.cpp:32 in $(Directory)\sampletests\tests\typeparameterizedtests.cpp:line 32 + at typeparameterizedtests.cpp:32 in $(directory)\sampletests\tests\typeparameterizedtests.cpp:line 32 @@ -595,7 +595,7 @@ at #2 - parameterizedtests.cpp:40 in $(Directory)\sampletests\tests\parameterize Expected: (this->container[0] + this->container[1]) != (this->container[2]), actual: 3 vs 3 - at typeparameterizedtests.cpp:40 in $(Directory)\sampletests\tests\typeparameterizedtests.cpp:line 40 + at typeparameterizedtests.cpp:40 in $(directory)\sampletests\tests\typeparameterizedtests.cpp:line 40 @@ -603,7 +603,7 @@ at #2 - parameterizedtests.cpp:40 in $(Directory)\sampletests\tests\parameterize Expected: (this->container[0] + this->container[1]) != (this->container[2]), actual: 3 vs 3 - at typeparameterizedtests.cpp:36 in $(Directory)\sampletests\tests\typeparameterizedtests.cpp:line 36 + at typeparameterizedtests.cpp:36 in $(directory)\sampletests\tests\typeparameterizedtests.cpp:line 36 @@ -617,7 +617,7 @@ at #2 - parameterizedtests.cpp:40 in $(Directory)\sampletests\tests\parameterize Expected equality of these values: 1 2 - at umlauttests.cpp:9 in $(Directory)\sampletests\tests\umlauttests.cpp:line 9 + at umlauttests.cpp:9 in $(directory)\sampletests\tests\umlauttests.cpp:line 9 @@ -630,7 +630,7 @@ at #2 - parameterizedtests.cpp:40 in $(Directory)\sampletests\tests\parameterize 2 theInstance.GetValue(1) Which is: 3 - at umlauttests.cpp:94 in $(Directory)\sampletests\tests\umlauttests.cpp:line 94 + at umlauttests.cpp:94 in $(directory)\sampletests\tests\umlauttests.cpp:line 94 @@ -643,7 +643,7 @@ at #2 - parameterizedtests.cpp:40 in $(Directory)\sampletests\tests\parameterize Which is: "\xE4\xF6\xFC\xDF\xC4\xD6\xDC" GetParam().s Which is: "\xC4\xD6\xDC\xE4\xF6\xFC\xDF" - at umlauttests.cpp:58 in $(Directory)\sampletests\tests\umlauttests.cpp:line 58 + at umlauttests.cpp:58 in $(directory)\sampletests\tests\umlauttests.cpp:line 58 @@ -651,7 +651,7 @@ at #2 - parameterizedtests.cpp:40 in $(Directory)\sampletests\tests\parameterize Expected: (this->container[0] + this->container[1]) != (this->container[2]), actual: 3 vs 3 - at typeparameterizedtests.cpp:57 in $(Directory)\sampletests\tests\typeparameterizedtests.cpp:line 57 + at typeparameterizedtests.cpp:57 in $(directory)\sampletests\tests\typeparameterizedtests.cpp:line 57 @@ -660,7 +660,7 @@ at #2 - parameterizedtests.cpp:40 in $(Directory)\sampletests\tests\parameterize Expected: (this->container[0] + this->container[1]) != (this->container[2]), actual: 3 vs 3 - at typeparameterizedtests.cpp:65 in $(Directory)\sampletests\tests\typeparameterizedtests.cpp:line 65 + at typeparameterizedtests.cpp:65 in $(directory)\sampletests\tests\typeparameterizedtests.cpp:line 65 @@ -668,7 +668,7 @@ at #2 - parameterizedtests.cpp:40 in $(Directory)\sampletests\tests\parameterize Expected: (this->container[0] + this->container[1]) != (this->container[2]), actual: 3 vs 3 - at typeparameterizedtests.cpp:61 in $(Directory)\sampletests\tests\typeparameterizedtests.cpp:line 61 + at typeparameterizedtests.cpp:61 in $(directory)\sampletests\tests\typeparameterizedtests.cpp:line 61 diff --git a/README.md b/README.md index 4ee305a2b..d5d4982ad 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![Build status](https://ci.appveyor.com/api/projects/status/8hdgmdy1ogqi606j/branch/master?svg=true)](https://ci.appveyor.com/project/csoltenborn/googletestadapter-u1cxh/branch/master) [![Code coverage](https://codecov.io/gh/csoltenborn/GoogleTestAdapter/branch/master/graph/badge.svg)](https://codecov.io/gh/csoltenborn/GoogleTestAdapter) -[![Visual Studio Marketplace downloads](https://img.shields.io/badge/vs_marketplace-130k-blue.svg)](https://marketplace.visualstudio.com/items?itemName=ChristianSoltenborn.GoogleTestAdapter) +[![Visual Studio Marketplace downloads](https://img.shields.io/badge/vs_marketplace-48k-blue.svg)](https://marketplace.visualstudio.com/items?itemName=ChristianSoltenborn.GoogleTestAdapter) [![NuGet downloads](https://img.shields.io/nuget/dt/GoogleTestAdapter.svg?colorB=0c7dbe&label=nuget)](https://www.nuget.org/packages/GoogleTestAdapter) @@ -52,14 +52,14 @@ Please note that I will see your donations as appreciation of my work so far and #### Installation -[![Download from Visual Studio Marketplace](https://img.shields.io/badge/vs_marketplace-v0.16.1-blue.svg)](https://marketplace.visualstudio.com/items?itemName=ChristianSoltenborn.GoogleTestAdapter) +[![Download from Visual Studio Marketplace](https://img.shields.io/badge/vs_marketplace-v0.17.0-blue.svg)](https://marketplace.visualstudio.com/items?itemName=ChristianSoltenborn.GoogleTestAdapter) [![Download from NuGet](https://img.shields.io/nuget/vpre/GoogleTestAdapter.svg?colorB=0c7dbe&label=nuget)](https://www.nuget.org/packages/GoogleTestAdapter) [![Download from GitHub](https://img.shields.io/github/release/csoltenborn/GoogleTestAdapter/all.svg?colorB=0c7dbe&label=github)](https://github.com/csoltenborn/GoogleTestAdapter/releases) Google Test Adapter can be installed in three ways: * Install through the Visual Studio Marketplace at *Tools/Extensions and Updates* - search for *Google Test Adapter*. -* Download and launch the VSIX installer from either the [Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=ChristianSoltenborn.GoogleTestAdapter) or [GitHub](https://github.com/csoltenborn/GoogleTestAdapter/releases/download/v0.16.1/GoogleTestAdapter-0.16.1.vsix) +* Download and launch the VSIX installer from either the [Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=ChristianSoltenborn.GoogleTestAdapter) or [GitHub](https://github.com/csoltenborn/GoogleTestAdapter/releases/download/v0.17.0/GoogleTestAdapter-0.17.0.vsix) * Add a NuGet dependency to the [Google test adapter nuget package](https://www.nuget.org/packages/GoogleTestAdapter/) to your Google Test projects. Note, however, that Visual Studio integration is limited this way: VS can discover and run tests, but no debugging, options or toolbar will be available; configuration is only possible through solution config files (see below). After restarting VS, your tests will be displayed in the Test Explorer at build completion time. If no or not all tests show up, have a look at the [trouble shooting section](#trouble_shooting). diff --git a/appveyor.yml b/appveyor.yml index 4f783793a..fcc3d7e23 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 0.16.1.{build} +version: 0.17.0.{build} os: - Visual Studio 2017 configuration: Release