solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge branch 'qt-uiaction-tests' of https://github.com/AliKet/wxWidgets

Browse source 
Enable automatic tests using wxUIActionSimulator under wxQt.

See #24015.
This commit is contained in:
Vadim Zeitlin 2023-11-17 01:05:56 +01:00
commit 5a184d423b
21 changed files with 257 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

5
.github/workflows/ci.yml vendored
View file

@ -135,7 +135,7 @@ jobs:
- name: Ubuntu 18.04 wxQt
runner: ubuntu-latest
container: ubuntu:18.04
configure_flags: --with-qt --enable-pch --without-opengl --disable-uiactionsim
configure_flags: --with-qt --enable-pch --without-opengl
skip_samples: true
use_xvfb: true
@ -370,6 +370,9 @@ jobs:
wx_tests_selection='~[.] ~RichTextCtrlTestCase'
fi
# The tests only work reliably with native windows
export QT_USE_NATIVE_WINDOWS=1
# Configure the system to create core files and create them in the
# current directory instead of using apport to handle them, as
# Ubuntu does by default (even in a container where apport is not

3
include/wx/qt/treectrl.h
View file

@ -139,6 +139,9 @@ protected:
virtual void OnImagesChanged() override;
// For wxEVT_TREE_KEY_DOWN generation
void OnKeyDown(wxKeyEvent &event);
private:
void SendDeleteEvent(const wxTreeItemId &item);
wxTreeItemId GetNext(const wxTreeItemId &item) const;

6
src/common/uiactioncmn.cpp
View file

@ -94,6 +94,7 @@ bool wxUIActionSimulatorImpl::MouseDragDrop(long x1, long y1, long x2, long y2,
bool
wxUIActionSimulator::Key(int keycode, int modifiers, bool isDown)
{
#ifndef __WXQT__
wxASSERT_MSG( !(modifiers & wxMOD_META ),
"wxMOD_META is not implemented" );
wxASSERT_MSG( !(modifiers & wxMOD_WIN ),
@ -108,6 +109,11 @@ wxUIActionSimulator::Key(int keycode, int modifiers, bool isDown)
SimulateModifiers(modifiers, false);
return rc;
#else
// Under wxQt we have to pass modifiers along with keycode for the simulation
// to succeed.
return m_impl->DoKey(keycode, modifiers, isDown);
#endif
}
void wxUIActionSimulator::SimulateModifiers(int modifiers, bool isDown)

13
src/qt/treectrl.cpp
View file

@ -578,6 +578,8 @@ bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id,
SetWindowStyleFlag(style);
Bind(wxEVT_KEY_DOWN, &wxTreeCtrl::OnKeyDown, this);
return QtCreateControl(parent, id, pos, size, style, validator, name);
}
@ -1426,3 +1428,14 @@ wxTreeItemId wxTreeCtrl::GetNext(const wxTreeItemId &item) const
} while ( p.IsOk() && !toFind.IsOk() );
return toFind;
}
void wxTreeCtrl::OnKeyDown(wxKeyEvent& event)
{
// send a tree event
wxTreeEvent te( wxEVT_TREE_KEY_DOWN, this);
te.m_evtKey = event;
if ( GetEventHandler()->ProcessEvent( te ) )
return;
event.Skip();
}

184
src/qt/uiaction.cpp
View file

