Fix android/helper

Author: bootstraponline

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

@@ -1,45 +1,33 @@
 # rake android[android/helper]
 describe 'android/helper' do
-  t 'tag_name_to_android' do
-    act = tag_name_to_android 'abslist'
-    exp = ['android.widget.AbsListView']
-    act.must_equal exp
-
-    act = tag_name_to_android 'button'
-    exp = %w(android.widget.Button android.widget.ImageButton)
-    act.must_equal exp
-
-    msg = ''
-    begin; tag_name_to_android 'zz'; rescue Exception => e; msg = e.message; end
-    msg.must_equal 'Invalid tag name zz'
-  end
-
-  t 'find_eles_attr' do
+  t 'tags' do
     exp = ["API Demos", "Accessibility", "Animation", "App", "Content", "Graphics", "Media", "NFC", "OS", "Preference", "Text", "Views"]
 
     # must wait for page to load
-    ignore { wait_true(10) { find_eles_attr(:text) == exp } }
-    act = find_eles_attr :text
+    ignore { wait_true(10) { tags('android.widget.TextView').map { |e| e.text } == exp } }
+    act = tags('android.widget.TextView').map { |e| e.text }
 
     act.must_equal exp
   end
 
   def page_class_data
-    (<<-TXT).gsub ' ', ''
-      12x android.widget.TextView
-      4x android.widget.FrameLayout
-      4x android.widget.LinearLayout
-      2x android.view.View
-      1x android.widget.ListView
-      1x android.widget.ImageView
+    (<<-TXT).strip
+12x android.widget.TextView
+4x android.widget.FrameLayout
+2x android.widget.LinearLayout
+2x android.view.View
+1x android.widget.ListView
+1x android.widget.ImageView
+1x hierarchy
     TXT
   end
 
   # t 'get_selendroid_inspect' # only works on selendroid
   t 'get_page_class' do
     # digit values change based on screen size
-    exp = page_class_data.gsub(/\d+/,'')
-    act = get_page_class.gsub(' ', '').gsub(/\d+/,'')
+    # larger screens have more elements
+    exp = page_class_data.gsub(/\d+/, '')
+    act = get_page_class.gsub(/\d+/, '')
     act.must_equal exp
   end
 
@@ -53,10 +41,6 @@ def page_class_data
   # t 'get_inspect' do # tested by get_android_inspect
   # t 'page' do # tested by get_android_inspect
 
-  t 'fast_duration' do
-    fast_duration.must_equal 0.0357
-  end
-
   def id_key
     'animation_2_instructions'
   end
@@ -84,8 +68,8 @@ def id_value
   end
 
   t 'find by id' do
-    name('accessibility').click
-    name('accessibility node provider').click
+    find('accessibility').click
+    find('accessibility node provider').click
     id 'accessibility_node_provider' # Accessibility/Accessibility Node Provider
     2.times { back }
   end

lib/appium_lib/android/helper.rb

@@ -76,17 +76,6 @@ def page class_name=false
       nil
     end
 
-    # JavaScript code from https://github.com/appium/appium/blob/master/app/android.js
-    #
-    # ```javascript
-    # Math.round(1.0/28.0 * 28) = 1
-    # ```
-    #
-    # We want steps to be exactly 1. If it's zero then a tap is used instead of a swipe.
-    def fast_duration
-      0.0357 # 1.0/28.0
-    end
-
     # Lists package, activity, and adb shell am start -n value for current app.
     # Works on local host only (not remote).
     # noinspection RubyArgCount