Merge pull request #207 from appium/no_xpath

No xpath

Author: bootstraponline

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

@@ -20,7 +20,7 @@ def fade_in
 
   t 'button' do
     # by index
-    wait { button(1).name.must_equal fade_in }
+    2.times { wait { button(1).name.must_equal fade_in } }
 
     # by name contains
     wait { button('ade').name.must_equal fade_in }
@@ -45,7 +45,7 @@ def fade_in
   end
 
   t 'buttons_exact' do
-    wait { buttons_exact(fade_in).first.name.must_equal fade_in }
+    2.times { wait { buttons_exact(fade_in).first.name.must_equal fade_in } }
   end
 
   t { after_last }

android_tests/lib/android/specs/android/helper.rb

@@ -68,11 +68,10 @@ def id_value
   end
 
   t 'find by id' do
-    wait do
-      find('accessibility').click
-      find('accessibility node provider').click
-      id 'accessibility_node_provider' # Accessibility/Accessibility Node Provider
-      2.times { back }
-    end
+    wait { find('accessibility').click }
+    wait { find('accessibility node provider').click }
+    wait { id 'accessibility_node_provider' } # Accessibility/Accessibility Node Provider
+    2.times { back }
   end
+
 end

android_tests/lib/android/specs/common/device.rb

@@ -41,14 +41,14 @@
   end
 
   t 'set_context' do
-    wait do
-      scroll_to('Views').click
-      scroll_to('WebView').click
-      set_context 'WEBVIEW'
-      current_context.must_equal 'WEBVIEW_1'
-    end
+    wait { scroll_to('Views').click }
+    wait { scroll_to('WebView').click }
+    wait { set_context 'WEBVIEW' }
+    wait { current_context.must_equal 'WEBVIEW_1' }
+
+    wait { set_context 'NATIVE_APP' }
+    wait { current_context.must_equal 'NATIVE_APP' }
 
-    set_context 'NATIVE_APP'
     2.times { back; sleep 1 }
   end
 
@@ -66,10 +66,7 @@
   end
 
   t 'app_strings' do
-    wait do
-      strs = app_strings
-      strs.has_key?('activity_save_restore').must_equal true
-    end
+    wait_true { app_strings.has_key? 'activity_save_restore' }
   end
 
   def must_return_element element
@@ -116,9 +113,9 @@ def must_return_element element
   end
 
   t 'push and pull file' do
+    file = 'A Fine Day'
+    path = '/data/local/tmp/remote.txt'
     wait do
-      file = "A Fine Day"
-      path = "/data/local/tmp/remote.txt"
       push_file path, file
       read_file = pull_file path
       read_file.must_equal file

android_tests/lib/android/specs/common/helper.rb

@@ -78,20 +78,6 @@
     wait { tags('android.widget.TextView').length.must_equal 12 }
   end
 
-  t 'find_ele_by_attr_include' do
-    wait do
-      el_text = find_ele_by_attr_include('android.widget.TextView', :text, 'acc').text
-      el_text.must_equal 'Accessibility'
-    end
-  end
-
-  t 'find_eles_by_attr_include' do
-    wait do
-      ele_count = find_eles_by_attr_include('android.widget.TextView', :text, 'e').length
-      ele_count.must_equal 7
-    end
-  end
-
   t 'first_ele' do
     wait do
       first_ele('android.widget.TextView').text.must_equal 'API Demos'

android_tests/lib/android/specs/driver.rb

@@ -33,8 +33,8 @@ def is_sauce
       actual[:caps][:app] = File.basename actual[:caps][:app]
       expected            = { caps:             { platformName: 'android',
                                                   app:          'api.apk',
-                                                  appPackage:   '',
-                                                  appActivity:  '', },
+                                                  appPackage:   'io.appium.android.apis',
+                                                  appActivity:  '.ApiDemos', },
                               custom_url:       false,
                               export_session:   false,
                               default_wait:     1,
@@ -45,7 +45,15 @@ def is_sauce
                               device:           :android,
                               debug:            true, }
 
-      actual.must_equal expected
+      if actual != expected
+        diff    = HashDiff.diff expected, actual
+        diff    = "diff (expected, actual):\n#{diff}"
+        # example:
+        # change :ios in expected to match 'ios' in actual
+        # [["~", "caps.platformName", :ios, "ios"]]
+        message = "\n\nactual:\n\n: #{actual.ai}expected:\n\n#{expected.ai}\n\n#{diff}"
+        fail message
+      end
     end
   end
 

android_tests/lib/run.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'spec'
 require 'fakefs/safe'
+require 'hashdiff'
 require_relative '../../lib/appium_lib'
 
 =begin

lib/appium_lib/android/element/button.rb

@@ -7,27 +7,43 @@ module Android
     private
 
     # @private
