Fix tests that were failing due to the use of the deprecated assert_equals statements.

.gitignore

@@ -2,11 +2,14 @@ RELEASE-VERSION
 .idea
 *.pyc
 *.egg-info
+*.egg
 *.log
 report.html
 log.html
 output.xml
 \#*\#
 *~
 nosetests.xml
-po_log.txt
+po_log.txt
+libdoc.xml
+

.travis.yml

@@ -1,17 +1,23 @@
-env: 
-  global: 
+env:
+  global:
     secure: aStjr7/mZJDdPqJ210HPRZygxXA36SzXyBraK9x6eqaDR+yqZpGJBIYMlRzqV1Fwlh1BUFbOYNczmLEQs+Sf3uPxyEWhFc5L0qKlvUE98fsf6IJuFJdwfwBG1/vrJTNm0JviBI/6lPlB2/EYtJJBWmYQGsrXXoP5Cc38T+z/a0s=
 language: python
 python:
-  - "2.7"
+  - 2.7
+  - 3.5
+matrix:
+  allow_failures:
+    - python: 3.5
 install:
+  # for Python 3 we need robotframework-selenium2library 1.8.x
+  - if [ $TRAVIS_PYTHON_VERSION == 3.5 ]; then pip install -U https://github.com/HelioGuilherme66/robotframework-selenium2library/archive/v1.8.0b3.tar.gz; fi
   - pip install .
 script:
-  - nosetests -vs --with-xunit tests/test_unit.py tests/test_functional.py
+  - nosetests -vs --with-xunit robotpageobjects/tests/test_unit.py robotpageobjects/tests/test_functional.py
 deploy:
   provider: pypi
   user: hellmanj
-  password: 
+  password:
     secure: D5T3Wo8DGHxxU5+7kE+y6uVVrxoOhLfiCZl9q3BEE9OrbnGmzFngRfP1o37ulk78v7PQGNqtn+95nWOWthJcp4897eB6YhKsa1Q8+HSlNynsf/7WW2cgTEgSWppZNaMoUF+my1NW2baKbmcgwRt3Hsxz9HkOvoFfQAR0ZovUy1U=
   on:
     tags: true

Makefile

@@ -0,0 +1,8 @@
+SHELL := /bin/bash
+CURRENT_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
+
+all: test
+
+test:
+	@echo "Run Tests"
+	nosetests -vs --with-xunit robotpageobjects/tests/test_unit.py robotpageobjects/tests/test_functional.py

requirements.txt

@@ -1,5 +1,6 @@
 decorator
 mock==1.0.1
 requests==2.1.0
-robotframework-selenium2library==1.7.2
+robotframework-selenium2library
+six
 uritemplate==0.6

robotpageobjects/__init__.py

@@ -1,4 +1,3 @@
-from .base import Override, robot_alias, not_keyword
-from .page import Page
-from .component import Component
-
+from robotpageobjects.base import Override, robot_alias, not_keyword
+from robotpageobjects.page import Page
+from robotpageobjects.component import Component

robotpageobjects/abstractedlogger.py

@@ -3,8 +3,8 @@
 import robot.api.logger
 import robot.output.pyloggingconf as robot_logging_conf
 
-from optionhandler import OptionHandler
-from context import Context
+from robotpageobjects.optionhandler import OptionHandler
+from robotpageobjects.context import Context
 
 
 class Logger(object):

robotpageobjects/base.py

@@ -11,10 +11,10 @@
 from Selenium2Library import Selenium2Library
 from Selenium2Library.keywords.keywordgroup import KeywordGroupMetaClass
 
-from . import abstractedlogger
-from . import exceptions
-from .context import Context
-from .optionhandler import OptionHandler
+from robotpageobjects.abstractedlogger import Logger
+from robotpageobjects import exceptions
+from robotpageobjects.context import Context
+from robotpageobjects.optionhandler import OptionHandler
 
 
 class _Keywords(object):
