Fixed Get Window Titles when non ascii title (#1257)

aaltat · web-flow · commit c84662adbffb · 2018-12-07T00:49:40.000+02:00
* Fixed Get Window Titles when non ascii title

* Update to use plural_or_not
diff --git a/atest/acceptance/windows.robot b/atest/acceptance/windows.robot
@@ -22,6 +22,16 @@ Get Window Titles
     ${titles}=    Get Window Titles
     Should Be Equal    ${titles}    ${exp_titles}
 
+Get Window Titles With Non ASCII Title
+    ${exp_titles}=    Create List    Click link to show a popup window    äää
+    Click Link    my popup
+    Wait Until New Window Is Open
+    ${parent} =    Select Window    Original
+    Click Element    unicode
+    ${titles} =    Get Window Titles
+    Should Be Equal    ${titles}    ${exp_titles}
+    [Teardown]  Select Window    ${parent}
+
 Get Title
     ${title} =    Get Title
     Should Be Equal As Strings    ${title}    Click link to show a popup window
diff --git a/atest/resources/html/javascript/dynamic_content.html b/atest/resources/html/javascript/dynamic_content.html
@@ -15,6 +15,7 @@
 	<body>
 		<a href="javascript:return false;" onclick="document.title='Changed'; return false;">change title</a><br/>
 		<a href="javascript:return false;" onclick="add_content('target', 'added content'); return false;">add content</a><br/>
+		<a id="unicode" href="javascript:return false;" onclick="document.title='äää'; return false;">title to ääää</a><br/>
 		<p>
 		<input type="radio" name="group" value="title" 
 		 onclick="document.title='Changed by Button';" />Change Title<br/>
diff --git a/src/SeleniumLibrary/keywords/window.py b/src/SeleniumLibrary/keywords/window.py
@@ -20,6 +20,7 @@
 
 from SeleniumLibrary.base import keyword, LibraryComponent
 from SeleniumLibrary.locators import WindowManager
+from SeleniumLibrary.utils import plural_or_not
 
 
 class WindowKeywords(LibraryComponent):
@@ -219,10 +220,10 @@ def set_window_position(self, x, y):
 
     def _log_list(self, items, what='item'):
         msg = [
-            'Altogether {} {}.'.format(
-                len(items), what if len(items) == 1 else '{}s'.format(what))
+            'Altogether %s %s%s.'
+            % (len(items), what, plural_or_not(items))
         ]
         for index, item in enumerate(items):
-            msg.append('{}: {}'.format(index + 1, item))
+            msg.append('%s: %s' % (index + 1, item))
         self.info('\n'.join(msg))
         return items
