appium · ki4070ma · Jan 30, 2020 · Jan 28, 2020 · Jan 29, 2020 · Jan 29, 2020
diff --git a/ci-jobs/functional/run_android_test.yml b/ci-jobs/functional/run_android_test.yml
@@ -7,6 +7,8 @@ jobs:
       CI: ${{ parameters.ci }}
     steps:
       - template: ./run_appium.yml
+        parameters:
+          OPENCV: ${{ parameters.opencv }}
       - script: bash ci-jobs/functional/start-emulator.sh
         displayName: Create and run Emulator
       - script: |

diff --git a/ci-jobs/functional/run_appium.yml b/ci-jobs/functional/run_appium.yml
@@ -5,6 +5,9 @@ steps:
   displayName: Install Node 11.x
 - script: npm install -g appium@beta --chromedriver_version='2.44'
   displayName: Install appium
+- script: npm install -g opencv4nodejs
+  condition: and(succeeded(), eq('${{ parameters.opencv }}', true))
+  displayName: Install opencv4nodejs
 - task: UsePythonVersion@0
   inputs:
     versionSpec: '3.x'

diff --git a/ci-jobs/functional_test.yml b/ci-jobs/functional_test.yml
@@ -32,6 +32,7 @@ jobs:
       testFiles: 'device_time_tests.py search_context/find_by_*.py'
       sdkVer: ${{ parameters.androidSdkVer }}
       CI: ${{ parameters.ci }}
+      OPENCV: true
   - template: ./functional/run_android_test.yml
     parameters:
       name: 'func_test_android2'

diff --git a/test/functional/android/file/find_by_image_success.png b/test/functional/android/file/find_by_image_success.png
diff --git a/test/functional/android/search_context/find_by_image_tests.py b/test/functional/android/search_context/find_by_image_tests.py
@@ -15,21 +15,21 @@
 import base64
 import unittest
 
-import pytest
 from selenium.common.exceptions import NoSuchElementException, TimeoutException
-from selenium.webdriver.common.by import By
 from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.support.ui import WebDriverWait
 
 from appium import webdriver
+from appium.webdriver.common.mobileby import MobileBy
 from test.functional.android.helper import desired_capabilities
 
+from ..helper.test_helper import wait_for_element
+
 
-@pytest.mark.skip(reason="Need to fix broken test")
 class FindByImageTests(unittest.TestCase):
 
     def setUp(self):
-        desired_caps = desired_capabilities.get_desired_capabilities('ApiDemos-debug.apk')
+        desired_caps = desired_capabilities.get_desired_capabilities('ApiDemos-debug.apk.zip')
         self.driver = webdriver.Remote('http://localhost:4723/wd/hub', desired_caps)
 
         # relax template matching
@@ -42,13 +42,10 @@ def tearDown(self):
 
     def test_find_based_on_image_template(self):
         image_path = desired_capabilities.PATH('file/find_by_image_success.png')
-        print(image_path)
         with open(image_path, 'rb') as png_file:
             b64_data = base64.b64encode(png_file.read()).decode('UTF-8')
 
-        el = WebDriverWait(self.driver, 3).until(
-            EC.presence_of_element_located((By.IMAGE, b64_data))
-        )
+        el = wait_for_element(self.driver, MobileBy.IMAGE, b64_data)
         size = el.size
         self.assertIsNotNone(size['width'])
         self.assertIsNotNone(size['height'])
@@ -62,16 +59,14 @@ def test_find_based_on_image_template(self):
         self.assertIsNotNone(rect['y'])
         self.assertTrue(el.is_displayed())
         el.click()
-        self.driver.find_element_by_accessibility_id("Alarm")
+        wait_for_element(self.driver, MobileBy.ACCESSIBILITY_ID, "Alarm")
 
     def test_find_multiple_elements_by_image_just_returns_one(self):
-        WebDriverWait(self.driver, 3).until(
-            EC.presence_of_element_located((By.ACCESSIBILITY_ID, "App"))
-        )
+        wait_for_element(self.driver, MobileBy.ACCESSIBILITY_ID, "App")
         image_path = desired_capabilities.PATH('file/find_by_image_success.png')
         els = self.driver.find_elements_by_image(image_path)
         els[0].click()
-        self.driver.find_element_by_accessibility_id("Alarm")
+        wait_for_element(self.driver, MobileBy.ACCESSIBILITY_ID, "Alarm")
 
     def test_find_throws_no_such_element(self):
         image_path = desired_capabilities.PATH('file/find_by_image_failure.png')
@@ -80,7 +75,7 @@ def test_find_throws_no_such_element(self):
 
         with self.assertRaises(TimeoutException):
             WebDriverWait(self.driver, 3).until(
-                EC.presence_of_element_located((By.IMAGE, b64_data))
+                EC.presence_of_element_located((MobileBy.IMAGE, b64_data))
             )
         with self.assertRaises(NoSuchElementException):
             self.driver.find_element_by_image(image_path)