From bf6efe4b15917d3aa7d8eb094d3c0cbc868ea325 Mon Sep 17 00:00:00 2001
From: Chris Holt <lefthandedgoat@gmail.com>
Date: Sun, 7 Sep 2014 13:40:23 -0500
Subject: [PATCH] Performance feedback for Sergey #163

---
 src/canopy/canopy.fs        | 32 +++++++++++++++++++++++---------
 src/canopy/configuration.fs |  2 +-
 src/canopy/finders.fs       |  3 ++-
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/canopy/canopy.fs b/src/canopy/canopy.fs
index 97816285..d75dc2ad 100644
--- a/src/canopy/canopy.fs
+++ b/src/canopy/canopy.fs
@@ -193,7 +193,7 @@ let waitFor = waitFor2 "Condition not met in given amount of time. If you want t
     
 //find related    
 let rec private findElements cssSelector (searchContext : ISearchContext) : IWebElement list =
-    if optmizeByDisablingCoverageReport = false then searchedFor <- (cssSelector, browser.Url) :: searchedFor
+    if optimizeByDisablingCoverageReport = false then searchedFor <- (cssSelector, browser.Url) :: searchedFor
     let findInIFrame () =
         let iframes = findByCss "iframe" searchContext.FindElements
         if iframes.IsEmpty then 
@@ -211,8 +211,10 @@ let rec private findElements cssSelector (searchContext : ISearchContext) : IWeb
     try
         let results =
             if (hints.ContainsKey cssSelector) then
-                let finder = hints.[cssSelector]
-                seq { yield finder cssSelector searchContext.FindElements }
+                let finders = hints.[cssSelector]
+                finders
+                |> Seq.map (fun finder -> finder cssSelector searchContext.FindElements)
+                |> Seq.filter(fun list -> not(list.IsEmpty))
             else
                 configuredFinders cssSelector searchContext.FindElements        
                 |> Seq.filter(fun list -> not(list.IsEmpty))
@@ -778,9 +780,21 @@ let addFinder finder =
         |> Seq.append (seq { yield finder cssSelector f }))
     
 //hints    
-let css selector = hints.[selector] <- findByCss; selector
-let xpath selector = hints.[selector] <- findByXpath; selector
-let jquery selector = hints.[selector] <- findByJQuery; selector
-let label selector = hints.[selector] <- findByLabel; selector
-let text selector = hints.[selector] <- findByText; selector
-let value selector = hints.[selector] <- findByValue; selector
\ No newline at end of file
+let private addHintFinder hints finder = hints |> Seq.append (seq { yield finder })
+let private addSelector finder selector hintType =
+    //gaurd against adding same hintType multipe times and increase size of finder seq
+    if not <| (hints.ContainsKey(selector) && addedHints.[selector] |> List.exists (fun hint -> hint = hintType)) then
+        if hints.ContainsKey(selector) then 
+            hints.[selector] <- addHintFinder hints.[selector] finder
+            addedHints.[selector] <- [hintType] @ addedHints.[selector]
+        else 
+            hints.[selector] <- seq { yield finder }  
+            addedHints.[selector] <- [hintType]
+    selector
+
+let css = addSelector findByCss "css"
+let xpath = addSelector findByXpath "xpath"
+let jquery = addSelector findByJQuery "jquery"
+let label = addSelector findByLabel "label"
+let text = addSelector findByText "text"
+let value = addSelector findByValue "value"
\ No newline at end of file
diff --git a/src/canopy/configuration.fs b/src/canopy/configuration.fs
index 70e64e7f..3793b0ef 100644
--- a/src/canopy/configuration.fs
+++ b/src/canopy/configuration.fs
@@ -21,4 +21,4 @@ let mutable throwIfMoreThanOneElement = false
 let mutable configuredFinders = finders.defaultFinders
 let mutable writeToSelectWithOptionValue = true
 let mutable optimizeBySkippingIFrameCheck = false
-let mutable optmizeByDisablingCoverageReport = false
\ No newline at end of file
+let mutable optimizeByDisablingCoverageReport = false
\ No newline at end of file
diff --git a/src/canopy/finders.fs b/src/canopy/finders.fs
index 27932431..09c5bc39 100644
--- a/src/canopy/finders.fs
+++ b/src/canopy/finders.fs
@@ -66,4 +66,5 @@ let mutable defaultFinders =
         }
     )
 
-let hints = new System.Collections.Generic.Dictionary<string, (string -> (By -> System.Collections.ObjectModel.ReadOnlyCollection<IWebElement>) -> IWebElement list)>()
\ No newline at end of file
+let addedHints = System.Collections.Generic.Dictionary<string, string list>()
+let hints = new System.Collections.Generic.Dictionary<string, seq<(string -> (By -> System.Collections.ObjectModel.ReadOnlyCollection<IWebElement>) -> IWebElement list)>>()
\ No newline at end of file