robotframework-appiumwindows 0.1.4__py3-none-any.whl → 0.1.6__py3-none-any.whl

AppiumLibrary/keywords/_element.py

@@ -510,9 +510,46 @@ class _ElementKeywords(KeywordGroup):
     
     # TODO temporary add, will remove in the future
     def appium_click_until(self, locators: list, timeout=None, handle_error=True):
-        return self.appium_click_first_match(locators=locators, timeout=timeout, handle_error=handle_error)
+        """
+        Click any element in the list of locators until all elements are not found.
+
+        Args:
+            locators: List of locators to try in order.
+            timeout: Maximum time to wait for an element to appear (default: None).
+            handle_error: Whether to handle errors (default: True).
+        """
+        self._info(f"Appium Click Until: locators='{locators}', timeout='{timeout}', handle_error='{handle_error}'")
+
+        def func():
+            found = False
+            for locator in locators:
+                element = self._element_find(locator, True, False)
+                if element:
+                    element.click()
+                    found = True
+
+            if not found:
+                return False
+            raise Exception(f"Still found element in {locators}, retrying...")
+
+        return self._retry(
+            timeout,
+            func,
+            action=f"Click until '{locators}'",
+            required=not handle_error,
+            return_value=False,
+            poll_interval=None
+        )
 
     def appium_click_first_match(self, locators: list, timeout=None, handle_error=True):
+        """
+        Click the first element in the list of locators that appears.
+
+        Args:
+            locators: List of locators to try in order.
+            timeout: Maximum time to wait for an element to appear (default: None).
+            handle_error: Whether to handle errors (default: True).
+        """
         self._info(f"Appium Click First Match: locators='{locators}', timeout='{timeout}', handle_error='{handle_error}'")
 
         def func():
@@ -533,6 +570,7 @@ class _ElementKeywords(KeywordGroup):
             func,
             action=f"Click until '{locators}'",
             required=not handle_error,
+            return_value=False,
             poll_interval=None
         )
 
@@ -1183,7 +1221,7 @@ class _ElementKeywords(KeywordGroup):
 
             time.sleep(poll)
 
-        if self._log_level in self.LOG_LEVEL_DEBUG:
+        if self._log_level == 'DEBUG':
             duration = time.time() - start
             self._debug(f"_retry duration for action '{action}': {duration:.2f}s")
 

AppiumLibrary/keywords/_windows.py

@@ -14,28 +14,27 @@ class _WindowsKeywords(KeywordGroup):
         super().__init__()
 
     # Public
-    def appium_hover(self, locator, start_locator=None, timeout=20, **kwargs):
+    def appium_hover(self, locator, start_locator=None, timeout=None, **kwargs):
         self._info(f"Appium Hover '{locator}', timeout '{timeout}'")
         self._appium_hover_api(start_locator=start_locator, end_locator=locator, timeout=timeout, **kwargs)
 
-    def appium_click_offset(self, locator, x_offset=0, y_offset=0, timeout=20, **kwargs):
-        self._info(
-            f"Appium Click Offset '{locator}', (x_offset,y_offset) '({x_offset},{y_offset})', timeout '{timeout}'")
+    def appium_click_offset(self, locator, x_offset=0, y_offset=0, timeout=None, **kwargs):
+        self._info(f"Appium Click Offset '{locator}', (x_offset,y_offset) '({x_offset},{y_offset})', timeout '{timeout}'")
         self._appium_click_api(locator=locator, timeout=timeout, x_offset=x_offset, y_offset=y_offset, **kwargs)
 
-    def appium_right_click(self, locator, timeout=20, **kwargs):
+    def appium_right_click(self, locator, timeout=None, **kwargs):
         self._info(f"Appium Right Click '{locator}', timeout '{timeout}'")
         self._appium_click_api(locator=locator, timeout=timeout, button="right", **kwargs)
 
-    def appium_left_click(self, locator, timeout=20, **kwargs):
+    def appium_left_click(self, locator, timeout=None, **kwargs):
         self._info(f"Appium Left Click '{locator}', timeout '{timeout}'")
         self._appium_click_api(locator=locator, timeout=timeout, button="left", **kwargs)
 
-    def appium_double_click(self, locator, timeout=20, **kwargs):
+    def appium_double_click(self, locator, timeout=None, **kwargs):
         self._info(f"Appium Double Click '{locator}', timeout '{timeout}'")
         self._appium_click_api(locator=locator, timeout=timeout, times=2, **kwargs)
 
