microsoft · Evangelink · Dec 16, 2024 · Dec 1, 2024 · Nov 28, 2024 · Dec 2, 2024
diff --git a/src/Adapter/MSTest.TestAdapter/Discovery/TestMethodValidator.cs b/src/Adapter/MSTest.TestAdapter/Discovery/TestMethodValidator.cs
@@ -62,22 +62,12 @@ internal virtual bool IsValidTestMethod(MethodInfo testMethodInfo, Type type, IC
             return false;
         }
 
-        // Generic method Definitions are not valid.
-        if (testMethodInfo.IsGenericMethodDefinition)
-        {
-            string message = string.Format(CultureInfo.CurrentCulture, Resource.UTA_ErrorGenericTestMethod, testMethodInfo.DeclaringType!.FullName, testMethodInfo.Name);
-            warnings.Add(message);
-            return false;
-        }
-
         bool isAccessible = testMethodInfo.IsPublic
             || (_discoverInternals && testMethodInfo.IsAssembly);
 
         // Todo: Decide whether parameter count matters.
-        // The isGenericMethod check below id to verify that there are no closed generic methods slipping through.
-        // Closed generic methods being GenericMethod<int> and open being GenericMethod<TAttribute>.
         bool isValidTestMethod = isAccessible &&
-                                 testMethodInfo is { IsAbstract: false, IsStatic: false, IsGenericMethod: false } &&
+                                 testMethodInfo is { IsAbstract: false, IsStatic: false } &&
                                  testMethodInfo.IsValidReturnType();
 
         if (!isValidTestMethod)

diff --git a/src/Adapter/MSTest.TestAdapter/Extensions/MethodInfoExtensions.cs b/src/Adapter/MSTest.TestAdapter/Extensions/MethodInfoExtensions.cs
@@ -7,6 +7,7 @@
 
 using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Helpers;
 using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.MSTestAdapter;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Extensions;
