From fd459d26de99dda39f5f79f4029537e098294d0b Mon Sep 17 00:00:00 2001 From: Christian Soltenborn Date: Sat, 13 Apr 2019 09:48:23 +0200 Subject: [PATCH 01/19] fixed wrong serialization check --- GoogleTestAdapter/Core/Settings/RunSettings.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GoogleTestAdapter/Core/Settings/RunSettings.cs b/GoogleTestAdapter/Core/Settings/RunSettings.cs index 5ecc7a4b9..1ac996605 100644 --- a/GoogleTestAdapter/Core/Settings/RunSettings.cs +++ b/GoogleTestAdapter/Core/Settings/RunSettings.cs @@ -108,7 +108,7 @@ public RunSettings(string projectRegex) public bool ShouldSerializeDebuggingNamedPipeId() { return DebuggingNamedPipeId != null; } public virtual string SolutionDir { get; set; } - public bool ShouldSerializeSolutionDir() { return DebuggingNamedPipeId != null; } + public bool ShouldSerializeSolutionDir() { return SolutionDir != null; } public virtual string PlatformName { get; set; } public bool ShouldSerializePlatformName() { return PlatformName != null; } From b9de316047a0e274d4f6775eb620319347ec0735 Mon Sep 17 00:00:00 2001 From: Christian Soltenborn Date: Sun, 28 Apr 2019 11:58:08 +0200 Subject: [PATCH 02/19] preparing release --- GoogleTestAdapter/Packaging.GTA/VsPackage.nuspec | 2 +- .../VsPackage.GTA/Resources/ReleaseNotes/0.16.0.md | 14 ++++++++++---- README.md | 6 +++--- appveyor.yml | 2 +- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/GoogleTestAdapter/Packaging.GTA/VsPackage.nuspec b/GoogleTestAdapter/Packaging.GTA/VsPackage.nuspec index 680add415..c5915dfab 100644 --- a/GoogleTestAdapter/Packaging.GTA/VsPackage.nuspec +++ b/GoogleTestAdapter/Packaging.GTA/VsPackage.nuspec @@ -2,7 +2,7 @@ GoogleTestAdapter - 0.15.0 + 0.16.0 Google Test Adapter Christian Soltenborn Christian Soltenborn diff --git a/GoogleTestAdapter/VsPackage.GTA/Resources/ReleaseNotes/0.16.0.md b/GoogleTestAdapter/VsPackage.GTA/Resources/ReleaseNotes/0.16.0.md index b739a24a7..4324e7411 100644 --- a/GoogleTestAdapter/VsPackage.GTA/Resources/ReleaseNotes/0.16.0.md +++ b/GoogleTestAdapter/VsPackage.GTA/Resources/ReleaseNotes/0.16.0.md @@ -1,4 +1,10 @@ -* enhancement: option *Debugger engine* allows to choose *Managed and native*, which allows to debug into managed code also ([#276](https://github.com/csoltenborn/GoogleTestAdapter/issues/276)) -* enhancement: [*settings helper files*]([tokens](https://github.com/csoltenborn/GoogleTestAdapter#settings_helper_files)) allow to provide additional information to GTA at test discovery and execution time ([example project](https://github.com/csoltenborn/GoogleTestAdapter/tree/master/SampleTests/DllProject)). This feature can be used to remove the need for a special configuration file for CI, or to reduce configuration redundancy between project and GTA settings ([#278](https://github.com/csoltenborn/GoogleTestAdapter/issues/278)) -* enhancement: speedup of test discovery ([#TODO](https://github.com/csoltenborn/GoogleTestAdapter/issues/TODO)) -* usability: reorganized options ([#271](https://github.com/csoltenborn/GoogleTestAdapter/issues/271)) \ No newline at end of file +**Remark:** Visual Studio 2019 by default installs *Test Adapter for Google Test* (the MS clone of this adapter based on GTA 0.10.1); if you want to continue using GTA, you need to manually install it. In that case, make sure to uninstall TAfGT (and other test adapters which might be installed, see below), since neither can GTA and TAfGT be installed in parallel, nor does it make sense to do so. + +Changes within this version: + +* enhancement: option *Debugger engine* has new choice *Managed and native*, which allows to debug into managed code also ([#276](https://github.com/csoltenborn/GoogleTestAdapter/issues/276)) +* enhancement: [*settings helper files*](https://github.com/csoltenborn/GoogleTestAdapter#settings_helper_files) allow to provide additional information to GTA at test discovery and execution time ([example project](https://github.com/csoltenborn/GoogleTestAdapter/tree/master/SampleTests/DllProject)). This feature can be used to remove the need for a special configuration file for CI, or to reduce configuration redundancy between project and GTA settings ([#278](https://github.com/csoltenborn/GoogleTestAdapter/issues/278)) +* enhancement: speedup of test discovery. Hint: disabling or uninstalling unnecessary test adapters might also speed up test discovery ([#282](https://github.com/csoltenborn/GoogleTestAdapter/issues/282)) +* enhancement: new options allow better control of GTA output: output modes *None* and *Verbose* have been added, printing timestamp and/or severity can be disabled, output can be tagged with `[GTA]`, and summary of warnings and errors can be disabled ([#283](https://github.com/csoltenborn/GoogleTestAdapter/issues/283)) +* usability: reorganized options. Note that this potentially is a **breaking change**, since some XML options have been renamed; if your settings files happen to use these options, GTA will print a warning and tell you how to adjust them ([#271](https://github.com/csoltenborn/GoogleTestAdapter/issues/271)) +* donations: thanks to Pascal, Timothy, Jarred, Lin Chun, Anonymous, Юлиан, and the great company [GEOSLOPE](https://www.geoslope.com/) - I really appreciate it! \ No newline at end of file diff --git a/README.md b/README.md index 98db67bf8..9dd0252d0 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-121k-blue.svg)](https://marketplace.visualstudio.com/items?itemName=ChristianSoltenborn.GoogleTestAdapter) +[![Visual Studio Marketplace downloads](https://img.shields.io/badge/vs_marketplace-128k-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.15.0-blue.svg)](https://marketplace.visualstudio.com/items?itemName=ChristianSoltenborn.GoogleTestAdapter) +[![Download from Visual Studio Marketplace](https://img.shields.io/badge/vs_marketplace-v0.16.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.15.0/GoogleTestAdapter-0.15.0.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.16.0/GoogleTestAdapter-0.16.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 51bd6dfbe..fb5d9b8be 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 0.15.0.{build} +version: 0.16.0.{build} os: - Visual Studio 2017 configuration: Release From d10195d09efc033ce0ef5ebf0a233fe2aa816633 Mon Sep 17 00:00:00 2001 From: Christian Soltenborn Date: Sun, 28 Apr 2019 15:11:49 +0200 Subject: [PATCH 03/19] added version, fixed button width --- .../VsPackage.GTA/ReleaseNotes/History.cs | 3 +- .../ReleaseNotesDialog.Designer.cs | 118 +++++++++--------- .../Resources/ReleaseNotes/0.16.0.md | 2 +- .../OptionsPages/OptionsUpdater.cs | 14 +++ 4 files changed, 76 insertions(+), 61 deletions(-) diff --git a/GoogleTestAdapter/VsPackage.GTA/ReleaseNotes/History.cs b/GoogleTestAdapter/VsPackage.GTA/ReleaseNotes/History.cs index a76214905..f56290532 100644 --- a/GoogleTestAdapter/VsPackage.GTA/ReleaseNotes/History.cs +++ b/GoogleTestAdapter/VsPackage.GTA/ReleaseNotes/History.cs @@ -65,7 +65,8 @@ static History() { new Version(0, 14, 2), new DateTime(2018, 12, 16) }, { new Version(0, 14, 3), new DateTime(2019, 2, 5) }, { new Version(0, 14, 4), new DateTime(2019, 2, 24) }, - { new Version(0, 15, 0), new DateTime(2019, 3, 9) } + { new Version(0, 15, 0), new DateTime(2019, 3, 9) }, + { new Version(0, 16, 0), new DateTime(2019, 4, 28) } }; } } diff --git a/GoogleTestAdapter/VsPackage.GTA/ReleaseNotes/ReleaseNotesDialog.Designer.cs b/GoogleTestAdapter/VsPackage.GTA/ReleaseNotes/ReleaseNotesDialog.Designer.cs index 9cb54a4e5..5e6ad97af 100644 --- a/GoogleTestAdapter/VsPackage.GTA/ReleaseNotes/ReleaseNotesDialog.Designer.cs +++ b/GoogleTestAdapter/VsPackage.GTA/ReleaseNotes/ReleaseNotesDialog.Designer.cs @@ -33,17 +33,17 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - this.components = new Container(); - ComponentResourceManager resources = new ComponentResourceManager(typeof(ReleaseNotesDialog)); - this.RootPanel = new TableLayoutPanel(); - this.NavigationPanel = new FlowLayoutPanel(); - this.BackButton = new Button(); - this.ForwardButton = new Button(); - this.WebBrowser = new WebBrowser(); - this.OkButtonPanel = new TableLayoutPanel(); - this.DonateButton = new Button(); - this.OkButton = new Button(); - this.toolTip = new ToolTip(this.components); + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ReleaseNotesDialog)); + this.RootPanel = new System.Windows.Forms.TableLayoutPanel(); + this.NavigationPanel = new System.Windows.Forms.FlowLayoutPanel(); + this.BackButton = new System.Windows.Forms.Button(); + this.ForwardButton = new System.Windows.Forms.Button(); + this.WebBrowser = new System.Windows.Forms.WebBrowser(); + this.OkButtonPanel = new System.Windows.Forms.TableLayoutPanel(); + this.DonateButton = new System.Windows.Forms.Button(); + this.OkButton = new System.Windows.Forms.Button(); + this.toolTip = new System.Windows.Forms.ToolTip(this.components); this.RootPanel.SuspendLayout(); this.NavigationPanel.SuspendLayout(); this.OkButtonPanel.SuspendLayout(); @@ -52,21 +52,21 @@ private void InitializeComponent() // RootPanel // this.RootPanel.ColumnCount = 2; - this.RootPanel.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 50F)); - this.RootPanel.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 50F)); + this.RootPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.RootPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.RootPanel.Controls.Add(this.NavigationPanel, 0, 0); this.RootPanel.Controls.Add(this.WebBrowser, 0, 1); this.RootPanel.Controls.Add(this.OkButtonPanel, 0, 2); - this.RootPanel.Dock = DockStyle.Fill; - this.RootPanel.Location = new Point(0, 0); - this.RootPanel.Margin = new Padding(7); + this.RootPanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.RootPanel.Location = new System.Drawing.Point(0, 0); + this.RootPanel.Margin = new System.Windows.Forms.Padding(7); this.RootPanel.Name = "RootPanel"; this.RootPanel.RowCount = 3; - this.RootPanel.RowStyles.Add(new RowStyle()); - this.RootPanel.RowStyles.Add(new RowStyle(SizeType.Percent, 100F)); - this.RootPanel.RowStyles.Add(new RowStyle()); - this.RootPanel.RowStyles.Add(new RowStyle(SizeType.Absolute, 45F)); - this.RootPanel.Size = new Size(1829, 1251); + this.RootPanel.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.RootPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.RootPanel.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.RootPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 45F)); + this.RootPanel.Size = new System.Drawing.Size(1829, 1251); this.RootPanel.TabIndex = 0; // // NavigationPanel @@ -75,21 +75,21 @@ private void InitializeComponent() this.RootPanel.SetColumnSpan(this.NavigationPanel, 2); this.NavigationPanel.Controls.Add(this.BackButton); this.NavigationPanel.Controls.Add(this.ForwardButton); - this.NavigationPanel.Dock = DockStyle.Fill; - this.NavigationPanel.Location = new Point(7, 7); - this.NavigationPanel.Margin = new Padding(7); + this.NavigationPanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.NavigationPanel.Location = new System.Drawing.Point(7, 7); + this.NavigationPanel.Margin = new System.Windows.Forms.Padding(7); this.NavigationPanel.Name = "NavigationPanel"; - this.NavigationPanel.Size = new Size(1815, 65); + this.NavigationPanel.Size = new System.Drawing.Size(1815, 65); this.NavigationPanel.TabIndex = 3; // // BackButton // this.BackButton.AccessibleName = "Go back"; this.BackButton.Enabled = false; - this.BackButton.Location = new Point(7, 7); - this.BackButton.Margin = new Padding(7); + this.BackButton.Location = new System.Drawing.Point(7, 7); + this.BackButton.Margin = new System.Windows.Forms.Padding(7); this.BackButton.Name = "BackButton"; - this.BackButton.Size = new Size(54, 51); + this.BackButton.Size = new System.Drawing.Size(54, 51); this.BackButton.TabIndex = 3; this.BackButton.Text = "<"; this.BackButton.UseVisualStyleBackColor = true; @@ -98,10 +98,10 @@ private void InitializeComponent() // this.ForwardButton.AccessibleName = "Go forward"; this.ForwardButton.Enabled = false; - this.ForwardButton.Location = new Point(75, 7); - this.ForwardButton.Margin = new Padding(7); + this.ForwardButton.Location = new System.Drawing.Point(75, 7); + this.ForwardButton.Margin = new System.Windows.Forms.Padding(7); this.ForwardButton.Name = "ForwardButton"; - this.ForwardButton.Size = new Size(54, 51); + this.ForwardButton.Size = new System.Drawing.Size(54, 51); this.ForwardButton.TabIndex = 4; this.ForwardButton.Text = ">"; this.ForwardButton.UseVisualStyleBackColor = true; @@ -111,44 +111,44 @@ private void InitializeComponent() this.WebBrowser.AccessibleName = "Browser"; this.WebBrowser.AllowWebBrowserDrop = false; this.RootPanel.SetColumnSpan(this.WebBrowser, 2); - this.WebBrowser.Dock = DockStyle.Fill; + this.WebBrowser.Dock = System.Windows.Forms.DockStyle.Fill; this.WebBrowser.IsWebBrowserContextMenuEnabled = false; - this.WebBrowser.Location = new Point(7, 86); - this.WebBrowser.Margin = new Padding(7); - this.WebBrowser.MinimumSize = new Size(47, 45); + this.WebBrowser.Location = new System.Drawing.Point(7, 86); + this.WebBrowser.Margin = new System.Windows.Forms.Padding(7); + this.WebBrowser.MinimumSize = new System.Drawing.Size(47, 45); this.WebBrowser.Name = "WebBrowser"; this.WebBrowser.ScriptErrorsSuppressed = true; - this.WebBrowser.Size = new Size(1815, 1079); + this.WebBrowser.Size = new System.Drawing.Size(1815, 1079); this.WebBrowser.TabIndex = 2; this.WebBrowser.WebBrowserShortcutsEnabled = false; - this.WebBrowser.Navigating += new WebBrowserNavigatingEventHandler(this.WebBrowser_Navigating); + this.WebBrowser.Navigating += new System.Windows.Forms.WebBrowserNavigatingEventHandler(this.WebBrowser_Navigating); // // OkButtonPanel // - this.OkButtonPanel.Anchor = ((AnchorStyles)((AnchorStyles.Left | AnchorStyles.Right))); + this.OkButtonPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.OkButtonPanel.AutoSize = true; this.OkButtonPanel.ColumnCount = 2; this.RootPanel.SetColumnSpan(this.OkButtonPanel, 2); - this.OkButtonPanel.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.33333F)); - this.OkButtonPanel.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.33333F)); + this.OkButtonPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33333F)); + this.OkButtonPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33333F)); this.OkButtonPanel.Controls.Add(this.DonateButton, 0, 0); this.OkButtonPanel.Controls.Add(this.OkButton, 1, 0); - this.OkButtonPanel.Location = new Point(7, 1179); - this.OkButtonPanel.Margin = new Padding(7); + this.OkButtonPanel.Location = new System.Drawing.Point(7, 1179); + this.OkButtonPanel.Margin = new System.Windows.Forms.Padding(7); this.OkButtonPanel.Name = "OkButtonPanel"; this.OkButtonPanel.RowCount = 1; - this.OkButtonPanel.RowStyles.Add(new RowStyle(SizeType.Percent, 100F)); - this.OkButtonPanel.Size = new Size(1815, 65); + this.OkButtonPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.OkButtonPanel.Size = new System.Drawing.Size(1815, 65); this.OkButtonPanel.TabIndex = 4; // // DonateButton // this.DonateButton.AccessibleName = "Close release notes dialog"; - this.DonateButton.Anchor = AnchorStyles.None; - this.DonateButton.Location = new Point(303, 7); - this.DonateButton.Margin = new Padding(7); + this.DonateButton.Anchor = System.Windows.Forms.AnchorStyles.None; + this.DonateButton.Location = new System.Drawing.Point(303, 7); + this.DonateButton.Margin = new System.Windows.Forms.Padding(7); this.DonateButton.Name = "DonateButton"; - this.DonateButton.Size = new Size(301, 51); + this.DonateButton.Size = new System.Drawing.Size(301, 51); this.DonateButton.TabIndex = 0; this.DonateButton.Text = "Cool - I want to donate!"; this.DonateButton.UseVisualStyleBackColor = true; @@ -156,12 +156,12 @@ private void InitializeComponent() // OkButton // this.OkButton.AccessibleName = "Close release notes dialog"; - this.OkButton.Anchor = AnchorStyles.None; - this.OkButton.DialogResult = DialogResult.Cancel; - this.OkButton.Location = new Point(1273, 7); - this.OkButton.Margin = new Padding(7); + this.OkButton.Anchor = System.Windows.Forms.AnchorStyles.None; + this.OkButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.OkButton.Location = new System.Drawing.Point(1231, 7); + this.OkButton.Margin = new System.Windows.Forms.Padding(7); this.OkButton.Name = "OkButton"; - this.OkButton.Size = new Size(175, 51); + this.OkButton.Size = new System.Drawing.Size(260, 51); this.OkButton.TabIndex = 1; this.OkButton.Text = "Thanks anyways..."; this.OkButton.UseVisualStyleBackColor = true; @@ -170,16 +170,16 @@ private void InitializeComponent() // this.AcceptButton = this.OkButton; this.AccessibleName = "Release notes of Google Test Adapter"; - this.AutoScaleDimensions = new SizeF(14F, 29F); - this.AutoScaleMode = AutoScaleMode.Font; + this.AutoScaleDimensions = new System.Drawing.SizeF(14F, 29F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.OkButton; this.CausesValidation = false; - this.ClientSize = new Size(1829, 1251); + this.ClientSize = new System.Drawing.Size(1829, 1251); this.Controls.Add(this.RootPanel); - this.Icon = ((Icon)(resources.GetObject("$this.Icon"))); - this.Margin = new Padding(7); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.Margin = new System.Windows.Forms.Padding(7); this.Name = "ReleaseNotesDialog"; - this.StartPosition = FormStartPosition.CenterParent; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Google Test Adapter: Release notes"; this.RootPanel.ResumeLayout(false); this.RootPanel.PerformLayout(); diff --git a/GoogleTestAdapter/VsPackage.GTA/Resources/ReleaseNotes/0.16.0.md b/GoogleTestAdapter/VsPackage.GTA/Resources/ReleaseNotes/0.16.0.md index 4324e7411..d0df90f18 100644 --- a/GoogleTestAdapter/VsPackage.GTA/Resources/ReleaseNotes/0.16.0.md +++ b/GoogleTestAdapter/VsPackage.GTA/Resources/ReleaseNotes/0.16.0.md @@ -1,4 +1,4 @@ -**Remark:** Visual Studio 2019 by default installs *Test Adapter for Google Test* (the MS clone of this adapter based on GTA 0.10.1); if you want to continue using GTA, you need to manually install it. In that case, make sure to uninstall TAfGT (and other test adapters which might be installed, see below), since neither can GTA and TAfGT be installed in parallel, nor does it make sense to do so. +**Remark:** Visual Studio 2019 by default installs *Test Adapter for Google Test* (the MS clone based on GTA 0.10.1); if you want to continue using GTA, you need to manually install it. In that case, make sure to uninstall TAfGT (and other test adapters which might not be needed, see below), since neither can GTA and TAfGT be installed in parallel, nor does it make sense to do so. Changes within this version: diff --git a/GoogleTestAdapter/VsPackage.Shared/OptionsPages/OptionsUpdater.cs b/GoogleTestAdapter/VsPackage.Shared/OptionsPages/OptionsUpdater.cs index 962d591df..5916cbeab 100644 --- a/GoogleTestAdapter/VsPackage.Shared/OptionsPages/OptionsUpdater.cs +++ b/GoogleTestAdapter/VsPackage.Shared/OptionsPages/OptionsUpdater.cs @@ -93,6 +93,8 @@ private void UpdateSettings() if (GetAndDeleteValue(GeneralOptionsPage, nameof(IGoogleTestAdapterSettings.DebugMode), bool.Parse, out var debugMode)) { _generalOptions.OutputMode = debugMode ? OutputMode.Debug : OutputMode.Info; } if (GetAndDeleteValue(GeneralOptionsPage, nameof(IGoogleTestAdapterSettings.TimestampOutput), bool.Parse, out bool timestampOutput)) { _generalOptions.TimestampMode = GetTimestampMode(timestampOutput); } GetAndDeleteValue(GeneralOptionsPage, nameof(IGoogleTestAdapterSettings.ShowReleaseNotes), bool.Parse, out _); + + DeleteSubkey(ParallelizationOptionsPage); } private static bool GetAndDeleteValue(string optionsKey, string propertyName, Func map, out T value) @@ -119,6 +121,18 @@ private static bool GetAndDeleteValue(string optionsKey, string propertyName, return false; } + private static void DeleteSubkey(string subkey) + { + try + { + Registry.CurrentUser.DeleteSubKey(subkey); + } + catch (Exception) + { + // too bad + } + } + private TimestampMode GetTimestampMode(bool timestampOutput) { if (timestampOutput) From 769dbc1bc874c0c6dab130aabc60998f02919424 Mon Sep 17 00:00:00 2001 From: Christian Soltenborn Date: Sun, 28 Apr 2019 17:21:19 +0200 Subject: [PATCH 04/19] fixed link to example project and typo --- .../VsPackage.GTA/Resources/ReleaseNotes/0.16.0.md | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/GoogleTestAdapter/VsPackage.GTA/Resources/ReleaseNotes/0.16.0.md b/GoogleTestAdapter/VsPackage.GTA/Resources/ReleaseNotes/0.16.0.md index d0df90f18..8f2efa9f8 100644 --- a/GoogleTestAdapter/VsPackage.GTA/Resources/ReleaseNotes/0.16.0.md +++ b/GoogleTestAdapter/VsPackage.GTA/Resources/ReleaseNotes/0.16.0.md @@ -3,7 +3,7 @@ Changes within this version: * enhancement: option *Debugger engine* has new choice *Managed and native*, which allows to debug into managed code also ([#276](https://github.com/csoltenborn/GoogleTestAdapter/issues/276)) -* enhancement: [*settings helper files*](https://github.com/csoltenborn/GoogleTestAdapter#settings_helper_files) allow to provide additional information to GTA at test discovery and execution time ([example project](https://github.com/csoltenborn/GoogleTestAdapter/tree/master/SampleTests/DllProject)). This feature can be used to remove the need for a special configuration file for CI, or to reduce configuration redundancy between project and GTA settings ([#278](https://github.com/csoltenborn/GoogleTestAdapter/issues/278)) +* enhancement: [*settings helper files*](https://github.com/csoltenborn/GoogleTestAdapter#settings_helper_files) allow to provide additional information to GTA at test discovery and execution time ([example project](https://github.com/csoltenborn/GoogleTestAdapter/tree/master/SampleTests/HelperFileTests)). This feature can be used to remove the need for a special configuration file for CI, or to reduce configuration redundancy between project and GTA settings ([#278](https://github.com/csoltenborn/GoogleTestAdapter/issues/278)) * enhancement: speedup of test discovery. Hint: disabling or uninstalling unnecessary test adapters might also speed up test discovery ([#282](https://github.com/csoltenborn/GoogleTestAdapter/issues/282)) * enhancement: new options allow better control of GTA output: output modes *None* and *Verbose* have been added, printing timestamp and/or severity can be disabled, output can be tagged with `[GTA]`, and summary of warnings and errors can be disabled ([#283](https://github.com/csoltenborn/GoogleTestAdapter/issues/283)) * usability: reorganized options. Note that this potentially is a **breaking change**, since some XML options have been renamed; if your settings files happen to use these options, GTA will print a warning and tell you how to adjust them ([#271](https://github.com/csoltenborn/GoogleTestAdapter/issues/271)) diff --git a/README.md b/README.md index 9dd0252d0..c6dafff99 100644 --- a/README.md +++ b/README.md @@ -94,7 +94,7 @@ Note that due to the overriding hierarchy described above, you probably want to For reference, see a settings file [AllTestSettings.gta.runsettings](https://raw.githubusercontent.com/csoltenborn/GoogleTestAdapter/master/GoogleTestAdapter/Resources/AllTestSettings.gta.runsettings) containing all available settings, a more realistic solution settings file [SampleTests.gta.runsettings](https://raw.githubusercontent.com/csoltenborn/GoogleTestAdapter/master/SampleTests/SampleTests.gta.runsettings) as delivered with the SampleTests solution, and a user settings file [NonDeterministic.runsettings](https://raw.githubusercontent.com/csoltenborn/GoogleTestAdapter/master/SampleTests/NonDeterministic.runsettings) as used by GTA's end-to-end tests. The syntax of the GTA settings files (excluding the `` node) is specified by [this schema](https://raw.githubusercontent.com/csoltenborn/GoogleTestAdapter/master/GoogleTestAdapter/TestAdapter/GoogleTestAdapterSettings.xsd). ##### Settings helper files -GTA does not provide direct access to VS project settings such as *Project* > *Properties* > *Debugging* > *Environment*. Additionally, when run as NuGet dependency, GTA does not have access to information such as solution dir or Platform/Configuration a test executable has been build with. +GTA does not provide direct access to VS project settings such as *Project* > *Properties* > *Debugging* > *Environment*. Additionally, when run as NuGet dependency, GTA does not have access to information such as solution dir or Platform/Configuration a test executable has been built with. To overcome these problems, GTA supports so-called *settings helper files* which provide that information to GTA. Helper files are usually generated as part of the build, e.g. within a post-build event, which might look like this: From 849b0f60ddc45dfc982f9de2f44a39712d98569d Mon Sep 17 00:00:00 2001 From: Christian Soltenborn Date: Fri, 3 May 2019 06:52:16 +0200 Subject: [PATCH 05/19] changed upper version --- .../Packaging.GTA/source.extension.vsixmanifest | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/GoogleTestAdapter/Packaging.GTA/source.extension.vsixmanifest b/GoogleTestAdapter/Packaging.GTA/source.extension.vsixmanifest index cbd4155ad..70812a009 100644 --- a/GoogleTestAdapter/Packaging.GTA/source.extension.vsixmanifest +++ b/GoogleTestAdapter/Packaging.GTA/source.extension.vsixmanifest @@ -11,14 +11,13 @@ Unit Test, C++, Google Test, GoogleTest, GTest, Test Explorer, Testing - - - - + + + + - @@ -28,7 +27,7 @@ - - + + From db6f65b2a645da48a78fcdead715e86e92e747a2 Mon Sep 17 00:00:00 2001 From: Christian Soltenborn Date: Sat, 4 May 2019 18:22:24 +0200 Subject: [PATCH 06/19] preparing release --- GoogleTestAdapter/Packaging.GTA/VsPackage.nuspec | 2 +- GoogleTestAdapter/VsPackage.GTA/ReleaseNotes/History.cs | 3 ++- .../VsPackage.GTA/Resources/ReleaseNotes/0.16.1.md | 1 + GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj | 3 +++ README.md | 6 +++--- appveyor.yml | 2 +- 6 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 GoogleTestAdapter/VsPackage.GTA/Resources/ReleaseNotes/0.16.1.md diff --git a/GoogleTestAdapter/Packaging.GTA/VsPackage.nuspec b/GoogleTestAdapter/Packaging.GTA/VsPackage.nuspec index c5915dfab..bfb2282ee 100644 --- a/GoogleTestAdapter/Packaging.GTA/VsPackage.nuspec +++ b/GoogleTestAdapter/Packaging.GTA/VsPackage.nuspec @@ -2,7 +2,7 @@ GoogleTestAdapter - 0.16.0 + 0.16.1 Google Test Adapter Christian Soltenborn Christian Soltenborn diff --git a/GoogleTestAdapter/VsPackage.GTA/ReleaseNotes/History.cs b/GoogleTestAdapter/VsPackage.GTA/ReleaseNotes/History.cs index f56290532..0b0716afd 100644 --- a/GoogleTestAdapter/VsPackage.GTA/ReleaseNotes/History.cs +++ b/GoogleTestAdapter/VsPackage.GTA/ReleaseNotes/History.cs @@ -66,7 +66,8 @@ static History() { new Version(0, 14, 3), new DateTime(2019, 2, 5) }, { 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, 0), new DateTime(2019, 4, 28) }, + { new Version(0, 16, 1), new DateTime(2019, 5, 4) } }; } } diff --git a/GoogleTestAdapter/VsPackage.GTA/Resources/ReleaseNotes/0.16.1.md b/GoogleTestAdapter/VsPackage.GTA/Resources/ReleaseNotes/0.16.1.md new file mode 100644 index 000000000..9efd4a9de --- /dev/null +++ b/GoogleTestAdapter/VsPackage.GTA/Resources/ReleaseNotes/0.16.1.md @@ -0,0 +1 @@ +* enhancement: GTA can now also be installed into VS 2019 16.1 Preview 2 ([#286](https://github.com/csoltenborn/GoogleTestAdapter/issues/286), thanks to [Thomas Krogstad](https://github.com/trkrogstad) for report and testing) \ No newline at end of file diff --git a/GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj b/GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj index c41375c23..019b2b0da 100644 --- a/GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj +++ b/GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj @@ -232,6 +232,9 @@ PreserveNewest + + PreserveNewest + diff --git a/README.md b/README.md index c6dafff99..4ee305a2b 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-128k-blue.svg)](https://marketplace.visualstudio.com/items?itemName=ChristianSoltenborn.GoogleTestAdapter) +[![Visual Studio Marketplace downloads](https://img.shields.io/badge/vs_marketplace-130k-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.0-blue.svg)](https://marketplace.visualstudio.com/items?itemName=ChristianSoltenborn.GoogleTestAdapter) +[![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 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.0/GoogleTestAdapter-0.16.0.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.16.1/GoogleTestAdapter-0.16.1.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 fb5d9b8be..4f783793a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 0.16.0.{build} +version: 0.16.1.{build} os: - Visual Studio 2017 configuration: Release From 73de762a52e5e73869e54a9667f8e984107392aa Mon Sep 17 00:00:00 2001 From: Christian Soltenborn Date: Sun, 6 Oct 2019 13:49:55 +0200 Subject: [PATCH 07/19] updated AppVeyor build, fixed some tests --- .../Core.Tests/GoogleTestDiscovererTests.cs | 10 +- .../DiaResolver.Tests/DiaResolverTests.cs | 2 +- ...nsoleDllTests__HardCrashingSampleTests.xml | 8 +- ...ampleTests_Settings_Coverage_Isolation.xml | 8 +- ...sts170_Settings_Coverage_Type_EQ_Small.xml | 16 +- ...h_AddPassesWithTraits_OR_Type_EQ_Small.xml | 16 +- ...tionProjectSettings_Coverage_Isolation.xml | 144 +++++++++--------- ...h_AddPassesWithTraits_OR_Type_EQ_Small.xml | 16 +- ...Tests_Coverage_Isolation_Type_EQ_Small.xml | 16 +- ...h_AddPassesWithTraits_OR_Type_EQ_Small.xml | 16 +- ...ts__SampleTests_Settings_Type_EQ_Small.xml | 16 +- ...tionProjectSettings_Coverage_Isolation.xml | 144 +++++++++--------- appveyor.yml | 2 +- 13 files changed, 207 insertions(+), 207 deletions(-) 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/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/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__HardCrashingSampleTests.xml b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__HardCrashingSampleTests.xml index 8bb6c2314..f7ae9c814 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..a5516f6fb 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..b1ff818f5 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..8db54b052 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..9138cd011 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..753e11839 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..efe91b775 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..ad0e62fee 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..d0ae1be02 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..dc7b7d3a0 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/appveyor.yml b/appveyor.yml index 4f783793a..d06dfb29b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ version: 0.16.1.{build} os: -- Visual Studio 2017 +- Visual Studio 2019 configuration: Release platform: Any CPU environment: From 97e99d54f4d7c566239406d4b7e432578ea20ef0 Mon Sep 17 00:00:00 2001 From: Christian Soltenborn Date: Sun, 6 Oct 2019 14:05:15 +0200 Subject: [PATCH 08/19] Revert "updated AppVeyor build, fixed some tests" This reverts commit 73de762a52e5e73869e54a9667f8e984107392aa. --- .../Core.Tests/GoogleTestDiscovererTests.cs | 10 +- .../DiaResolver.Tests/DiaResolverTests.cs | 2 +- ...nsoleDllTests__HardCrashingSampleTests.xml | 8 +- ...ampleTests_Settings_Coverage_Isolation.xml | 8 +- ...sts170_Settings_Coverage_Type_EQ_Small.xml | 16 +- ...h_AddPassesWithTraits_OR_Type_EQ_Small.xml | 16 +- ...tionProjectSettings_Coverage_Isolation.xml | 144 +++++++++--------- ...h_AddPassesWithTraits_OR_Type_EQ_Small.xml | 16 +- ...Tests_Coverage_Isolation_Type_EQ_Small.xml | 16 +- ...h_AddPassesWithTraits_OR_Type_EQ_Small.xml | 16 +- ...ts__SampleTests_Settings_Type_EQ_Small.xml | 16 +- ...tionProjectSettings_Coverage_Isolation.xml | 144 +++++++++--------- appveyor.yml | 2 +- 13 files changed, 207 insertions(+), 207 deletions(-) diff --git a/GoogleTestAdapter/Core.Tests/GoogleTestDiscovererTests.cs b/GoogleTestAdapter/Core.Tests/GoogleTestDiscovererTests.cs index 19698fa9e..75a978889 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().ContainEquivalentOf(@"sampletests\tests\main.cpp"); + exitCodeTestCase.CodeFilePath.Should().Contain(@"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().EndWithEquivalent(@"sampletests\tests\fixturetests.cpp"); + testCase.CodeFilePath.Should().EndWith(@"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().EndWithEquivalent(@"sampletests\tests\typeparameterizedtests.cpp"); + testCase.CodeFilePath.Should().EndWith(@"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().BeEquivalentTo(expectedCodeFilePath); + testCases[0].CodeFilePath.Should().Be(expectedCodeFilePath); testCases[0].LineNumber.Should().Be(5); testCases[1].DisplayName.Should().Be("Failing.InvokeFunction"); - testCases[1].CodeFilePath.Should().BeEquivalentTo(expectedCodeFilePath); + testCases[1].CodeFilePath.Should().Be(expectedCodeFilePath); testCases[1].LineNumber.Should().Be(10); } diff --git a/GoogleTestAdapter/DiaResolver.Tests/DiaResolverTests.cs b/GoogleTestAdapter/DiaResolver.Tests/DiaResolverTests.cs index c85e70c11..2b7889c35 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, - 88); + 90); } [TestMethod] diff --git a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__HardCrashingSampleTests.xml b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__HardCrashingSampleTests.xml index f7ae9c814..8bb6c2314 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 a5516f6fb..0c96ca7e4 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 b1ff818f5..01b933f15 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 8db54b052..a06afcc6b 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 9138cd011..5928a68e2 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 753e11839..f60935cc1 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 efe91b775..ff03e58a1 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 ad0e62fee..f8353aa21 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 d0ae1be02..2be9bf792 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 dc7b7d3a0..164d44c23 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/appveyor.yml b/appveyor.yml index d06dfb29b..4f783793a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ version: 0.16.1.{build} os: -- Visual Studio 2019 +- Visual Studio 2017 configuration: Release platform: Any CPU environment: From 4479406123c6577d908313229a58d58fe7dca323 Mon Sep 17 00:00:00 2001 From: Christian Soltenborn Date: Sun, 6 Oct 2019 15:49:15 +0200 Subject: [PATCH 09/19] improved test stability --- .../Core.Tests/GoogleTestDiscovererTests.cs | 10 +- .../DiaResolver.Tests/DiaResolverTests.cs | 2 +- .../Tests.Common/Resources/Trx2TestRun.xslt | 7 +- ...nsoleDllTests__HardCrashingSampleTests.xml | 8 +- ...ampleTests_Settings_Coverage_Isolation.xml | 8 +- ...sts170_Settings_Coverage_Type_EQ_Small.xml | 16 +- ...h_AddPassesWithTraits_OR_Type_EQ_Small.xml | 16 +- ...tionProjectSettings_Coverage_Isolation.xml | 144 +++++++++--------- ...h_AddPassesWithTraits_OR_Type_EQ_Small.xml | 16 +- ...Tests_Coverage_Isolation_Type_EQ_Small.xml | 16 +- ...h_AddPassesWithTraits_OR_Type_EQ_Small.xml | 16 +- ...ts__SampleTests_Settings_Type_EQ_Small.xml | 16 +- ...tionProjectSettings_Coverage_Isolation.xml | 144 +++++++++--------- 13 files changed, 212 insertions(+), 207 deletions(-) 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/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/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/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 From d8aa6495f007adf692426b8cb3cb61b281fcb01b Mon Sep 17 00:00:00 2001 From: Christian Soltenborn Date: Wed, 25 Sep 2019 20:25:41 +0200 Subject: [PATCH 10/19] added option to configure how non-executable tests are reported to VS --- GoogleTestAdapter/Common/Common.csproj | 1 + .../Common/MissingTestsReportMode.cs | 28 +++++++++++ .../Core/Runners/SequentialTestRunner.cs | 2 +- .../Core/Runners/TestResultCollector.cs | 48 ++++++++++++++----- .../Settings/IGoogleTestAdapterSettings.cs | 2 + .../Core/Settings/RunSettings.cs | 3 ++ .../Core/Settings/SettingsWrapper.cs | 8 ++++ .../Resources/AllTestSettings.gta.runsettings | 1 + .../TestAdapter/GoogleTestAdapterSettings.xsd | 9 ++++ GoogleTestAdapter/Tests.Common/TestsBase.cs | 2 + .../GoogleTestExtensionOptionsPage.cs | 1 + .../TestExecutionOptionsDialogPage.cs | 12 +++++ 12 files changed, 103 insertions(+), 14 deletions(-) create mode 100644 GoogleTestAdapter/Common/MissingTestsReportMode.cs 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..bb3a2fbe0 --- /dev/null +++ b/GoogleTestAdapter/Common/MissingTestsReportMode.cs @@ -0,0 +1,28 @@ +using System.Collections.Generic; +using System.ComponentModel; + +namespace GoogleTestAdapter.Common +{ + [TypeConverter(typeof(MissingTestsReportModeConverter))] + public enum MissingTestsReportMode + { + DoNotReport, + ReportAsSkipped, + ReportAsFailed + } + + public class MissingTestsReportModeConverter : EnumConverterBase + { + public const string DoNotReport = "Do not report"; + public const string ReportAsSkipped = "Report as skipped"; + public const string ReportAsFailed = "Report as failed"; + + public MissingTestsReportModeConverter() : base(new Dictionary + { + { MissingTestsReportMode.DoNotReport, DoNotReport}, + { MissingTestsReportMode.ReportAsSkipped, ReportAsSkipped}, + { MissingTestsReportMode.ReportAsFailed, ReportAsFailed}, + }) {} + } + +} \ No newline at end of file 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..82b30a279 100644 --- a/GoogleTestAdapter/Core/Runners/TestResultCollector.cs +++ b/GoogleTestAdapter/Core/Runners/TestResultCollector.cs @@ -3,6 +3,7 @@ using System.Linq; using GoogleTestAdapter.Common; using GoogleTestAdapter.Model; +using GoogleTestAdapter.Settings; using GoogleTestAdapter.TestResults; namespace GoogleTestAdapter.Runners @@ -10,12 +11,15 @@ namespace GoogleTestAdapter.Runners public class TestResultCollector { 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 +46,7 @@ public List CollectTestResults(IEnumerable testCasesRun, s if (crashedTestCase != null) CreateMissingResults(remainingTestCases, crashedTestCase, testResults); else - ReportSuspiciousTestCases(remainingTestCases); + ReportSuspiciousTestCases(remainingTestCases, testResults); } return testResults; @@ -84,25 +88,43 @@ 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 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}"); + + string errorMessage = "Test case has not been run due to unkown reasons"; + switch (_settings.MissingTestsReportMode) + { + case MissingTestsReportMode.DoNotReport: + // nothing to do + break; + case MissingTestsReportMode.ReportAsFailed: + testResults.AddRange(testCases.Select(tc => CreateTestResult(tc, TestOutcome.Failed, errorMessage, null))); + break; + case MissingTestsReportMode.ReportAsSkipped: + testResults.AddRange(testCases.Select(tc => CreateTestResult(tc, TestOutcome.Skipped, errorMessage, null))); + break; + } + } + + 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..98be029a4 100644 --- a/GoogleTestAdapter/Core/Settings/SettingsWrapper.cs +++ b/GoogleTestAdapter/Core/Settings/SettingsWrapper.cs @@ -452,6 +452,14 @@ public virtual int MaxNrOfThreads } } + public const string OptionMissingTestsReportMode = "Behavior if discovered tests can not be run"; + public const string OptionMissingTestsReportModeDescription = + "If a test can not be run (e.g. since 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."; + public const MissingTestsReportMode OptionMissingTestsReportModeDefaultValue = MissingTestsReportMode.ReportAsFailed; + + public virtual MissingTestsReportMode MissingTestsReportMode => + _currentSettings.MissingTestsReportMode ?? OptionMissingTestsReportModeDefaultValue; + #endregion #region TestDiscoveryOptionsPage 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/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/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.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 } From 173dc1470d3cd783d9aadfffbf75e4e2cfc7c0b2 Mon Sep 17 00:00:00 2001 From: Christian Soltenborn Date: Sun, 6 Oct 2019 13:46:03 +0200 Subject: [PATCH 11/19] fixed tests, added some more tests --- .../Common/MissingTestsReportMode.cs | 3 + .../Core/Runners/TestResultCollector.cs | 36 +++++-- .../Core/Settings/SettingsWrapper.cs | 7 +- .../TestExecutorParallelTests.cs | 12 ++- .../TestExecutorSequentialTests.cs | 9 +- ...cutorSequentialTests_FrameworkDebugging.cs | 95 ++++++++++++++++++- .../TestExecutorTestsBase.cs | 10 +- 7 files changed, 147 insertions(+), 25 deletions(-) diff --git a/GoogleTestAdapter/Common/MissingTestsReportMode.cs b/GoogleTestAdapter/Common/MissingTestsReportMode.cs index bb3a2fbe0..ae30030ca 100644 --- a/GoogleTestAdapter/Common/MissingTestsReportMode.cs +++ b/GoogleTestAdapter/Common/MissingTestsReportMode.cs @@ -7,6 +7,7 @@ namespace GoogleTestAdapter.Common public enum MissingTestsReportMode { DoNotReport, + ReportAsNotFound, ReportAsSkipped, ReportAsFailed } @@ -14,12 +15,14 @@ public enum MissingTestsReportMode 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}, }) {} diff --git a/GoogleTestAdapter/Core/Runners/TestResultCollector.cs b/GoogleTestAdapter/Core/Runners/TestResultCollector.cs index 82b30a279..8961f9207 100644 --- a/GoogleTestAdapter/Core/Runners/TestResultCollector.cs +++ b/GoogleTestAdapter/Core/Runners/TestResultCollector.cs @@ -10,6 +10,12 @@ 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; @@ -96,22 +102,34 @@ private void CreateMissingResults(TestCase[] testCases, TestCase crashedTestCase 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}"); - string errorMessage = "Test case has not been run due to unkown reasons"; + _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: - // nothing to do - break; + return null; case MissingTestsReportMode.ReportAsFailed: - testResults.AddRange(testCases.Select(tc => CreateTestResult(tc, TestOutcome.Failed, errorMessage, null))); - break; + return TestOutcome.Failed; case MissingTestsReportMode.ReportAsSkipped: - testResults.AddRange(testCases.Select(tc => CreateTestResult(tc, TestOutcome.Skipped, errorMessage, null))); - break; + return TestOutcome.Skipped; + case MissingTestsReportMode.ReportAsNotFound: + return TestOutcome.NotFound; + default: + throw new InvalidOperationException($"Unknown {nameof(MissingTestsReportMode)}: {_settings.MissingTestsReportMode}"); } } diff --git a/GoogleTestAdapter/Core/Settings/SettingsWrapper.cs b/GoogleTestAdapter/Core/Settings/SettingsWrapper.cs index 98be029a4..f3c80e05a 100644 --- a/GoogleTestAdapter/Core/Settings/SettingsWrapper.cs +++ b/GoogleTestAdapter/Core/Settings/SettingsWrapper.cs @@ -452,10 +452,11 @@ public virtual int MaxNrOfThreads } } - public const string OptionMissingTestsReportMode = "Behavior if discovered tests can not be run"; + public const string OptionMissingTestsReportMode = "Behavior for missing test results"; public const string OptionMissingTestsReportModeDescription = - "If a test can not be run (e.g. since 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."; - public const MissingTestsReportMode OptionMissingTestsReportModeDefaultValue = MissingTestsReportMode.ReportAsFailed; + "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; 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] From fb326e92e91fbd87cd510cc47a8601a9c3367b8f Mon Sep 17 00:00:00 2001 From: Christian Soltenborn Date: Sun, 6 Oct 2019 18:22:34 +0200 Subject: [PATCH 12/19] preparing release --- GoogleTestAdapter/Packaging.GTA/VsPackage.nuspec | 2 +- GoogleTestAdapter/VsPackage.GTA/ReleaseNotes/History.cs | 3 ++- .../VsPackage.GTA/Resources/ReleaseNotes/0.17.0.md | 2 ++ GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj | 3 +++ README.md | 6 +++--- appveyor.yml | 2 +- 6 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 GoogleTestAdapter/VsPackage.GTA/Resources/ReleaseNotes/0.17.0.md 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/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/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 From 21282f95956b9ff179145e75e22cbee7ee53e2da Mon Sep 17 00:00:00 2001 From: Christian Soltenborn Date: Sat, 12 Oct 2019 08:14:43 +0200 Subject: [PATCH 13/19] bugfix: added missing enum literal to GoogleTestAdapterSettings.xsd --- GoogleTestAdapter/TestAdapter/GoogleTestAdapterSettings.xsd | 1 + 1 file changed, 1 insertion(+) diff --git a/GoogleTestAdapter/TestAdapter/GoogleTestAdapterSettings.xsd b/GoogleTestAdapter/TestAdapter/GoogleTestAdapterSettings.xsd index 78ddcfd85..be58e8a22 100644 --- a/GoogleTestAdapter/TestAdapter/GoogleTestAdapterSettings.xsd +++ b/GoogleTestAdapter/TestAdapter/GoogleTestAdapterSettings.xsd @@ -141,6 +141,7 @@ + From 283b7f1edc9e8dcd3242c8324fe153401534188c Mon Sep 17 00:00:00 2001 From: Christian Soltenborn Date: Sat, 12 Oct 2019 08:17:20 +0200 Subject: [PATCH 14/19] preparing release --- GoogleTestAdapter/Packaging.GTA/VsPackage.nuspec | 2 +- GoogleTestAdapter/VsPackage.GTA/ReleaseNotes/History.cs | 3 ++- .../VsPackage.GTA/Resources/ReleaseNotes/0.17.1.md | 1 + GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj | 3 +++ README.md | 4 ++-- appveyor.yml | 2 +- 6 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 GoogleTestAdapter/VsPackage.GTA/Resources/ReleaseNotes/0.17.1.md diff --git a/GoogleTestAdapter/Packaging.GTA/VsPackage.nuspec b/GoogleTestAdapter/Packaging.GTA/VsPackage.nuspec index 83bc51853..41f4da72b 100644 --- a/GoogleTestAdapter/Packaging.GTA/VsPackage.nuspec +++ b/GoogleTestAdapter/Packaging.GTA/VsPackage.nuspec @@ -2,7 +2,7 @@ GoogleTestAdapter - 0.17.0 + 0.17.1 Google Test Adapter Christian Soltenborn Christian Soltenborn diff --git a/GoogleTestAdapter/VsPackage.GTA/ReleaseNotes/History.cs b/GoogleTestAdapter/VsPackage.GTA/ReleaseNotes/History.cs index fe6116299..42a2448d9 100644 --- a/GoogleTestAdapter/VsPackage.GTA/ReleaseNotes/History.cs +++ b/GoogleTestAdapter/VsPackage.GTA/ReleaseNotes/History.cs @@ -68,7 +68,8 @@ static History() { 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, 17, 0), new DateTime(2019, 10, 6) } + { new Version(0, 17, 0), new DateTime(2019, 10, 6) }, + { new Version(0, 17, 1), new DateTime(2019, 10, 12) } }; } } diff --git a/GoogleTestAdapter/VsPackage.GTA/Resources/ReleaseNotes/0.17.1.md b/GoogleTestAdapter/VsPackage.GTA/Resources/ReleaseNotes/0.17.1.md new file mode 100644 index 000000000..07ffdf2bb --- /dev/null +++ b/GoogleTestAdapter/VsPackage.GTA/Resources/ReleaseNotes/0.17.1.md @@ -0,0 +1 @@ +* bugfix: adapter settings and debugging were broken if option *Behavior for missing test results* was set to *Report as not found* ([#298](https://github.com/csoltenborn/GoogleTestAdapter/issues/298)) \ No newline at end of file diff --git a/GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj b/GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj index c9d496c12..72c833d6c 100644 --- a/GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj +++ b/GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj @@ -238,6 +238,9 @@ PreserveNewest + + PreserveNewest + diff --git a/README.md b/README.md index d5d4982ad..8c3e94e1e 100644 --- a/README.md +++ b/README.md @@ -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.17.0-blue.svg)](https://marketplace.visualstudio.com/items?itemName=ChristianSoltenborn.GoogleTestAdapter) +[![Download from Visual Studio Marketplace](https://img.shields.io/badge/vs_marketplace-v0.17.1-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.17.0/GoogleTestAdapter-0.17.0.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.1/GoogleTestAdapter-0.17.1.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 fcc3d7e23..d5c4bceae 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 0.17.0.{build} +version: 0.17.1.{build} os: - Visual Studio 2017 configuration: Release From aa02435bc5141e7af407a5ba42a900d6dea52108 Mon Sep 17 00:00:00 2001 From: Christian Soltenborn Date: Sat, 19 Oct 2019 07:58:32 +0200 Subject: [PATCH 15/19] added option to set environment variables without affecting the global environment --- .../Core.Tests/Core.Tests.csproj | 1 + .../Core.Tests/GoogleTestDiscovererTests.cs | 6 +- .../Helpers/DotNetProcessExecutorTests.cs | 13 ++ .../EnvironmentVariablesParserTests.cs | 160 ++++++++++++++++++ .../Runners/SequentialTestRunnerTests.cs | 27 ++- .../Settings/SettingsWrapperTests.cs | 94 +++++++++- GoogleTestAdapter/Core/Core.csproj | 1 + .../Helpers/EnvironmentVariablesParser.cs | 92 ++++++++++ GoogleTestAdapter/Core/Helpers/Utils.cs | 7 + .../Contracts/IProcessExecutor.cs | 5 +- .../ProcessExecution/DotNetProcessExecutor.cs | 6 +- .../Core/Runners/SequentialTestRunner.cs | 27 ++- .../Settings/IGoogleTestAdapterSettings.cs | 2 + .../Core/Settings/PlaceholderReplacer.cs | 40 +++++ .../Core/Settings/RunSettings.cs | 3 + .../Core/Settings/SettingsWrapper.cs | 23 ++- .../Core/TestCases/TestCaseFactory.cs | 2 + .../Resources/AllTestSettings.gta.runsettings | 1 + .../NativeDebuggedProcessExecutorTests.cs | 13 ++ .../TestAdapter/CommonFunctions.cs | 1 + .../TestAdapter/GoogleTestAdapterSettings.xsd | 1 + .../FrameworkDebuggedProcessExecutor.cs | 7 +- .../NativeDebuggedProcessExecutor.cs | 16 +- .../Settings/RunSettingsContainer.cs | 1 + .../Tests.Common/Fakes/FakeLogger.cs | 2 + .../TestData/SolutionProject.runsettings | 1 + .../Tests.Common/TestResources.cs | 6 +- .../Tests/ProcessExecutorTests.cs | 44 ++++- GoogleTestAdapter/Tests.Common/TestsBase.cs | 3 + .../GoogleTestExtensionOptionsPage.cs | 1 + .../TestExecutionOptionsDialogPage.cs | 14 ++ ...soleDllTests__List_TestsOf_SampleTests.txt | 1 + ...eDllTests__List_TestsOf_SampleTests170.txt | 1 + ...tionProjectSettings_Coverage_Isolation.xml | 20 ++- ...tionProjectSettings_Coverage_Isolation.xml | 20 ++- SampleTests/Tests/BasicTests.cpp | 11 ++ 36 files changed, 621 insertions(+), 52 deletions(-) create mode 100644 GoogleTestAdapter/Core.Tests/Helpers/EnvironmentVariablesParserTests.cs create mode 100644 GoogleTestAdapter/Core/Helpers/EnvironmentVariablesParser.cs diff --git a/GoogleTestAdapter/Core.Tests/Core.Tests.csproj b/GoogleTestAdapter/Core.Tests/Core.Tests.csproj index 06cf1b6ba..859dfff03 100644 --- a/GoogleTestAdapter/Core.Tests/Core.Tests.csproj +++ b/GoogleTestAdapter/Core.Tests/Core.Tests.csproj @@ -93,6 +93,7 @@ + diff --git a/GoogleTestAdapter/Core.Tests/GoogleTestDiscovererTests.cs b/GoogleTestAdapter/Core.Tests/GoogleTestDiscovererTests.cs index 19698fa9e..46adaa78e 100644 --- a/GoogleTestAdapter/Core.Tests/GoogleTestDiscovererTests.cs +++ b/GoogleTestAdapter/Core.Tests/GoogleTestDiscovererTests.cs @@ -374,11 +374,11 @@ public void GetTestsFromExecutable_Tests_TestNamesBeingPrefixesAreFoundWithCorre IList testCases = discoverer.GetTestsFromExecutable(TestResources.Tests_ReleaseX86); var abcdTest = testCases.Single(tc => tc.DisplayName == "abcd.t"); - abcdTest.LineNumber.Should().Be(156); + abcdTest.LineNumber.Should().Be(167); var bbcdTest = testCases.Single(tc => tc.DisplayName == "bbcd.t"); - bbcdTest.LineNumber.Should().Be(161); + bbcdTest.LineNumber.Should().Be(172); var bcdTest = testCases.Single(tc => tc.DisplayName == "bcd.t"); - bcdTest.LineNumber.Should().Be(166); + bcdTest.LineNumber.Should().Be(177); } [TestMethod] diff --git a/GoogleTestAdapter/Core.Tests/Helpers/DotNetProcessExecutorTests.cs b/GoogleTestAdapter/Core.Tests/Helpers/DotNetProcessExecutorTests.cs index b377c8d15..5f258f52e 100644 --- a/GoogleTestAdapter/Core.Tests/Helpers/DotNetProcessExecutorTests.cs +++ b/GoogleTestAdapter/Core.Tests/Helpers/DotNetProcessExecutorTests.cs @@ -48,6 +48,19 @@ public void ExecuteProcessBlocking_IgnoresIfProcessReturnsErrorCode_DoesNotThrow Test_WithSimpleCommand_ReturnsOutputOfCommand(); } + [TestMethod] + [TestCategory(TestMetadata.TestCategories.Unit)] + public void ExecuteProcessBlocking_SetEnvVariable_EnvVariableIsSet() + { + Test_WithEnvSetting_EnvVariableIsSet(); + } + + [TestMethod] + [TestCategory(TestMetadata.TestCategories.Unit)] + public void ExecuteProcessBlocking_SetExistingEnvVariable_EnvVariableIsOverridden() + { + Test_WithOverridingEnvSetting_EnvVariableHasNewValue(); + } } } \ No newline at end of file diff --git a/GoogleTestAdapter/Core.Tests/Helpers/EnvironmentVariablesParserTests.cs b/GoogleTestAdapter/Core.Tests/Helpers/EnvironmentVariablesParserTests.cs new file mode 100644 index 000000000..8c445a0a6 --- /dev/null +++ b/GoogleTestAdapter/Core.Tests/Helpers/EnvironmentVariablesParserTests.cs @@ -0,0 +1,160 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using FluentAssertions; +using GoogleTestAdapter.Tests.Common.Fakes; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using static GoogleTestAdapter.Tests.Common.TestMetadata.TestCategories; + +namespace GoogleTestAdapter.Helpers +{ + [TestClass] + public class EnvironmentVariablesParserTests + { + private FakeLogger _fakeLogger; + private EnvironmentVariablesParser _parser; + + [TestInitialize] + public void SetUp() + { + _fakeLogger = new FakeLogger(); + _parser = new EnvironmentVariablesParser(_fakeLogger); + } + + [TestMethod] + [TestCategory(Unit)] + public void ParseEnvironmentVariablesString_EmptyString_ReturnsCorrectDictionary() + { + CheckParserInvocation("", result => result.Should().BeEmpty()); + } + + [TestMethod] + [TestCategory(Unit)] + public void ParseEnvironmentVariablesString_SimpleCase_ReturnsCorrectDictionary() + { + CheckParserInvocation("Foo=Bar", result => + { + result.Should().HaveCount(1); + result["Foo"].Should().Be("Bar"); + }); + } + + [TestMethod] + [TestCategory(Unit)] + public void ParseEnvironmentVariablesString_EnvVarWithEmptyValue_ReturnsCorrectDictionary() + { + CheckParserInvocation("Foo=", result => + { + result.Should().HaveCount(1); + result["Foo"].Should().Be(""); + }); + } + + [TestMethod] + [TestCategory(Unit)] + public void ParseEnvironmentVariablesString_EnvVarWithoutValue_IsIgnoredAndLogged() + { + CheckParserInvocation("Foo", result => result.Should().BeEmpty(), "must be of the form Name=Value"); + } + + [TestMethod] + [TestCategory(Unit)] + public void ParseEnvironmentVariablesString_EnvVarWithStrangeName_ReturnsCorrectDictionary() + { + CheckParserInvocation(@"_(){}[]$*+-\/""#',;.@!?=Bar", result => + { + result.Should().HaveCount(1); + result[@"_(){}[]$*+-\/""#',;.@!?"].Should().Be("Bar"); + }); + } + + [TestMethod] + [TestCategory(Unit)] + public void ParseEnvironmentVariablesString_EnvVarWithInvalidName_IsIgnoredAndLogged() + { + CheckParserInvocation(@"%Foo=Bar", result => result.Should().BeEmpty(), "regex"); + } + + [TestMethod] + [TestCategory(Unit)] + public void ParseEnvironmentVariablesString_NameIsTooLong_IsIgnoredAndLogged() + { + var name = "F" + new string('o', 255); + name.Length.Should().Be(256); + + CheckParserInvocation($"{name}=Bar", result => + { + result.Should().HaveCount(1); + result[name].Should().Be("Bar"); + }); + + string invalidName = name + "o"; + CheckParserInvocation($"{invalidName}=Bar", result => result.Should().BeEmpty(), "variable names must not be longer than"); + } + + [TestMethod] + [TestCategory(Unit)] + public void ParseEnvironmentVariablesString_ValueIsTooLong_IsIgnoredAndLogged() + { + var value = "B" + new string('a', 32767); + value.Length.Should().Be(32768); + + CheckParserInvocation($"Foo={value}", result => + { + result.Should().HaveCount(1); + result["Foo"].Should().Be(value); + }); + + string invalidValue = value + "a"; + CheckParserInvocation($"Foo={invalidValue}", result => result.Should().BeEmpty(), "variable values must not be longer than"); + } + + [TestMethod] + [TestCategory(Unit)] + public void ParseEnvironmentVariablesString_ValueHasEqualSign_ReturnsCorrectDictionary() + { + CheckParserInvocation("MyVar=A=B", result => + { + result.Should().HaveCount(1); + result["MyVar"].Should().Be("A=B"); + }); + } + + [TestMethod] + [TestCategory(Unit)] + public void ParseEnvironmentVariablesString_SeveralVariables_ReturnsCorrectDictionary() + { + CheckParserInvocation("MyVar=A=B//||//MyOtherVar==//||//MyLastVar=Foo///||//", result => + { + result.Should().HaveCount(3); + result["MyVar"].Should().Be("A=B"); + result["MyOtherVar"].Should().Be("="); + result["MyLastVar"].Should().Be("Foo/"); + }); + } + + private void CheckParserInvocation(string option, Action> assertions, string errorMessage = null) + { + IDictionary result; + if (errorMessage == null) + { + result = _parser.ParseEnvironmentVariablesString(option); + assertions(result); + _fakeLogger.All.Should().BeEmpty(); + return; + } + + // logging + result = _parser.ParseEnvironmentVariablesString(option); + assertions(result); + _fakeLogger.Warnings.Should().ContainSingle(); + _fakeLogger.Warnings.Single().Should().Contain(errorMessage); + + // Exception + _parser.Invoking(p => p.ParseEnvironmentVariablesString(option, false)) + .Should().Throw().WithMessage($"*{errorMessage}*"); + } + + } + +} \ No newline at end of file diff --git a/GoogleTestAdapter/Core.Tests/Runners/SequentialTestRunnerTests.cs b/GoogleTestAdapter/Core.Tests/Runners/SequentialTestRunnerTests.cs index db4bd4e2f..1498f69df 100644 --- a/GoogleTestAdapter/Core.Tests/Runners/SequentialTestRunnerTests.cs +++ b/GoogleTestAdapter/Core.Tests/Runners/SequentialTestRunnerTests.cs @@ -83,6 +83,22 @@ public void RunTests_WorkingDirSetForProject_TestPasses() It.Is>(tr => CheckSingleResultHasOutcome(tr, TestOutcome.Passed))), Times.Once); } + [TestMethod] + [TestCategory(Integration)] + public void RunTests_EnvironmentVariableSetForSolution_TestPasses() + { + TestCase testCase = TestDataCreator.GetTestCases("EnvironmentVariable.IsSet").First(); + var settings = CreateSettings(PlaceholderReplacer.SolutionDirPlaceholder, null, "MYENVVAR=MyValue"); + + var runner = new SequentialTestRunner("", 0, "", MockFrameworkReporter.Object, TestEnvironment.Logger, settings, new SchedulingAnalyzer(TestEnvironment.Logger)); + + runner.RunTests(testCase.Yield(), false, ProcessExecutorFactory); + + MockLogger.Verify(l => l.LogError(It.IsAny()), Times.Never); + MockFrameworkReporter.Verify(r => r.ReportTestResults( + It.Is>(tr => CheckSingleResultHasOutcome(tr, TestOutcome.Passed))), Times.Once); + } + private void DoRunCancelingTests(bool killProcesses, int lower, int upper) { MockOptions.Setup(o => o.KillProcessesOnCancel).Returns(killProcesses); @@ -106,13 +122,14 @@ private void DoRunCancelingTests(bool killProcesses, int lower, int upper) stopwatch.ElapsedMilliseconds.Should().BeLessThan(upper); // 2nd test should not be executed } - private SettingsWrapper CreateSettings(string solutionWorkingDir, string projectWorkingDir) + private SettingsWrapper CreateSettings(string solutionWorkingDir, string projectWorkingDir, string environmentVariable = null) { var mockContainer = new Mock(); + var solutionSettings = new RunSettings {WorkingDir = solutionWorkingDir}; mockContainer .Setup(c => c.SolutionSettings) - .Returns(new RunSettings { WorkingDir = solutionWorkingDir }); + .Returns(solutionSettings); if (projectWorkingDir != null) { @@ -121,9 +138,15 @@ private SettingsWrapper CreateSettings(string solutionWorkingDir, string project .Returns(new RunSettings { WorkingDir = projectWorkingDir }); } + if (environmentVariable != null) + { + solutionSettings.EnvironmentVariables = environmentVariable; + } + return new SettingsWrapper(mockContainer.Object, TestResources.SampleTestsSolutionDir) { RegexTraitParser = new RegexTraitParser(MockLogger.Object), + EnvironmentVariablesParser = new EnvironmentVariablesParser(MockLogger.Object), HelperFilesCache = new HelperFilesCache(MockLogger.Object) }; } diff --git a/GoogleTestAdapter/Core.Tests/Settings/SettingsWrapperTests.cs b/GoogleTestAdapter/Core.Tests/Settings/SettingsWrapperTests.cs index e79388551..fe1544e4d 100644 --- a/GoogleTestAdapter/Core.Tests/Settings/SettingsWrapperTests.cs +++ b/GoogleTestAdapter/Core.Tests/Settings/SettingsWrapperTests.cs @@ -33,6 +33,7 @@ public override void SetUp() TheOptions = new SettingsWrapper(containerMock.Object) { RegexTraitParser = new RegexTraitParser(TestEnvironment.Logger), + EnvironmentVariablesParser = new EnvironmentVariablesParser(TestEnvironment.Logger), HelperFilesCache = new HelperFilesCache(TestEnvironment.Logger) }; } @@ -48,7 +49,7 @@ public override void TearDown() [TestMethod] [TestCategory(Unit)] - public void NrOfTestRepitions_InvalidValue_ReturnsDefaultValue() + public void NrOfTestRepetitions_InvalidValue_ReturnsDefaultValue() { MockXmlOptions.Setup(o => o.NrOfTestRepetitions).Returns(-2); TheOptions.NrOfTestRepetitions.Should().Be(SettingsWrapper.OptionNrOfTestRepetitionsDefaultValue); @@ -631,6 +632,96 @@ public void Clone_WhileExecuting_ReturnsFreshSettingsWrapperInstance() }); } + [TestMethod] + [TestCategory(Unit)] + public void EnvironmentVariables_Empty_ReturnsEmptyDictionary() + { + MockXmlOptions.Setup(o => o.EnvironmentVariables).Returns(""); + + var envVars = TheOptions.GetEnvironmentVariablesForDiscovery("theExecutable"); + envVars.Should().BeEmpty(); + + envVars = TheOptions.GetEnvironmentVariablesForExecution("theExecutable", "theTestDirectory", 42); + envVars.Should().BeEmpty(); + } + + [TestMethod] + [TestCategory(Unit)] + public void EnvironmentVariables_SingleKeyValuePair_ReturnsDictionaryWithThatPair() + { + MockXmlOptions.Setup(o => o.EnvironmentVariables).Returns("MyVar=MyValue"); + + var envVars = TheOptions.GetEnvironmentVariablesForDiscovery("theExecutable"); + envVars.Should().HaveCount(1); + envVars["MyVar"].Should().Be("MyValue"); + + envVars = TheOptions.GetEnvironmentVariablesForExecution("theExecutable", "theTestDirectory", 42); + envVars.Should().HaveCount(1); + envVars["MyVar"].Should().Be("MyValue"); + } + + [TestMethod] + [TestCategory(Unit)] + public void EnvironmentVariables_SinglePairWithEmptyValue_ReturnsDictionaryWithThatPair() + { + MockXmlOptions.Setup(o => o.EnvironmentVariables).Returns("MyVar="); + + var envVars = TheOptions.GetEnvironmentVariablesForDiscovery("theExecutable"); + envVars.Should().HaveCount(1); + envVars["MyVar"].Should().BeEmpty(); + + envVars = TheOptions.GetEnvironmentVariablesForExecution("theExecutable", "theTestDirectory", 42); + envVars.Should().HaveCount(1); + envVars["MyVar"].Should().BeEmpty(); + } + + [TestMethod] + [TestCategory(Unit)] + public void EnvironmentVariables_SinglePairWithoutValue_ReturnsDictionaryWithThatPair() + { + MockXmlOptions.Setup(o => o.EnvironmentVariables).Returns("MyVar"); + + var envVars = TheOptions.GetEnvironmentVariablesForDiscovery("theExecutable"); + envVars.Should().BeEmpty(); + + envVars = TheOptions.GetEnvironmentVariablesForExecution("theExecutable", "theTestDirectory", 42); + envVars.Should().BeEmpty(); + } + + [TestMethod] + [TestCategory(Unit)] + public void EnvironmentVariables_SinglePairWithEqualsSignInValue_ReturnsDictionaryWithThatPair() + { + MockXmlOptions.Setup(o => o.EnvironmentVariables).Returns("MyVar=A=B"); + + var envVars = TheOptions.GetEnvironmentVariablesForDiscovery("theExecutable"); + envVars.Should().HaveCount(1); + envVars["MyVar"].Should().Be("A=B"); + + envVars = TheOptions.GetEnvironmentVariablesForExecution("theExecutable", "theTestDirectory", 42); + envVars.Should().HaveCount(1); + envVars["MyVar"].Should().Be("A=B"); + } + + [TestMethod] + [TestCategory(Unit)] + public void EnvironmentVariables_SeveralPairs_AreAllReturned() + { + MockXmlOptions.Setup(o => o.EnvironmentVariables).Returns("MyVar=A=B//||//MyOtherVar==//||//MyLastVar=Foo///||//"); + + var envVars = TheOptions.GetEnvironmentVariablesForDiscovery("theExecutable"); + envVars.Should().HaveCount(3); + envVars["MyVar"].Should().Be("A=B"); + envVars["MyOtherVar"].Should().Be("="); + envVars["MyLastVar"].Should().Be("Foo/"); + + envVars = TheOptions.GetEnvironmentVariablesForExecution("theExecutable", "theTestDirectory", 42); + envVars.Should().HaveCount(3); + envVars["MyVar"].Should().Be("A=B"); + envVars["MyOtherVar"].Should().Be("="); + envVars["MyLastVar"].Should().Be("Foo/"); + } + private SettingsWrapper CreateSettingsWrapper(string solutionWorkdir, params string[] projects) { var containerMock = new Mock(); @@ -647,6 +738,7 @@ private SettingsWrapper CreateSettingsWrapper(string solutionWorkdir, params str return new SettingsWrapper(containerMock.Object) { RegexTraitParser = new RegexTraitParser(MockLogger.Object), + EnvironmentVariablesParser = new EnvironmentVariablesParser(MockLogger.Object), HelperFilesCache = new HelperFilesCache(MockLogger.Object) }; } diff --git a/GoogleTestAdapter/Core/Core.csproj b/GoogleTestAdapter/Core/Core.csproj index 8d651cb85..5cd11902b 100644 --- a/GoogleTestAdapter/Core/Core.csproj +++ b/GoogleTestAdapter/Core/Core.csproj @@ -53,6 +53,7 @@ + diff --git a/GoogleTestAdapter/Core/Helpers/EnvironmentVariablesParser.cs b/GoogleTestAdapter/Core/Helpers/EnvironmentVariablesParser.cs new file mode 100644 index 000000000..923b5e165 --- /dev/null +++ b/GoogleTestAdapter/Core/Helpers/EnvironmentVariablesParser.cs @@ -0,0 +1,92 @@ +using System; +using System.Collections.Generic; +using System.Text.RegularExpressions; +using GoogleTestAdapter.Common; +using GoogleTestAdapter.Settings; + +namespace GoogleTestAdapter.Helpers +{ + public class EnvironmentVariablesParser + { + public const string Separator = SettingsWrapper.TraitsRegexesPairSeparator; + + // following https://stackoverflow.com/a/20635858/1276129 + private static readonly Regex NameRegex = new Regex( + @"^[\w\(\){}\[\]$*+-\\/""#',;.@!?]+$", RegexOptions.Compiled, TimeSpan.FromMilliseconds(250)); + + private const int MaxNameLength = 256; + private const int MaxValueLength = 32768; + + private readonly ILogger _logger; + + public EnvironmentVariablesParser(ILogger logger) + { + _logger = logger; + } + + public IDictionary ParseEnvironmentVariablesString(string option, bool ignoreErrors = true) + { + var envVarDictionary = new Dictionary(); + foreach (var envVar in option.Split(new [] {Separator}, StringSplitOptions.RemoveEmptyEntries)) + { + var index = envVar.IndexOf("=", StringComparison.InvariantCulture); + if (index == -1) + { + string errorMsg = $"Environment variables must be of the form Name=Value, but '{envVar}' is lacking the ="; + if (ignoreErrors) + { + _logger?.LogWarning(errorMsg); + continue; + } + + throw new Exception(errorMsg); + } + + string name = envVar.Substring(0, index); + string value = envVar.Substring(index + 1); + + if (!NameRegex.IsMatch(name)) + { + string errorMsg = $"Environment variable names must match the regex '${NameRegex}', but '{name}' does not"; + if (ignoreErrors) + { + _logger?.LogWarning(errorMsg); + continue; + } + + throw new Exception(errorMsg); + } + + if (name.Length > MaxNameLength) + { + string errorMsg = $"Environment variable names must not be longer than {MaxNameLength} chars, but '${name}' has a length of {name.Length}"; + if (ignoreErrors) + { + _logger?.LogWarning(errorMsg); + continue; + } + + throw new Exception(errorMsg); + } + + if (value.Length > MaxValueLength) + { + string errorMsg = $"Environment variable values must not be longer than {MaxValueLength} chars, but '${value}' has a length of {value.Length}"; + if (ignoreErrors) + { + _logger?.LogWarning(errorMsg); + continue; + } + + throw new Exception(errorMsg); + } + + envVarDictionary.Add(name, value); + } + + return envVarDictionary; + } + + } + +} \ No newline at end of file diff --git a/GoogleTestAdapter/Core/Helpers/Utils.cs b/GoogleTestAdapter/Core/Helpers/Utils.cs index afe357b6c..fecc1bd8f 100644 --- a/GoogleTestAdapter/Core/Helpers/Utils.cs +++ b/GoogleTestAdapter/Core/Helpers/Utils.cs @@ -87,6 +87,13 @@ public static void ValidateTraitRegexes(string value) parser.ParseTraitsRegexesString(value, ignoreErrors: false); } + public static void ValidateEnvironmentVariables(string value) + { + // The parser will throw if the value is not well formed. + var parser = new EnvironmentVariablesParser(null); + parser.ParseEnvironmentVariablesString(value, ignoreErrors: false); + } + public static bool BinaryFileContainsStrings(string executable, Encoding encoding, IEnumerable strings) { byte[] file = File.ReadAllBytes(executable); diff --git a/GoogleTestAdapter/Core/ProcessExecution/Contracts/IProcessExecutor.cs b/GoogleTestAdapter/Core/ProcessExecution/Contracts/IProcessExecutor.cs index 1db55d696..951585b62 100644 --- a/GoogleTestAdapter/Core/ProcessExecution/Contracts/IProcessExecutor.cs +++ b/GoogleTestAdapter/Core/ProcessExecution/Contracts/IProcessExecutor.cs @@ -2,12 +2,13 @@ using System; using System.IO; +using System.Collections.Generic; namespace GoogleTestAdapter.ProcessExecution.Contracts { public interface IProcessExecutor { - int ExecuteCommandBlocking(string command, string parameters, string workingDir, string pathExtension, Action reportOutputLine); + int ExecuteCommandBlocking(string command, string parameters, string workingDir, string pathExtension, IDictionary environmentVariables, Action reportOutputLine); void Cancel(); } @@ -22,7 +23,7 @@ public static int ExecuteBatchFileBlocking(this IProcessExecutor executor, strin } string command = Path.Combine(Environment.SystemDirectory, "cmd.exe"); - return executor.ExecuteCommandBlocking(command, $"/C \"{batchFile}\" {parameters}", workingDir, pathExtension, + return executor.ExecuteCommandBlocking(command, $"/C \"{batchFile}\" {parameters}", workingDir, pathExtension, new Dictionary(), reportOutputLine); } } diff --git a/GoogleTestAdapter/Core/ProcessExecution/DotNetProcessExecutor.cs b/GoogleTestAdapter/Core/ProcessExecution/DotNetProcessExecutor.cs index f30b2d8ca..46d3fcde0 100644 --- a/GoogleTestAdapter/Core/ProcessExecution/DotNetProcessExecutor.cs +++ b/GoogleTestAdapter/Core/ProcessExecution/DotNetProcessExecutor.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using System.Diagnostics; using System.Text; using System.Threading; @@ -33,7 +34,7 @@ public DotNetProcessExecutor(bool printTestOutput, ILogger logger) _logger = logger; } - public int ExecuteCommandBlocking(string command, string parameters, string workingDir, string pathExtension, + public int ExecuteCommandBlocking(string command, string parameters, string workingDir, string pathExtension, IDictionary environmentVariables, Action reportOutputLine) { // output reading after https://stackoverflow.com/a/7608823/1276129 @@ -50,6 +51,9 @@ public int ExecuteCommandBlocking(string command, string parameters, string work if (!string.IsNullOrEmpty(pathExtension)) processStartInfo.EnvironmentVariables["PATH"] = Utils.GetExtendedPath(pathExtension); + foreach (var environmentVariable in environmentVariables) + processStartInfo.EnvironmentVariables[environmentVariable.Key] = environmentVariable.Value; + _process = new Process {StartInfo = processStartInfo}; using (AutoResetEvent outputWaitHandle = new AutoResetEvent(false)) using (AutoResetEvent errorWaitHandle = new AutoResetEvent(false)) diff --git a/GoogleTestAdapter/Core/Runners/SequentialTestRunner.cs b/GoogleTestAdapter/Core/Runners/SequentialTestRunner.cs index a6e6a4ab5..d491f914b 100644 --- a/GoogleTestAdapter/Core/Runners/SequentialTestRunner.cs +++ b/GoogleTestAdapter/Core/Runners/SequentialTestRunner.cs @@ -55,12 +55,14 @@ public void RunTests(IEnumerable testCasesToRun, bool isBeingDebugged, { string workingDir = _settings.GetWorkingDirForExecution(executable, _testDir, _threadId); string userParameters = _settings.GetUserParametersForExecution(executable, _testDir, _threadId); + IDictionary environmentVariables = _settings.GetEnvironmentVariablesForExecution(executable, _testDir, _threadId); RunTestsFromExecutable( executable, workingDir, groupedTestCases[executable], userParameters, + environmentVariables, isBeingDebugged, processExecutorFactory); }); @@ -82,7 +84,7 @@ public void Cancel() // ReSharper disable once UnusedParameter.Local private void RunTestsFromExecutable(string executable, string workingDir, - IEnumerable testCasesToRun, string userParameters, + IEnumerable testCasesToRun, string userParameters, IDictionary environmentVariables, bool isBeingDebugged, IDebuggedProcessExecutorFactory processExecutorFactory) { string resultXmlFile = Path.GetTempFileName(); @@ -96,7 +98,7 @@ private void RunTestsFromExecutable(string executable, string workingDir, break; } var streamingParser = new StreamingStandardOutputTestResultParser(arguments.TestCases, _logger, _frameworkReporter); - var results = RunTests(executable, workingDir, isBeingDebugged, processExecutorFactory, arguments, resultXmlFile, streamingParser).ToArray(); + var results = RunTests(executable, workingDir, isBeingDebugged, processExecutorFactory, arguments, environmentVariables, resultXmlFile, streamingParser).ToArray(); try { @@ -123,11 +125,11 @@ private void RunTestsFromExecutable(string executable, string workingDir, } private IEnumerable RunTests(string executable, string workingDir, bool isBeingDebugged, - IDebuggedProcessExecutorFactory processExecutorFactory, CommandLineGenerator.Args arguments, string resultXmlFile, StreamingStandardOutputTestResultParser streamingParser) + IDebuggedProcessExecutorFactory processExecutorFactory, CommandLineGenerator.Args arguments, IDictionary environmentVariables, string resultXmlFile, StreamingStandardOutputTestResultParser streamingParser) { try { - return TryRunTests(executable, workingDir, isBeingDebugged, processExecutorFactory, arguments, resultXmlFile, streamingParser); + return TryRunTests(executable, workingDir, isBeingDebugged, processExecutorFactory, arguments, environmentVariables, resultXmlFile, streamingParser); } catch (Exception e) { @@ -151,11 +153,11 @@ public static void LogExecutionError(ILogger logger, string executable, string w } private IEnumerable TryRunTests(string executable, string workingDir, bool isBeingDebugged, - IDebuggedProcessExecutorFactory processExecutorFactory, CommandLineGenerator.Args arguments, string resultXmlFile, + IDebuggedProcessExecutorFactory processExecutorFactory, CommandLineGenerator.Args arguments, IDictionary environmentVariables, string resultXmlFile, StreamingStandardOutputTestResultParser streamingParser) { var consoleOutput = - RunTestExecutable(executable, workingDir, arguments,isBeingDebugged, processExecutorFactory, streamingParser); + RunTestExecutable(executable, workingDir, arguments, environmentVariables, isBeingDebugged, processExecutorFactory, streamingParser); var remainingTestCases = arguments.TestCases @@ -168,10 +170,19 @@ private IEnumerable TryRunTests(string executable, string workingDir return testResults; } - private List RunTestExecutable(string executable, string workingDir, CommandLineGenerator.Args arguments, bool isBeingDebugged, IDebuggedProcessExecutorFactory processExecutorFactory, + private List RunTestExecutable(string executable, string workingDir, CommandLineGenerator.Args arguments, IDictionary environmentVariables, bool isBeingDebugged, IDebuggedProcessExecutorFactory processExecutorFactory, StreamingStandardOutputTestResultParser streamingParser) { string pathExtension = _settings.GetPathExtension(executable); + if (!string.IsNullOrEmpty(pathExtension)) + { + if (environmentVariables.ContainsKey("PATH") && !string.IsNullOrEmpty(environmentVariables["PATH"])) + { + _logger.LogWarning($"Executable {executable}: Both a path extension and a PATH environment variable have been provided! The PATH environment variable will be ignored."); + environmentVariables.Remove("PATH"); + } + } + bool isTestOutputAvailable = !isBeingDebugged || _settings.DebuggerKind > DebuggerKind.VsTestFramework; bool printTestOutput = _settings.PrintTestOutput && !_settings.ParallelTestExecution && @@ -198,7 +209,7 @@ void OnNewOutputLine(string line) printTestOutput, _logger) : processExecutorFactory.CreateExecutor(printTestOutput, _logger); int exitCode = _processExecutor.ExecuteCommandBlocking( - executable, arguments.CommandLine, workingDir, pathExtension, + executable, arguments.CommandLine, workingDir, pathExtension, environmentVariables, isTestOutputAvailable ? (Action) OnNewOutputLine : null); streamingParser.Flush(); diff --git a/GoogleTestAdapter/Core/Settings/IGoogleTestAdapterSettings.cs b/GoogleTestAdapter/Core/Settings/IGoogleTestAdapterSettings.cs index 3e4ed43da..c8b75d188 100644 --- a/GoogleTestAdapter/Core/Settings/IGoogleTestAdapterSettings.cs +++ b/GoogleTestAdapter/Core/Settings/IGoogleTestAdapterSettings.cs @@ -36,6 +36,7 @@ public interface IGoogleTestAdapterSettings int? TestDiscoveryTimeoutInSeconds { get; set; } string WorkingDir { get; set; } string PathExtension { get; set; } + string EnvironmentVariables { get; set; } string BatchForTestSetup { get; set; } string BatchForTestTeardown { get; set; } string TraitsRegexesAfter { get; set; } @@ -84,6 +85,7 @@ public static void GetUnsetValuesFrom(this IGoogleTestAdapterSettings self, IGoo self.TestDiscoveryTimeoutInSeconds = self.TestDiscoveryTimeoutInSeconds ?? other.TestDiscoveryTimeoutInSeconds; self.WorkingDir = self.WorkingDir ?? other.WorkingDir; self.PathExtension = self.PathExtension ?? other.PathExtension; + self.EnvironmentVariables = self.EnvironmentVariables ?? other.EnvironmentVariables; self.BatchForTestSetup = self.BatchForTestSetup ?? other.BatchForTestSetup; self.BatchForTestTeardown = self.BatchForTestTeardown ?? other.BatchForTestTeardown; self.TraitsRegexesAfter = self.TraitsRegexesAfter ?? other.TraitsRegexesAfter; diff --git a/GoogleTestAdapter/Core/Settings/PlaceholderReplacer.cs b/GoogleTestAdapter/Core/Settings/PlaceholderReplacer.cs index 31a74c232..46dade961 100644 --- a/GoogleTestAdapter/Core/Settings/PlaceholderReplacer.cs +++ b/GoogleTestAdapter/Core/Settings/PlaceholderReplacer.cs @@ -138,6 +138,46 @@ public string ReplacePathExtensionPlaceholders(string pathExtension, string exec } + public const string EnvironmentPlaceholders = "Placeholders:\n" + + DescriptionOfSolutionDirPlaceHolder + "\n" + + DescriptionOfPlatformNamePlaceholder + "\n" + + DescriptionOfConfigurationNamePlaceholder + "\n" + + DescriptionOfExecutableDirPlaceHolder + "\n" + + DescriptionOfExecutablePlaceHolder + "\n" + + DescriptionOfTestDirPlaceholder + TestExecutionOnly + "\n" + + DescriptionOfThreadIdPlaceholder + TestExecutionOnly + "\n" + + DescriptionOfEnvVarPlaceholders; + + public string ReplaceEnvironmentVariablesPlaceholdersForExecution(string environmentVariables, string executable, string testDirectory, int threadId) + { + environmentVariables = + ReplaceTestDirAndThreadIdPlaceholders(environmentVariables, testDirectory, threadId); + environmentVariables = ReplaceExecutablePlaceholders(environmentVariables, executable); + environmentVariables = ReplacePlatformAndConfigurationPlaceholders(environmentVariables, executable); + environmentVariables = ReplaceSolutionDirPlaceholder(environmentVariables, executable); + environmentVariables = ReplaceEnvironmentVariables(environmentVariables); + environmentVariables = ReplaceHelperFileSettings(environmentVariables, executable); + + CheckForRemainingPlaceholders(environmentVariables, SettingsWrapper.OptionAdditionalTestExecutionParams); + + return environmentVariables; + } + + public string ReplaceEnvironmentVariablesPlaceholdersForDiscovery(string environmentVariables, string executable) + { + environmentVariables = ReplaceExecutablePlaceholders(environmentVariables, executable); + environmentVariables = RemoveTestDirAndThreadIdPlaceholders(environmentVariables); + environmentVariables = ReplacePlatformAndConfigurationPlaceholders(environmentVariables, executable); + environmentVariables = ReplaceSolutionDirPlaceholder(environmentVariables, executable); + environmentVariables = ReplaceEnvironmentVariables(environmentVariables); + environmentVariables = ReplaceHelperFileSettings(environmentVariables, executable); + + CheckForRemainingPlaceholders(environmentVariables, SettingsWrapper.OptionAdditionalTestExecutionParams); + + return environmentVariables; + } + + public const string AdditionalTestExecutionParamPlaceholders = "Placeholders:\n" + DescriptionOfSolutionDirPlaceHolder + "\n" + DescriptionOfPlatformNamePlaceholder + "\n" + diff --git a/GoogleTestAdapter/Core/Settings/RunSettings.cs b/GoogleTestAdapter/Core/Settings/RunSettings.cs index ae50352ae..81871a522 100644 --- a/GoogleTestAdapter/Core/Settings/RunSettings.cs +++ b/GoogleTestAdapter/Core/Settings/RunSettings.cs @@ -37,6 +37,9 @@ public RunSettings(string projectRegex) public virtual string PathExtension { get; set; } public bool ShouldSerializePathExtension() { return PathExtension != null; } + public virtual string EnvironmentVariables { get; set; } + public bool ShouldSerializeEnvironmentVariables() { return EnvironmentVariables != null; } + public virtual bool? CatchExceptions { get; set; } public bool ShouldSerializeCatchExceptions() { return CatchExceptions != null; } diff --git a/GoogleTestAdapter/Core/Settings/SettingsWrapper.cs b/GoogleTestAdapter/Core/Settings/SettingsWrapper.cs index f3c80e05a..da34e24e9 100644 --- a/GoogleTestAdapter/Core/Settings/SettingsWrapper.cs +++ b/GoogleTestAdapter/Core/Settings/SettingsWrapper.cs @@ -19,6 +19,7 @@ public class SettingsWrapper private readonly SettingsPrinter _settingsPrinter; public RegexTraitParser RegexTraitParser { private get; set; } + public EnvironmentVariablesParser EnvironmentVariablesParser { private get; set; } private HelperFilesCache _cache; public HelperFilesCache HelperFilesCache @@ -55,7 +56,8 @@ public virtual SettingsWrapper Clone() return new SettingsWrapper(_settingsContainer, _solutionDir) { RegexTraitParser = RegexTraitParser, - HelperFilesCache = HelperFilesCache + HelperFilesCache = HelperFilesCache, + EnvironmentVariablesParser = EnvironmentVariablesParser }; } @@ -370,6 +372,25 @@ public string GetPathExtension(string executable) => _placeholderReplacer.ReplacePathExtensionPlaceholders(PathExtension, executable); + public const string OptionEnvironmentVariables = "Environment variables"; + public const string OptionEnvironmentVariablesDescription = "Allows to provide environment variables which will be added to a test executable's run context. Environment variables are separated by '" + + EnvironmentVariablesParser.Separator + + "'.\nExample: MyVar=MyValue" + EnvironmentVariablesParser.Separator + "MyDir=" + PlaceholderReplacer.TestDirPlaceholder + + "\n" + PlaceholderReplacer.EnvironmentPlaceholders; + public const string OptionEnvironmentVariablesDefaultValue = ""; + + public virtual string EnvironmentVariables => + _currentSettings.EnvironmentVariables ?? OptionEnvironmentVariablesDefaultValue; + + public IDictionary GetEnvironmentVariablesForDiscovery(string executable) + => EnvironmentVariablesParser.ParseEnvironmentVariablesString( + _placeholderReplacer.ReplaceEnvironmentVariablesPlaceholdersForDiscovery(EnvironmentVariables, executable)); + + public IDictionary GetEnvironmentVariablesForExecution(string executable, string testDirectory, int threadId) + => EnvironmentVariablesParser.ParseEnvironmentVariablesString( + _placeholderReplacer.ReplaceEnvironmentVariablesPlaceholdersForExecution(EnvironmentVariables, executable, testDirectory, threadId)); + + public const string OptionAdditionalTestExecutionParams = "Additional test execution parameters"; public const string OptionAdditionalTestExecutionParamsDescription = "Additional parameters for Google Test executable during test execution. " + PlaceholderReplacer.AdditionalTestExecutionParamPlaceholders; diff --git a/GoogleTestAdapter/Core/TestCases/TestCaseFactory.cs b/GoogleTestAdapter/Core/TestCases/TestCaseFactory.cs index 6a927210b..bf90efcc9 100644 --- a/GoogleTestAdapter/Core/TestCases/TestCaseFactory.cs +++ b/GoogleTestAdapter/Core/TestCases/TestCaseFactory.cs @@ -72,6 +72,7 @@ public IList CreateTestCases(Action reportTestCase = null) string workingDir = _settings.GetWorkingDirForDiscovery(_executable); var finalParams = GetDiscoveryParams(); + var environmentVariables = _settings.GetEnvironmentVariablesForDiscovery(_executable); try { int processExitCode = ExecutionFailed; @@ -92,6 +93,7 @@ void OnReportOutputLine(string line) finalParams, workingDir, _settings.GetPathExtension(_executable), + environmentVariables, OnReportOutputLine); _logger.VerboseInfo($"Finished execution of {_executable}"); }); diff --git a/GoogleTestAdapter/Resources/AllTestSettings.gta.runsettings b/GoogleTestAdapter/Resources/AllTestSettings.gta.runsettings index baf236924..7acb579f7 100644 --- a/GoogleTestAdapter/Resources/AllTestSettings.gta.runsettings +++ b/GoogleTestAdapter/Resources/AllTestSettings.gta.runsettings @@ -25,6 +25,7 @@ 30 ${SolutionDir} C:\fooDir;C:\barDir + MyEnvVar=MyValue diff --git a/GoogleTestAdapter/TestAdapter.Tests/ProcessExecution/NativeDebuggedProcessExecutorTests.cs b/GoogleTestAdapter/TestAdapter.Tests/ProcessExecution/NativeDebuggedProcessExecutorTests.cs index 9b41e9a0d..714db6286 100644 --- a/GoogleTestAdapter/TestAdapter.Tests/ProcessExecution/NativeDebuggedProcessExecutorTests.cs +++ b/GoogleTestAdapter/TestAdapter.Tests/ProcessExecution/NativeDebuggedProcessExecutorTests.cs @@ -53,6 +53,19 @@ public void ExecuteProcessBlocking_IgnoresIfProcessReturnsErrorCode_DoesNotThrow Test_WithSimpleCommand_ReturnsOutputOfCommand(); } + [TestMethod] + [TestCategory(TestMetadata.TestCategories.Unit)] + public void ExecuteProcessBlocking_SetEnvVariable_EnvVariableIsSet() + { + Test_WithEnvSetting_EnvVariableIsSet(); + } + + [TestMethod] + [TestCategory(TestMetadata.TestCategories.Unit)] + public void ExecuteProcessBlocking_SetExistingEnvVariable_EnvVariableIsOverridden() + { + Test_WithOverridingEnvSetting_EnvVariableHasNewValue(); + } } } \ No newline at end of file diff --git a/GoogleTestAdapter/TestAdapter/CommonFunctions.cs b/GoogleTestAdapter/TestAdapter/CommonFunctions.cs index 509d45d58..f0a4bf937 100644 --- a/GoogleTestAdapter/TestAdapter/CommonFunctions.cs +++ b/GoogleTestAdapter/TestAdapter/CommonFunctions.cs @@ -68,6 +68,7 @@ public static void CreateEnvironment(IRunSettings runSettings, IMessageLogger me var loggerAdapter = new VsTestFrameworkLogger(messageLogger, () => settingsWrapper.OutputMode, () => settingsWrapper.TimestampMode, () => settingsWrapper.SeverityMode, () => settingsWrapper.PrefixOutputWithGta); settingsWrapper.RegexTraitParser = new RegexTraitParser(loggerAdapter); + settingsWrapper.EnvironmentVariablesParser = new EnvironmentVariablesParser(loggerAdapter); settingsWrapper.HelperFilesCache = new HelperFilesCache(loggerAdapter); LogWarningsForDeprecatedSettings(ourRunSettings, loggerAdapter); diff --git a/GoogleTestAdapter/TestAdapter/GoogleTestAdapterSettings.xsd b/GoogleTestAdapter/TestAdapter/GoogleTestAdapterSettings.xsd index be58e8a22..2cec07d7f 100644 --- a/GoogleTestAdapter/TestAdapter/GoogleTestAdapterSettings.xsd +++ b/GoogleTestAdapter/TestAdapter/GoogleTestAdapterSettings.xsd @@ -35,6 +35,7 @@ + diff --git a/GoogleTestAdapter/TestAdapter/ProcessExecution/FrameworkDebuggedProcessExecutor.cs b/GoogleTestAdapter/TestAdapter/ProcessExecution/FrameworkDebuggedProcessExecutor.cs index 348f5ef6b..f3dc02242 100644 --- a/GoogleTestAdapter/TestAdapter/ProcessExecution/FrameworkDebuggedProcessExecutor.cs +++ b/GoogleTestAdapter/TestAdapter/ProcessExecution/FrameworkDebuggedProcessExecutor.cs @@ -25,7 +25,7 @@ public FrameworkDebuggedProcessExecutor(IFrameworkHandle handle, bool printTestO _logger = logger; } - public int ExecuteCommandBlocking(string command, string parameters, string workingDir, string pathExtension, + public int ExecuteCommandBlocking(string command, string parameters, string workingDir, string pathExtension, IDictionary environmentVariables, Action reportOutputLine) { if (reportOutputLine != null) @@ -37,9 +37,8 @@ public int ExecuteCommandBlocking(string command, string parameters, string work throw new InvalidOperationException(); } - IDictionary envVariables = new Dictionary(); if (!string.IsNullOrEmpty(pathExtension)) - envVariables["PATH"] = Utils.GetExtendedPath(pathExtension); + environmentVariables["PATH"] = Utils.GetExtendedPath(pathExtension); _logger.DebugInfo($"Attaching debugger to '{command}' via {DebuggerKind.VsTestFramework} engine"); if (_printTestOutput) @@ -48,7 +47,7 @@ public int ExecuteCommandBlocking(string command, string parameters, string work $"Note that due to restrictions of the VsTest framework, the test executable's output can not be displayed in the test console when debugging tests. Use '{SettingsWrapper.OptionDebuggerKind}' option to overcome this problem.'"); } - _processId = _frameworkHandle.LaunchProcessWithDebuggerAttached(command, workingDir, parameters, envVariables); + _processId = _frameworkHandle.LaunchProcessWithDebuggerAttached(command, workingDir, parameters, environmentVariables); ProcessWaiter waiter; using (var process = Process.GetProcessById(_processId.Value)) diff --git a/GoogleTestAdapter/TestAdapter/ProcessExecution/NativeDebuggedProcessExecutor.cs b/GoogleTestAdapter/TestAdapter/ProcessExecution/NativeDebuggedProcessExecutor.cs index f02934834..dc115befb 100644 --- a/GoogleTestAdapter/TestAdapter/ProcessExecution/NativeDebuggedProcessExecutor.cs +++ b/GoogleTestAdapter/TestAdapter/ProcessExecution/NativeDebuggedProcessExecutor.cs @@ -36,11 +36,11 @@ public NativeDebuggedProcessExecutor(IDebuggerAttacher debuggerAttacher, Debugge _logger = logger; } - public int ExecuteCommandBlocking(string command, string parameters, string workingDir, string pathExtension, Action reportOutputLine) + public int ExecuteCommandBlocking(string command, string parameters, string workingDir, string pathExtension, IDictionary environmentVariables, Action reportOutputLine) { try { - int exitCode = NativeMethods.ExecuteCommandBlocking(command, parameters, workingDir, pathExtension, _debuggerAttacher, _debuggerEngine, _logger, _printTestOutput, reportOutputLine, processId => _processId = processId); + int exitCode = NativeMethods.ExecuteCommandBlocking(command, parameters, workingDir, pathExtension, environmentVariables, _debuggerAttacher, _debuggerEngine, _logger, _printTestOutput, reportOutputLine, processId => _processId = processId); _logger.DebugInfo($"Executable {command} returned with exit code {exitCode}"); return exitCode; } @@ -104,7 +104,7 @@ protected override void Dispose(bool disposing) private const uint INFINITE = 0xFFFFFFFF; internal static int ExecuteCommandBlocking( - string command, string parameters, string workingDir, string pathExtension, + string command, string parameters, string workingDir, string pathExtension, IDictionary environmentVariables, IDebuggerAttacher debuggerAttacher, DebuggerEngine debuggerEngine, ILogger logger, bool printTestOutput, Action reportOutputLine, Action reportProcessId) { @@ -113,7 +113,7 @@ internal static int ExecuteCommandBlocking( { pipeStream = new ProcessOutputPipeStream(); - var processInfo = CreateProcess(command, parameters, workingDir, pathExtension, pipeStream._writingEnd); + var processInfo = CreateProcess(command, parameters, workingDir, pathExtension, environmentVariables, pipeStream._writingEnd); reportProcessId(processInfo.dwProcessId); using (var process = new SafeWaitHandle(processInfo.hProcess, true)) using (var thread = new SafeWaitHandle(processInfo.hThread, true)) @@ -177,12 +177,14 @@ public static void CreatePipe(out SafePipeHandle readingEnd, out SafePipeHandle throw new Win32Exception(Marshal.GetLastWin32Error(), "Could not set handle information"); } - private static StringBuilder CreateEnvironment(string pathExtension) + private static StringBuilder CreateEnvironment(string pathExtension, IDictionary environmentVariables) { StringDictionary envVariables = new ProcessStartInfo().EnvironmentVariables; if (!string.IsNullOrEmpty(pathExtension)) envVariables["PATH"] = Utils.GetExtendedPath(pathExtension); + foreach (var environmentVariable in environmentVariables) + envVariables[environmentVariable.Key] = environmentVariable.Value; var envVariablesList = new List(); foreach (DictionaryEntry entry in envVariables) @@ -200,7 +202,7 @@ private static StringBuilder CreateEnvironment(string pathExtension) return result; } - private static PROCESS_INFORMATION CreateProcess(string command, string parameters, string workingDir, string pathExtension, + private static PROCESS_INFORMATION CreateProcess(string command, string parameters, string workingDir, string pathExtension, IDictionary environmentVariables, SafePipeHandle outputPipeWritingEnd) { var startupinfoex = new STARTUPINFOEX @@ -231,7 +233,7 @@ private static PROCESS_INFORMATION CreateProcess(string command, string paramete lpThreadAttributes: null, bInheritHandles: true, dwCreationFlags: CREATE_EXTENDED_STARTUPINFO_PRESENT | CREATE_SUSPENDED, - lpEnvironment: CreateEnvironment(pathExtension), + lpEnvironment: CreateEnvironment(pathExtension, environmentVariables), lpCurrentDirectory: workingDir, lpStartupInfo: startupinfoex, lpProcessInformation: out processInfo)) diff --git a/GoogleTestAdapter/TestAdapter/Settings/RunSettingsContainer.cs b/GoogleTestAdapter/TestAdapter/Settings/RunSettingsContainer.cs index 5ac50a502..c0a58301b 100644 --- a/GoogleTestAdapter/TestAdapter/Settings/RunSettingsContainer.cs +++ b/GoogleTestAdapter/TestAdapter/Settings/RunSettingsContainer.cs @@ -195,6 +195,7 @@ private static void ValidateAdditionalRunSettingsConstraints(RunSettings setting ValidateOne(nameof(settings.TestDiscoveryRegex), settings.TestDiscoveryRegex, Utils.ValidateRegex); ValidateOne(nameof(settings.TraitsRegexesBefore), settings.TraitsRegexesBefore, Utils.ValidateTraitRegexes); ValidateOne(nameof(settings.TraitsRegexesAfter), settings.TraitsRegexesAfter, Utils.ValidateTraitRegexes); + ValidateOne(nameof(settings.EnvironmentVariables), settings.EnvironmentVariables, Utils.ValidateEnvironmentVariables); ValidateOne(nameof(settings.ShuffleTestsSeed), settings.ShuffleTestsSeed, GoogleTestConstants.ValidateShuffleTestsSeedValue); } diff --git a/GoogleTestAdapter/Tests.Common/Fakes/FakeLogger.cs b/GoogleTestAdapter/Tests.Common/Fakes/FakeLogger.cs index 29b91ac41..e2193aaf7 100644 --- a/GoogleTestAdapter/Tests.Common/Fakes/FakeLogger.cs +++ b/GoogleTestAdapter/Tests.Common/Fakes/FakeLogger.cs @@ -16,6 +16,8 @@ public class FakeLogger : LoggerBase public IList All => GetMessages(Enum.GetValues(typeof(Severity)).Cast().ToArray()); + public FakeLogger() : this(() => OutputMode.Verbose, false) { } + public FakeLogger(Func outputMode, bool timestampLogMessages = true) : base(outputMode) { diff --git a/GoogleTestAdapter/Tests.Common/Resources/TestData/SolutionProject.runsettings b/GoogleTestAdapter/Tests.Common/Resources/TestData/SolutionProject.runsettings index 8e92384bd..1b9786b31 100644 --- a/GoogleTestAdapter/Tests.Common/Resources/TestData/SolutionProject.runsettings +++ b/GoogleTestAdapter/Tests.Common/Resources/TestData/SolutionProject.runsettings @@ -7,6 +7,7 @@ 3 $(ExecutableDir)\.. ! + MYENVVAR=MyValue diff --git a/GoogleTestAdapter/Tests.Common/TestResources.cs b/GoogleTestAdapter/Tests.Common/TestResources.cs index 22448dd70..d073b1221 100644 --- a/GoogleTestAdapter/Tests.Common/TestResources.cs +++ b/GoogleTestAdapter/Tests.Common/TestResources.cs @@ -40,10 +40,10 @@ public static class TestResources public const string Tests_DebugX64 = SampleTestsBuildDir + @"Debug-x64\Tests_gta.exe"; public const string Tests_ReleaseX64 = SampleTestsBuildDir + @"Release-x64\Tests_gta.exe"; public const string Tests_ReleaseX64_Output = TestdataDir + @"Tests_gta_exe_output.txt"; - public const int NrOfTests = 108; + public const int NrOfTests = 109; public const int NrOfPassingTests = 53; - public const int NrOfFailingTests = 55; - public const int NrOfGtest170CompatibleTests = 104; + public const int NrOfFailingTests = 56; + public const int NrOfGtest170CompatibleTests = 105; public static readonly string LoadTests_ReleaseX86 = Path.Combine(SampleTestsBuildDir, @"Release\LoadTests_gta.exe"); public const string LoadTests_Generated = TestdataDir + @"LoadTests\GeneratedLoadTests_gta.exe"; diff --git a/GoogleTestAdapter/Tests.Common/Tests/ProcessExecutorTests.cs b/GoogleTestAdapter/Tests.Common/Tests/ProcessExecutorTests.cs index 2334a55a9..8bafba05e 100644 --- a/GoogleTestAdapter/Tests.Common/Tests/ProcessExecutorTests.cs +++ b/GoogleTestAdapter/Tests.Common/Tests/ProcessExecutorTests.cs @@ -1,6 +1,8 @@ using System; +using System.Collections; using System.Collections.Generic; using System.IO; +using System.Linq; using FluentAssertions; using GoogleTestAdapter.Common; using GoogleTestAdapter.ProcessExecution.Contracts; @@ -25,7 +27,8 @@ protected void Test_ExecuteProcessBlocking_PingLocalHost() Path.Combine(Environment.SystemDirectory, "ping.exe"), "localhost", "", - null, + null, + new Dictionary(), s => output.Add(s)); exitCode.Should().Be(0); @@ -42,17 +45,18 @@ protected void Test_ExecuteProcessBlocking_SampleTests() null, null, "", + new Dictionary(), s => output.Add(s)); exitCode.Should().Be(1); output.Should().Contain(s => s.Contains("TestMath.AddPasses")); - output.Should().HaveCount(632); + output.Should().HaveCount(641); } protected void Test_WithSimpleCommand_ReturnsOutputOfCommand() { var output = new List(); - int exitCode = ProcessExecutor.ExecuteCommandBlocking("cmd.exe", "/C \"echo 2\"", ".", "", line => output.Add(line)); + int exitCode = ProcessExecutor.ExecuteCommandBlocking("cmd.exe", "/C \"echo 2\"", ".", "", new Dictionary(), line => output.Add(line)); exitCode.Should().Be(0); output.Should().ContainSingle(); @@ -61,7 +65,39 @@ protected void Test_WithSimpleCommand_ReturnsOutputOfCommand() protected void Test_IgnoresIfProcessReturnsErrorCode_DoesNotThrow() { - ProcessExecutor.ExecuteCommandBlocking("cmd.exe", "/C \"echo 2\"", ".", "", line => { }); + ProcessExecutor.ExecuteCommandBlocking("cmd.exe", "/C \"echo 2\"", ".", "", new Dictionary(), line => { }); + } + + protected void Test_WithEnvSetting_EnvVariableIsSet() + { + string envVarName = "MyVar"; + string envVarValue = "MyValue"; + + Environment.GetEnvironmentVariable(envVarName).Should().BeNull(); + + var output = new List(); + int exitCode = ProcessExecutor.ExecuteCommandBlocking("cmd.exe", "/C \"set\"", ".", "", new Dictionary {{ envVarName, envVarValue}}, line => output.Add(line)); + + exitCode.Should().Be(0); + output.Should().Contain($"{envVarName}={envVarValue}"); + Environment.GetEnvironmentVariable(envVarName).Should().BeNull(); + } + + protected void Test_WithOverridingEnvSetting_EnvVariableHasNewValue() + { + string newValue = "NewValue"; + + var envVar = Environment.GetEnvironmentVariables() + .Cast() + .First(v => !string.IsNullOrWhiteSpace(v.Value?.ToString()) && v.Value.ToString() != newValue); + string valueBeforeChange = envVar.Value.ToString(); + + var output = new List(); + int exitCode = ProcessExecutor.ExecuteCommandBlocking("cmd.exe", "/C \"set\"", ".", "", new Dictionary {{ envVar.Key.ToString(), newValue}}, line => output.Add(line)); + + exitCode.Should().Be(0); + output.Should().Contain($"{envVar.Key}={newValue}"); + Environment.GetEnvironmentVariable(envVar.Key.ToString()).Should().Be(valueBeforeChange); } } diff --git a/GoogleTestAdapter/Tests.Common/TestsBase.cs b/GoogleTestAdapter/Tests.Common/TestsBase.cs index 2ae141d15..9938ddf1c 100644 --- a/GoogleTestAdapter/Tests.Common/TestsBase.cs +++ b/GoogleTestAdapter/Tests.Common/TestsBase.cs @@ -3,6 +3,7 @@ using System.IO; using GoogleTestAdapter.Common; using GoogleTestAdapter.Framework; +using GoogleTestAdapter.Helpers; using GoogleTestAdapter.ProcessExecution; using GoogleTestAdapter.ProcessExecution.Contracts; using GoogleTestAdapter.Settings; @@ -63,6 +64,7 @@ public virtual void SetUp() public static void SetupOptions(Mock mockOptions, ILogger logger) { mockOptions.Object.HelperFilesCache = new HelperFilesCache(logger); + mockOptions.Object.EnvironmentVariablesParser = new EnvironmentVariablesParser(logger); mockOptions.Setup(o => o.CheckCorrectUsage(It.IsAny())).Callback(() => { }); mockOptions.Setup(o => o.Clone()).Returns(mockOptions.Object); @@ -95,6 +97,7 @@ public static void SetupOptions(Mock mockOptions, ILogger logge .Returns(SettingsWrapper.OptionEnableParallelTestExecutionDefaultValue); mockOptions.Setup(o => o.MaxNrOfThreads).Returns(SettingsWrapper.OptionMaxNrOfThreadsDefaultValue); mockOptions.Setup(o => o.PathExtension).Returns(SettingsWrapper.OptionPathExtensionDefaultValue); + mockOptions.Setup(o => o.EnvironmentVariables).Returns(SettingsWrapper.OptionEnvironmentVariablesDefaultValue); mockOptions.Setup(o => o.WorkingDir).Returns(SettingsWrapper.OptionWorkingDirDefaultValue); mockOptions.Setup(o => o.KillProcessesOnCancel).Returns(SettingsWrapper.OptionKillProcessesOnCancelDefaultValue); mockOptions.Setup(o => o.SkipOriginCheck).Returns(SettingsWrapper.OptionSkipOriginCheckDefaultValue); diff --git a/GoogleTestAdapter/VsPackage.Shared/GoogleTestExtensionOptionsPage.cs b/GoogleTestAdapter/VsPackage.Shared/GoogleTestExtensionOptionsPage.cs index b3d0f78e1..3d96cd612 100644 --- a/GoogleTestAdapter/VsPackage.Shared/GoogleTestExtensionOptionsPage.cs +++ b/GoogleTestAdapter/VsPackage.Shared/GoogleTestExtensionOptionsPage.cs @@ -270,6 +270,7 @@ private RunSettings GetRunSettingsFromOptionPages() AdditionalPdbs = _testExecutionOptions.AdditionalPdbs, WorkingDir = _testExecutionOptions.WorkingDir, PathExtension = _testExecutionOptions.PathExtension, + EnvironmentVariables = _testExecutionOptions.EnvironmentVariables, AdditionalTestExecutionParam = _testExecutionOptions.AdditionalTestExecutionParams, BatchForTestSetup = _testExecutionOptions.BatchForTestSetup, BatchForTestTeardown = _testExecutionOptions.BatchForTestTeardown, diff --git a/GoogleTestAdapter/VsPackage.Shared/OptionsPages/TestExecutionOptionsDialogPage.cs b/GoogleTestAdapter/VsPackage.Shared/OptionsPages/TestExecutionOptionsDialogPage.cs index a28803a90..41f9ea61a 100644 --- a/GoogleTestAdapter/VsPackage.Shared/OptionsPages/TestExecutionOptionsDialogPage.cs +++ b/GoogleTestAdapter/VsPackage.Shared/OptionsPages/TestExecutionOptionsDialogPage.cs @@ -95,6 +95,20 @@ public string PathExtension } private string _pathExtension = SettingsWrapper.OptionPathExtensionDefaultValue; + [Category(SettingsWrapper.CategoryRunConfigurationName)] + [DisplayName(SettingsWrapper.OptionEnvironmentVariables)] + [Description(SettingsWrapper.OptionEnvironmentVariablesDescription)] + public string EnvironmentVariables + { + get => _environmentVariables; + set + { + Utils.ValidateEnvironmentVariables(value); + SetAndNotify(ref _environmentVariables, value); + } + } + private string _environmentVariables = SettingsWrapper.OptionEnvironmentVariablesDefaultValue; + [Category(SettingsWrapper.CategoryRunConfigurationName)] [DisplayName(SettingsWrapper.OptionAdditionalTestExecutionParams)] [Description(SettingsWrapper.OptionAdditionalTestExecutionParamsDescription)] diff --git a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__List_TestsOf_SampleTests.txt b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__List_TestsOf_SampleTests.txt index 8d86fe627..1a535709d 100644 --- a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__List_TestsOf_SampleTests.txt +++ b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__List_TestsOf_SampleTests.txt @@ -8,6 +8,7 @@ TheFixture.AddPassesWithTraits2 TheFixture.AddPassesWithTraits3 CommandArgs.TestDirectoryIsSet WorkingDir.IsSolutionDirectory +EnvironmentVariable.IsSet TestMath.AddFails TestMath.AddPasses TestMath.Crash diff --git a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__List_TestsOf_SampleTests170.txt b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__List_TestsOf_SampleTests170.txt index 8724e2cc5..025f679a0 100644 --- a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__List_TestsOf_SampleTests170.txt +++ b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__List_TestsOf_SampleTests170.txt @@ -2,6 +2,7 @@ Api.Created.Tests.PassingTest Api_Created_Tests.FailingTest CommandArgs.TestDirectoryIsSet WorkingDir.IsSolutionDirectory +EnvironmentVariable.IsSet TestMath.AddFails TestMath.AddPasses TestMath.Crash 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 f94ca1595..bfd33b503 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 @@ -53,6 +53,7 @@ Test failed: Something is wrong + @@ -301,7 +302,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:147 in $(directory)\sampletests\tests\basictests.cpp:line 147 @@ -312,7 +313,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:162 in $(directory)\sampletests\tests\basictests.cpp:line 162 @@ -323,7 +324,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:155 in $(directory)\sampletests\tests\basictests.cpp:line 155 @@ -337,7 +338,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:124 in $(directory)\sampletests\tests\basictests.cpp:line 124 @@ -349,7 +350,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:139 in $(directory)\sampletests\tests\basictests.cpp:line 139 @@ -361,7 +362,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:132 in $(directory)\sampletests\tests\basictests.cpp:line 132 @@ -452,7 +453,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:56 in $(directory)\sampletests\tests\basictests.cpp:line 56 @@ -664,6 +665,9 @@ Which is: "\xE4\xF6\xFC\xDF\xC4\xD6\xDC" + + + @@ -936,7 +940,7 @@ Which is: "\xE4\xF6\xFC\xDF\xC4\xD6\xDC" - + \ No newline at end of file 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 bb33fd36d..b75bde32b 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 @@ -57,6 +57,7 @@ Test failed: Something is wrong + @@ -333,7 +334,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:147 in $(directory)\sampletests\tests\basictests.cpp:line 147 @@ -345,7 +346,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:162 in $(directory)\sampletests\tests\basictests.cpp:line 162 @@ -357,7 +358,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:155 in $(directory)\sampletests\tests\basictests.cpp:line 155 @@ -372,7 +373,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:124 in $(directory)\sampletests\tests\basictests.cpp:line 124 @@ -385,7 +386,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:139 in $(directory)\sampletests\tests\basictests.cpp:line 139 @@ -398,7 +399,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:132 in $(directory)\sampletests\tests\basictests.cpp:line 132 @@ -500,7 +501,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:56 in $(directory)\sampletests\tests\basictests.cpp:line 56 @@ -729,6 +730,9 @@ at #2 - parameterizedtests.cpp:40 in $(directory)\sampletests\tests\parameterize + + + @@ -1001,7 +1005,7 @@ at #2 - parameterizedtests.cpp:40 in $(directory)\sampletests\tests\parameterize - + \ No newline at end of file diff --git a/SampleTests/Tests/BasicTests.cpp b/SampleTests/Tests/BasicTests.cpp index 2be7d7d7d..87492d02b 100644 --- a/SampleTests/Tests/BasicTests.cpp +++ b/SampleTests/Tests/BasicTests.cpp @@ -40,6 +40,17 @@ TEST(WorkingDir, IsSolutionDirectory) ASSERT_TRUE(ends_with(working_directory, "SampleTests")) << "working_directory is " << working_directory; } +TEST(EnvironmentVariable, IsSet) +{ + char* buf = nullptr; + size_t sz = 0; + ASSERT_EQ(0, _dupenv_s(&buf, &sz, "MYENVVAR")); + ASSERT_TRUE(buf != nullptr); + ASSERT_EQ(std::string(buf), "MyValue"); + free(buf); +} + + TEST(TestMath, AddFails) { EXPECT_EQ(1000, Add(10, 10)); From f66782d15a7fe99e81e94e03330b552244b82a12 Mon Sep 17 00:00:00 2001 From: Christian Soltenborn Date: Fri, 6 Dec 2019 08:14:27 +0100 Subject: [PATCH 16/19] bugfix: last replacement of helper file would contain a line break --- .../Core/Settings/HelperFilesCache.cs | 2 +- .../TestAdapter.Tests/Settings/HelperFileTests.cs | 14 ++++++++++++++ .../HelperFileTests/HelperFileTests.vcxproj | 8 ++++---- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/GoogleTestAdapter/Core/Settings/HelperFilesCache.cs b/GoogleTestAdapter/Core/Settings/HelperFilesCache.cs index 499eb0800..c2af18a71 100644 --- a/GoogleTestAdapter/Core/Settings/HelperFilesCache.cs +++ b/GoogleTestAdapter/Core/Settings/HelperFilesCache.cs @@ -51,7 +51,7 @@ private IDictionary LoadReplacementsMap(string executable) if (!File.Exists(helperFile)) return new Dictionary(); - return ParseHelperFile(File.ReadAllText(helperFile)); + return ParseHelperFile(File.ReadAllText(helperFile).Trim()); } catch (Exception e) { diff --git a/GoogleTestAdapter/TestAdapter.Tests/Settings/HelperFileTests.cs b/GoogleTestAdapter/TestAdapter.Tests/Settings/HelperFileTests.cs index d7a9e2808..59b5acc10 100644 --- a/GoogleTestAdapter/TestAdapter.Tests/Settings/HelperFileTests.cs +++ b/GoogleTestAdapter/TestAdapter.Tests/Settings/HelperFileTests.cs @@ -50,6 +50,20 @@ public void HelperFileTests_AdditionalParamsAreProvided_TestSucceeds() tr.Outcome == TestOutcome.Passed)), Times.Once); } + [TestMethod] + [TestCategory(Integration)] + public void HelperFileTests_WorkingDirIsSetFromProjectSettings_TestSucceeds() + { + MockOptions.Setup(o => o.AdditionalTestExecutionParam).Returns("-TheTarget=$(TheTarget)"); + MockOptions.Setup(o => o.WorkingDir).Returns("$(TheWorkingDirectory)"); + + RunHelperFileTestsExecutable(); + + MockFrameworkHandle.Verify(h => h.RecordResult(It.Is(tr => + tr.DisplayName.Contains("HelperFileTests.TheTargetIsSet") && + tr.Outcome == TestOutcome.Passed)), Times.Once); + } + private void RunHelperFileTestsExecutable() { var testCase = new GoogleTestDiscoverer(MockLogger.Object, TestEnvironment.Options, new ProcessExecutorFactory()) diff --git a/SampleTests/HelperFileTests/HelperFileTests.vcxproj b/SampleTests/HelperFileTests/HelperFileTests.vcxproj index d1c529b87..052d7ca31 100644 --- a/SampleTests/HelperFileTests/HelperFileTests.vcxproj +++ b/SampleTests/HelperFileTests/HelperFileTests.vcxproj @@ -137,7 +137,7 @@ true - echo SolutionPath=$(SolutionPath)::GTA::SolutionDir=$(SolutionDir)::GTA::PlatformName=$(PlatformName)::GTA::ConfigurationName=$(ConfigurationName)::GTA::TheTarget=$(TargetFileName) > $(TargetPath).gta_settings_helper + echo SolutionPath=$(SolutionPath)::GTA::SolutionDir=$(SolutionDir)::GTA::PlatformName=$(PlatformName)::GTA::ConfigurationName=$(ConfigurationName)::GTA::TheTarget=$(TargetFileName)::GTA::TheWorkingDirectory=$(LocalDebuggerWorkingDirectory) > $(TargetPath).gta_settings_helper @@ -157,7 +157,7 @@ true - echo SolutionPath=$(SolutionPath)::GTA::SolutionDir=$(SolutionDir)::GTA::PlatformName=$(PlatformName)::GTA::ConfigurationName=$(ConfigurationName)::GTA::TheTarget=$(TargetFileName) > $(TargetPath).gta_settings_helper + echo SolutionPath=$(SolutionPath)::GTA::SolutionDir=$(SolutionDir)::GTA::PlatformName=$(PlatformName)::GTA::ConfigurationName=$(ConfigurationName)::GTA::TheTarget=$(TargetFileName)::GTA::TheWorkingDirectory=$(LocalDebuggerWorkingDirectory) > $(TargetPath).gta_settings_helper @@ -181,7 +181,7 @@ true - echo SolutionPath=$(SolutionPath)::GTA::SolutionDir=$(SolutionDir)::GTA::PlatformName=$(PlatformName)::GTA::ConfigurationName=$(ConfigurationName)::GTA::TheTarget=$(TargetFileName) > $(TargetPath).gta_settings_helper + echo SolutionPath=$(SolutionPath)::GTA::SolutionDir=$(SolutionDir)::GTA::PlatformName=$(PlatformName)::GTA::ConfigurationName=$(ConfigurationName)::GTA::TheTarget=$(TargetFileName)::GTA::TheWorkingDirectory=$(LocalDebuggerWorkingDirectory) > $(TargetPath).gta_settings_helper @@ -205,7 +205,7 @@ true - echo SolutionPath=$(SolutionPath)::GTA::SolutionDir=$(SolutionDir)::GTA::PlatformName=$(PlatformName)::GTA::ConfigurationName=$(ConfigurationName)::GTA::TheTarget=$(TargetFileName) > $(TargetPath).gta_settings_helper + echo SolutionPath=$(SolutionPath)::GTA::SolutionDir=$(SolutionDir)::GTA::PlatformName=$(PlatformName)::GTA::ConfigurationName=$(ConfigurationName)::GTA::TheTarget=$(TargetFileName)::GTA::TheWorkingDirectory=$(LocalDebuggerWorkingDirectory) > $(TargetPath).gta_settings_helper From e29707b4955d13d1abe4945680a0c7575b949aa4 Mon Sep 17 00:00:00 2001 From: Christian Soltenborn Date: Sat, 4 Jan 2020 19:59:56 +0100 Subject: [PATCH 17/19] added debug output --- GoogleTestAdapter/Core/Settings/HelperFilesCache.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/GoogleTestAdapter/Core/Settings/HelperFilesCache.cs b/GoogleTestAdapter/Core/Settings/HelperFilesCache.cs index c2af18a71..5cd3af61b 100644 --- a/GoogleTestAdapter/Core/Settings/HelperFilesCache.cs +++ b/GoogleTestAdapter/Core/Settings/HelperFilesCache.cs @@ -51,6 +51,7 @@ private IDictionary LoadReplacementsMap(string executable) if (!File.Exists(helperFile)) return new Dictionary(); + _logger.DebugInfo($"Parsing settings helper file at {helperFile} (executable: {executable})"); return ParseHelperFile(File.ReadAllText(helperFile).Trim()); } catch (Exception e) @@ -71,6 +72,7 @@ private IDictionary ParseHelperFile(string content) string placeholder = setting.Substring(0, index); string value = setting.Substring(index + 1, setting.Length - index - 1); replacementMap.Add(placeholder, value); + _logger.VerboseInfo($"Found placeholder {placeholder} with value '{value}'"); } } return replacementMap; From 718b198ae0608e49ec8c0098bb8e26fac42493f9 Mon Sep 17 00:00:00 2001 From: Christian Soltenborn Date: Sun, 12 Jan 2020 15:44:58 +0100 Subject: [PATCH 18/19] fixed minor flaw --- GoogleTestAdapter/Resources/AllTestSettings.gta.runsettings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GoogleTestAdapter/Resources/AllTestSettings.gta.runsettings b/GoogleTestAdapter/Resources/AllTestSettings.gta.runsettings index baf236924..58697c181 100644 --- a/GoogleTestAdapter/Resources/AllTestSettings.gta.runsettings +++ b/GoogleTestAdapter/Resources/AllTestSettings.gta.runsettings @@ -23,7 +23,7 @@ .*Tests.*.exe 30 - ${SolutionDir} + $(SolutionDir) C:\fooDir;C:\barDir From 737fcf72464422313b13f257a7283661d47c1cb9 Mon Sep 17 00:00:00 2001 From: Christian Soltenborn Date: Sat, 29 Feb 2020 10:10:07 +0100 Subject: [PATCH 19/19] preparing release --- GoogleTestAdapter/Packaging.GTA/VsPackage.nuspec | 2 +- GoogleTestAdapter/VsPackage.GTA/ReleaseNotes/History.cs | 3 ++- .../VsPackage.GTA/Resources/ReleaseNotes/0.18.0.md | 3 +++ GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj | 3 +++ README.md | 6 +++--- appveyor.yml | 2 +- 6 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 GoogleTestAdapter/VsPackage.GTA/Resources/ReleaseNotes/0.18.0.md diff --git a/GoogleTestAdapter/Packaging.GTA/VsPackage.nuspec b/GoogleTestAdapter/Packaging.GTA/VsPackage.nuspec index 41f4da72b..3d2f8e6ca 100644 --- a/GoogleTestAdapter/Packaging.GTA/VsPackage.nuspec +++ b/GoogleTestAdapter/Packaging.GTA/VsPackage.nuspec @@ -2,7 +2,7 @@ GoogleTestAdapter - 0.17.1 + 0.18.0 Google Test Adapter Christian Soltenborn Christian Soltenborn diff --git a/GoogleTestAdapter/VsPackage.GTA/ReleaseNotes/History.cs b/GoogleTestAdapter/VsPackage.GTA/ReleaseNotes/History.cs index 42a2448d9..e8404978a 100644 --- a/GoogleTestAdapter/VsPackage.GTA/ReleaseNotes/History.cs +++ b/GoogleTestAdapter/VsPackage.GTA/ReleaseNotes/History.cs @@ -69,7 +69,8 @@ static History() { new Version(0, 16, 0), new DateTime(2019, 4, 28) }, { new Version(0, 16, 1), new DateTime(2019, 5, 4) }, { new Version(0, 17, 0), new DateTime(2019, 10, 6) }, - { new Version(0, 17, 1), new DateTime(2019, 10, 12) } + { new Version(0, 17, 1), new DateTime(2019, 10, 12) }, + { new Version(0, 18, 0), new DateTime(2020, 2, 29) } }; } } diff --git a/GoogleTestAdapter/VsPackage.GTA/Resources/ReleaseNotes/0.18.0.md b/GoogleTestAdapter/VsPackage.GTA/Resources/ReleaseNotes/0.18.0.md new file mode 100644 index 000000000..ee3d8330d --- /dev/null +++ b/GoogleTestAdapter/VsPackage.GTA/Resources/ReleaseNotes/0.18.0.md @@ -0,0 +1,3 @@ +* enhancement: the new option *Environment variables* allows to modify the environment variables seen by the test executables without modifying the system's global environment. Variables are provided by means of key-value pairs 'Foo=Bar', and are separated by '//||//' ([#302](https://github.com/csoltenborn/GoogleTestAdapter/issues/302)) +* enhancement: added some debug output to make working with settings helper files easier ([#278](https://github.com/csoltenborn/GoogleTestAdapter/issues/278)) +* bugfix: if the last variable's value of a settings helper file was followed by a line break, that line break would be added to the value ([#306](https://github.com/csoltenborn/GoogleTestAdapter/issues/306)) \ No newline at end of file diff --git a/GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj b/GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj index 72c833d6c..320d708aa 100644 --- a/GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj +++ b/GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj @@ -241,6 +241,9 @@ PreserveNewest + + PreserveNewest + diff --git a/README.md b/README.md index 8c3e94e1e..163ddc2c7 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-48k-blue.svg)](https://marketplace.visualstudio.com/items?itemName=ChristianSoltenborn.GoogleTestAdapter) +[![Visual Studio Marketplace downloads](https://img.shields.io/badge/vs_marketplace-52k-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.17.1-blue.svg)](https://marketplace.visualstudio.com/items?itemName=ChristianSoltenborn.GoogleTestAdapter) +[![Download from Visual Studio Marketplace](https://img.shields.io/badge/vs_marketplace-v0.18.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.17.1/GoogleTestAdapter-0.17.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.18.0/GoogleTestAdapter-0.18.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 d5c4bceae..a4d75c77f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 0.17.1.{build} +version: 0.18.0.{build} os: - Visual Studio 2017 configuration: Release