@@ -537,7 +537,7 @@ class _BaseActions(_S2LWrapper):
     Helper class that defines actions for PageObjectLibrary.
     """
 
-    _abstracted_logger = abstractedlogger.Logger()
+    _abstracted_logger = Logger()
 
     def __init__(self, *args, **kwargs):
         """
@@ -718,7 +718,7 @@ def _element_find(self, locator, *args, **kwargs):
 
 
         self.driver.implicitly_wait(our_wait)
-        
+
 
         if locator in self.selectors:
             locator = self.resolve_selector(locator)

robotpageobjects/component.py

@@ -1,4 +1,4 @@
-from .base import _BaseActions, _SelectorsManager, _ComponentsManager, not_keyword
+from robotpageobjects.base import _BaseActions, _SelectorsManager, _ComponentsManager, not_keyword
 from Selenium2Library.locators.elementfinder import ElementFinder
 
 

robotpageobjects/context.py

@@ -1,6 +1,6 @@
 from robot.libraries.BuiltIn import BuiltIn
 from robot.running.context import EXECUTION_CONTEXTS
-from monkeypatches import do_monkeypatches
+from robotpageobjects.monkeypatches import do_monkeypatches
 
 do_monkeypatches()
 
@@ -39,11 +39,11 @@ def in_robot():
     @classmethod
     def set_keywords_exposed(cls):
         cls._keywords_exposed = True
-        
+
     @classmethod
     def set_cache(cls, cache):
         cls._cache = cache
-        
+
     @classmethod
     def get_cache(cls):
         return cls._cache

robotpageobjects/monkeypatches.py

@@ -17,8 +17,8 @@ def _make_phantomjs(self , remote , desired_capabilities , profile_dir):
             try:
                 browser = self._generic_make_browser(webdriver.PhantomJS,
                         webdriver.DesiredCapabilities.PHANTOMJS, remote, desired_capabilities)
-            except WebDriverException, e:
-                print "Couldn't connect to webdriver. WebDriverException was: " + str(e)
+            except WebDriverException as e:
+                print("Couldn't connect to webdriver. WebDriverException was: " + str(e))
                 browser = None
                 tries += 1
         if browser:
@@ -29,17 +29,17 @@ def _make_phantomjs(self , remote , desired_capabilities , profile_dir):
     Selenium2Library._make_phantomjs = _make_phantomjs
 
     ### BEGIN QAR-48165 monkey patch
-    ### This adds consistent support for negative indexes in Robot keywords. 
-    
-    __old_tef_init = TableElementFinder.__init__.__func__
+    ### This adds consistent support for negative indexes in Robot keywords.
+
+    __old_tef_init = TableElementFinder.__init__
     def __new_tef_init(self, *args, **kwargs):
         """
-        The _locator_suffixes data attribute is used at the end of built-in 
+        The _locator_suffixes data attribute is used at the end of built-in
         locator strings used by Selenium2Library.
-        
-        Monkey patch: added support for negative indexes (QAR-48165). The 
+
+        Monkey patch: added support for negative indexes (QAR-48165). The
         additional locator suffixes are used by the monkey-patched methods
-        'find_by_row' and 'find_by_col' defined below.  
+        'find_by_row' and 'find_by_col' defined below.
         """
         __old_tef_init(self, *args, **kwargs)
         self._locator_suffixes[('css', 'last-row')] = [' tr:nth-last-child(%s)']
@@ -51,12 +51,12 @@ def __new_tef_init(self, *args, **kwargs):
     TableElementFinder.__init__ = __new_tef_init
 
     def find_by_row(self, browser, table_locator, row, content):
-        """ 
+        """
         Selenium2Library locator method used by _TableElementKeywords.table_row_should_contain
         This in turn is used by the built-in Robot keyword 'Table Row Should Contain'.
-        
+
         Monkey patch: added support for negative indexes (QAR-48165).
-        """  
+        """
         location_method = "row"
         if "-" == row[0]:
             row = row[1:]
