Remove namespace from tests that are scheduled to run

Author: DavidARaygoza

GoogleTestAdapter/Core/Model/TestCase.cs

@@ -6,7 +6,7 @@ public class TestCase
     {
         public string Source { get; }
 
-        public string FullyQualifiedName { get; }
+        public string FullyQualifiedName { get; set; }
         public string DisplayName { get; }
 
         public string CodeFilePath { get; }

GoogleTestAdapter/Core/Runners/SequentialTestRunner.cs

@@ -63,17 +63,8 @@ public void RunTests(IEnumerable<TestCase> testCasesToRun, string baseDir,
 
                         foreach (var testCase in groupedTestCases[executable])
                         {
-                            string fullyQualifiedName = testCase.FullyQualifiedName;
+                            var key = Path.GetFullPath(testCase.Source) + ":" + testCase.FullyQualifiedName;
 
-                            // If testCase contains a namespace then remove it because GoogleTest has no knowledge of namespaces.
-                            int frequency = fullyQualifiedName.Where(x => (x == '.')).Count();
-
-                            if (frequency > 1)
-                            {
-                                fullyQualifiedName = fullyQualifiedName.Substring(fullyQualifiedName.IndexOf('.') + 1);
-                            }
-
-                            var key = Path.GetFullPath(testCase.Source) + ":" + fullyQualifiedName;
                             ITestPropertySettings settings;
                             // Tests with default settings are treated as not having settings and can be run together
                             if (_settings.TestPropertySettingsContainer.TryGetSettings(key, out settings)

GoogleTestAdapter/TestAdapter/TestExecutor.cs

@@ -229,6 +229,20 @@ private void DoRunTests(ICollection<TestCase> testCasesToRun, IRunContext runCon
 
                 _executor = new GoogleTestExecutor(_logger, _settings);
             }
+            foreach (TestCase tc in testCasesToRun)
+            {
+                // If namespace exists then remove it so we can compare the test display names.
+                //  Using just tc.DisplayName does not work for paramaterized test cases.
+                string fullyQualifiedName = tc.FullyQualifiedName;
+                int frequency = fullyQualifiedName.Where(x => (x == '.')).Count();
+                if (frequency > 1)
+                {
+                    fullyQualifiedName = fullyQualifiedName.Substring(fullyQualifiedName.IndexOf('.') + 1);
+                }
+
+                tc.FullyQualifiedName = fullyQualifiedName;
+            }
+
             _executor.RunTests(testCasesToRun, reporter, launcher,
                 runContext.IsBeingDebugged, runContext.SolutionDirectory, processExecutor);
             reporter.AllTestsFinished();