@@ -74,7 +75,7 @@ internal static bool HasCorrectTestMethodSignature(this MethodInfo method, bool
         DebugEx.Assert(method != null, "method should not be null.");
 
         return
-            method is { IsAbstract: false, IsStatic: false, IsGenericMethod: false } &&
+            method is { IsAbstract: false, IsStatic: false } &&
             (method.IsPublic || (discoverInternals && method.IsAssembly)) &&
             (method.GetParameters().Length == 0 || ignoreParameterLength) &&
             method.IsValidReturnType(); // Match return type Task for async methods only. Else return type void.
@@ -160,6 +161,11 @@ internal static void InvokeAsSynchronousTask(this MethodInfo methodInfo, object?
 
             try
             {
+                if (methodInfo.IsGenericMethod)
+                {
+                    methodInfo = ConstructGenericMethod(methodInfo, arguments);
+                }
+
                 invokeResult = methodInfo.Invoke(classInstance, arguments);
             }
             catch (Exception ex) when (ex is TargetParameterCountException or ArgumentException)
@@ -188,4 +194,103 @@ internal static void InvokeAsSynchronousTask(this MethodInfo methodInfo, object?
             valueTask.GetAwaiter().GetResult();
         }
     }
+
+    // Scenarios to test:
+    //
+    // [DataRow(null, "Hello")]
+    // [DataRow("Hello", null)]
+    // public void TestMethod<T>(T t1, T t2) { }
+    //
+    // [DataRow(0, "Hello")]
+    // public void TestMethod<T1, T2>(T2 p0, T1, p1) { }
+    private static MethodInfo ConstructGenericMethod(MethodInfo methodInfo, object?[]? arguments)
+    {
+        DebugEx.Assert(methodInfo.IsGenericMethod, "ConstructGenericMethod should only be called for a generic method.");
+
+        if (arguments is null)
+        {
+            // An example where this could happen is:
+            // [TestMethod]
+            // public void MyTestMethod<T>() { }
+
+            // TODO: Localize.
+            throw new TestFailedException(ObjectModel.UnitTestOutcome.Error, $"The generic test method '{methodInfo.Name}' doesn't have arguments, so the generic parameter cannot be inferred.");
+        }
+
+        Type[] genericDefinitions = methodInfo.GetGenericArguments();
+        var map = new (Type GenericDefinition, Type? Substitution)[genericDefinitions.Length];
+        for (int i = 0; i < map.Length; i++)
+        {
+            map[i] = (genericDefinitions[i], null);
+        }
+
+        ParameterInfo[] parameters = methodInfo.GetParameters();
+        for (int i = 0; i < parameters.Length; i++)
+        {
+            Type parameterType = parameters[i].ParameterType;
+            if (parameterType.IsGenericMethodParameter())
+            {
+                if (arguments[i] is null)
+                {
+                    continue;
+                }
+
+                Type substitution = arguments[i]!/*Very strange nullability warning*/.GetType();
+                int mapIndexForParameter = GetMapIndexForParameterType(parameterType, map);
+                Type? existingSubstitution = map[mapIndexForParameter].Substitution;
+
+                if (existingSubstitution is null || substitution.IsAssignableFrom(existingSubstitution))
+                {
+                    map[mapIndexForParameter] = (parameterType, substitution);
+                }
+                else if (existingSubstitution.IsAssignableFrom(substitution))
+                {
+                    // Do nothing. We already have a good existing substitution.
+                }
+                else
+                {
+                    // TODO: Localize.
+                    throw new InvalidOperationException($"Found two conflicting types for generic parameter '{parameterType.Name}'. The conflicting types are '{existingSubstitution}' and '{substitution}'.");
+                }
+            }
+        }
+
+        for (int i = 0; i < map.Length; i++)
+        {
+            // TODO: Better to throw? or tolerate and transform to typeof(object)?
+            Type substitution = map[i].Substitution ?? throw new InvalidOperationException($"The type of the generic parameter '{map[i].GenericDefinition.Name}' could not be inferred.");
+            genericDefinitions[i] = substitution;
+        }
+
+        try
+        {
+            MethodInfo constructed = methodInfo.MakeGenericMethod(genericDefinitions);
+            if (constructed.ContainsGenericParameters)
+            {
+                // TODO: Localize.
+                throw new TestFailedException(ObjectModel.UnitTestOutcome.Error, $"The generic test method '{methodInfo}' is not supported. Generic type parameters can only be the top level type. For example, 'T' is supported but 'T[]' is not.");
+            }
+
+            return constructed;
+        }
+        catch (Exception e)
+        {
+            // The caller catches ArgumentExceptions and will lose the original exception details.
+            // We transform the exception to TestFailedException here to preserve its details.
+            throw new TestFailedException(ObjectModel.UnitTestOutcome.Error, e.TryGetMessage(), e.TryGetStackTraceInformation(), e);
+        }
+    }
+
+    private static int GetMapIndexForParameterType(Type parameterType, (Type GenericDefinition, Type? Substitution)[] map)
+    {
+        for (int i = 0; i < map.Length; i++)
+        {
+            if (parameterType == map[i].GenericDefinition)
+            {
+                return i;
+            }
+        }
+
+        throw ApplicationStateGuard.Unreachable();
+    }
 }
diff --git a/src/Adapter/MSTest.TestAdapter/Resources/Resource.Designer.cs b/src/Adapter/MSTest.TestAdapter/Resources/Resource.Designer.cs
diff --git a/src/Adapter/MSTest.TestAdapter/Resources/Resource.resx b/src/Adapter/MSTest.TestAdapter/Resources/Resource.resx
@@ -175,9 +175,6 @@
     <value>Unable to load types from the test source '{0}'. Some or all of the tests in this source may not be discovered.
 Error: {1}</value>
   </data>
