cleanup, removing diagnostics

Author: Elizabeth Morrow

GoogleTestAdapter/Core/Runners/TestResultCollector.cs

@@ -38,7 +38,6 @@ bool isFixtureMethodCase(TestCase tc)
             CreateFixtureMethodResults(arrFixtureMethods, testResults);
 
             var consoleParser = new StandardOutputTestResultParser(arrTestCasesRun, consoleOutput, _logger);
-
             if (testResults.Count < arrTestCasesRun.Length)
                 CollectResultsFromConsoleOutput(consoleParser, testResults);
 

GoogleTestAdapter/Core/Settings/SettingsWrapper.cs

@@ -476,7 +476,7 @@ public virtual int NrOfTestRepetitions
         }
 
         public static readonly string OptionShowFixtureMethodNode = Resources.OptionShowFixtureMethodNode;
-        public const bool OptionShowFixtureMethodNodeDefaultValue = false; // TODO set to false 
+        public const bool OptionShowFixtureMethodNodeDefaultValue = false;
         public static readonly string OptionShowFixtureMethodNodeDescription = Resources.OptionShowFixtureMethodNodeDescription;
 
         public virtual bool ShowFixtureMethodNode => _currentSettings.ShowFixtureMethodNode ?? OptionShowFixtureMethodNodeDefaultValue;

GoogleTestAdapter/Core/TestCases/ListTestsParser.cs

