Add support for --treenode-filter (Fixes #6)

Author: Youssef1313

README.md

@@ -27,8 +27,6 @@ There are known limitations on the current support of MTP for xunit 2 which is p
     - Tracking issue: https://github.com/Youssef1313/YTest.MTP.XUnit2/issues/4
 - `TestMethodIdentifierProperty` is missing the parameter types for parameterized tests.
     - Tracking issue: https://github.com/Youssef1313/YTest.MTP.XUnit2/issues/5
-- MTP's `--treenode-filter` is not yet supported.
-    - Tracking issue: https://github.com/Youssef1313/YTest.MTP.XUnit2/issues/6
 - MTP's `--maximum-failed-tests` is not yet supported.
     - Tracking issue: https://github.com/Youssef1313/YTest.MTP.XUnit2/issues/7
 

src/YTest.MTP.XUnit2/MTPFramework/TestingPlatformBuilderHook.cs

@@ -1,5 +1,6 @@
 using Microsoft.Testing.Platform.Builder;
 using Microsoft.Testing.Platform.Capabilities.TestFramework;
+using Microsoft.Testing.Platform.Helpers;
 using Microsoft.Testing.Platform.Services;
 
 namespace YTest.MTP.XUnit2;
@@ -17,6 +18,7 @@ public static class TestingPlatformBuilderHook
     public static void AddExtensions(ITestApplicationBuilder testApplicationBuilder, string[] arguments)
     {
         testApplicationBuilder.CommandLine.AddProvider(() => new XUnit2MTPCommandLineProvider());
+        testApplicationBuilder.AddTreeNodeFilterService(XUnit2MTPExtension.Instance);
         var trxReportCapability = new XUnit2MTPTestTrxCapability();
         testApplicationBuilder.RegisterTestFramework(
             capabilitiesFactory: _ => new TestFrameworkCapabilities(trxReportCapability),

src/YTest.MTP.XUnit2/MTPFramework/XUnit2MTPExtension.cs

@@ -0,0 +1,23 @@
+using System.Threading.Tasks;
+using Microsoft.Testing.Platform.Extensions;
+
+namespace YTest.MTP.XUnit2;
+
+internal sealed class XUnit2MTPExtension : IExtension
+{
+    private XUnit2MTPExtension()
+    {
+    }
+
+    public static IExtension Instance { get; } = new XUnit2MTPExtension();
+
+    public string Uid => nameof(XUnit2MTPTestFramework);
+
+    public string Version => "1.0.0";
+
+    public string DisplayName => "XUnit 2 Microsoft.Testing.Platform adapter";
+
+    public string Description => DisplayName;
+
+    public Task<bool> IsEnabledAsync() => Task.FromResult(true);
+}

src/YTest.MTP.XUnit2/MTPFramework/XUnit2MTPTestFramework.cs

@@ -43,13 +43,13 @@ public XUnit2MTPTestFramework(
         _logger = loggerFactory.CreateLogger<XUnit2MTPTestFramework>();
     }
 
-    public string Uid => nameof(XUnit2MTPTestFramework);
+    public string Uid => XUnit2MTPExtension.Instance.Uid;
 
-    public string Version => "1.0.0";
+    public string Version => XUnit2MTPExtension.Instance.Version;
 
-    public string DisplayName => "XUnit 2 Microsoft.Testing.Platform adapter";
+    public string DisplayName => XUnit2MTPExtension.Instance.DisplayName;
 
-    public string Description => DisplayName;
+    public string Description => XUnit2MTPExtension.Instance.Description;
 
     public Type[] DataTypesProduced { get; } =
     [
@@ -241,10 +241,36 @@ private static bool MatchesFilter(ITestExecutionFilter mtpFilter, TestCaseFilter
         {
 #pragma warning disable TPEXP // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
             null or NopFilter => true,
+            TreeNodeFilter treeNodeFilter => treeNodeFilter.MatchesFilter(CreateNodePath(test), CreateFilterablePropertyBag(test)),
 #pragma warning restore TPEXP // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
-            TestNodeUidListFilter testNodeUidListFilter => testNodeUidListFilter.TestNodeUids.Contains(new TestNodeUid(test.UniqueID)),
+TestNodeUidListFilter testNodeUidListFilter => testNodeUidListFilter.TestNodeUids.Contains(new TestNodeUid(test.UniqueID)),
             _ => throw new NotSupportedException($"Filter type '{mtpFilter.GetType().FullName}' is not supported by XUnit2 MTP adapter."),
         };
+
+        static string CreateNodePath(ITestCase testCase)
+        {
+            var assemblyName = testCase.TestMethod.TestClass.Class.Assembly.SimpleAssemblyName();
+            var fqn = testCase.TestMethod.TestClass.Class.Name;
+            var lastDotIndex = fqn.LastIndexOf('.');
+            var namespaceName = lastDotIndex >= 0 ? fqn.Substring(0, lastDotIndex) : string.Empty;
+            var classTypeName = lastDotIndex >= 0 ? fqn.Substring(lastDotIndex + 1) : fqn;
+            var methodName = testCase.TestMethod.Method.Name;
+            return $"/{assemblyName}/{namespaceName}/{classTypeName}/{methodName}";
+        }
+
+        static PropertyBag CreateFilterablePropertyBag(ITestCase testCase)
+        {
+            var propertyBag = new PropertyBag();
+            foreach (var trait in testCase.Traits)
+            {
+                foreach (var traitValue in trait.Value)
+                {
+                    propertyBag.Add(new TestMetadataProperty(trait.Key, traitValue));
+                }
+            }
+
+            return propertyBag;
+        }
     }
 
     private async Task<TestAssemblyConfiguration> GetConfigurationAsync(string assemblyPath, CancellationToken cancellationToken)