4 new revisions:
Revision: 6960c7d8cfbc
Branch: default
Author: Pekka Klärck
Date: Thu Jan 9 22:05:09 2014 UTC
Log: fixed libdoc test after changing Dialogs lib
http://code.google.com/p/robotframework/source/detail?r=6960c7d8cfbc
Revision: 6c8db3ef7f56
Branch: default
Author: Pekka Klärck
Date: Thu Jan 9 22:14:04 2014 UTC
Log: Dialogs.Get Value From User: Renamed `hide` argument to
`hidden`....
http://code.google.com/p/robotframework/source/detail?r=6c8db3ef7f56
Revision: b4aa489bee07
Branch: default
Author: Pekka Klärck
Date: Thu Jan 9 23:01:32 2014 UTC
Log: Dialogs: Fix pressing InputDialog cancel/esc on Jython....
http://code.google.com/p/robotframework/source/detail?r=b4aa489bee07
Revision: 1ad51c1d15d5
Branch: default
Author: Pekka Klärck
Date: Thu Jan 9 23:59:49 2014 UTC
Log: Dialogs: Fixed settings focus with InputDialog on Jython....
http://code.google.com/p/robotframework/source/detail?r=1ad51c1d15d5
==============================================================================
Revision: 6960c7d8cfbc
Branch: default
Author: Pekka Klärck
Date: Thu Jan 9 22:05:09 2014 UTC
Log: fixed libdoc test after changing Dialogs lib
http://code.google.com/p/robotframework/source/detail?r=6960c7d8cfbc
Modified:
/atest/robot/libdoc/console_viewer.txt
=======================================
--- /atest/robot/libdoc/console_viewer.txt Fri Nov 15 11:57:39 2013 UTC
+++ /atest/robot/libdoc/console_viewer.txt Thu Jan 9 22:05:09 2014 UTC
@@ -27,7 +27,7 @@
... Pauses test execution until user sets the keyword status.
Should Contain Keyword Get Selection From User message, *values
... Pauses test execution and asks user to select a value.
- Should Contain Keyword Get Value From User message,
default_value=
+ Should Contain Keyword Get Value From User message,
default_value=, hide=False
... Pauses test execution and asks user to input a value.
Should Contain Keyword Pause Execution message=Test execution
paused. Press OK to continue.
... Pauses test execution until user clicks `Ok` button.
==============================================================================
Revision: 6c8db3ef7f56
Branch: default
Author: Pekka Klärck
Date: Thu Jan 9 22:14:04 2014 UTC
Log: Dialogs.Get Value From User: Renamed `hide` argument to `hidden`.
Update issue 1620
Renamed `hide` -> `hidden`.
http://code.google.com/p/robotframework/source/detail?r=6c8db3ef7f56
Modified:
/atest/robot/libdoc/console_viewer.txt
/atest/testdata/standard_libraries/dialogs/dialogs.txt
/src/robot/libraries/Dialogs.py
/src/robot/libraries/dialogs_ipy.py
/src/robot/libraries/dialogs_jy.py
/src/robot/libraries/dialogs_py.py
=======================================
--- /atest/robot/libdoc/console_viewer.txt Thu Jan 9 22:05:09 2014 UTC
+++ /atest/robot/libdoc/console_viewer.txt Thu Jan 9 22:14:04 2014 UTC
@@ -27,7 +27,7 @@
... Pauses test execution until user sets the keyword status.
Should Contain Keyword Get Selection From User message, *values
... Pauses test execution and asks user to select a value.
- Should Contain Keyword Get Value From User message,
default_value=, hide=False
+ Should Contain Keyword Get Value From User message,
default_value=, hidden=False
... Pauses test execution and asks user to input a value.
Should Contain Keyword Pause Execution message=Test execution
paused. Press OK to continue.
... Pauses test execution until user clicks `Ok` button.
=======================================
--- /atest/testdata/standard_libraries/dialogs/dialogs.txt Thu Jan 9
20:00:25 2014 UTC
+++ /atest/testdata/standard_libraries/dialogs/dialogs.txt Thu Jan 9
22:14:04 2014 UTC
@@ -31,9 +31,9 @@
Should Be Equal ${value} ${EMPTY}
Get Hidden Value From User
- ${value} = Get Value From User Type 'value' and press OK.
hide=yes
+ ${value} = Get Value From User Type 'value' and press OK.
hidden=yes
Should Be Equal ${value} value
- ${value} = Get Value From User Press OK. initial value
hidden
+ ${value} = Get Value From User Press OK. initial value hide
Should Be Equal ${value} initial value
Get Value From User Cancelled
=======================================
--- /src/robot/libraries/Dialogs.py Thu Jan 9 20:00:25 2014 UTC
+++ /src/robot/libraries/Dialogs.py Thu Jan 9 22:14:04 2014 UTC
@@ -71,7 +71,7 @@
raise AssertionError(msg)
-def get_value_from_user(message, default_value='', hide=False):
+def get_value_from_user(message, default_value='', hidden=False):
"""Pauses test execution and asks user to input a value.
Value typed by the user, or the possible default value, is returned.
@@ -80,14 +80,14 @@
`message` is the instruction shown in the dialog and `default_value` is
the possible default value shown in the input field.
- If `hide` is given any true value, such as any non-empty string, the
value
+ If `hidden` is given any true value, such as any non-empty string, the
value
typed by the user is hidden. This is a new feature in Robot Framework
2.8.4.
Example:
- | ${username} = | Get Value From User | Input user name | default |
- | ${password} = | Get Value From User | Input password | hide=yes |
+ | ${username} = | Get Value From User | Input user name | default |
+ | ${password} = | Get Value From User | Input password | hidden=yes |
"""
- return _validate_user_input(InputDialog(message, default_value, hide))
+ return _validate_user_input(InputDialog(message, default_value,
hidden))
def get_selection_from_user(message, *values):
=======================================
--- /src/robot/libraries/dialogs_ipy.py Thu Jan 9 20:00:25 2014 UTC
+++ /src/robot/libraries/dialogs_ipy.py Thu Jan 9 22:14:04 2014 UTC
@@ -27,7 +27,7 @@
class InputDialog(_AbstractWinformsDialog):
- def __init__(self, message, default, hide=False):
+ def __init__(self, message, default, hidden=False):
_AbstractWinformsDialog.__init__(self)
=======================================
--- /src/robot/libraries/dialogs_jy.py Thu Jan 9 20:00:25 2014 UTC
+++ /src/robot/libraries/dialogs_jy.py Thu Jan 9 22:14:04 2014 UTC
@@ -57,8 +57,8 @@
class InputDialog(_SwingDialog):
- def __init__(self, message, default, hide=False):
- self._input_field = JPasswordField() if hide else JTextField()
+ def __init__(self, message, default, hidden=False):
+ self._input_field = JPasswordField() if hidden else JTextField()
self._input_field.setText(default)
panel = JPanel(layout=GridLayout(2, 1))
panel.add(JLabel(message))
=======================================
--- /src/robot/libraries/dialogs_py.py Thu Jan 9 20:00:25 2014 UTC
+++ /src/robot/libraries/dialogs_py.py Thu Jan 9 22:14:04 2014 UTC
@@ -118,11 +118,11 @@
class InputDialog(_TkDialog):
- def __init__(self, message, default='', hide=False):
- _TkDialog.__init__(self, message, default, hide=hide)
+ def __init__(self, message, default='', hidden=False):
+ _TkDialog.__init__(self, message, default, hidden=hidden)
- def _create_selector(self, parent, default, hide):
- self._entry = Entry(parent, show='*' if hide else '')
+ def _create_selector(self, parent, default, hidden):
+ self._entry = Entry(parent, show='*' if hidden else '')
self._entry.insert(0, default)
self._entry.select_range(0, END)
return self._entry
==============================================================================
Revision: b4aa489bee07
Branch: default
Author: Pekka Klärck
Date: Thu Jan 9 23:01:32 2014 UTC
Log: Dialogs: Fix pressing InputDialog cancel/esc on Jython.
Update issue 1620
Fixed cancel/esc on Jython.
http://code.google.com/p/robotframework/source/detail?r=b4aa489bee07
Modified:
/atest/robot/standard_libraries/dialogs/dialogs.txt
/atest/testdata/standard_libraries/dialogs/dialogs.txt
/src/robot/libraries/dialogs_jy.py
=======================================
--- /atest/robot/standard_libraries/dialogs/dialogs.txt Thu Jan 9 20:00:25
2014 UTC
+++ /atest/robot/standard_libraries/dialogs/dialogs.txt Thu Jan 9 23:01:32
2014 UTC
@@ -31,12 +31,18 @@
Get Value From User Cancelled
Check Test Case ${TESTNAME}
+
+Get Value From User Exited
+ Check Test Case ${TESTNAME}
Get Selection From User
Check Test Case ${TESTNAME}
Get Selection From User Cancelled
Check Test Case ${TESTNAME}
+
+Get Selection From User Exited
+ Check Test Case ${TESTNAME}
Multiple dialogs in a row
Check Test Case ${TESTNAME}
=======================================
--- /atest/testdata/standard_libraries/dialogs/dialogs.txt Thu Jan 9
22:14:04 2014 UTC
+++ /atest/testdata/standard_libraries/dialogs/dialogs.txt Thu Jan 9
23:01:32 2014 UTC
@@ -40,6 +40,10 @@
[Documentation] FAIL No value provided by user.
Get Value From User Press Cancel.
+Get Value From User Exited
+ [Documentation] FAIL No value provided by user.
+ Get Value From User Press <Esc>.
+
Get Selection From User
${value} = Get Selection From User Select 'value' and press OK.
... zip zap foo value bar
@@ -49,6 +53,10 @@
[Documentation] FAIL No value provided by user.
Get Selection From User Press Cancel. zip zap foo
+Get Selection From User Exited
+ [Documentation] FAIL No value provided by user.
+ Get Selection From User Press <Esc>. zip zap foo
+
Multiple dialogs in a row
[Documentation] FAIL No value provided by user.
Pause Execution Verify that dialog is closed immediately.\n\nAfter
pressing Ok.
=======================================
--- /src/robot/libraries/dialogs_jy.py Thu Jan 9 22:14:04 2014 UTC
+++ /src/robot/libraries/dialogs_jy.py Thu Jan 9 23:01:32 2014 UTC
@@ -16,7 +16,7 @@
from java.awt import GridLayout
from javax.swing import JLabel, JOptionPane, JPanel, JPasswordField,
JTextField
from javax.swing.JOptionPane import PLAIN_MESSAGE, UNINITIALIZED_VALUE, \
- YES_NO_OPTION, OK_CANCEL_OPTION, DEFAULT_OPTION
+ YES_NO_OPTION, OK_CANCEL_OPTION, OK_OPTION, DEFAULT_OPTION
class _SwingDialog(object):
@@ -67,6 +67,8 @@
_SwingDialog.__init__(self, pane)
def _get_value(self, pane):
+ if pane.getValue() != OK_OPTION:
+ return None
return self._input_field.getText()
==============================================================================
Revision: 1ad51c1d15d5
Branch: default
Author: Pekka Klärck
Date: Thu Jan 9 23:59:49 2014 UTC
Log: Dialogs: Fixed settings focus with InputDialog on Jython.
Update issue 1620
Now focus is set to input field by default on Jython. This is how it works
w/ Python and how it worked with Jython in 2.8.3.
http://code.google.com/p/robotframework/source/detail?r=1ad51c1d15d5
Modified:
/src/robot/libraries/dialogs_jy.py
=======================================
--- /src/robot/libraries/dialogs_jy.py Thu Jan 9 23:01:32 2014 UTC
+++ /src/robot/libraries/dialogs_jy.py Thu Jan 9 23:59:49 2014 UTC
@@ -14,6 +14,7 @@
import time
from java.awt import GridLayout
+from java.awt.event import WindowAdapter
from javax.swing import JLabel, JOptionPane, JPanel, JPasswordField,
JTextField
from javax.swing.JOptionPane import PLAIN_MESSAGE, UNINITIALIZED_VALUE, \
YES_NO_OPTION, OK_CANCEL_OPTION, OK_OPTION, DEFAULT_OPTION
@@ -32,6 +33,7 @@
dialog = pane.createDialog(None, 'Robot Framework')
dialog.setModal(False)
dialog.setAlwaysOnTop(True)
+ dialog.addWindowFocusListener(pane.focus_listener)
dialog.show()
while dialog.isShowing():
time.sleep(0.2)
@@ -42,12 +44,6 @@
return value if value != UNINITIALIZED_VALUE else None
-class WrappedOptionPane(JOptionPane):
-
- def getMaxCharactersPerLineCount(self):
- return 120
-
-
class MessageDialog(_SwingDialog):
def __init__(self, message):
@@ -60,10 +56,12 @@
def __init__(self, message, default, hidden=False):
self._input_field = JPasswordField() if hidden else JTextField()
self._input_field.setText(default)
+ self._input_field.selectAll()
panel = JPanel(layout=GridLayout(2, 1))
panel.add(JLabel(message))
panel.add(self._input_field)
pane = WrappedOptionPane(panel, PLAIN_MESSAGE, OK_CANCEL_OPTION)
+ pane.set_focus_listener(self._input_field)
_SwingDialog.__init__(self, pane)
def _get_value(self, pane):
@@ -90,3 +88,22 @@
def _get_value(self, pane):
return pane.getValue() == 'PASS'
+
+
+class WrappedOptionPane(JOptionPane):
+ focus_listener = None
+
+ def getMaxCharactersPerLineCount(self):
+ return 120
+
+ def set_focus_listener(self, component):
+ self.focus_listener = WindowFocusListener(component)
+
+
+class WindowFocusListener(WindowAdapter):
+
+ def __init__(self, component):
+ self.component = component
+
+ def windowGainedFocus(self, event):
+ self.component.requestFocusInWindow()
--
---
You received this message because you are subscribed to the Google Groups "robotframework-commit" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to robotframework-commit+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
