[WIP]add scrollable index param into scroll_uiselector (#507)

add scrollable index param into scroll_uiselector

Author: KazuCocoa

android_tests/lib/android/specs/android/element/generic.rb

@@ -33,14 +33,25 @@ def partial
   # scroll_to is broken
   t 'scroll_to' do
     wait { find('Views').click }
-    wait { scroll_to('rotating button').text.must_equal 'Rotating Button' }
+    wait { scroll_to('scrollbars').text.must_equal 'ScrollBars' }
+
+    wait { find('ScrollBars').click }
+    wait { text('style').click }
+    wait { scroll_to('Developers', 1).text.must_include 'What would it take to build a better mobile phone?' }
+    back
+    back
     # back to start activity
     back
   end
 
   t 'scroll_to_exact' do
     wait { find('Views').click }
-    wait { scroll_to_exact('Rotating Button').text.must_equal 'Rotating Button' }
+
+    wait { scroll_to_exact('ScrollBars').text.must_equal 'ScrollBars' }
+    wait { find('ScrollBars').click }
+    wait { text('style').click }
+    back
+    back
     # back to start activity
     back
   end

lib/appium_lib/android/element/generic.rb

@@ -29,30 +29,34 @@ def finds_exact(value)
     end
 
     # @private
-    def scroll_uiselector(content)
-      "new UiScrollable(new UiSelector().scrollable(true).instance(0)).scrollIntoView(#{content}.instance(0));"
+    def scroll_uiselector(content, index = 0)
+      "new UiScrollable(new UiSelector().scrollable(true).instance(#{index})).scrollIntoView(#{content}.instance(0));"
     end
 
     # Scroll to the first element containing target text or description.
-    # @param text [String] the text to search for in the text value and content description
+    # @param text [String] the text or resourceId to search for in the text value and content description
+    # @param scrollable_index [Integer] the index for scrollable views.
     # @return [Element] the element scrolled to
-    def scroll_to(text)
+    def scroll_to(text, scrollable_index = 0)
       text = %("#{text}")
 
-      args = scroll_uiselector("new UiSelector().textContains(#{text})") +
-             scroll_uiselector("new UiSelector().descriptionContains(#{text})")
+      args = scroll_uiselector("new UiSelector().textContains(#{text})", scrollable_index) +
+             scroll_uiselector("new UiSelector().descriptionContains(#{text})", scrollable_index) +
+             scroll_uiselector(resource_id(text, "new UiSelector().resourceId(#{text});"), scrollable_index)
 
       find_element :uiautomator, args
     end
 
     # Scroll to the first element with the exact target text or description.
-    # @param text [String] the text to search for in the text value and content description
+    # @param text [String] the text or resourceId to search for in the text value and content description
+    # @param scrollable_index [Integer] the index for scrollable views.
     # @return [Element] the element scrolled to
-    def scroll_to_exact(text)
+    def scroll_to_exact(text, scrollable_index = 0)
       text = %("#{text}")
 
-      args = scroll_uiselector("new UiSelector().text(#{text})") +
-             scroll_uiselector("new UiSelector().description(#{text})")
+      args = scroll_uiselector("new UiSelector().text(#{text})", scrollable_index) +
+             scroll_uiselector("new UiSelector().description(#{text})", scrollable_index) +
+             scroll_uiselector(resource_id(text, "new UiSelector().resourceId(#{text});"), scrollable_index)
 
       find_element :uiautomator, args
     end

lib/appium_lib/android/helper.rb

@@ -256,7 +256,7 @@ def tags(class_name)
     # @param on_match [String] the string to return on resourceId match
     #
     # @return [String] empty string on failure, on_match on successful match
-    def _resource_id(string, on_match)
+    def resource_id(string, on_match)
       return '' unless string
 
       # unquote the string
@@ -289,14 +289,14 @@ def string_visible_contains(class_name, value)
       value = %("#{value}")
 
       if class_name == '*'
-        return (_resource_id(value, "new UiSelector().resourceId(#{value});") +
+        return (resource_id(value, "new UiSelector().resourceId(#{value});") +
           "new UiSelector().descriptionContains(#{value});" \
           "new UiSelector().textContains(#{value});")
       end
 
       class_name = %("#{class_name}")
 
-      _resource_id(value, "new UiSelector().className(#{class_name}).resourceId(#{value});") +
+      resource_id(value, "new UiSelector().className(#{class_name}).resourceId(#{value});") +
         "new UiSelector().className(#{class_name}).descriptionContains(#{value});" \
         "new UiSelector().className(#{class_name}).textContains(#{value});"
     end
@@ -326,14 +326,14 @@ def string_visible_exact(class_name, value)
       value = %("#{value}")
 
       if class_name == '*'
-        return (_resource_id(value, "new UiSelector().resourceId(#{value});") +
+        return (resource_id(value, "new UiSelector().resourceId(#{value});") +
           "new UiSelector().description(#{value});" \
           "new UiSelector().text(#{value});")
       end
 
       class_name = %("#{class_name}")
 
-      _resource_id(value, "new UiSelector().className(#{class_name}).resourceId(#{value});") +
+      resource_id(value, "new UiSelector().className(#{class_name}).resourceId(#{value});") +
         "new UiSelector().className(#{class_name}).description(#{value});" \
         "new UiSelector().className(#{class_name}).text(#{value});"
     end