Adding the conditions for the negative scenario in the AddOperator fo…

…r FastFilter (#1252)
microsoft · Oct 31, 2017 · 30c4e02 · 30c4e02
1 parent 71cbcd0
commit 30c4e02
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/src/Microsoft.TestPlatform.Common/Filtering/FastFilter.cs b/src/Microsoft.TestPlatform.Common/Filtering/FastFilter.cs
@@ -150,6 +150,11 @@ internal void AddOperator(Operator @operator)
                     {
                         operatorEncountered = true;
                         fastFilterOperator = @operator;
+                        if ((fastFilterOperation == Operation.NotEqual && fastFilterOperator == Operator.Or)
+                            || (fastFilterOperation == Operation.Equal && fastFilterOperator == Operator.And))
+                        {
+                            containsValidFilter = false;
+                        }
                     }
                 }
                 else

diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/Filtering/FastFilterTests.cs b/test/Microsoft.TestPlatform.Common.UnitTests/Filtering/FastFilterTests.cs
@@ -54,6 +54,7 @@ public void AndOperatorAndEqualsOperationShouldNotCreateFastFilter()
             var fastFilter = filterExpressionWrapper.fastFilter;
 
             Assert.IsTrue(fastFilter == null);
+            Assert.IsTrue(string.IsNullOrEmpty(filterExpressionWrapper.ParseError));
         }
 
         [TestMethod]
@@ -63,6 +64,7 @@ public void OrOperatorAndNotEqualsOperationShouldNotCreateFastFilter()
             var fastFilter = filterExpressionWrapper.fastFilter;
 
             Assert.IsTrue(fastFilter == null);
+            Assert.IsTrue(string.IsNullOrEmpty(filterExpressionWrapper.ParseError));
         }
 
         [TestMethod]