@ -14,6 +14,11 @@
#include "wx/uiaction.h"
#include "wx/private/uiaction.h"
// Apparently {mouse,key}Event() functions signature has changed from QWidget to
// QWindow at some time during Qt5. Fortunately, we can continue to use the API
// taking QWidget by defining QT_WIDGETS_LIB before including the test headers.
#define QT_WIDGETS_LIB
#include <QtTest/QtTestGui>
#include <QtWidgets/QApplication>
#include <QtWidgets/QWidget>
@ -26,16 +31,6 @@
using namespace Qt;
using namespace QTest;
// Apparently {mouse,key}Event() functions signature has changed from QWidget
// to QWindow at some time during Qt5, but we don't know when exactly. We do
// know that they take QWindow for 5.2 and, presumably, later versions (but not
// for whichever version this code was originally written for).
#if (QT_VERSION >= QT_VERSION_CHECK(5, 2, 0))
inline QWindow* argForEvents(QWidget* w) { return w->windowHandle(); }
#else
inline QWidget* argForEvents(QWidget* w) { return w; }
#endif
class wxUIActionSimulatorQtImpl : public wxUIActionSimulatorImpl
{
public:
@ -52,15 +47,66 @@ public:
virtual bool MouseDown(int button = wxMOUSE_BTN_LEFT) override;
virtual bool MouseUp(int button = wxMOUSE_BTN_LEFT) override;
virtual bool MouseClick(int button = wxMOUSE_BTN_LEFT) override;
virtual bool MouseDblClick(int button = wxMOUSE_BTN_LEFT) override;
virtual bool DoKey(int keycode, int modifiers, bool isDown) override;
private:
// This class has no public ctors, use Get() instead.
wxUIActionSimulatorQtImpl() { }
wxUIActionSimulatorQtImpl() { m_mousePosition = QCursor::pos(); }
// Simulating mouse clicks with one or more modifiers only works if the modifier(s)
// is/are passed along with the mouse click. We just put SaveModifierForMouseClicks()
// inside DoKey() to remember which modifier(s) is/are currently pressed and pass that
// information to SimulateMouseButton() so code like the following works as expected:
//
// sim.KeyDown(WXK_SHIFT);
// sim.MouseClick();
// sim.KeyUp(WXK_SHIFT);
//
void SaveModifierForMouseClicks(int keycode, bool isDown)
{
switch ( keycode )
{
default:
wxFALLTHROUGH;
case WXK_SHIFT:
isDown ? m_modifiers |= wxMOD_SHIFT
: m_modifiers &= ~wxMOD_SHIFT;
break;
case WXK_ALT:
isDown ? m_modifiers |= wxMOD_ALT
: m_modifiers &= ~wxMOD_ALT;
break;
case WXK_CONTROL:
isDown ? m_modifiers |= wxMOD_CONTROL
: m_modifiers &= ~wxMOD_CONTROL;
break;
}
}
int m_modifiers = wxMOD_NONE; // for mouse clicks only
QPoint m_mousePosition;
wxDECLARE_NO_COPY_CLASS(wxUIActionSimulatorQtImpl);
};
static Qt::KeyboardModifiers ConvertToQtModifiers(int modifiers)
{
Qt::KeyboardModifiers qtmodifiers = Qt::NoModifier;
if ( modifiers & wxMOD_SHIFT )
qtmodifiers |= Qt::ShiftModifier;
if ( modifiers & wxMOD_ALT )
qtmodifiers |= Qt::AltModifier;
if ( modifiers & wxMOD_CONTROL )
qtmodifiers |= Qt::ControlModifier;
return qtmodifiers;
}
static MouseButton ConvertMouseButton( int button )
{
MouseButton qtButton;
@ -96,56 +142,100 @@ static MouseButton ConvertMouseButton( int button )
}
static bool SimulateMouseButton( MouseAction mouseAction, MouseButton mouseButton )
static bool SimulateMouseButton( MouseAction mouseAction,
MouseButton mouseButton,
QPoint mousePosition,
Qt::KeyboardModifiers modifiers = Qt::NoModifier )
{
QPoint mousePosition = QCursor::pos();
QWidget *widget = QApplication::widgetAt( mousePosition );
if ( widget != nullptr )
mouseEvent( mouseAction, argForEvents(widget), mouseButton, NoModifier, mousePosition );
if ( !widget )
return false;
const QPoint pos = widget->mapFromGlobal(mousePosition);
// Notice that windowHandle() returns a valid handle for native widgets only.
widget->windowHandle() != nullptr ?
mouseEvent( mouseAction, widget->windowHandle(), mouseButton, modifiers, pos ) :
mouseEvent( mouseAction, widget, mouseButton, modifiers, pos );
// If we found a widget then we successfully simulated an event:
return widget != nullptr;
}
static bool SimulateKeyboardKey( KeyAction keyAction, Key key )
{
QWidget *widget = QApplication::focusWidget();
if ( widget != nullptr )
keyEvent( keyAction, argForEvents(widget), key );
// If we found a widget then we successfully simulated an event:
return widget != nullptr;
}
bool wxUIActionSimulatorQtImpl::MouseDown( int button )
{
return SimulateMouseButton( MousePress, ConvertMouseButton( button ));
}
bool wxUIActionSimulatorQtImpl::MouseUp(int button)
{
return SimulateMouseButton( MouseRelease, ConvertMouseButton( button ));
}
bool wxUIActionSimulatorQtImpl::MouseMove(long x, long y)
{
QCursor::setPos( x, y );
return true;
}
static bool SimulateKeyboardKey( KeyAction keyAction, Key key, int modifiers )
{
QWidget *widget = QApplication::focusWidget();
if ( !widget )
return false;
// I don't know if this is a bug in QTest or not, but simulating Shift+Char
// always produces a lowercase of that char! (which must be in uppercase)
if ( modifiers == wxMOD_SHIFT && key < 256 )
{
const QChar qChar(key);
if ( qChar.isLetter() )
{
widget->windowHandle() != nullptr ?
sendKeyEvent( keyAction, widget->windowHandle(), key,
QString(qChar.toUpper()), Qt::ShiftModifier ) :
sendKeyEvent( keyAction, widget, key,
QString(qChar.toUpper()), Qt::ShiftModifier );
return true;
}
}
widget->windowHandle() != nullptr ?
keyEvent( keyAction, widget->windowHandle(), key, ConvertToQtModifiers(modifiers) ) :
keyEvent( keyAction, widget, key, ConvertToQtModifiers(modifiers) );
// If we found a widget then we successfully simulated an event:
return true;
}
bool wxUIActionSimulatorQtImpl::MouseDown(int button)
{
return SimulateMouseButton( MousePress, ConvertMouseButton( button ),
m_mousePosition, ConvertToQtModifiers( m_modifiers ) );
}
bool wxUIActionSimulatorQtImpl::MouseUp(int button)
{
return SimulateMouseButton( MouseRelease, ConvertMouseButton( button ),
m_mousePosition, ConvertToQtModifiers( m_modifiers ) );
}
bool wxUIActionSimulatorQtImpl::MouseMove(long x, long y)
{
m_mousePosition = QPoint(x, y);
return SimulateMouseButton( QTest::MouseMove, NoButton, m_mousePosition );
}
bool wxUIActionSimulatorQtImpl::MouseClick(int button)
{
return SimulateMouseButton( QTest::MouseClick, ConvertMouseButton( button ),
m_mousePosition, ConvertToQtModifiers( m_modifiers ) );
}
bool wxUIActionSimulatorQtImpl::MouseDblClick(int button)
{
return SimulateMouseButton( QTest::MouseDClick, ConvertMouseButton( button ), m_mousePosition );
}
bool wxUIActionSimulatorQtImpl::DoKey(int keyCode, int modifiers, bool isDown)
{
Qt::KeyboardModifiers qtmodifiers;
enum Key key;
SaveModifierForMouseClicks(keyCode, isDown);
key = (enum Key) wxQtConvertKeyCode( keyCode, modifiers, qtmodifiers );
Qt::KeyboardModifiers qtmodifiers;
enum Key key = (enum Key) wxQtConvertKeyCode( keyCode, modifiers, qtmodifiers );
wxCHECK_MSG(key, false, wxT("No current key conversion equivalent in Qt"));
KeyAction keyAction = isDown ? Press : Release;
return SimulateKeyboardKey( keyAction, key );
return SimulateKeyboardKey( keyAction, key, modifiers );
}