@@ -7,12 +7,10 @@ namespace GoogleTestAdapter.TestCases
     public class ListTestsParser
     {
         private readonly string _testNameSeparator;
-        private readonly bool _showFixtureMethodNode;
 
-        public ListTestsParser(string testNameSeparator, bool showFixtureMethodNode)
+        public ListTestsParser(string testNameSeparator)
         {
             _testNameSeparator = testNameSeparator;
-            _showFixtureMethodNode = showFixtureMethodNode;
         }
 
         public IList<TestCaseDescriptor> ParseListTestsOutput(IEnumerable<string> consoleOutput)

GoogleTestAdapter/Core/TestCases/StreamingListTestsParser.cs

@@ -2,10 +2,10 @@
 
 using System;
 using System.Text.RegularExpressions;
-using System.Xml.Linq;
 
 namespace GoogleTestAdapter.TestCases
 {
+
     public class StreamingListTestsParser
     {
         private static readonly Regex SuiteRegex = new Regex($@"(([^.\s]*(?:\.[\S]+)*)|([\w\/]*(?:\.[\w\/]+)*))(?:{Regex.Escape(GoogleTestConstants.TypedTestMarker)}(.*))?", RegexOptions.Compiled);

GoogleTestAdapter/Core/TestCases/TestCaseFactory.cs

@@ -2,7 +2,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
@@ -28,7 +27,6 @@ public class TestCaseFactory
         public TestCaseFactory(string executable, ILogger logger, SettingsWrapper settings,
             IDiaResolverFactory diaResolverFactory)
         {
-            Debugger.Launch();
             _logger = logger;
             _settings = settings;
             _executable = executable;
@@ -37,7 +35,6 @@ public TestCaseFactory(string executable, ILogger logger, SettingsWrapper settin
 
         public IList<TestCase> CreateTestCases(Action<TestCase> reportTestCase = null)
         {
-            Debugger.Launch();
             List<string> standardOutput = new List<string>();
             if (_settings.UseNewTestExecutionFramework)
             {
@@ -69,7 +66,7 @@ public IList<TestCase> CreateTestCases(Action<TestCase> reportTestCase = null)
                 return new List<TestCase>();
             }
 
-            IList<TestCaseDescriptor> testCaseDescriptors = new ListTestsParser(_settings.TestNameSeparator, _settings.ShowFixtureMethodNode).ParseListTestsOutput(standardOutput);
+            IList<TestCaseDescriptor> testCaseDescriptors = new ListTestsParser(_settings.TestNameSeparator).ParseListTestsOutput(standardOutput);
             var testCaseLocations = GetTestCaseLocations(testCaseDescriptors, _settings.GetPathExtension(_executable));
 
             IList<TestCase> testCases = new List<TestCase>();
@@ -99,7 +96,6 @@ public IList<TestCase> CreateTestCases(Action<TestCase> reportTestCase = null)
 
         private IList<TestCase> NewCreateTestcases(Action<TestCase> reportTestCase, List<string> standardOutput)
         {
-            Debugger.Launch();
             var testCases = new List<TestCase>();
 
             var resolver = new NewTestCaseResolver(

GoogleTestAdapter/Core/TestResults/StandardOutputTestResultParser.cs

@@ -2,7 +2,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
 using System.Text.RegularExpressions;
@@ -16,6 +15,7 @@ public class StandardOutputTestResultParser
         private const string Run = "[ RUN      ]";
         public const string Failed = "[  FAILED  ]";
         public const string Passed = "[       OK ]";
+        public const string FailedFixture = "SetUpTestSuite or TearDownTestSuite";
 
         public static readonly string CrashText = Resources.CrashText;
 

GoogleTestAdapter/Core/TestResults/StreamingStandardOutputTestResultParser.cs

@@ -2,7 +2,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Text.RegularExpressions;
 using GoogleTestAdapter.Common;
@@ -31,7 +30,7 @@ static StreamingStandardOutputTestResultParser()
             string passedMarker = Regex.Escape(StandardOutputTestResultParser.Passed);
             string failedMarker = Regex.Escape(StandardOutputTestResultParser.Failed);
             PrefixedLineRegex = new Regex($"(.+)((?:{passedMarker}|{failedMarker}).*)", RegexOptions.Compiled);
-            FixtureMethodResultRegex = new Regex($@"(?:{failedMarker}\s*)(\w+):(?:\s+SetUpTestSuite or TearDownTestSuite)", RegexOptions.Compiled);
+            FixtureMethodResultRegex = new Regex($@"(?:{failedMarker}\s*)(\w+):(?:\s+{StandardOutputTestResultParser.FailedFixture})", RegexOptions.Compiled);
         }
 
         public StreamingStandardOutputTestResultParser(IEnumerable<TestCase> testCasesRun,
@@ -71,7 +70,7 @@ private void DoReportLine(string line)
                 }
                 ReportTestStart(line);
             }
-            else if (StandardOutputTestResultParser.IsFailedLine(line) && line.Contains("TearDownTestSuite"))
+            else if (StandardOutputTestResultParser.IsFailedLine(line) && line.Contains(StandardOutputTestResultParser.FailedFixture))
             {
                 ReportFixtureMethodFailure(line);
             }

GoogleTestAdapter/Resources/AllTestSettings.gta.runsettings

@@ -17,6 +17,7 @@
         <ParallelTestExecution>false</ParallelTestExecution>
         <PrintTestOutput>true</PrintTestOutput>
         <RunDisabledTests>false</RunDisabledTests>
+        <ShowFixtureMethodNode>false</ShowFixtureMethodNode>
         <ShuffleTests>false</ShuffleTests>
         <ShuffleTestsSeed>0</ShuffleTestsSeed>
         <TestDiscoveryRegex>.*Tests.*.exe</TestDiscoveryRegex>

GoogleTestAdapter/VsPackage.TAfGT/GoogleTestExtensionOptionsPage.vsct

@@ -44,7 +44,6 @@
 
       <Button guid="guidGoogleTestExtensionOptionsPageCmdSet" id="SwitchShowFixtureNodeOptionCommandId" priority="0x0103" type="Button">
         <Parent guid="guidGoogleTestExtensionOptionsPageCmdSet" id="ToolbarGroup" />
-        <!--<Icon guid="toolbaricons" id="show_fixture_node" />-->
         <CommandFlag>DefaultInvisible</CommandFlag>
         <CommandFlag>DynamicVisibility</CommandFlag>
         <Strings>