Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
namespace Microsoft.Testing.Platform.Requests;

// Allows to express an expression A & B or A | B
internal sealed class OperatorExpression(FilterOperator op, IReadOnlyCollection<FilterExpression> subExpressions) : FilterExpression
internal sealed class OperatorExpression(FilterOperator op, IReadOnlyList<FilterExpression> subExpressions) : FilterExpression
{
public FilterOperator Op { get; } = op;

public IReadOnlyCollection<FilterExpression> SubExpressions { get; } = subExpressions;
public IReadOnlyList<FilterExpression> SubExpressions { get; } = subExpressions;
}
Original file line number Diff line number Diff line change
Expand Up @@ -542,10 +542,60 @@ private static bool MatchFilterPattern(
int endFragmentIndex,
PropertyBag properties)
{
#if NET8_0_OR_GREATER
return MatchFilterPattern(
filterExpression,
testNodeFullPath.AsSpan(startFragmentIndex, endFragmentIndex - startFragmentIndex),
properties);
#else
string str = testNodeFullPath[startFragmentIndex..endFragmentIndex];
return MatchFilterPattern(filterExpression, str, properties);
#endif
}

#if NET8_0_OR_GREATER
private static bool MatchFilterPattern(
FilterExpression filterExpression,
ReadOnlySpan<char> testNodeFragment,
PropertyBag properties)
{
switch (filterExpression)
{
case ValueExpression vExpr:
return vExpr.Regex.IsMatch(testNodeFragment);
case OperatorExpression { Op: FilterOperator.Or, SubExpressions: var subexprs }:
foreach (FilterExpression expr in subexprs)
{
if (MatchFilterPattern(expr, testNodeFragment, properties))
{
return true;
}
}

return false;
case OperatorExpression { Op: FilterOperator.And, SubExpressions: var subexprs }:
foreach (FilterExpression expr in subexprs)
{
if (!MatchFilterPattern(expr, testNodeFragment, properties))
{
return false;
}
}

return true;
case OperatorExpression { Op: FilterOperator.Not, SubExpressions: var subexprs }:
return !MatchFilterPattern(subexprs.Single(), testNodeFragment, properties);
case ValueAndPropertyExpression { Value: var valueExpr, Properties: var propExpr }:
return MatchFilterPattern(valueExpr, testNodeFragment, properties)
&& MatchProperties(propExpr, properties);
case NopExpression:
return true;
default:
throw ApplicationStateGuard.Unreachable();
}
}
#endif

private static bool MatchFilterPattern(
FilterExpression filterExpression,
string testNodeFragment,
Expand Down