-  <data name="UTA_ErrorGenericTestMethod" xml:space="preserve">
-    <value>UTA015: A generic method cannot be a test method. {0}.{1} has invalid signature</value>
-  </data>
   <data name="TestAssembly_FileDoesNotExist" xml:space="preserve">
     <value>File does not exist: {0}</value>
   </data>

diff --git a/src/Adapter/MSTest.TestAdapter/Resources/xlf/Resource.cs.xlf b/src/Adapter/MSTest.TestAdapter/Resources/xlf/Resource.cs.xlf
@@ -203,11 +203,6 @@ Error: {1}</source>
 Chyba: {1}</target>
         <note></note>
       </trans-unit>
-      <trans-unit id="UTA_ErrorGenericTestMethod">
-        <source>UTA015: A generic method cannot be a test method. {0}.{1} has invalid signature</source>
-        <target state="translated">UTA015: Obecná metoda nemůže být testovací metodou. {0}.{1} má neplatný podpis.</target>
-        <note></note>
-      </trans-unit>
       <trans-unit id="TestAssembly_FileDoesNotExist">
         <source>File does not exist: {0}</source>
         <target state="translated">Neexistující soubor: {0}</target>

diff --git a/src/Adapter/MSTest.TestAdapter/Resources/xlf/Resource.de.xlf b/src/Adapter/MSTest.TestAdapter/Resources/xlf/Resource.de.xlf
@@ -203,11 +203,6 @@ Error: {1}</source>
 Fehler: {1}</target>
         <note></note>
       </trans-unit>
-      <trans-unit id="UTA_ErrorGenericTestMethod">
-        <source>UTA015: A generic method cannot be a test method. {0}.{1} has invalid signature</source>
-        <target state="translated">UTA015: Eine generische Methode kann keine Testmethode sein. '{0}.{1}' weist eine ungültige Signatur auf.</target>
-        <note></note>
-      </trans-unit>
       <trans-unit id="TestAssembly_FileDoesNotExist">
         <source>File does not exist: {0}</source>
         <target state="translated">Die Datei ist nicht vorhanden: {0}</target>

diff --git a/src/Adapter/MSTest.TestAdapter/Resources/xlf/Resource.es.xlf b/src/Adapter/MSTest.TestAdapter/Resources/xlf/Resource.es.xlf
@@ -203,11 +203,6 @@ Error: {1}</source>
 Error: {1}</target>
         <note></note>
       </trans-unit>
-      <trans-unit id="UTA_ErrorGenericTestMethod">
-        <source>UTA015: A generic method cannot be a test method. {0}.{1} has invalid signature</source>
-        <target state="translated">UTA015: Un método genérico no puede ser un método de prueba. {0}.{1} tiene una firma no válida</target>
-        <note></note>
-      </trans-unit>
       <trans-unit id="TestAssembly_FileDoesNotExist">
         <source>File does not exist: {0}</source>
         <target state="translated">El archivo no existe: {0}</target>

diff --git a/src/Adapter/MSTest.TestAdapter/Resources/xlf/Resource.fr.xlf b/src/Adapter/MSTest.TestAdapter/Resources/xlf/Resource.fr.xlf
@@ -203,11 +203,6 @@ Error: {1}</source>
 Erreur : {1}</target>
         <note></note>
       </trans-unit>
-      <trans-unit id="UTA_ErrorGenericTestMethod">
-        <source>UTA015: A generic method cannot be a test method. {0}.{1} has invalid signature</source>
-        <target state="translated">UTA015 : une méthode générique ne peut pas être une méthode de test. {0}.{1} a une signature non valide</target>
-        <note></note>
-      </trans-unit>
       <trans-unit id="TestAssembly_FileDoesNotExist">
         <source>File does not exist: {0}</source>
         <target state="translated">Fichier inexistant : {0}</target>

