Fix warning (#174)

* fix warning

* tweak tests for espresso

* update changelog

* fix rubocop

Author: KazuCocoa

CHANGELOG.md

@@ -6,6 +6,7 @@ Read `release_notes.md` for commit level details.
 ### Enhancements
 
 ### Bug fixes
+- Reduce warnings for method definitions
 
 ### Deprecations
 

lib/appium_lib_core/device.rb

@@ -54,6 +54,8 @@ def extend_webdriver_with_forwardable
         private
 
         def delegate_from_appium_driver(method, delegation_target = :driver)
+          return if ::Appium::Core::Device.method_defined? method
+
           def_delegator delegation_target, method
         end
 
@@ -65,9 +67,11 @@ def delegate_driver_method(method)
 
         def create_bridge_command(method)
           ::Appium::Core::Base::Bridge::MJSONWP.class_eval do
+            undef_method method if method_defined? method
             block_given? ? class_eval(&Proc.new) : define_method(method) { execute method }
           end
           ::Appium::Core::Base::Bridge::W3C.class_eval do
+            undef_method method if method_defined? method
             block_given? ? class_eval(&Proc.new) : define_method(method) { execute method }
           end
         end

lib/appium_lib_core/driver.rb

@@ -174,6 +174,7 @@ def delegated_target_for_test
       # @private
       def initialize(opts = {})
         @delegate_target = self # for testing purpose
+        @automation_name = nil # initialise before `set_automation_name`
 
         opts = Appium.symbolize_keys opts
         validate_keys(opts)
@@ -332,7 +333,7 @@ def appium_server_version
       #     @core.platform_version #=> [10,1,1]
       #
       def platform_version
-        p_version = @driver.capabilities['platformVersion']
+        p_version = @driver.capabilities['platformVersion'] || @driver.session_capabilities['platformVersion']
         p_version.split('.').map(&:to_i)
       end
 

script/commands.rb

@@ -16,6 +16,8 @@ class CommandsChecker
     # - webdriver_w3c_commands: ::Selenium::WebDriver::Remote::W3C::Bridge::COMMANDS
     #
     def initialize
+      @spec_commands = nil
+
       @implemented_mjsonwp_commands = convert_driver_commands Appium::Core::Commands::MJSONWP::COMMANDS
       @implemented_w3c_commands = convert_driver_commands Appium::Core::Commands::W3C::COMMANDS
       @implemented_core_commands = convert_driver_commands Appium::Core::Commands::COMMANDS

test/functional/android/android/device_test.rb

@@ -273,12 +273,14 @@ def test_keyevent
 
       def test_press_keycode
         # http://developer.android.com/reference/android/view/KeyEvent.html
-        assert @driver.press_keycode(176)
+        result = @driver.press_keycode(176) # it does not raise error
+        assert result || result.nil?
       end
 
       def test_long_press_keycode
         # http://developer.android.com/reference/android/view/KeyEvent.html
-        assert @driver.long_press_keycode(176)
+        result = @driver.long_press_keycode(176) # it does not raise error
+        assert result || result.nil?
       end
 
       def test_open_notifications
@@ -346,6 +348,8 @@ def test_take_element_screenshot
       end
 
       def test_viewport_screenshot
+        skip 'Espresso does not support battery_info' if @@core.automation_name == :espresso
+
         file = @driver.save_viewport_screenshot 'android_viewport_screenshot_test.png'
 
         assert File.exist?(file.path)
@@ -363,6 +367,8 @@ def test_clipbord
       end
 
       def test_battery_info
+        skip 'Espresso does not support battery_info' if @@core.automation_name == :espresso
+
         result = @driver.battery_info
 
         assert !result[:state].nil?
@@ -394,17 +400,25 @@ def test_file_management
       private
 
       def scroll_to(text)
-        text = %("#{text}")
-        rid  = resource_id(text, "new UiSelector().resourceId(#{text});")
-        args = rid.empty? ? ["new UiSelector().textContains(#{text})", "new UiSelector().descriptionContains(#{text})"] : [rid]
-        args.each_with_index do |arg, index|
-          begin
-            elem = @driver.find_element :uiautomator,
-                                        'new UiScrollable(new UiSelector().scrollable(true).instance(0))' \
-                                        ".scrollIntoView(#{arg}.instance(0));"
-            return elem
-          rescue StandardError => e
-            raise e if index == args.size - 1
+        if @@core.automation_name == :espresso
+          @driver.find_element :accessibility_id, text
+        else
+          text = %("#{text}")
+          rid  = resource_id(text, "new UiSelector().resourceId(#{text});")
+          args = if rid.empty?
+                   ["new UiSelector().textContains(#{text})", "new UiSelector().descriptionContains(#{text})"]
+                 else
+                   [rid]
+                 end
+          args.each_with_index do |arg, index|
+            begin
+              elem = @driver.find_element :uiautomator,
+                                          'new UiScrollable(new UiSelector().scrollable(true).instance(0))' \
+                                          ".scrollIntoView(#{arg}.instance(0));"
+              return elem
+            rescue StandardError => e
+              raise e if index == args.size - 1
+            end
           end
         end
       end

test/functional/android/android/image_comparison_test.rb

@@ -16,6 +16,8 @@ def teardown
       end
 
       def test_image_comparison_match_result
+        skip 'Requres `npm install -g appium opencv4nodejs`' if `which opencv4nodejs`.empty?
+
         image1 = File.read AppiumLibCoreTest.path_of('test/functional/data/test_normal.png')
         image2 = File.read AppiumLibCoreTest.path_of('test/functional/data/test_has_blue.png')
 
@@ -31,6 +33,8 @@ def test_image_comparison_match_result
       end
 
       def test_image_comparison_find_result
+        skip 'Requres `npm install -g appium opencv4nodejs`' if `which opencv4nodejs`.empty?
+
         image1 = File.read AppiumLibCoreTest.path_of('test/functional/data/test_normal.png')
         image2 = File.read AppiumLibCoreTest.path_of('test/functional/data/test_has_blue.png')
 
@@ -46,6 +50,8 @@ def test_image_comparison_find_result
       end
 
       def test_image_comparison_get_images_result
+        skip 'Requres `npm install -g appium opencv4nodejs`' if `which opencv4nodejs`.empty?
+
         image1 = File.read AppiumLibCoreTest.path_of('test/functional/data/test_normal.png')
         image2 = File.read AppiumLibCoreTest.path_of('test/functional/data/test_has_blue.png')
 

test/functional/android/webdriver/device_test.rb

@@ -68,7 +68,12 @@ def test_page_source
         xml = REXML::Document.new s_source
 
         assert s_source.include?('io.appium.android.apis')
-        assert_equal expected, xml[2].elements.each('//*') { |v| v }.map(&:name) # rubocop:disable Lint/Void:
+
+        if @@core.automation_name == :espresso
+          assert_equal 130, xml[2].elements.each('//*') { |v| v }.map(&:name).size # rubocop:disable Lint/Void:
+        else
+          assert_equal expected, xml[2].elements.each('//*') { |v| v }.map(&:name) # rubocop:disable Lint/Void:
+        end
       end
 
       # def test_location
@@ -107,7 +112,7 @@ def test_dismiss_alert
         # assert @driver.switch_to.alert.dismiss
 
         # Because the results depends on OS version.
-        @@core.wait { assert_equal 'CANCEL', @driver.find_element(:id, 'android:id/button2').name.upcase }
+        @@core.wait { assert_equal 'CANCEL', @driver.find_element(:id, 'android:id/button2').text.upcase }
         assert @driver.find_element(:id, 'android:id/button2').click
       end
 

test/functional/android/webdriver/w3c_actions_test.rb

@@ -42,6 +42,8 @@ def test_tap_scroll
           .release
           .perform
 
+        # TODO: Selenium::WebDriver::Error::MoveTargetOutOfBoundsError: was raised in Espresso
+
         @driver.manage.timeouts.implicit_wait = 3
         assert_raises ::Selenium::WebDriver::Error::NoSuchElementError do
           @driver.find_element(:accessibility_id, 'Custom')

test/functional/ios/webdriver/device_test.rb

@@ -62,7 +62,8 @@ def test_page_source
 
         assert s_source.include?('AppiumAUT')
         assert s_source.include?('XCUIElementTypeApplication type')
-        assert_equal 78, s_xml[2].elements.each('//*') { |v| v }.map(&:name).size # rubocop:disable Lint/Void:
+
+        assert [78, 81].include?(s_xml[2].elements.each('//*') { |v| v }.map(&:name).size) # rubocop:disable Lint/Void:
       end
 
       def test_location

test/test_helper.rb

@@ -8,7 +8,6 @@
 require 'minitest/reporters'
 require 'minitest'
 
-$VERBOSE = nil
 Appium::Logger.level = ::Logger::FATAL # Show Logger logs only they are fatal
 
 Minitest::Reporters.use! Minitest::Reporters::ProgressReporter.new

test/unit/android/device/mjsonwp/image_comparison_test.rb

@@ -2,12 +2,12 @@
 require 'webmock/minitest'
 require 'base64'
 
-# $ rake test:unit TEST=test/unit/android/device/mjsonwp/commands_test.rb
+# $ rake test:unit TEST=test/unit/android/device/mjsonwp/image_comparison_test.rb
 class AppiumLibCoreTest
   module Android
     module Device
       module MJSONWP
-        class CommandsTest < Minitest::Test
+        class ImageComparisonTest < Minitest::Test
           include AppiumLibCoreTest::Mock
 
           def setup