From 6af1a10df62d2849fcb495a1423db2dc59978812 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20G=C3=B3mez?= <luisalonsogg@gmail.com>
Date: Tue, 7 Mar 2017 15:37:31 -0800
Subject: [PATCH] Fixed a bug in AutomationSearchCondition.Satisfies() when all
 the provided OrConditions are false

Tests are included to ensure the fix is correct
---
 .../AutomationSearchConditionTests.cs         | 155 ++++++++++++++++++
 .../TestStack.White.UITests.csproj            |   1 +
 .../AutomationSearchCondition.cs              |  10 +-
 3 files changed, 163 insertions(+), 3 deletions(-)
 create mode 100644 src/TestStack.White.UITests/AutomationElementSearch/AutomationSearchConditionTests.cs

diff --git a/src/TestStack.White.UITests/AutomationElementSearch/AutomationSearchConditionTests.cs b/src/TestStack.White.UITests/AutomationElementSearch/AutomationSearchConditionTests.cs
new file mode 100644
index 00000000..3f05651d
--- /dev/null
+++ b/src/TestStack.White.UITests/AutomationElementSearch/AutomationSearchConditionTests.cs
@@ -0,0 +1,155 @@
+using NUnit.Framework;
+using System.Windows.Automation;
+using TestStack.White.AutomationElementSearch;
+using TestStack.White.UIItems;
+using TestStack.White.UIItems.ListBoxItems;
+
+namespace TestStack.White.UITests.AutomationElementSearch
+{
+	[TestFixture(WindowsFramework.WinForms)]
+	[TestFixture(WindowsFramework.Wpf)]
+	public class AutomationSearchConditionTests : WhiteUITestBase
+	{
+		public AutomationSearchConditionTests(WindowsFramework framework)
+			 : base(framework)
+		{
+		}
+
+		[Test]
+		public void BothOrConditionsAreFalseTest()
+		{
+			var button = MainWindow.Get<Button>("ButtonWithTooltip");
+			var twoConditions = new OrCondition(
+						AutomationSearchCondition.ByAutomationId("X").Condition,
+						AutomationSearchCondition.ByName("X").Condition);
+			var bothOrConditionsAreFalse = new AutomationSearchCondition(twoConditions);
+			bool result = bothOrConditionsAreFalse.Satisfies(button.AutomationElement);
+			Assert.That(result, Is.False);
+		}
+		[Test]
+		public void FirstOrConditionIsTrueTest()
+		{
+			var button = MainWindow.Get<Button>("ButtonWithTooltip");
+			var twoConditions = new OrCondition(
+						AutomationSearchCondition.ByAutomationId("ButtonWithTooltip").Condition,
+						AutomationSearchCondition.ByName("X").Condition);
+			var firstOrConditionIsTrue = new AutomationSearchCondition(twoConditions);
+			bool result = firstOrConditionIsTrue.Satisfies(button.AutomationElement);
+			Assert.That(result, Is.True);
+		}
+		[Test]
+		public void SecondOrConditionIsTrueTest()
+		{
+			var button = MainWindow.Get<Button>("ButtonWithTooltip");
+			var twoConditions = new OrCondition(
+						AutomationSearchCondition.ByAutomationId("X").Condition,
+						AutomationSearchCondition.ByName("Button with Tooltip").Condition);
+			var secondOrConditionIsTrue = new AutomationSearchCondition(twoConditions);
+			bool result = secondOrConditionIsTrue.Satisfies(button.AutomationElement);
+			Assert.That(result, Is.True);
+		}
+		[Test]
+		public void BothOrConditionsAreTrueTest()
+		{
+			var button = MainWindow.Get<Button>("ButtonWithTooltip");
+			var twoConditions = new OrCondition(
+						AutomationSearchCondition.ByAutomationId("ButtonWithTooltip").Condition,
+						AutomationSearchCondition.ByName("Button with Tooltip").Condition);
+			var bothOrConditionsAreTrue = new AutomationSearchCondition(twoConditions);
+			bool result = bothOrConditionsAreTrue.Satisfies(button.AutomationElement);
+			Assert.That(result, Is.True);
+		}
+
+		[Test]
+		public void BothAndConditionsAreFalseTest()
+		{
+			var button = MainWindow.Get<Button>("ButtonWithTooltip");
+			var twoConditions = new AndCondition(
+						AutomationSearchCondition.ByAutomationId("X").Condition,
+						AutomationSearchCondition.ByName("X").Condition);
+			var bothOrConditionsAreFalse = new AutomationSearchCondition(twoConditions);
+			bool result = bothOrConditionsAreFalse.Satisfies(button.AutomationElement);
+			Assert.That(result, Is.False);
+		}
+		[Test]
+		public void FirstAndConditionIsTrueTest()
+		{
+			var button = MainWindow.Get<Button>("ButtonWithTooltip");
+			var twoConditions = new AndCondition(
+						AutomationSearchCondition.ByAutomationId("ButtonWithTooltip").Condition,
+						AutomationSearchCondition.ByName("X").Condition);
+			var firstAndConditionIsTrue = new AutomationSearchCondition(twoConditions);
+			bool result = firstAndConditionIsTrue.Satisfies(button.AutomationElement);
+			Assert.That(result, Is.False);
+		}
+		[Test]
+		public void SecondAndConditionIsTrueTest()
+		{
+			var button = MainWindow.Get<Button>("ButtonWithTooltip");
+			var twoConditions = new AndCondition(
+						AutomationSearchCondition.ByAutomationId("X").Condition,
+						AutomationSearchCondition.ByName("Button with Tooltip").Condition);
+			var secondAndConditionIsTrue = new AutomationSearchCondition(twoConditions);
+			bool result = secondAndConditionIsTrue.Satisfies(button.AutomationElement);
+			Assert.That(result, Is.False);
+		}
+		[Test]
+		public void BothAndConditionsAreTrueTest()
+		{
+			var button = MainWindow.Get<Button>("ButtonWithTooltip");
+			var twoConditions = new AndCondition(
+						AutomationSearchCondition.ByAutomationId("ButtonWithTooltip").Condition,
+						AutomationSearchCondition.ByName("Button with Tooltip").Condition);
+			var bothAndConditionsAreTrue = new AutomationSearchCondition(twoConditions);
+			bool result = bothAndConditionsAreTrue.Satisfies(button.AutomationElement);
+			Assert.That(result, Is.True);
+		}
+
+		[Test]
+		public void ComplexOrConditionTest()
+		{
+			var button = MainWindow.Get<Button>("ButtonWithTooltip");
+			var comboBox = MainWindow.Get<ComboBox>("EditableComboBox");
+			var listBox = MainWindow.Get<ListBox>("ListBoxWithVScrollBar");
+			var checkedListBox = MainWindow.Get<ListBox>("CheckedListBox");
+			var typeConditions = new OrCondition(
+						AutomationSearchCondition.ByControlType(ControlType.Image).Condition,
+						AutomationSearchCondition.ByControlType(ControlType.List).Condition);
+			var nameOrIdConditions = new OrCondition(
+						AutomationSearchCondition.ByAutomationId("EditableComboBox").Condition,
+						AutomationSearchCondition.ByName("CheckedListBoxTests").Condition);
+			var complexOrCondition = new AutomationSearchCondition(new OrCondition(typeConditions, nameOrIdConditions));
+			bool resultForButton = complexOrCondition.Satisfies(button.AutomationElement);
+			bool resultForComboBox = complexOrCondition.Satisfies(comboBox.AutomationElement);
+			bool resultForListBox = complexOrCondition.Satisfies(listBox.AutomationElement);
+			bool resultForCheckedListBox = complexOrCondition.Satisfies(checkedListBox.AutomationElement);
+			Assert.That(resultForButton, Is.False);
+			Assert.That(resultForComboBox, Is.True);
+			Assert.That(resultForListBox, Is.True);
+			Assert.That(resultForCheckedListBox, Is.True);
+		}
+		[Test]
+		public void ComplexAndConditionTest()
+		{
+			var button = MainWindow.Get<Button>("ButtonWithTooltip");
+			var comboBox = MainWindow.Get<ComboBox>("EditableComboBox");
+			var listBox = MainWindow.Get<ListBox>("ListBoxWithVScrollBar");
+			var checkedListBox = MainWindow.Get<ListBox>("CheckedListBox");
+			var typeConditions = new OrCondition(
+						AutomationSearchCondition.ByControlType(ControlType.Button).Condition,
+						AutomationSearchCondition.ByControlType(ControlType.ComboBox).Condition);
+			var nameOrIdConditions = new OrCondition(
+						AutomationSearchCondition.ByAutomationId("ListBoxWithVScrollBar").Condition,
+						AutomationSearchCondition.ByName("Button with Tooltip").Condition);
+			var complexAndCondition = new AutomationSearchCondition(new AndCondition(typeConditions, nameOrIdConditions));
+			bool resultForButton = complexAndCondition.Satisfies(button.AutomationElement);
+			bool resultForComboBox = complexAndCondition.Satisfies(comboBox.AutomationElement);
+			bool resultForListBox = complexAndCondition.Satisfies(listBox.AutomationElement);
+			bool resultForCheckedListBox = complexAndCondition.Satisfies(checkedListBox.AutomationElement);
+			Assert.That(resultForButton, Is.True);
+			Assert.That(resultForComboBox, Is.False);
+			Assert.That(resultForListBox, Is.False);
+			Assert.That(resultForCheckedListBox, Is.False);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/TestStack.White.UITests/TestStack.White.UITests.csproj b/src/TestStack.White.UITests/TestStack.White.UITests.csproj
index 0be3fda7..12dcad71 100644
--- a/src/TestStack.White.UITests/TestStack.White.UITests.csproj
+++ b/src/TestStack.White.UITests/TestStack.White.UITests.csproj
@@ -60,6 +60,7 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="AutomationElementSearch\AutomationSearchConditionTests.cs" />
     <Compile Include="ControlTests\ColorTests.cs" />
     <Compile Include="ControlTests\CustomUIItemTests.cs" />
     <Compile Include="ControlTests\GroupBoxTests.cs" />
diff --git a/src/TestStack.White/AutomationElementSearch/AutomationSearchCondition.cs b/src/TestStack.White/AutomationElementSearch/AutomationSearchCondition.cs
index 04d10128..4436fccd 100644
--- a/src/TestStack.White/AutomationElementSearch/AutomationSearchCondition.cs
+++ b/src/TestStack.White/AutomationElementSearch/AutomationSearchCondition.cs
@@ -128,8 +128,12 @@ private bool Satisfies(AutomationElement element, Condition[] testConditions, bo
             foreach (Condition condition in testConditions)
             {
                 if (condition is AndCondition && !Satisfies(element, ((AndCondition) condition).GetConditions(), true)) return false;
-                if (condition is OrCondition && !Satisfies(element, ((OrCondition) condition).GetConditions(), false)) return false;
-
+                if (condition is OrCondition)
+                {
+                    bool result = Satisfies(element, ((OrCondition)condition).GetConditions(), false);
+                    if (!result && and) return false;
+                    if (result && !and) return true;
+                }
                 if (condition is PropertyCondition)
                 {
                     var match = ValueMatchers[((PropertyCondition) condition).Property.ProgrammaticName](element.Current, ((PropertyCondition) condition).Value);
@@ -137,7 +141,7 @@ private bool Satisfies(AutomationElement element, Condition[] testConditions, bo
                     if (match && !and) return true;
                 }
             }
-            return true;
+            return and;
         }
 
         public virtual void Add(Condition condition)