Compose path to testhost + adapter.

test/Microsoft.TestPlatform.AcceptanceTests/ExecutionTests.cs

@@ -20,7 +20,7 @@ public class ExecutionTests : AcceptanceTestBase
 
     [TestMethod]
     [MSTestCompatibilityDataSource(InProcess = true)]
-    public void RunMultipleTestAssemblies(RunnerInfo runnerInfo, MSTestInfo msTestInfo)
+    public void RunMultipleTestAssemblies(RunnerInfo runnerInfo, TesthostInfo testhostInfo, MSTestInfo msTestInfo)
     {
         SetTestEnvironment(_testEnvironment, runnerInfo);
 
@@ -33,15 +33,15 @@ public void RunMultipleTestAssemblies(RunnerInfo runnerInfo, MSTestInfo msTestIn
     }
 
     [TestMethod]
-    //[TestPlatformCompatibilityDataSource("netcoreapp2.1", "LegacyStable", "netcoreapp2.1", "Latest", "LatestPreview")]
-    [TestPlatformCompatibilityDataSource("netcoreapp2.1", AcceptanceTestBase.LATEST_TO_LEGACY, "netcoreapp2.1", AcceptanceTestBase.LATEST_TO_LEGACY, AcceptanceTestBase.LATESTPREVIEW_TO_LEGACY)]
+    [TestPlatformCompatibilityDataSource("netcoreapp2.1", "LegacyStable", "netcoreapp2.1", "Latest", "LatestPreview")]
+    // [TestPlatformCompatibilityDataSource("netcoreapp2.1", LATEST_TO_LEGACY, "netcoreapp2.1", LATEST_TO_LEGACY, LATESTPREVIEW_TO_LEGACY)]
     //[TestPlatformCompatibilityDataSource()]
 
-    public void RunMultipleTestAssemblies223(RunnerInfo runnerInfo, VSTestConsoleInfo consoleInfo, MSTestInfo msTestInfo)
+    public void RunMultipleTestAssemblies223(RunnerInfo runnerInfo, VSTestConsoleInfo consoleInfo, TesthostInfo testhostInfo, MSTestInfo msTestInfo)
     {
         SetTestEnvironment(_testEnvironment, runnerInfo, consoleInfo);
 
-        var assemblyPaths = BuildMultipleAssemblyPath(msTestInfo, "SimpleTestProject.dll", "SimpleTestProject2.dll").Trim('\"');
+        var assemblyPaths = BuildMultipleAssemblyPath(testhostInfo, msTestInfo, "SimpleTestProject.dll", "SimpleTestProject2.dll").Trim('\"');
 
         InvokeVsTestForExecution(assemblyPaths, testAdapterPath: null, FrameworkArgValue, string.Empty);
 

test/Microsoft.TestPlatform.AcceptanceTests/Extension/TestDataSource.cs

@@ -100,3 +100,35 @@ string ITestDataSource.GetDisplayName(MethodInfo methodInfo, object[] data)
         return GetDisplayName(methodInfo, (T1)data[0], (T2)data[1], (T3)data[2]);
     }
 }
+
+[AttributeUsage(AttributeTargets.Method)]
+public abstract class TestDataSource<T1, T2, T3, T4> : Attribute, ITestDataSource
+    where T1 : notnull
+    where T2 : notnull
+    where T3 : notnull
+{
+    private readonly List<object[]> _data = new();
+
+    public abstract void CreateData(MethodInfo methodInfo);
+
+    public void AddData(T1 value1, T2 value2, T3 value3, T4 value4)
+    {
+        _data.Add(new object[] { value1, value2, value3, value4 });
+    }
+
+    public virtual string GetDisplayName(MethodInfo methodInfo, T1 value1, T2 value2, T3 value3, T4 value4)
+    {
+        return $"{methodInfo.Name} ({value1}, {value2}, {value3}, {value4})";
+    }
+
+    IEnumerable<object[]> ITestDataSource.GetData(MethodInfo methodInfo)
+    {
+        CreateData(methodInfo);
+        return _data;
+    }
+
+    string ITestDataSource.GetDisplayName(MethodInfo methodInfo, object[] data)
+    {
+        return GetDisplayName(methodInfo, (T1)data[0], (T2)data[1], (T3)data[2], (T4)data[3]);
+    }
+}

test/Microsoft.TestPlatform.AcceptanceTests/Extension/TestPlatformCompatibilityDataSource.cs

@@ -15,7 +15,7 @@
 
 namespace Microsoft.TestPlatform.AcceptanceTests;
 