-    def _button_visible_string opts={}
-      index = opts.fetch :index, false
-      if index
-        %Q(//#{Button}[#{index}] | //#{ImageButton}[#{index}])
+    def _button_visible_selectors opts={}
+      button_index       = opts.fetch :button_index, false
+      image_button_index = opts.fetch :image_button_index, false
+
+      # complex_find(...)
+      # 4 = className(String className)
+      # 9 = instance(final int instance)
+
+      if button_index && image_button_index
+        [
+          # className().instance()
+          [[4, Button], [9, button_index]],
+          # className().instance()
+          [[4, ImageButton], [9, image_button_index]]
+        ]
       else
-        %Q(//#{Button} | //#{ImageButton})
+        [
+          # className()
+          [[4, Button]],
+          # className()
+          [[4, ImageButton]]
+        ]
       end
     end
 
     # @private
     def _button_exact_string value
       button       = string_visible_exact Button, value
       image_button = string_visible_exact ImageButton, value
-      "#{button} | #{image_button}"
+      button + image_button
     end
 
     # @private
     def _button_contains_string value
       button       = string_visible_contains Button, value
       image_button = string_visible_contains ImageButton, value
-      "#{button} | #{image_button}"
+      button + image_button
     end
 
     public
@@ -41,47 +57,54 @@ def button value
       # Android needs to combine button and image button to match iOS.
       if value.is_a? Numeric
         index = value
-        raise "#{index} is not a valid xpath index. Must be >= 1" if index <= 0
+        raise "#{index} is not a valid index. Must be >= 1" if index <= 0
 
-        return xpath _button_visible_string index: index
+        return complex_find _button_visible_selectors index: index
       end
 
-      xpath _button_contains_string value
+      complex_find _button_contains_string value
     end
 
     # Find all buttons containing value.
     # If value is omitted, all buttons are returned.
     # @param value [String] the value to search for
     # @return [Array<Button>]
     def buttons value=false
-      return xpaths _button_visible_string unless value
-      xpaths _button_contains_string value
+      return complex_find mode: 'all', selectors: _button_visible_selectors unless value
+      complex_find mode: 'all', selectors: _button_contains_string(value)
     end
 
     # Find the first button.
     # @return [Button]
     def first_button
-      xpath _button_visible_string
+      complex_find _button_visible_selectors button_index: 0, image_button_index: 0
     end
 
     # Find the last button.
     # @return [Button]
     def last_button
-      xpath _button_visible_string index: 'last()'
+      # uiautomator index doesn't support last
+      # and it's 0 indexed
+      button_index       = tags(Button).length
+      button_index       -= 1 if button_index >= 0
+      image_button_index = tags(ImageButton).length
+      image_button_index -= 1 if image_button_index >= 0
+
+      complex_find _button_visible_selectors button_index: button_index, image_button_index: image_button_index
     end
 
     # Find the first button that exactly matches value.
     # @param value [String] the value to match exactly
     # @return [Button]
     def button_exact value
-      xpath _button_exact_string value
+      complex_find _button_exact_string value
     end
 
     # Find all buttons that exactly match value.
     # @param value [String] the value to match exactly
     # @return [Array<Button>]
     def buttons_exact value
-      xpaths _button_exact_string value
+      complex_find mode: 'all', selectors: _button_exact_string(value)
     end
   end # module Android
 end # module Appium

lib/appium_lib/android/element/generic.rb

@@ -5,28 +5,28 @@ module Android
     # @param value [String] the value to search for
     # @return [Element]
     def find value
-      xpath_visible_contains '*', value
+      complex_find_contains '*', value
     end
 
     # Find all elements containing value
     # @param value [String] the value to search for
     # @return [Array<Element>]
     def finds value
-      xpaths_visible_contains '*', value
+      complex_finds_contains '*', value
     end
 
     # Find the first element exactly matching value
     # @param value [String] the value to search for
     # @return [Element]
     def find_exact value
-      xpath_visible_exact '*', value
+      complex_find_exact '*', value
     end
 
     # Find all elements exactly matching value
     # @param value [String] the value to search for
     # @return [Array<Element>]
     def finds_exact value
-      xpaths_visible_exact '*', value
+      complex_finds_exact '*', value
     end
 
     # Scroll to the first element containing target text or description.

lib/appium_lib/android/element/text.rb

@@ -9,7 +9,7 @@ module Android
     # @return [TextView]
     def text value
       return ele_index TextView, value if value.is_a? Numeric
-      xpath_visible_contains TextView, value
+      complex_find_contains TextView, value
     end
 
     # Find all TextViews containing value.
@@ -18,7 +18,7 @@ def text value
     # @return [Array<TextView>]
     def texts value=false
       return tags TextView unless value
-      xpaths_visible_contains TextView, value
+      complex_finds_contains TextView, value
     end
 
     # Find the first TextView.
@@ -37,14 +37,14 @@ def last_text
     # @param value [String] the value to match exactly
     # @return [TextView]
     def text_exact value
-      xpath_visible_exact TextView, value
+      complex_find_exact TextView, value
     end
 
     # Find all TextViews that exactly match value.
     # @param value [String] the value to match exactly
     # @return [Array<TextView>]
     def texts_exact value
-      xpaths_visible_exact TextView, value
+      complex_finds_exact TextView, value
     end
   end # module Android
 end # module Appium

lib/appium_lib/android/element/textfield.rb

@@ -8,7 +8,7 @@ module Android
     # @return [EditText]
     def textfield value
       return ele_index EditText, value if value.is_a? Numeric
-      xpath_visible_contains EditText, value
+      complex_find_contains EditText, value
     end
 
     # Find all EditTexts containing value.
@@ -17,7 +17,7 @@ def textfield value
     # @return [Array<EditText>]
     def textfields value=false
       return tags EditText unless value
-      xpaths_visible_contains EditText, value
+      complex_finds_contains EditText, value
     end
 
     # Find the first EditText.
@@ -36,14 +36,14 @@ def last_textfield
     # @param value [String] the value to match exactly
     # @return [EditText]
     def textfield_exact value
-      xpath_visible_exact EditText, value
+      complex_find_exact EditText, value
     end
 
     # Find all EditTexts that exactly match value.
     # @param value [String] the value to match exactly
     # @return [Array<EditText>]
     def textfields_exact value
-      xpaths_visible_exact EditText, value
+      complex_finds_exact EditText, value
     end
   end # module Android
 end # module Appium