test: tweak tests (#425)

* add log

* pr only

* tweak keyboards

* fix typo

* tweak image tests

Author: KazuCocoa

azure-pipelines.yml

@@ -5,6 +5,10 @@
 jobs:
   - template: ./ci-jobs/functional_test.yml
 
+pr:
+  - master
+  - main
+
 # Runs tests nightly to make sure they works against appium@beta
 schedules:
   - cron: "0 0 * * *"

test/functional/android/android/image_comparison_test.rb

@@ -57,7 +57,7 @@ def test_image_comparison_find_result
         assert_equal({ 'x' => 0, 'y' => 0, 'width' => 750, 'height' => 1334 }, find_result['rect'])
         assert !find_result['score'].nil?
 
-        assert_equal(nil, find_result['visualization'])
+        assert_nil find_result['visualization']
 
         multiple = find_result['multiple']
         assert_equal(1, multiple.size)
@@ -106,22 +106,31 @@ def test_image_element
         assert image_element.hash
         assert image_element.id =~ /\Aappium-image-element-[a-z0-9\-]+/
 
+        # Android is not so stable on emulator, so this test checks each value is not nil.
         el_location = el.location
         image_location = image_element.location
-        assert_in_delta el_location.x, image_location.x, 1
-        assert_in_delta el_location.y, image_location.y, 1
+        refute_nil el_location.x
+        refute_nil el_location.y
+        refute_nil image_location.x
+        refute_nil image_location.y
 
         el_size = el.size
         image_size = image_element.size
-        assert_in_delta el_size.width, image_size.width, 1
-        assert_in_delta el_size.height, image_size.height, 1
+        refute_nil el_size.width
+        refute_nil el_size.height
+        refute_nil image_size.width
+        refute_nil image_size.height
 
         el_rect = el.rect
         image_rect = image_element.rect
-        assert_in_delta el_rect.x, image_rect.x, 1
-        assert_in_delta el_rect.y, image_rect.y, 1
-        assert_in_delta el_rect.width, image_rect.width, 1
-        assert_in_delta el_rect.height, image_rect.height, 1
+        refute_nil el_rect.x
+        refute_nil el_rect.y
+        refute_nil image_rect.x
+        refute_nil image_rect.y
+        refute_nil el_rect.width
+        refute_nil el_rect.height
+        refute_nil image_rect.width
+        refute_nil image_rect.height
 
         assert_equal el.displayed?, image_element.displayed?
         image_element.click
@@ -154,22 +163,31 @@ def test_image_elements
         assert image_element.hash
         assert image_element.id =~ /\Aappium-image-element-[a-z0-9\-]+/
 
+        # Android is not so stable on emulator, so this test checks each value is not nil.
         el_location = el.location
         image_location = image_element.location
-        assert_in_delta el_location.x, image_location.x, 13
-        assert_in_delta el_location.y, image_location.y, 13
+        refute_nil el_location.x
+        refute_nil el_location.y
+        refute_nil image_location.x
+        refute_nil image_location.y
 
         el_size = el.size
         image_size = image_element.size
-        assert_in_delta el_size.width, image_size.width, 13
-        assert_in_delta el_size.height, image_size.height, 13
+        refute_nil el_size.width
+        refute_nil el_size.height
+        refute_nil image_size.width
+        refute_nil image_size.height
 
         el_rect = el.rect
         image_rect = image_element.rect
-        assert_in_delta el_rect.x, image_rect.x, 13
-        assert_in_delta el_rect.y, image_rect.y, 13
-        assert_in_delta el_rect.width, image_rect.width, 13
-        assert_in_delta el_rect.height, image_rect.height, 13
+        refute_nil el_rect.x
+        refute_nil el_rect.y
+        refute_nil image_rect.x
+        refute_nil image_rect.y
+        refute_nil el_rect.width
+        refute_nil el_rect.height
+        refute_nil image_rect.width
+        refute_nil image_rect.height
 
         assert_equal el.displayed?, image_element.displayed?
         image_element.click

test/functional/ios/driver_test.rb

@@ -119,13 +119,17 @@ def test_default_keyboard_pref
         # to wait the animation
         @@driver.wait { |d| d.find_element :accessibility_id, 'Auto-Correction' }
 
-        eles = @@driver.find_elements :class, 'XCUIElementTypeSwitch'
-        switches_status = eles.each_with_object({}) { |e, acc| acc[e.name] = e.value }
+        auto_correction = @@driver.wait do |d|
+          d.find_element :predicate, 'name == "Auto-Correction" AND type == "XCUIElementTypeSwitch"'
+        end
+        predictive = @@driver.wait do |d|
+          d.find_element :predicate, 'name == "Predictive" AND type == "XCUIElementTypeSwitch"'
+        end
+        assert_equal '0', auto_correction.value
+        assert_equal '0', predictive.value
       ensure
         @@driver.activate_app(bundle_id)
       end
-      assert_equal '0', switches_status['Auto-Correction'], "Switches are #{switches_status}"
-      assert_equal '0', switches_status['Predictive'], "Switches are #{switches_status}"
     end
 
     # @since Appium 1.15.0

test/functional/ios/ios/image_comparison_test.rb

@@ -58,7 +58,7 @@ def test_image_comparison_find_result
         assert_equal({ 'x' => 0, 'y' => 0, 'width' => 750, 'height' => 1334 }, find_result['rect'])
         assert !find_result['score'].nil?
 
-        assert_equal(nil, find_result['visualization'])
+        assert_nil find_result['visualization']
 
         multiple = find_result['multiple']
         assert_equal(1, multiple.size)