Small fixes in BrowserHandling

baangt/base/BrowserHandling/BrowserHandling.py

@@ -162,7 +162,8 @@ class BrowserDriver:
             )
 
 
-    def _mobileConnectAppium(self, browserName, desired_app, mobileApp, mobile_app_setting):
+    @staticmethod
+    def _mobileConnectAppium(browserName, desired_app, mobileApp, mobile_app_setting):
         validSettings = False
         desired_cap = desired_app
 
@@ -303,8 +304,7 @@ class BrowserDriver:
             if not success:
                 raise Exceptions.baangtTestStepException(f"Window {windowNumber} doesn't exist after timeout {timeout}")
 
-    def findByAndWaitForValue(self, id=None, css=None, xpath=None, class_name=None, iframe=None, timeout=20,
-                              optional=False):
+    def findByAndWaitForValue(self, id=None, css=None, xpath=None, class_name=None, iframe=None, timeout=20, optional=False):
         """
 
         @param id: ID of the element
@@ -430,7 +430,8 @@ class BrowserDriver:
         else:
             return webDrv.webdriver_doSomething(GC.CMD_CLICK, self.element, timeout=timeout, optional=optional, browserData = self.browserData)
 
-    def _isValidKeyValue(self, value):
+    @staticmethod
+    def _isValidKeyValue(value):
         isValid = False
         if not value:
             pass
@@ -519,7 +520,8 @@ class BrowserDriver:
         l_list = self.downloadFolderMonitoring.getNewFiles()
         return l_list
 
-    def _setLocator(self, id, css, xpath, class_name, browserData):
+    @staticmethod
+    def _setLocator(id, css, xpath, class_name, browserData):
         browserData.locatorType = None
         browserData.locator = None
         if xpath:

baangt/base/BrowserHandling/BrowserHelperFunction.py

@@ -23,6 +23,9 @@ class BrowserDriverData:
     driver : None
 
 class BrowserHelperFunction:
+    """
+    Helper function class for BrowserHandling. 
+    """
 
     @staticmethod
     def browserHelper_setBrowserDownloadDirRandom():
@@ -143,6 +146,8 @@ class BrowserHelperFunction:
 
     @staticmethod
     def browserHelper_getFirefoxFileUrl():
+        #TODO check if this function can be combined with browserHelper_getChromeFileUrl
+        # Can ctypes.c_voidp used for both browsers?
         url = None
         response = requests.get(GC.GECKO_URL)
         gecko = response.json()

baangt/base/BrowserHandling/WebdriverFunctions.py

@@ -22,6 +22,9 @@ import sys
 logger = logging.getLogger("pyC")
 
 class WebdriverFunctions:
+    """
+    The webdriverclass for BrowserHandling to interact with selenium webdriver.
+    """
 
     BROWSER_DRIVERS = {
         GC.BROWSER_FIREFOX: webdriver.Firefox,
@@ -189,7 +192,6 @@ class WebdriverFunctions:
         REQUEST_TIMEOUT_MINIMUM = 1.5
         REQUEST_POLL_FREQUENCY = 0.5
 
-
         element = None
         html = None
         begin = time.time()

baangt/hookSpecs.py

@@ -386,7 +386,7 @@ class baangtHookSpec(object):
     # -------------------------------------------------------------------
 
     @hook_spec
-    def webdriverFunctions_webdriver_doSomething(self, webdriverobject, command, value=None, timeout=20, optional=False, browserData=None):
+    def webdriverFunctions_webdriver_doSomething(self, webdriverobject, command, element, value=None, timeout=20, optional=False, browserData=None):
         pass
 
 
@@ -406,11 +406,11 @@ class baangtHookSpec(object):
 
     # -------------------------------------------------------------------
 
-
     @hook_spec
     def browserHelperFunction_browserHelper_log(self, browserHelperObject, logType, logText, browserData, cbTakeScreenshot = None, **kwargs):
         pass
 
+
     @hook_spec
     def browserHelperFunction_browserHelper_findBrowserDriverPaths(self, browserHelperObject ,filename):
         pass