add tests and tweak helpers which handle xml (#813)

* tweak helper

* add missing puts

Author: KazuCocoa

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

@@ -10,10 +10,12 @@
     # larger screens have more elements
 
     act = get_page_class
-    act.must_include 'android.widget.TextView'
-    act.must_include 'android.widget.ListView'
-    act.must_include 'android.widget.FrameLayout'
-    act.must_include 'hierarchy'
+    act.split("\n").length.must_be :>=, 5
+    act.must_include '13x android.widget.TextView'
+    act.must_include '3x android.widget.FrameLayout'
+    act.must_include '2x android.view.ViewGroup'
+    act.must_include '1x android.widget.ListView'
+    act.must_include '1x hierarchy'
   end
 
   # t 'page_class' do # tested by get_page_class

ios_tests/lib/ios/specs/common/helper.rb

@@ -209,8 +209,16 @@ def uibutton_text
   end
 
   t 'get_page_class' do
-    # 8 local. 9 on sauce.
-    get_page_class.split("\n").length.must_be :>=, 8
+    act = get_page_class
+    act.split("\n").length.must_be :>=, 8
+    act.must_include '24x XCUIElementTypeStaticText'
+    act.must_include '12x XCUIElementTypeCell'
+    act.must_include '8x XCUIElementTypeOther'
+    act.must_include '2x XCUIElementTypeWindow'
+    act.must_include '1x XCUIElementTypeStatusBar'
+    act.must_include '1x XCUIElementTypeTable'
+    act.must_include '1x XCUIElementTypeNavigationBar'
+    act.must_include '1x XCUIElementTypeApplication'
   end
 
   # TODO: write tests

lib/appium_lib/common/helper.rb

@@ -59,28 +59,33 @@ def xpaths(xpath_str)
     class CountElements < Nokogiri::XML::SAX::Document
       attr_reader :result
 
-      def initialize
+      def initialize(platform)
         reset
+        @platform = platform
       end
 
       def reset
         @result = Hash.new 0
       end
 
       # http://nokogiri.org/Nokogiri/XML/SAX/Document.html
-      def start_element(name, attrs = [], driver = $driver)
-        # Count only visible elements. Android is always visible
-        element_visible = driver.device_is_android? ? true : Hash[attrs]['visible'] == 'true'
+      def start_element(name, attrs = [])
+        element_visible = case @platform.to_sym
+                          when :android
+                            true
+                          else # :ios, :windows
+                            Hash[attrs]['visible'] == 'true'
+                          end
+
         @result[name] += 1 if element_visible
       end
 
       def formatted_result
-        message = ''
-        sorted  = @result.sort_by { |_element, count| count }.reverse
-        sorted.each do |element, count|
-          message += "#{count}x #{element}\n"
-        end
-        message.strip
+        @result
+          .sort_by { |_element, count| count }
+          .reverse
+          .each_with_object('') { |element, acc| acc << "#{element[1]}x #{element[0]}\n" }
+          .strip
       end
     end # class CountElements
 
@@ -94,7 +99,7 @@ def formatted_result
     #                  #    x XCUIElementTypeNavigationBar\n1x XCUIElementTypeApplication"
     #
     def get_page_class
-      parser = @count_elements_parser ||= Nokogiri::XML::SAX::Parser.new(CountElements.new)
+      parser = @count_elements_parser ||= Nokogiri::XML::SAX::Parser.new(CountElements.new(@core.device))
 
       parser.document.reset
       parser.parse get_source

lib/appium_lib/ios/common/helper.rb

@@ -67,7 +67,9 @@ def page(opts = {})
         parser.document.reset
         parser.document.filter = class_name
         parser.parse s
-        parser.document.result
+        result = parser.document.result
+        puts result
+        result
       else
         s = get_source
         parser = Nokogiri::XML::SAX::Parser.new(UITestElementsPrinter.new)