-
Notifications
You must be signed in to change notification settings - Fork 44
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add dclick option to test assistant #444
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,8 +3,9 @@ | |
except ImportError: | ||
import mock | ||
import nose | ||
from unittest import skipIf | ||
|
||
from traitsui.tests._tools import skip_if_null | ||
from traits.etsconfig.api import ETSConfig | ||
|
||
from enable.component import Component | ||
from enable.testing import EnableTestAssistant, _MockWindow | ||
|
@@ -23,7 +24,24 @@ def test_mouse_move(): | |
assert not event.shift_down | ||
nose.tools.assert_equal(event.window.get_pointer_position(), (10, 20)) | ||
|
||
@skip_if_null | ||
|
||
def test_mouse_down(): | ||
test_assistant = EnableTestAssistant() | ||
component = Component(bounds=[100, 200]) | ||
component.normal_left_down = mock.Mock() | ||
test_assistant.mouse_down(component, x=0, y=0) | ||
component.normal_left_down.assert_called_once() | ||
|
||
|
||
def test_mouse_dclick(): | ||
test_assistant = EnableTestAssistant() | ||
component = Component(bounds=[100, 200]) | ||
component.normal_left_dclick = mock.Mock() | ||
test_assistant.mouse_dclick(component, x=0, y=0) | ||
component.normal_left_dclick.assert_called_once() | ||
|
||
|
||
@skipIf(ETSConfig.toolkit == "null", "Skipping null tookit") | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Not happy about this change. |
||
def test_mouse_move_real_window(): | ||
from enable.api import Window | ||
|
||
|
@@ -42,15 +60,16 @@ def test_mouse_move_real_window(): | |
# can't test pointer position, not set, but if we get here it didn't | ||
# try to set the pointer position | ||
|
||
@skip_if_null | ||
|
||
@skipIf(ETSConfig.toolkit == "null", "Skipping null tookit") | ||
def test_mouse_move_real_window_mocked_position(): | ||
from enable.api import Window | ||
|
||
test_assistant = EnableTestAssistant() | ||
component = Component(bounds=[100, 200]) | ||
|
||
with mock.patch.object(Window, 'get_pointer_position', | ||
return_value=None): | ||
return_value=None): | ||
window = Window(None, component=component) | ||
event = test_assistant.mouse_move(component, 10, 20, window) | ||
|
||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It took me a while to understand if this "left_down" or "right_down" was necessary... I think it could potentially be handled by the window to change focus, so it makes sense to keep.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Whether or not it necessary, what matters is whether the generated event has the same features of the events which are generated by the backends, eg.
enable/enable/qt4/base_window.py
Lines 456 to 458 in 854778d
This doesn't allow generation of chorded double-click events, but that's probably for the best 😄