Include namespace in test name (#225)

Author: spebl

GoogleTestAdapter/Core/Runners/SequentialTestRunner.cs

@@ -63,7 +63,7 @@ public void RunTests(IEnumerable<TestCase> testCasesToRun, string baseDir,
 
                         foreach (var testCase in groupedTestCases[executable])
                         {
-                            var key = Path.GetFullPath(testCase.Source) + ":" + testCase.FullyQualifiedName;
+                            var key = Path.GetFullPath(testCase.Source) + ":" + testCase.DisplayName;
                             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/Core/TestCases/TestCaseFactory.cs

@@ -253,8 +253,13 @@ private TestCase CreateTestCase(TestCaseDescriptor descriptor, TestCaseLocation
         {
             if (location != null)
             {
+                var ns = GetTestSignatureNamespace(location.TestClassSignature);
+
+                if (ns != string.Empty)
+                    ns += ".";
+
                 var testCase = new TestCase(
-                    descriptor.FullyQualifiedName, _executable, descriptor.DisplayName, location.Sourcefile, (int)location.Line);
+                    ns + descriptor.FullyQualifiedName, _executable, descriptor.DisplayName, location.Sourcefile, (int)location.Line);
                 testCase.Traits.AddRange(GetFinalTraits(descriptor.DisplayName, location.Traits));
                 return testCase;
             }
@@ -264,6 +269,17 @@ private TestCase CreateTestCase(TestCaseDescriptor descriptor, TestCaseLocation
                 descriptor.FullyQualifiedName, _executable, descriptor.DisplayName, "", 0);
         }
 
+        internal static string GetTestSignatureNamespace(string signature)
+        {
+            var namespaceEnd = signature.LastIndexOf("::", StringComparison.Ordinal);
+            if (namespaceEnd > 0)
+            {
+                return signature.Substring(0, namespaceEnd);
+            }
+
+            return string.Empty;
+        }
+
         internal static string StripTestSymbolNamespace(string symbol)
         {
             var suffixLength = GoogleTestConstants.TestBodySignature.Length;

GoogleTestAdapter/Core/TestResults/StandardOutputTestResultParser.cs

@@ -59,8 +59,8 @@ private TestResult CreateTestResult(int indexOfTestcase)
             int currentLineIndex = indexOfTestcase;
 
             string line = _consoleOutput[currentLineIndex++];
-            string qualifiedTestname = RemovePrefix(line).Trim();
-            TestCase testCase = FindTestcase(qualifiedTestname);
+            string testDisplayName = RemovePrefix(line).Trim();
+            TestCase testCase = FindTestcase(testDisplayName);
             if (testCase == null)
             {
                 _logger.DebugWarning(String.Format(Resources.NoKnownTestCaseMessage, line));
@@ -189,14 +189,14 @@ private int FindIndexOfNextTestcase(int currentIndex)
             return -1;
         }
 
-        private TestCase FindTestcase(string qualifiedTestname)
+        private TestCase FindTestcase(string testDisplayName)
         {
-            return FindTestcase(qualifiedTestname, _testCasesRun);
+            return FindTestcase(testDisplayName, _testCasesRun);
         }
 
-        public static TestCase FindTestcase(string qualifiedTestname, IList<TestCase> testCasesRun)
+        public static TestCase FindTestcase(string testDisplayName, IList<TestCase> testCasesRun)
         {
-            return testCasesRun.SingleOrDefault(tc => tc.FullyQualifiedName == qualifiedTestname);
+            return testCasesRun.SingleOrDefault(tc => tc.DisplayName == testDisplayName);
         }
 
         public static bool IsRunLine(string line)