diff --git a/src/Adapter/MSTest.TestAdapter/Resources/xlf/Resource.it.xlf b/src/Adapter/MSTest.TestAdapter/Resources/xlf/Resource.it.xlf
@@ -203,11 +203,6 @@ Error: {1}</source>
 Errore: {1}</target>
         <note></note>
       </trans-unit>
-      <trans-unit id="UTA_ErrorGenericTestMethod">
-        <source>UTA015: A generic method cannot be a test method. {0}.{1} has invalid signature</source>
-        <target state="translated">UTA015: un metodo generico non può essere un metodo di test. La firma di {0}.{1} non è valida</target>
-        <note></note>
-      </trans-unit>
       <trans-unit id="TestAssembly_FileDoesNotExist">
         <source>File does not exist: {0}</source>
         <target state="translated">Il file {0} non esiste</target>

diff --git a/src/Adapter/MSTest.TestAdapter/Resources/xlf/Resource.ja.xlf b/src/Adapter/MSTest.TestAdapter/Resources/xlf/Resource.ja.xlf
@@ -204,11 +204,6 @@ Error: {1}</source>
 エラー: {1}</target>
         <note></note>
       </trans-unit>
-      <trans-unit id="UTA_ErrorGenericTestMethod">
-        <source>UTA015: A generic method cannot be a test method. {0}.{1} has invalid signature</source>
-        <target state="translated">UTA015: ジェネリック メソッドがテスト メソッドになることはできません。{0}.{1} のシグネチャは無効です</target>
-        <note></note>
-      </trans-unit>
       <trans-unit id="TestAssembly_FileDoesNotExist">
         <source>File does not exist: {0}</source>
         <target state="translated">ファイルが存在しません: {0}</target>

diff --git a/src/Adapter/MSTest.TestAdapter/Resources/xlf/Resource.ko.xlf b/src/Adapter/MSTest.TestAdapter/Resources/xlf/Resource.ko.xlf
@@ -203,11 +203,6 @@ Error: {1}</source>
 오류: {1}</target>
         <note></note>
       </trans-unit>
-      <trans-unit id="UTA_ErrorGenericTestMethod">
-        <source>UTA015: A generic method cannot be a test method. {0}.{1} has invalid signature</source>
-        <target state="translated">UTA015: 제네릭 메서드는 테스트 메서드일 수 없습니다. {0}.{1}에 잘못된 서명이 있습니다.</target>
-        <note></note>
-      </trans-unit>
       <trans-unit id="TestAssembly_FileDoesNotExist">
         <source>File does not exist: {0}</source>
         <target state="translated">파일이 없습니다. {0}</target>

diff --git a/src/Adapter/MSTest.TestAdapter/Resources/xlf/Resource.pl.xlf b/src/Adapter/MSTest.TestAdapter/Resources/xlf/Resource.pl.xlf
@@ -203,11 +203,6 @@ Error: {1}</source>
 Błąd: {1}</target>
         <note></note>
       </trans-unit>
-      <trans-unit id="UTA_ErrorGenericTestMethod">
-        <source>UTA015: A generic method cannot be a test method. {0}.{1} has invalid signature</source>
-        <target state="translated">UTA015: Metoda ogólna nie może być metodą testową. {0}{1} ma nieprawidłową sygnaturę</target>
-        <note></note>
-      </trans-unit>
       <trans-unit id="TestAssembly_FileDoesNotExist">
         <source>File does not exist: {0}</source>
         <target state="translated">Plik nie istnieje: {0}</target>

diff --git a/src/Adapter/MSTest.TestAdapter/Resources/xlf/Resource.pt-BR.xlf b/src/Adapter/MSTest.TestAdapter/Resources/xlf/Resource.pt-BR.xlf
@@ -203,11 +203,6 @@ Error: {1}</source>
 Erro: {1}</target>
         <note></note>
       </trans-unit>