3
src/qt/window.cpp
View file

@ -492,6 +492,9 @@ void wxWindowQt::DoEnable(bool enable)
void wxWindowQt::SetFocus()
{
if ( !GetHandle()->isActiveWindow() )
GetHandle()->activateWindow();
GetHandle()->setFocus();
}

2
tests/controls/comboboxtest.cpp
View file

@ -134,7 +134,7 @@ void ComboBoxTestCase::Size()
void ComboBoxTestCase::PopDismiss()
{
#if defined(__WXMSW__) || defined(__WXGTK210__)
#if defined(__WXMSW__) || defined(__WXGTK210__) || defined(__WXQT__)
EventCounter drop(m_combo, wxEVT_COMBOBOX_DROPDOWN);
EventCounter close(m_combo, wxEVT_COMBOBOX_CLOSEUP);

1
tests/controls/dataviewctrltest.cpp
View file

@ -873,6 +873,7 @@ TEST_CASE_METHOD(SingleSelectDataViewCtrlTestCase,
EventCounter keyEvents(m_dvc, wxEVT_KEY_DOWN);
m_dvc->SetFocus();
wxYield();
wxUIActionSimulator sim;
sim.Char(WXK_DOWN);

32
tests/controls/gridtest.cpp
View file

@ -639,7 +639,11 @@ TEST_CASE_METHOD(GridTestCase, "Grid::Size", "[grid]")
wxUIActionSimulator sim;
wxPoint pt = m_grid->ClientToScreen(wxPoint(m_grid->GetRowLabelSize() +
m_grid->GetColSize(0), 5));
m_grid->GetColSize(0), 5));
#ifdef __WXQT__
pt += wxPoint(1, 0); // FIXME: why this is needed?
#endif
sim.MouseMove(pt);
wxYield();
@ -659,6 +663,10 @@ TEST_CASE_METHOD(GridTestCase, "Grid::Size", "[grid]")
pt = m_grid->ClientToScreen(wxPoint(5, m_grid->GetColLabelSize() +
m_grid->GetRowSize(0)));
#ifdef __WXQT__
pt += wxPoint(0, 1); // FIXME: why this is needed?
#endif
sim.MouseDragDrop(pt.x, pt.y, pt.x, pt.y + 50);
WaitFor("mouse drag to be processed", [&]() {
@ -973,6 +981,7 @@ TEST_CASE_METHOD(GridTestCase, "Grid::MoveGridCursorUsingEndKey", "[grid]")
m_grid->SetColPos(10, 5);
m_grid->SetFocus();
wxYield();
sim.KeyDown(WXK_END, wxMOD_CONTROL);
sim.KeyUp(WXK_END, wxMOD_CONTROL);
@ -999,6 +1008,7 @@ TEST_CASE_METHOD(GridTestCase, "Grid::SelectUsingEndKey", "[grid]")
REQUIRE( m_grid->IsVisible(0, 0) );
m_grid->SetFocus();
wxYield();
sim.KeyDown(WXK_END, wxMOD_CONTROL | wxMOD_SHIFT);
sim.KeyUp(WXK_END, wxMOD_CONTROL | wxMOD_SHIFT);
@ -1373,6 +1383,8 @@ TEST_CASE_METHOD(GridTestCase, "Grid::Editable", "[grid]")
m_grid->SetFocus();
m_grid->SetGridCursor(1, 1);
wxYield();
sim.Text("abab");
wxYield();
@ -1404,6 +1416,8 @@ TEST_CASE_METHOD(GridTestCase, "Grid::ReadOnly", "[grid]")
m_grid->SetGridCursor(1, 1);
wxYield();
CHECK(m_grid->IsCurrentCellReadOnly());
sim.Text("abab");
@ -1481,8 +1495,8 @@ TEST_CASE_METHOD(GridTestCase, "Grid::WindowAsEditorControl", "[grid]")
TEST_CASE_METHOD(GridTestCase, "Grid::ResizeScrolledHeader", "[grid]")
{
// TODO this test currently works only under Windows and GTK unfortunately
#if wxUSE_UIACTIONSIMULATOR && (defined(__WXMSW__) || defined(__WXGTK__))
// TODO this test currently works only under Windows, GTK and Qt unfortunately
#if wxUSE_UIACTIONSIMULATOR && (defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXQT__))
if ( !EnableUITests() )
return;
@ -1506,6 +1520,10 @@ TEST_CASE_METHOD(GridTestCase, "Grid::ResizeScrolledHeader", "[grid]")
m_grid->GetColLabelSize())
- wxPoint(0, 5));
#ifdef __WXQT__
point += wxPoint(1, 0); // FIXME: why this is needed?
#endif
wxUIActionSimulator sim;
wxYield();
@ -1528,8 +1546,8 @@ TEST_CASE_METHOD(GridTestCase, "Grid::ResizeScrolledHeader", "[grid]")
TEST_CASE_METHOD(GridTestCase, "Grid::ColumnMinWidth", "[grid]")
{
// TODO this test currently works only under Windows and GTK unfortunately
#if wxUSE_UIACTIONSIMULATOR && (defined(__WXMSW__) || defined(__WXGTK__))
// TODO this test currently works only under Windows, GTK and Qt unfortunately
#if wxUSE_UIACTIONSIMULATOR && (defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXQT__))
if ( !EnableUITests() )
return;
@ -1561,6 +1579,10 @@ TEST_CASE_METHOD(GridTestCase, "Grid::ColumnMinWidth", "[grid]")
m_grid->GetColLabelSize())
- wxPoint(0, 5));
#ifdef __WXQT__
point += wxPoint(1, 0); // FIXME: why this is needed?
#endif
wxUIActionSimulator sim;
// Drag to reach the minimal width.

