diff --git a/tests/controls/dataviewctrltest.cpp b/tests/controls/dataviewctrltest.cpp index bfb849b14d..9d308117f2 100644 --- a/tests/controls/dataviewctrltest.cpp +++ b/tests/controls/dataviewctrltest.cpp @@ -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); diff --git a/tests/controls/gridtest.cpp b/tests/controls/gridtest.cpp index 103937c8b8..738c4846cf 100644 --- a/tests/controls/gridtest.cpp +++ b/tests/controls/gridtest.cpp @@ -973,6 +973,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 +1000,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 +1375,8 @@ TEST_CASE_METHOD(GridTestCase, "Grid::Editable", "[grid]") m_grid->SetFocus(); m_grid->SetGridCursor(1, 1); + wxYield(); + sim.Text("abab"); wxYield(); @@ -1404,6 +1408,8 @@ TEST_CASE_METHOD(GridTestCase, "Grid::ReadOnly", "[grid]") m_grid->SetGridCursor(1, 1); + wxYield(); + CHECK(m_grid->IsCurrentCellReadOnly()); sim.Text("abab"); diff --git a/tests/controls/itemcontainertest.cpp b/tests/controls/itemcontainertest.cpp index 44c06a367a..70d89fed7a 100644 --- a/tests/controls/itemcontainertest.cpp +++ b/tests/controls/itemcontainertest.cpp @@ -345,6 +345,7 @@ void ItemContainerTestCase::SimSelect() container->Append("third"); GetContainerWindow()->SetFocus(); + wxYield(); wxUIActionSimulator sim; CPPUNIT_ASSERT( sim.Select("third") ); diff --git a/tests/controls/slidertest.cpp b/tests/controls/slidertest.cpp index af1a8ae15f..8ee6db458a 100644 --- a/tests/controls/slidertest.cpp +++ b/tests/controls/slidertest.cpp @@ -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); diff --git a/tests/validators/valnum.cpp b/tests/validators/valnum.cpp index 49c912187a..1702d30486 100644 --- a/tests/validators/valnum.cpp +++ b/tests/validators/valnum.cpp @@ -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() == "" );