@@ -68,32 +68,32 @@ def find_by_row(self, browser, table_locator, row, content):
     TableElementFinder.find_by_row = find_by_row
 
     def find_by_col(self, browser, table_locator, col, content):
-        """ 
+        """
         Selenium2Library locator method used by _TableElementKeywords.table_row_should_contain
-        
+
         Monkey patch: added support for negative indexes (QAR-48165).
-        """  
+        """
         location_method = "col"
         if "-" == col[0]:
             col = col[1:]
             location_method = "last-col"
         locators = self._parse_table_locator(table_locator, location_method)
         locators = [locator % str(col) for locator in locators]
         return self._search_in_locators(browser, locators, content)
-    
+
     TableElementFinder.find_by_col = find_by_col
 
     def get_table_cell(self, table_locator, row, column, loglevel='INFO'):
         """Returns the content from a table cell.
 
         Row and column number start from 1. Header and footer rows are
         included in the count. A negative row or column number can be used
-        to get rows counting from the end (end: -1) This means that also 
-        cell content from header or footer rows can be obtained with this 
+        to get rows counting from the end (end: -1) This means that also
+        cell content from header or footer rows can be obtained with this
         keyword. To understand how tables are identified, please take a look at
         the `introduction`.
-        
-        Monkey patch: added support for negative indexes (QAR-48165).  
+
+        Monkey patch: added support for negative indexes (QAR-48165).
         get_table_cell is used by the built-in keyword 'Table Cell Should Contain'.
         """
         row = int(row)
@@ -105,13 +105,13 @@ def get_table_cell(self, table_locator, row, column, loglevel='INFO'):
         table = self._table_element_finder.find(self._current_browser(), table_locator)
         if table is not None:
             rows = table.find_elements_by_xpath("./thead/tr")
-            if row_index >= len(rows) or row_index < 0: 
+            if row_index >= len(rows) or row_index < 0:
                 rows.extend(table.find_elements_by_xpath("./tbody/tr"))
-            if row_index >= len(rows) or row_index < 0: 
+            if row_index >= len(rows) or row_index < 0:
                 rows.extend(table.find_elements_by_xpath("./tfoot/tr"))
             if row_index < len(rows):
                 columns = rows[row_index].find_elements_by_tag_name('th')
-                if column_index >= len(columns) or column_index < 0: 
+                if column_index >= len(columns) or column_index < 0:
                     columns.extend(rows[row_index].find_elements_by_tag_name('td'))
                 if column_index < len(columns):
                     return columns[column_index].text

robotpageobjects/optionhandler.py

@@ -1,9 +1,10 @@
 import re
 import os
 import imp
+import six
 
-from context import Context
-import exceptions
+from robotpageobjects.context import Context
+from robotpageobjects import exceptions
 
 
 from robot.libraries.BuiltIn import BuiltIn
@@ -24,7 +25,10 @@ def __new__(cls, *args, **kwargs):
 
         # Singleton pattern...
         if cls._instance is None:
-            cls._instance = super(OptionHandler, cls).__new__(cls, *args, **kwargs)
+            if six.PY2:
+                cls._instance = super(OptionHandler, cls).__new__(cls, *args, **kwargs)
+            else:
+                cls._instance = super().__new__(cls)
             cls._new_called += 1
 
         return cls._instance
@@ -61,7 +65,7 @@ def _get_opts_from_var_file(self):
             try:
                 vars_mod = imp.load_source("vars", abs_var_file_path)
 
-            except (ImportError, IOError), e:
+            except (ImportError, IOError) as e:
                 raise exceptions.VarFileImportErrorError(
                     "Couldn't import variable file: %s. Ensure it exists and is importable." % var_file_path)
 
