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

Fix wxGrid cell editing unit test in wxGTK

Browse Source 
Wait until the in-place editor is actually shown and then wait again
until is hidden.
This commit is contained in:
Vadim Zeitlin
2019-10-12 16:07:11 +02:00
parent b66a4b9948
commit 879d6e40b2
1 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
tests/controls/gridtest.cpp
View File

@@ -23,6 +23,10 @@
#include "asserthelper.h" #include "asserthelper.h"
#include "wx/uiaction.h" #include "wx/uiaction.h"
#ifdef __WXGTK__
#include "wx/stopwatch.h"
#endif // __WXGTK__
class GridTestCase : public CppUnit::TestCase class GridTestCase : public CppUnit::TestCase
{ {
public: public:
@@ -163,11 +167,42 @@ void GridTestCase::CellEdit()
m_grid->SetFocus(); m_grid->SetFocus();
m_grid->SetGridCursor(1, 1); m_grid->SetGridCursor(1, 1);
wxYield();
sim.Text("abab"); sim.Text("abab");
// We need to wait until the editor is really shown under GTK, consider
// that it happens once it gets focus.
#ifdef __WXGTK__
for ( wxStopWatch sw; wxWindow::FindFocus() == m_grid; )
{
if ( sw.Time() > 250 )
{
WARN("Editor control not shown until timeout expiration");
break;
}
wxYield();
}
#endif // __WXGTK__
sim.Char(WXK_RETURN); sim.Char(WXK_RETURN);
wxYield(); wxYield();
#ifdef __WXGTK__
for ( wxStopWatch sw; wxWindow::FindFocus() != m_grid; )
{
if ( sw.Time() > 250 )
{
WARN("Editor control not hidden until timeout expiration");
break;
}
wxYield();
}
#endif // __WXGTK__
CPPUNIT_ASSERT_EQUAL(1, created.GetCount()); CPPUNIT_ASSERT_EQUAL(1, created.GetCount());
CPPUNIT_ASSERT_EQUAL(1, changing.GetCount()); CPPUNIT_ASSERT_EQUAL(1, changing.GetCount());
CPPUNIT_ASSERT_EQUAL(1, changed.GetCount()); CPPUNIT_ASSERT_EQUAL(1, changed.GetCount());