FastFilter Fix (microsoft#1247)

* Adding the conditions for the negative scenario in the AddOperator for FastFilter

src/Microsoft.TestPlatform.Common/Filtering/FastFilter.cs

@@ -7,6 +7,7 @@ namespace Microsoft.VisualStudio.TestPlatform.Common.Filtering
     using System.Collections.Generic;
     using System.Collections.Immutable;
     using System.Diagnostics;
+    using System.Globalization;
     using System.Linq;
     using System.Text.RegularExpressions;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel;
@@ -41,7 +42,7 @@ internal FastFilter(string filterPropertyName, ImmutableHashSet<string> filterPr
             }
             else
             {
-                throw new ArgumentException();
+                throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, Resources.Resources.FastFilterException));
             }
         }
 
@@ -150,6 +151,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

src/Microsoft.TestPlatform.Common/Resources/Resources.resx

@@ -150,6 +150,9 @@
   <data name="FailedToFindInstalledUnitTestExtensions" xml:space="preserve">
     <value>Failed to find the list of installed unit test extensions. Reason: {0}</value>
   </data>
+  <data name="FastFilterException" xml:space="preserve">
+    <value>An error occured while creating Fast filter.</value>
+  </data>
   <data name="IgnoredDuplicateConfiguration" xml:space="preserve">
     <value>There are multiple configurations that have data collector FriendlyName as '{0}'. Duplicate configurations will be ignored in the test run.</value>
   </data>

test/Microsoft.TestPlatform.Common.UnitTests/Filtering/FastFilterTests.cs

@@ -3,10 +3,12 @@
 
 namespace Microsoft.TestPlatform.Common.UnitTests.Filtering
 {
+    using System;
     using System.Collections.Generic;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
     using Microsoft.VisualStudio.TestPlatform.Common.Filtering;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+    using System.Collections.Immutable;
 
     [TestClass]
     public class FastFilterTests
@@ -54,6 +56,7 @@ public void AndOperatorAndEqualsOperationShouldNotCreateFastFilter()
             var fastFilter = filterExpressionWrapper.fastFilter;
 
             Assert.IsTrue(fastFilter == null);
+            Assert.IsTrue(string.IsNullOrEmpty(filterExpressionWrapper.ParseError));
         }
 
         [TestMethod]
@@ -63,6 +66,7 @@ public void OrOperatorAndNotEqualsOperationShouldNotCreateFastFilter()
             var fastFilter = filterExpressionWrapper.fastFilter;
 
             Assert.IsTrue(fastFilter == null);
+            Assert.IsTrue(string.IsNullOrEmpty(filterExpressionWrapper.ParseError));
         }
 
         [TestMethod]
@@ -310,5 +314,20 @@ public void FastFilterWithWithRegexParseErrorShouldNotCreateFastFilter()
             Assert.AreEqual(null, filterExpressionWrapper.fastFilter);
             Assert.IsFalse(string.IsNullOrEmpty(filterExpressionWrapper.ParseError));
         }
+
+        [TestMethod]
+        public void FastFilterShouldThrowExceptionForUnsupportedOperatorOperationCombination()
+        {
+            ImmutableHashSet<string>.Builder filterHashSetBuilder = ImmutableHashSet.CreateBuilder<string>();
+            try
+            {
+                var filter = new FastFilter("dummyName", filterHashSetBuilder.ToImmutableHashSet(), Operation.Equal, Operator.And);
+            }
+            catch (Exception ex)
+            {
+                Assert.IsTrue(ex is ArgumentException);
+                Assert.AreEqual("An error occured while creating Fast filter.", ex.Message);
+            }
+        }
     }
 }