Skip to content

Fix match all filter not working when property expression is present #4495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Youssef1313 merged 1 commit into from
Jan 2, 2025
Merged

Fix match all filter not working when property expression is present #4495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/Platform/Microsoft.Testing.Platform/Requests/TreeNodeFilter/TreeNodeFilter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,13 @@ public bool MatchesFilter(string testNodeFullPath, PropertyBag filterablePropert
if (currentFragmentIndex >= _filters.Count)
{
// Note: The regex for ** is .*.*, so we match against such a value expression.
return currentFragmentIndex > 0 && _filters.Last() is ValueExpression { Value: ".*.*" };
FilterExpression lastFilter = _filters.Last();
if (lastFilter is ValueAndPropertyExpression valueAndPropertyExpression)
{
lastFilter = valueAndPropertyExpression.Value;
}

return currentFragmentIndex > 0 && lastFilter is ValueExpression { Value: ".*.*" };
}

if (!MatchFilterPattern(
Expand Down
19 changes: 19 additions & 0 deletions test/UnitTests/Microsoft.Testing.Platform.UnitTests/Requests/TreeNodeFilterTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,4 +167,23 @@ public void PropertiesDoNotNeedUrlEncodingOfSlashes(string filter, string nodePa
Assert.IsFalse(filterInstance.MatchesFilter(nodePath, nodeProperties));
}
}

[TestMethod]
public void MatchAllFilterWithPropertyExpression()
{
TreeNodeFilter filter = new("/**[A=B]");
Assert.IsTrue(filter.MatchesFilter("/A/B/C/D", new PropertyBag(new KeyValuePairStringProperty("A", "B"))));
Assert.IsFalse(filter.MatchesFilter("/A/B/C/D", new PropertyBag(new KeyValuePairStringProperty("A", "C"))));
}

[TestMethod]
public void MatchAllFilterSubpathWithPropertyExpression()
{
TreeNodeFilter filter = new("/A/**[A=B]");
Assert.IsTrue(filter.MatchesFilter("/A/B/C/D", new PropertyBag(new KeyValuePairStringProperty("A", "B"))));
Assert.IsFalse(filter.MatchesFilter("/B/A/C/D", new PropertyBag(new KeyValuePairStringProperty("A", "B"))));
}

[TestMethod]
public void MatchAllFilterWithPropertyExpression_DoNotAllowInMiddleOfFilter() => Assert.ThrowsException<ArgumentException>(() => _ = new TreeNodeFilter("/**/Path[A=B]"));
}