-      <trans-unit id="UTA_ErrorGenericTestMethod">
-        <source>UTA015: A generic method cannot be a test method. {0}.{1} has invalid signature</source>
-        <target state="translated">UTA015: um método genérico não pode ser um método de teste. {0}.{1} tem assinatura inválida</target>
-        <note></note>
-      </trans-unit>
       <trans-unit id="TestAssembly_FileDoesNotExist">
         <source>File does not exist: {0}</source>
         <target state="translated">O arquivo não existe: {0}</target>

diff --git a/src/Adapter/MSTest.TestAdapter/Resources/xlf/Resource.ru.xlf b/src/Adapter/MSTest.TestAdapter/Resources/xlf/Resource.ru.xlf
@@ -203,11 +203,6 @@ Error: {1}</source>
 Ошибка: {1}</target>
         <note></note>
       </trans-unit>
-      <trans-unit id="UTA_ErrorGenericTestMethod">
-        <source>UTA015: A generic method cannot be a test method. {0}.{1} has invalid signature</source>
-        <target state="translated">UTA015: универсальный метод не может быть методом теста. {0}.{1} имеет недопустимую сигнатуру</target>
-        <note></note>
-      </trans-unit>
       <trans-unit id="TestAssembly_FileDoesNotExist">
         <source>File does not exist: {0}</source>
         <target state="translated">Файл не существует: {0}</target>

diff --git a/src/Adapter/MSTest.TestAdapter/Resources/xlf/Resource.tr.xlf b/src/Adapter/MSTest.TestAdapter/Resources/xlf/Resource.tr.xlf
@@ -203,11 +203,6 @@ Error: {1}</source>
 Hata: {1}</target>
         <note></note>
       </trans-unit>
-      <trans-unit id="UTA_ErrorGenericTestMethod">
-        <source>UTA015: A generic method cannot be a test method. {0}.{1} has invalid signature</source>
-        <target state="translated">UTA015: Genel metot bir test metodu olamaz. {0}.{1} geçersiz imzaya sahip</target>
-        <note></note>
-      </trans-unit>
       <trans-unit id="TestAssembly_FileDoesNotExist">
         <source>File does not exist: {0}</source>
         <target state="translated">Dosya yok: {0}</target>

diff --git a/src/Adapter/MSTest.TestAdapter/Resources/xlf/Resource.zh-Hans.xlf b/src/Adapter/MSTest.TestAdapter/Resources/xlf/Resource.zh-Hans.xlf
@@ -203,11 +203,6 @@ Error: {1}</source>
 错误: {1}</target>
         <note></note>
       </trans-unit>
-      <trans-unit id="UTA_ErrorGenericTestMethod">
-        <source>UTA015: A generic method cannot be a test method. {0}.{1} has invalid signature</source>
-        <target state="translated">UTA015: 泛型方法不可为测试方法。{0}.{1} 具有无效签名</target>
-        <note></note>
-      </trans-unit>
       <trans-unit id="TestAssembly_FileDoesNotExist">
         <source>File does not exist: {0}</source>
         <target state="translated">文件不存在: {0}</target>

diff --git a/src/Adapter/MSTest.TestAdapter/Resources/xlf/Resource.zh-Hant.xlf b/src/Adapter/MSTest.TestAdapter/Resources/xlf/Resource.zh-Hant.xlf
@@ -203,11 +203,6 @@ Error: {1}</source>
 錯誤: {1}</target>
         <note></note>
       </trans-unit>
-      <trans-unit id="UTA_ErrorGenericTestMethod">
-        <source>UTA015: A generic method cannot be a test method. {0}.{1} has invalid signature</source>
-        <target state="translated">UTA015: 泛型方法不可為測試方法。{0}.{1} 具有無效的簽章</target>
-        <note></note>
-      </trans-unit>
       <trans-unit id="TestAssembly_FileDoesNotExist">
         <source>File does not exist: {0}</source>
         <target state="translated">檔案不存在: {0}</target>