-    def appium_drag_and_drop(self, start_locator=None, end_locator=None, timeout=20, **kwargs):
+    def appium_drag_and_drop(self, start_locator=None, end_locator=None, timeout=None, **kwargs):
         self._info(f"Appium Drag And Drop '{start_locator} -> {end_locator}', timeout '{timeout}'")
         self._appium_drag_and_drop_api(start_locator=start_locator, end_locator=end_locator, timeout=timeout, **kwargs)
 
@@ -164,7 +163,7 @@ class _WindowsKeywords(KeywordGroup):
 
         self._apply_modifier_keys(click_params, kwargs.get("modifierKeys"))
 
-        def _action():
+        def func():
             elements = self._element_find(locator, False, False)
             if not elements:
                 raise Exception(f"Element not found: {locator}")
@@ -185,7 +184,14 @@ class _WindowsKeywords(KeywordGroup):
             driver.execute_script("windows: click", click_params)
             time.sleep(0.5)
 
-        self._retry(_action, timeout, f"Failed to perform click action on '{locator}'")
+        self._retry(
+            timeout,
+            func,
+            action=f"Failed to perform click action on '{locator}'",
+            required=kwargs.pop("required", True),
+            return_value=kwargs.pop("return_value", True),
+            poll_interval=kwargs.pop("poll_interval", None)
+        )
 
     def _appium_hover_api(self, start_locator, end_locator, timeout, **kwargs):
         """
@@ -201,13 +207,15 @@ class _WindowsKeywords(KeywordGroup):
 
         self._apply_modifier_keys(hover_params, kwargs.get("modifierKeys"))
 
-        def _action():
+        def func():
             if start_locator:
                 start_element = self._element_find(start_locator, True, False)
                 if start_element:
                     hover_params["startElementId"] = start_element.id
                     hover_params.pop("startX", None)
                     hover_params.pop("startY", None)
+                else:
+                    raise Exception(f"Start element not found: {start_locator}")
 
             if end_locator:
                 end_element = self._element_find(end_locator, True, False)
@@ -215,11 +223,20 @@ class _WindowsKeywords(KeywordGroup):
                     hover_params["endElementId"] = end_element.id
                     hover_params.pop("endX", None)
                     hover_params.pop("endY", None)
+                else:
+                    raise Exception(f"End element not found: {end_locator}")
 
             self._current_application().execute_script("windows: hover", hover_params)
             time.sleep(0.5)
 
-        self._retry(_action, timeout, "Failed to perform hover action")
+        self._retry(
+            timeout,
+            func,
+            action="Failed to perform hover action",
+            required=kwargs.pop("required", True),
+            return_value=kwargs.pop("return_value", True),
+            poll_interval=kwargs.pop("poll_interval", None)
+        )
 
     def _appium_drag_and_drop_api(self, start_locator, end_locator, timeout, **kwargs):
         """
@@ -236,7 +253,7 @@ class _WindowsKeywords(KeywordGroup):
 
         self._apply_modifier_keys(drag_params, kwargs.get("modifierKeys"))
 
-        def _action():
+        def func():
             if start_locator:
                 start_element = self._element_find(start_locator, True, False)
                 if start_element:
@@ -254,7 +271,14 @@ class _WindowsKeywords(KeywordGroup):
             self._current_application().execute_script("windows: clickAndDrag", drag_params)
             time.sleep(0.5)
 