@@ -85,7 +89,7 @@ def _normalize(self, opts):
         Convert an option keyname to lower-cased robot format, or convert
         all the keys in a dictionary to robot format.
         """
-        if isinstance(opts, basestring):
+        if isinstance(opts, six.string_types):
             name = opts.lower()
             rmatch = re.search("\$\{(.+)\}", name)
             return rmatch.group(1) if rmatch else name

robotpageobjects/page.py

@@ -21,18 +21,22 @@
 from __future__ import print_function
 import inspect
 import re
-import urllib2
+try:
+    import urllib.request as urllib2
+except ImportError:
+    import urllib2
+import six
 
 import decorator
 from Selenium2Library import Selenium2Library
 from selenium import webdriver
 from selenium.common.exceptions import WebDriverException
 import uritemplate
 
-from .base import _ComponentsManagerMeta, not_keyword, robot_alias, _BaseActions, _Keywords, Override, _SelectorsManager, _ComponentsManager
-from . import exceptions
-from .context import Context
-from .sig import get_method_sig
+from robotpageobjects.base import _ComponentsManagerMeta, not_keyword, robot_alias, _BaseActions, _Keywords, Override, _SelectorsManager, _ComponentsManager
+from robotpageobjects import exceptions
+from robotpageobjects.context import Context
+from robotpageobjects.sig import get_method_sig
 
 
 # determine if libdoc is running to avoid generating docs for automatically generated aliases
@@ -241,7 +245,7 @@ def get_keyword_names(self):
     def _attempt_screenshot(self):
             try:
                 self.capture_page_screenshot()
-            except Exception, e:
+            except Exception as e:
                 if e.message.find("No browser is open") != -1:
                     pass
 
@@ -435,7 +439,7 @@ def _resolve_url(self, *args):
 
             first_arg = args[0]
             if not self._is_robot:
-                if isinstance(first_arg, basestring):
+                if isinstance(first_arg, six.string_types):
                     # In Python, if the first argument is a string and not a dict, it's a url or path.
                     arg_type = "url"
                 else:
@@ -574,7 +578,7 @@ class MyPageObject(PageObject):
 
             try:
                 self.open_browser(resolved_url, self.browser, remote_url=remote_url, desired_capabilities=caps)
-            except (urllib2.HTTPError, WebDriverException, ValueError), e:
+            except (urllib2.HTTPError, WebDriverException, ValueError) as e:
                 raise exceptions.SauceConnectionError("Unable to run Sauce job.\n%s\n"
                                                       "Sauce variables were:\n"
                                                       "sauce_platform: %s\n"

tests/basetestcase.py → robotpageobjects/tests/basetestcase.py

@@ -287,7 +287,7 @@ def write_var_file(self, *args, **kwargs):
             for i in kwargs:
                 line = "%s = '%s'\n" % (i, kwargs[i])
                 f.write(line)
-        except Exception, e:
+        except Exception as e:
             raise Exception("Problem creating vars file: %s" % e)
         finally:
             if f:

robotpageobjects/tests/scenarios/po/basepageobjects/__init__.py

@@ -0,0 +1,2 @@
+from robotpageobjects.tests.scenarios.po.basepageobjects.homepage import BaseHomePage
+from robotpageobjects.tests.scenarios.po.basepageobjects.resultspage import BaseResultsPage

robotpageobjects/tests/scenarios/po/mydbpageobjects/__init__.py

@@ -0,0 +1,2 @@
+from robotpageobjects.tests.scenarios.po.mydbpageobjects.homepage import MyDBHomePage
+from robotpageobjects.tests.scenarios.po.mydbpageobjects.resultspage import MyDBResultsPage

tests/scenarios/po/widget_no_uri_attr.py → robotpageobjects/tests/scenarios/po/widget_no_uri_attr.py

@@ -10,7 +10,7 @@ class SearchResultPage(Page):
     @robot_alias("__name__should_have_results")
     def should_have_results(self, expected):
         len_results = len(self.find_elements("xpath=id('results')/li", required=False))
-        asserts.assert_equals(len_results, int(expected), "Unexpected number of results found on %s, got %s, "
+        asserts.assert_equal(len_results, int(expected), "Unexpected number of results found on %s, got %s, "
                                                          "expected %s" %(
             self.name, len_results, expected))