Merge pull request #251 from microsoft/dev/gcampbell/FixParameterizedWorkingDirectory

Fix parameterized test settings

Author: gcampbell-msft

GoogleTestAdapter/Core/Runners/SequentialTestRunner.cs

@@ -12,6 +12,7 @@
 using GoogleTestAdapter.Model;
 using GoogleTestAdapter.Framework;
 using GoogleTestAdapter.Settings;
+using GoogleTestAdapter.TestCases;
 
 namespace GoogleTestAdapter.Runners
 {
@@ -64,6 +65,18 @@ public void RunTests(IEnumerable<TestCase> testCasesToRun, string baseDir,
                         foreach (var testCase in groupedTestCases[executable])
                         {
                             var key = Path.GetFullPath(testCase.Source) + ":" + testCase.FullyQualifiedName;
+
+                            var testType = testCase.Traits.FirstOrDefault(t => t.Name.Equals(nameof(TestCaseDescriptor.TestType)));
+
+                            // If it is a parameterized test, we should look for the "parent" key which doesn't have the suite or the id defined in the xml file. 
+                            // The strategy for this can also be seen in the MethodSignatureCreate.cs file, going the other way.
+                            if (testType != null && Enum.TryParse(testType.Value, out TestCaseDescriptor.TestTypes type) && type == TestCaseDescriptor.TestTypes.Parameterized)
+                            {
+                                int firstIndex = testCase.FullyQualifiedName.IndexOf("/");
+                                int lastIndex = testCase.FullyQualifiedName.LastIndexOf("/");
+                                key = string.Concat(Path.GetFullPath(testCase.Source), ":", "*", testCase.FullyQualifiedName.Substring(firstIndex, lastIndex - firstIndex), "/*");
+                            }
+
                             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

@@ -234,6 +234,9 @@ private TestCase CreateTestCase(TestCaseDescriptor descriptor)
             var testCase = new TestCase(
                 descriptor.FullyQualifiedName, descriptor.FullyQualifiedName, _executable, descriptor.DisplayName, "", 0);
             testCase.Traits.AddRange(GetFinalTraits(descriptor.DisplayName, new List<Trait>()));
+
+            // Add the TestType for use in the executor when constructing the test key.
+            testCase.Traits.Add(new Trait(nameof(TestCaseDescriptor.TestType), descriptor.TestType.ToString()));
             return testCase;
         }
 
@@ -261,12 +264,19 @@ private TestCase CreateTestCase(TestCaseDescriptor descriptor, TestCaseLocation
                 var testCase = new TestCase(
                     descriptor.FullyQualifiedName, ns + descriptor.FullyQualifiedName, _executable, descriptor.DisplayName, location.Sourcefile, (int)location.Line);
                 testCase.Traits.AddRange(GetFinalTraits(descriptor.DisplayName, location.Traits));
+
+                // Add the TestType for use in the executor when constructing the test key.
+                testCase.Traits.Add(new Trait(nameof(TestCaseDescriptor.TestType), descriptor.TestType.ToString()));
                 return testCase;
             }
 
-            _logger.LogWarning(String.Format(Resources.LocationNotFoundError, descriptor.FullyQualifiedName));
-            return new TestCase(
+            var returnTest = new TestCase(
                 descriptor.FullyQualifiedName, descriptor.FullyQualifiedName, _executable, descriptor.DisplayName, "", 0);
+
+            // Add the TestType for use in the executor when constructing the test key.
+            returnTest.Traits.Add(new Trait(nameof(TestCaseDescriptor.TestType), descriptor.TestType.ToString()));
+            _logger.LogWarning(String.Format(Resources.LocationNotFoundError, descriptor.FullyQualifiedName));
+            return returnTest;
         }
 
         internal static string GetTestSignatureNamespace(string signature)