test: some small adjustments

Author: KazuCocoa

test/functional/android/android/device_test.rb

@@ -193,43 +193,34 @@ def test_get_display_density
 
       def test_press_keycode
         # http://developer.android.com/reference/android/view/KeyEvent.html
-        result = @driver.press_keycode(176) # it does not raise error
+        result = @driver.press_keycode(84) # it does not raise error
         assert result || result.nil?
       end
 
       def test_long_press_keycode
         # http://developer.android.com/reference/android/view/KeyEvent.html
-        result = @driver.long_press_keycode(176) # it does not raise error
+        result = @driver.long_press_keycode(84) # it does not raise error
         assert result || result.nil?
       end
 
       def test_open_notifications
         skip if @@core.automation_name == :espresso
 
-        # test & comments from https://github.com/appium/appium/blob/1.x/test/functional/android/apidemos/notifications-specs.js#L19
-        # get to the notification page
-        @@core.wait { @driver.find_element(:accessibility_id, 'App').click }
-        @@core.wait { scroll_to('Notification').click }
-        @@core.wait { @driver.find_element(:accessibility_id, 'Status Bar').click }
-        # create a notification
-        @@core.wait { @driver.find_element :accessibility_id, ':-|' }.click
         @driver.open_notifications
         # shouldn't see the elements behind shade
 
         # Sometimes, we should wait animation
         @@core.wait(timeout: 5) do
           error = assert_raises ::Selenium::WebDriver::Error::WebDriverError do
-            @driver.find_element :accessibility_id, ':-|'
+            @driver.find_element :accessibility_id, 'Appium Settings'
           end
           assert 'An element could not be located on the page using the given search parameters.', error.message
         end
 
-        # should see the notification
-        @@core.wait_true { @driver.find_element :xpath, '//*[@text="Mood ring"]' }
         # return to app
         @driver.back
         # should be able to see elements from app
-        @@core.wait_true { @driver.find_element :accessibility_id, ':-|' }
+        @@core.wait_true { @driver.find_element :accessibility_id, 'Accessibility' }
       end
 
       def test_ime_available_engines

test/functional/android/android/mobile_commands_test.rb

@@ -97,9 +97,9 @@ def test_drawer
         @driver = @core.start_driver
 
         el = @core.wait { @driver.find_element(:accessibility_id, 'Views') }
-        assert_mobile_command_error 'mobile: openDrawer', { element: el.id, gravity: 1 },
+        assert_mobile_command_error 'mobile: openDrawer', { elementId: el.id, gravity: 1 },
                                     'Could not open drawer'
-        assert_mobile_command_error 'mobile: closeDrawer', { element: el.id, gravity: 1 },
+        assert_mobile_command_error 'mobile: closeDrawer', { elementId: el.id, gravity: 1 },
                                     'Could not close drawer'
       end
 
@@ -115,7 +115,7 @@ def test_datepicker
         @core.wait { @driver.find_element(:accessibility_id, 'change the date') }.click
 
         date_picker = @driver.find_element(:id, 'android:id/datePicker')
-        @driver.execute_script('mobile: setDate', { year: 2020, monthOfYear: 10, dayOfMonth: 25, element: date_picker.id })
+        @driver.execute_script('mobile: setDate', { year: 2020, monthOfYear: 10, dayOfMonth: 25, elementId: date_picker.id })
         assert_equal 'Sun, Oct 25', @driver.find_element(:id, 'android:id/date_picker_header_date').text
       end
 
@@ -146,12 +146,12 @@ def test_navigate_to
 
         el = @core.wait { @driver.find_element(:accessibility_id, 'Views') }
 
-        assert_mobile_command_error 'mobile: navigateTo', { element: el.id, menuItemId: -100 },
+        assert_mobile_command_error 'mobile: navigateTo', { elementId: el.id, menuItemId: -100 },
                                     'must be a non-negative number'
-        assert_mobile_command_error 'mobile: navigateTo', { element: el.id, menuItemId: 'no element' },
+        assert_mobile_command_error 'mobile: navigateTo', { elementId: el.id, menuItemId: 'no element' },
                                     'must be a non-negative number'
         # A test demo apk has no the element
-        assert_mobile_command_error 'mobile: navigateTo', { element: el.id, menuItemId: 10 },
+        assert_mobile_command_error 'mobile: navigateTo', { elementId: el.id, menuItemId: 10 },
                                     'Could not navigate to menu item 10'
       end
 
@@ -164,19 +164,17 @@ def test_scroll_page_on_view_pager
         @driver = @core.start_driver
         el = @core.wait { @driver.find_element(:accessibility_id, 'Views') }
 
-        assert_mobile_command_error 'mobile: scrollToPage',  { element: el.id, scrollTo: 'right' },
+        assert_mobile_command_error 'mobile: scrollToPage',  { elementId: el.id, scrollTo: 'right' },
                                     'Could not perform scroll to on element'
-        assert_mobile_command_error 'mobile: scrollToPage',  { element: el.id, scrollTo: '' },
-                                    'Invalid scrollTo parameters'
-        assert_mobile_command_error 'mobile: scrollToPage',  { element: el.id, scrollToPage: -100 },
+        assert_mobile_command_error 'mobile: scrollToPage',  { elementId: el.id, scrollToPage: -100 },
                                     'be a non-negative integer'
         error = assert_raises ::Selenium::WebDriver::Error::InvalidArgumentError do
-          @driver.execute_script 'mobile: scrollToPage', { element: el.id }
+          @driver.execute_script 'mobile: scrollToPage', { elementId: el.id }
         end
         assert error.message.include? "Must provide either 'scrollTo' or 'scrollToPage'"
 
         # A test demo apk has no the element
-        assert_mobile_command_error 'mobile: scrollToPage', { element: el.id, scrollToPage: 2, smoothScroll: true },
+        assert_mobile_command_error 'mobile: scrollToPage', { elementId: el.id, scrollToPage: 2, smoothScroll: true },
                                     'Could not perform scroll to on element'
       end