-public sealed class TestPlatformCompatibilityDataSource : TestDataSource<RunnerInfo, VSTestConsoleInfo, MSTestInfo>
+public sealed class TestPlatformCompatibilityDataSource : TestDataSource<RunnerInfo, VSTestConsoleInfo, TesthostInfo, MSTestInfo>
 {
     private static XmlDocument? s_depsXml;
     private readonly string[] _runnerFrameworks;
@@ -58,7 +58,7 @@ public TestPlatformCompatibilityDataSource(
 
     public override void CreateData(MethodInfo methodInfo)
     {
-        var dataRows = new List<KeyValuePair<RunnerInfo, KeyValuePair<VSTestConsoleInfo, MSTestInfo>>>();
+        var dataRows = new List<(RunnerInfo runnerInfo, VSTestConsoleInfo vstestConsoleInfo, TesthostInfo testhostInfo, MSTestInfo mstestInfo)>();
         AddEveryVersionOfRunner(dataRows);
 
         // with every version of host
@@ -100,11 +100,11 @@ public override void CreateData(MethodInfo methodInfo)
 
         foreach (var dataRow in dataRows)
         {
-            AddData(dataRow.Key, dataRow.Value.Key, dataRow.Value.Value);
+            AddData(dataRow.runnerInfo, dataRow.vstestConsoleInfo, dataRow.testhostInfo, dataRow.mstestInfo);
         }
     }
 
-    private void AddOlderConfigurations(List<KeyValuePair<RunnerInfo, KeyValuePair<VSTestConsoleInfo, MSTestInfo>>> dataRows)
+    private void AddOlderConfigurations(List<(RunnerInfo, VSTestConsoleInfo, TesthostInfo, MSTestInfo)> dataRows)
     {
         // Older configurations where the runner, host and adapter version are the same.
         // We already added the row where all are newest when adding combination with all runners.
@@ -126,7 +126,7 @@ private void AddOlderConfigurations(List<KeyValuePair<RunnerInfo, KeyValuePair<V
         }
     }
 
-    private void AddEveryVersionOfAdapter(List<KeyValuePair<RunnerInfo, KeyValuePair<VSTestConsoleInfo, MSTestInfo>>> dataRows)
+    private void AddEveryVersionOfAdapter(List<(RunnerInfo, VSTestConsoleInfo, TesthostInfo, MSTestInfo)> dataRows)
     {
         var runnerVersion = _runnerVersions[0];
         foreach (var runnerFramework in _runnerFrameworks)
@@ -149,7 +149,7 @@ private void AddEveryVersionOfAdapter(List<KeyValuePair<RunnerInfo, KeyValuePair
         }
     }
 
-    private void AddEveryVersionOfHost(List<KeyValuePair<RunnerInfo, KeyValuePair<VSTestConsoleInfo, MSTestInfo>>> dataRows)
+    private void AddEveryVersionOfHost(List<(RunnerInfo, VSTestConsoleInfo, TesthostInfo, MSTestInfo)> dataRows)
     {
         var runnerVersion = _runnerVersions[0];
 
@@ -176,7 +176,7 @@ private void AddEveryVersionOfHost(List<KeyValuePair<RunnerInfo, KeyValuePair<VS
         }
     }
 
-    private void AddEveryVersionOfRunner(List<KeyValuePair<RunnerInfo, KeyValuePair<VSTestConsoleInfo, MSTestInfo>>> dataRows)
+    private void AddEveryVersionOfRunner(List<(RunnerInfo, VSTestConsoleInfo, TesthostInfo, MSTestInfo)> dataRows)
     {
         foreach (var runnerVersion in _runnerVersions)
         {
@@ -199,13 +199,14 @@ private void AddEveryVersionOfRunner(List<KeyValuePair<RunnerInfo, KeyValuePair<
         }
     }
 
-    private void AddRow(List<KeyValuePair<RunnerInfo, KeyValuePair<VSTestConsoleInfo, MSTestInfo>>> dataRows,
+    private void AddRow(List<(RunnerInfo, VSTestConsoleInfo, TesthostInfo, MSTestInfo)> dataRows,
         string runnerVersion, string runnerFramework, string hostVersion, string hostFramework, string adapter, string adapterVersion)
     {
-        var mstestInfo = GetMSTestInfo(adapterVersion);
         RunnerInfo runnerInfo = GetRunnerInfo(runnerFramework, hostFramework, inIsolation: true);
         var vstestConsoleInfo = GetVSTestConsoleInfo(runnerVersion, runnerInfo);
-        dataRows.Add(new KeyValuePair<RunnerInfo, KeyValuePair<VSTestConsoleInfo, MSTestInfo>>(runnerInfo, new KeyValuePair<VSTestConsoleInfo, MSTestInfo>(vstestConsoleInfo, mstestInfo)));
+        var testhostInfo = TesthostCompatibilityDataSource.GetTesthostInfo(hostVersion);
+        var mstestInfo = GetMSTestInfo(adapterVersion);
+        dataRows.Add(new(runnerInfo, vstestConsoleInfo, testhostInfo, mstestInfo));
     }
 
     private RunnerInfo GetRunnerInfo(string runnerFramework, string hostFramework, bool inIsolation)

test/Microsoft.TestPlatform.AcceptanceTests/Extension/TesthostCompatibilityDataSource.cs

@@ -99,7 +99,7 @@ public string GetDisplayName(MethodInfo methodInfo, object[] data)
         return string.Format(CultureInfo.CurrentCulture, "{0} ({1})", methodInfo.Name, string.Join(",", data));
     }
 
-    private TesthostInfo GetTesthostInfo(string testhostVersionType)
+    internal static TesthostInfo GetTesthostInfo(string testhostVersionType)
     {
         var depsXml = GetDependenciesXml();
 

test/Microsoft.TestPlatform.TestUtilities/IntegrationTestBase.cs

@@ -919,6 +919,21 @@ protected string BuildMultipleAssemblyPath(DllInfo dllInfo, params string[] asse
         return string.Join(" ", assetFullPaths);
     }
 
+    protected string BuildMultipleAssemblyPath(TesthostInfo testhostInfo, DllInfo adapterInfo, params string[] assetNames)
+    {
+        var assetFullPaths = new string[assetNames.Length];
+        for (var i = 0; i < assetNames.Length; i++)
+        {
+            var path = GetAssetFullPath(assetNames[i]);
+            var updatedPath = testhostInfo.UpdatePath(adapterInfo.UpdatePath(path));
+            Assert.IsTrue(File.Exists(updatedPath), "GetTestAsset: Path not found: {0}. Most likely you need to build using build.cmd -s PrepareAcceptanceTests.", updatedPath);
+
+            assetFullPaths[i] = updatedPath.AddDoubleQuote();
+        }
+
+        return string.Join(" ", assetFullPaths);
+    }
+
     protected static string GetDiagArg(string rootDir)
         => " --diag:" + Path.Combine(rootDir, "log.txt");