1
tests/controls/itemcontainertest.cpp
View file

@ -345,6 +345,7 @@ void ItemContainerTestCase::SimSelect()
container->Append("third");
GetContainerWindow()->SetFocus();
wxYield();
wxUIActionSimulator sim;
CPPUNIT_ASSERT( sim.Select("third") );

4
tests/controls/listboxtest.cpp
View file

@ -199,8 +199,8 @@ void ListBoxTestCase::ClickEvents()
m_list->Append(testitems);
m_list->Update();
m_list->Refresh();
m_list->Update();
sim.MouseMove(m_list->ClientToScreen(wxPoint(10, 10)));
wxYield();
@ -242,8 +242,8 @@ void ListBoxTestCase::ClickNotOnItem()
// simply avoid it by starting with a valid selection.
m_list->SetSelection(0);
m_list->Update();
m_list->Refresh();
m_list->Update();
sim.MouseMove(m_list->ClientToScreen(wxPoint(m_list->GetSize().x - 10, m_list->GetSize().y - 10)));
wxYield();

5
tests/controls/propgridtest.cpp
View file

@ -1477,8 +1477,11 @@ TEST_CASE("PropertyGridTestCase", "[propgrid]")
SECTION("SetSplitterPosition")
{
#ifndef __WXQT__
const int trySplitterPos = 50;
#else
const int trySplitterPos = 51; // FIXME!
#endif
int style = wxPG_AUTO_SORT; // wxPG_SPLITTER_AUTO_CENTER;
ReplaceGrid(pgManager, style, -1);

2
tests/controls/radioboxtest.cpp
View file

@ -145,7 +145,7 @@ TEST_CASE_METHOD(RadioBoxTestCase, "RadioBox::HelpText", "[radiobox][help]")
TEST_CASE_METHOD(RadioBoxTestCase, "RadioBox::ToolTip", "[radiobox][tooltip]")
{
#if defined (__WXMSW__) || defined(__WXGTK__)
#if defined (__WXMSW__) || defined(__WXGTK__) || defined(__WXQT__)
//GetItemToolTip returns null if there is no tooltip set
CHECK(!m_radio->GetItemToolTip(0));

12
tests/controls/slidertest.cpp
View file

@ -93,6 +93,7 @@ void SliderTestCase::PageUpDown()
wxUIActionSimulator sim;
m_slider->SetFocus();
wxYield();
sim.Char(WXK_PAGEUP);
sim.Char(WXK_PAGEDOWN);
@ -111,8 +112,9 @@ void SliderTestCase::LineUpDown()
EventCounter linedown(m_slider, wxEVT_SCROLL_LINEDOWN);
wxUIActionSimulator sim;
wxYield();
m_slider->SetFocus();
wxYield();
sim.Char(WXK_UP);
sim.Char(WXK_DOWN);
@ -130,8 +132,9 @@ void SliderTestCase::EvtSlider()
EventCounter slider(m_slider, wxEVT_SLIDER);
wxUIActionSimulator sim;
wxYield();
m_slider->SetFocus();
wxYield();
sim.Char(WXK_UP);
sim.Char(WXK_DOWN);
@ -146,8 +149,9 @@ void SliderTestCase::LinePageSize()
{
#if wxUSE_UIACTIONSIMULATOR
wxUIActionSimulator sim;
wxYield();
m_slider->SetFocus();
wxYield();
m_slider->SetPageSize(20);
@ -221,7 +225,7 @@ void SliderTestCase::Thumb()
CPPUNIT_ASSERT(track.GetCount() != 0);
CPPUNIT_ASSERT_EQUAL(1, release.GetCount());
#if defined(__WXMSW__) || defined(__WXGTK__)
#if defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXQT__)
CPPUNIT_ASSERT_EQUAL(1, changed.GetCount());
#endif
#endif

15
tests/controls/textctrltest.cpp
View file

@ -32,6 +32,10 @@
#include "waitfor.h"
#endif
#ifdef __WXQT__
#include <QtGlobal>
#endif
#include "wx/private/localeset.h"
#include "textentrytest.h"
@ -241,6 +245,10 @@ void TextCtrlTestCase::ReadOnly()
m_text->SetFocus();
#endif
// We get spurious update under wxQt. get rid of it before doing
// the next simulation.
updated.Clear();
sim.Text("abcdef");
wxYield();
@ -252,6 +260,13 @@ void TextCtrlTestCase::ReadOnly()
void TextCtrlTestCase::MaxLength()
{
#if wxUSE_UIACTIONSIMULATOR
#ifdef __WXQT__
#if (QT_VERSION < QT_VERSION_CHECK(5, 12, 0))
WARN("wxEVT_TEXT_MAXLEN event is only generated if Qt version is 5.12 or greater");
return;
#endif
#endif
EventCounter updated(m_text, wxEVT_TEXT);
EventCounter maxlen(m_text, wxEVT_TEXT_MAXLEN);

6
tests/controls/treectrltest.cpp
View file

@ -317,6 +317,11 @@ void TreeCtrlTestCase::LabelEdit()
wxUIActionSimulator sim;
#ifdef __WXQT__
m_tree->SetFocus();
wxYield();
#endif
m_tree->SetFocusedItem(m_tree->GetRootItem());
m_tree->EditLabel(m_tree->GetRootItem());
@ -338,6 +343,7 @@ void TreeCtrlTestCase::KeyDown()
wxUIActionSimulator sim;
m_tree->SetFocus();
wxYield();
sim.Text("aAbB");
wxYield();

8
tests/events/keyboard.cpp
View file

@ -243,6 +243,9 @@ void KeyboardEventTestCase::tearDown()
void KeyboardEventTestCase::NormalLetter()
{
#ifdef __WXQT__
WARN("FIXME! doesn't work like the other ports.");
#else
wxUIActionSimulator sim;
sim.Char('a');
wxYield();
@ -255,6 +258,7 @@ void KeyboardEventTestCase::NormalLetter()
CPPUNIT_ASSERT_EQUAL( 1, m_win->GetKeyUpCount() );
ASSERT_KEY_EVENT_IS( m_win->GetKeyUpEvent(), 'A' );
#endif
}
void KeyboardEventTestCase::NormalSpecial()
@ -275,6 +279,9 @@ void KeyboardEventTestCase::NormalSpecial()
void KeyboardEventTestCase::CtrlLetter()
{
#ifdef __WXQT__
WARN("FIXME! doesn't work like the other ports.");
#else
wxUIActionSimulator sim;
sim.Char('z', wxMOD_CONTROL);
wxYield();
@ -294,6 +301,7 @@ void KeyboardEventTestCase::CtrlLetter()
KeyDesc('Z', wxMOD_CONTROL) );
ASSERT_KEY_EVENT_IS( m_win->GetKeyUpEvent(1),
ModKeyUp(WXK_CONTROL) );
#endif
}
void KeyboardEventTestCase::CtrlSpecial()

5
tests/graphics/measuring.cpp
View file

@ -171,6 +171,9 @@ TEST_CASE("wxDC::GetPartialTextExtent", "[dc][text-extent][partial]")
TEST_CASE("wxGC::GetTextExtent", "[dc][text-extent]")
{
#ifdef __WXQT__
WARN("Skip test known to fail under wxQt");
#else
wxGraphicsRenderer* renderer = wxGraphicsRenderer::GetDefaultRenderer();
REQUIRE(renderer);
wxGraphicsContext* context = renderer->CreateMeasuringContext();
@ -185,7 +188,7 @@ TEST_CASE("wxGC::GetTextExtent", "[dc][text-extent]")
// TODO: Determine a way to make these tests more robust.
CHECK(width > 0.0);
CHECK(height > 0.0);
#endif
}
#endif // TEST_GC

10
tests/menu/menu.cpp
View file

@ -23,6 +23,8 @@
#include "wx/translation.h"
#include "wx/uiaction.h"
#include "waitfor.h"
#include <stdarg.h>
#include <memory>
@ -604,7 +606,13 @@ void MenuTestCase::Events()
// Invoke the accelerator.
m_frame->Show();
m_frame->SetFocus();
wxYield();
// Wait for m_frame to become focused. Because (at least under wxQt when running
// the entire test suite) the first test below would fail due to the simulation
// starts before the frame become focused.
WaitFor("the frame to become focused", [this]() {
return m_frame->HasFocus();
});
wxUIActionSimulator sim;
sim.KeyDown(WXK_F1);

6
tests/test.cpp
View file

@ -524,11 +524,11 @@ bool EnableUITests()
if ( s_enabled == -1 )
{
#if defined(__WXMSW__) || defined(__WXGTK__)
#if defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXQT__)
s_enabled = 1;
#else // !(__WXMSW__ || __WXGTK__)
#else // !(__WXMSW__ || __WXGTK__ || __WXQT__)
s_enabled = 0;
#endif // (__WXMSW__ || __WXGTK__)
#endif // (__WXMSW__ || __WXGTK__ || __WXQT__)
}
}

1
tests/validators/valnum.cpp
View file

@ -281,6 +281,7 @@ TEST_CASE_METHOD(NumValidatorTestCase, "ValNum::Interactive", "[valnum]")
// Entering '-' in a control with positive range is not allowed.
m_text->SetFocus();
wxYield();
sim.Char('-');
wxYield();
CHECK( m_text->GetValue() == "" );