Added support for WinUI3 appxrecipe. (#2849)

Author: azchohfi

src/Microsoft.TestPlatform.CrossPlatEngine/Discovery/DiscoveryManager.cs

@@ -100,7 +100,7 @@ public void DiscoverTests(DiscoveryCriteria discoveryCriteria, ITestDiscoveryEve
                 // Validate the sources
                 foreach (var kvp in discoveryCriteria.AdapterSourceMap)
                 {
-                    var verifiedSources = GetValidSources(kvp.Value, this.sessionMessageLogger);
+                    var verifiedSources = GetValidSources(kvp.Value, this.sessionMessageLogger, discoveryCriteria.Package);
                     if (verifiedSources.Any())
                     {
                         verifiedExtensionSourceMap.Add(kvp.Key, kvp.Value);
@@ -189,8 +189,9 @@ private void OnReportTestCases(IEnumerable<TestCase> testCases)
         /// </summary>
         /// <param name="sources"> Paths to source file to look for tests in.  </param>
         /// <param name="logger">logger</param>
+        /// <param name="package">package</param>
         /// <returns> The list of verified sources. </returns>
-        internal static IEnumerable<string> GetValidSources(IEnumerable<string> sources, IMessageLogger logger)
+        internal static IEnumerable<string> GetValidSources(IEnumerable<string> sources, IMessageLogger logger, string package)
         {
             Debug.Assert(sources != null, "sources");
             var verifiedSources = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
@@ -202,10 +203,28 @@ internal static IEnumerable<string> GetValidSources(IEnumerable<string> sources,
 
                 if (!File.Exists(src))
                 {
-                    var errorMessage = string.Format(CultureInfo.CurrentCulture, CrossPlatEngineResources.FileNotFound, src);
-                    logger.SendMessage(TestMessageLevel.Warning, errorMessage);
+                    void SendWarning()
+                    {
+                        var errorMessage = string.Format(CultureInfo.CurrentCulture, CrossPlatEngineResources.FileNotFound, src);
+                        logger.SendMessage(TestMessageLevel.Warning, errorMessage);
+                    }
 
-                    continue;
+                    if (string.IsNullOrEmpty(package))
+                    {
+                        SendWarning();
+
+                        continue;
+                    }
+
+                    // It is also possible that this is a packaged app, so the tests might be inside the package
+                    src = !Path.IsPathRooted(source) ? Path.Combine(Path.GetDirectoryName(package), source) : source;
+
+                    if (!File.Exists(src))
+                    {
+                        SendWarning();
+
+                        continue;
+                    }
                 }
 
                 if (!verifiedSources.Add(src))

src/Microsoft.TestPlatform.CrossPlatEngine/Execution/BaseRunTests.cs

@@ -48,7 +48,7 @@ internal abstract class BaseRunTests
         private ITestRunEventsHandler testRunEventsHandler;
         private ITestEventsPublisher testEventsPublisher;
         private ITestRunCache testRunCache;
-        private string package;
+        private protected string package;
         private IRequestData requestData;
 
         /// <summary>

src/Microsoft.TestPlatform.CrossPlatEngine/Execution/RunTestsWithSources.cs

@@ -150,7 +150,7 @@ private Dictionary<Tuple<Uri, string>, IEnumerable<string>> GetExecutorVsSources
             // Validate the sources 
             foreach (var kvp in this.adapterSourceMap)
             {
-                var verifiedSources = DiscoveryManager.GetValidSources(kvp.Value, logger);
+                var verifiedSources = DiscoveryManager.GetValidSources(kvp.Value, logger, package);
                 if (verifiedSources.Any())
                 {
                     verifiedExtensionSourceMap.Add(kvp.Key, kvp.Value);

test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Discovery/DiscoveryManagerTests.cs

@@ -88,6 +88,29 @@ public void DiscoverTestsShouldLogIfTheSourceDoesNotExist()
                 Times.Once);
         }
 
+        [TestMethod]
+        public void DiscoverTestsShouldLogIfTheSourceDoesNotExistIfItHasAPackage()
+        {
+            var criteria = new DiscoveryCriteria(new List<string> { "imaginary.exe" }, 100, null);
+
+            var packageName = "recipe.AppxRecipe";
+
+            var fakeDirectory = Directory.GetDirectoryRoot(typeof(DiscoveryManagerTests).GetTypeInfo().Assembly.Location);
+
+            criteria.Package = Path.Combine(fakeDirectory, Path.Combine(packageName));
+            var mockLogger = new Mock<ITestDiscoveryEventsHandler2>();
+
+            this.discoveryManager.DiscoverTests(criteria, mockLogger.Object);
+
+            var errorMessage = string.Format(CultureInfo.CurrentCulture, "Could not find file {0}.", Path.Combine(fakeDirectory, "imaginary.exe"));
+            mockLogger.Verify(
+                l =>
+                l.HandleLogMessage(
+                    Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestMessageLevel.Warning,
+                    errorMessage),
+                Times.Once);
+        }
+
         [TestMethod]
         public void DiscoverTestsShouldLogIfThereAreNoValidSources()
         {