-        self._retry(_action, timeout, "Failed to perform drag and drop action")
+        self._retry(
+            timeout,
+            func,
+            action="Failed to perform drag and drop action",
+            required=kwargs.pop("required", True),
+            return_value=kwargs.pop("return_value", True),
+            poll_interval=kwargs.pop("poll_interval", None)
+        )
 
     def _appium_keys_api(self, text, **kwargs):
         """

{robotframework_appiumwindows-0.1.4.dist-info → robotframework_appiumwindows-0.1.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: robotframework-appiumwindows
-Version: 0.1.4
+Version: 0.1.6
 Summary: Robot Framework AppiumLibrary extension for Windows desktop automation using NovaWindows2 Driver instead of WinAppDriver.
 Author-email: Huy Nguyen <nguyenvanhuy0612@gmail.com>
 License: MIT

{robotframework_appiumwindows-0.1.4.dist-info → robotframework_appiumwindows-0.1.6.dist-info}/RECORD

@@ -3,21 +3,21 @@ AppiumLibrary/appium_path.py,sha256=fAsq8pY-Rknqxph0SS4qYQvZSvzKif5PV9XE9uz5Myw,
 AppiumLibrary/version.py,sha256=tiPfWbcvAi_f_6m9SWjLspGk6wtLrLIYPpARm5C07o4,41
 AppiumLibrary/keywords/__init__.py,sha256=j9ug8IsxoltsFwiYMvuk1lGWPzJdmrrG9btcmjgFYIE,746
 AppiumLibrary/keywords/_applicationmanagement.py,sha256=J0rDv8neQwX4tnmR7QdbfPPF9BxVyyq-hyK5gGzsuwk,22682
-AppiumLibrary/keywords/_element.py,sha256=AYZT9l8dditffpjbuYjN1edWSiwgmGnJICp8KZqAlHI,54872
+AppiumLibrary/keywords/_element.py,sha256=QY-ASpNGrijOyXwku4FHHUHoa9ISNehtY86chQz9pjY,56159
 AppiumLibrary/keywords/_logging.py,sha256=07VoC1CYkCBWeEBeay-kpBHhES-uIb5g6_B7kXf1IHI,1864
 AppiumLibrary/keywords/_powershell.py,sha256=dFz_LVbewZ3F3RzDwk4Py8BMSm05XnpojczcYJ2eiaQ,24151
 AppiumLibrary/keywords/_runonfailure.py,sha256=dsy0qAyvoRFbnLy1lZgwadnFrKoFRh8hwTmRHocoz40,2847
 AppiumLibrary/keywords/_screenrecord.py,sha256=ND1BQXt14uXbnknCNU2l4Wzna5abIUGU1l8FHM6dqZs,6789
 AppiumLibrary/keywords/_screenshot.py,sha256=K5JJciCLOYbuSGzY5OErxL1Kc9tJX16GhqztdAzw32o,3747
 AppiumLibrary/keywords/_waiting.py,sha256=GvX2Yn88zX_1rrl-MEADgx62wXUm08m8E04fcDlSLls,6265
-AppiumLibrary/keywords/_windows.py,sha256=wxlZhU5xJm_Y0j8Rv0qYVP_UnHpcLetPZSeK_f74ZZA,11788
+AppiumLibrary/keywords/_windows.py,sha256=jqOnRA3bcVdEBT3nxXK_V1ozzNxrwX-YJaahylXx3Mw,12643
 AppiumLibrary/keywords/keywordgroup.py,sha256=nd7zhoqodlG4E7-smySMGbK6e1cV9AjI0FAxr4YncMc,2467
 AppiumLibrary/locators/__init__.py,sha256=XtTYoS3PKdGSjZIR7fvaaK-ExaOh8ZWW2dddNBL419c,102
 AppiumLibrary/locators/elementfinder.py,sha256=acwAJ2OJsN59yJ5201UH5GdRgWJIzEj5Cc-xCgHTJW8,10977
 AppiumLibrary/utils/__init__.py,sha256=kFiEGeyc2IJVA1nUx2DezPkkO7HWTDnoL__gW4nRRlw,1572
 AppiumLibrary/utils/applicationcache.py,sha256=YrRQgz-4d77hToib4ApBjFT5VohO65DMNiNVUr_PI_0,1523
-robotframework_appiumwindows-0.1.4.dist-info/licenses/LICENSE,sha256=0usw_6IO4DLz-QIR_RLmRq9n4JX_Yns3Ew6dO-2FQmc,1070
-robotframework_appiumwindows-0.1.4.dist-info/METADATA,sha256=KhKi9I648go1eRtQc-PBgAihtNCOHScpV7vwwrK-Y8U,10256
-robotframework_appiumwindows-0.1.4.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-robotframework_appiumwindows-0.1.4.dist-info/top_level.txt,sha256=2o2iQDagXnzsewODgcttx95vTzvaYaZB7q6KJB8sf-I,14
-robotframework_appiumwindows-0.1.4.dist-info/RECORD,,
+robotframework_appiumwindows-0.1.6.dist-info/licenses/LICENSE,sha256=0usw_6IO4DLz-QIR_RLmRq9n4JX_Yns3Ew6dO-2FQmc,1070
+robotframework_appiumwindows-0.1.6.dist-info/METADATA,sha256=s2sT6_7GhIHMtZVkitHeRx2eaQ484U4zo3Xc9LVK5GU,10256
+robotframework_appiumwindows-0.1.6.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+robotframework_appiumwindows-0.1.6.dist-info/top_level.txt,sha256=2o2iQDagXnzsewODgcttx95vTzvaYaZB7q6KJB8sf-I,14
+robotframework_appiumwindows-0.1.6.dist-info/RECORD,,