Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Provide more information for failures involving FindFocus()

Browse Source 
It is useful to know where the focus actually is when a test checking
that it's set to a particular window fails.
This commit is contained in:
Vadim Zeitlin
2019-07-17 15:09:34 +02:00
parent ee0f21388f
commit e3caafabc3
5 changed files with 77 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/controls/windowtest.cpp
View File

@@ -21,6 +21,8 @@
#include "asserthelper.h"
#include "testableframe.h"
#include "testwindow.h"
#include "wx/uiaction.h"
#include "wx/caret.h"
#include "wx/cshelp.h"
@@ -153,7 +155,7 @@ void WindowTestCase::FocusEvent()
m_window->SetFocus();
CPPUNIT_ASSERT(setfocus.WaitEvent(500));
CPPUNIT_ASSERT(m_window->HasFocus());
CHECK_FOCUS_IS( m_window );
wxButton* button = new wxButton(wxTheApp->GetTopWindow(), wxID_ANY);
@@ -298,7 +300,7 @@ void WindowTestCase::Focus()
if ( m_window->AcceptsFocus() )
{
m_window->SetFocus();
CPPUNIT_ASSERT(m_window->HasFocus());
CHECK_FOCUS_IS(m_window);
}
//Set the focus back to the main window
@@ -307,7 +309,7 @@ void WindowTestCase::Focus()
if ( m_window->AcceptsFocusFromKeyboard() )
{
m_window->SetFocusFromKbd();
CPPUNIT_ASSERT(m_window->HasFocus());
CHECK_FOCUS_IS(m_window);
}
#endif
}