From 247ee328b3c9db3d39a38579c72930a3b4011359 Mon Sep 17 00:00:00 2001 From: ali kettab Date: Sat, 25 Jul 2020 12:14:42 +0100 Subject: [PATCH 1/5] remove workaround from BitmapComboBoxTestCase --- tests/controls/bitmapcomboboxtest.cpp | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/tests/controls/bitmapcomboboxtest.cpp b/tests/controls/bitmapcomboboxtest.cpp index 0ae29e3457..2a011b3869 100644 --- a/tests/controls/bitmapcomboboxtest.cpp +++ b/tests/controls/bitmapcomboboxtest.cpp @@ -59,19 +59,6 @@ private: void Bitmap(); -#if defined(__WXGTK__) && wxUSE_UIACTIONSIMULATOR - virtual void SimSelect() wxOVERRIDE - { - // There is an inexplicable and locally irreproducible failure in this - // test for wxBitmapComboBox when it runs on the Linux buildbot slaves: - // wxUIActionSimulator::Select() fails there for some reason, so skip - // the test. If you ever manage to reproduce this locally, please try - // to debug it to understand what goes on! - if ( !IsAutomaticTest() ) - ItemContainerTestCase::SimSelect(); - } -#endif // __WXGTK__ - wxBitmapComboBox *m_combo; wxDECLARE_NO_COPY_CLASS(BitmapComboBoxTestCase); From 852f817291f8c80b249c55f19ecf23ef544c187e Mon Sep 17 00:00:00 2001 From: ali kettab Date: Sat, 25 Jul 2020 12:34:25 +0100 Subject: [PATCH 2/5] Get rid of redundant call to wxDELETE (no real change) --- tests/controls/checkboxtest.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tests/controls/checkboxtest.cpp b/tests/controls/checkboxtest.cpp index e1edd3e514..04709b7635 100644 --- a/tests/controls/checkboxtest.cpp +++ b/tests/controls/checkboxtest.cpp @@ -53,6 +53,7 @@ private: // any meaning otherwise. bool CreateCheckBox(long style) { + wxDELETE( m_check ); m_check = new wxCheckBox(wxTheApp->GetTopWindow(), wxID_ANY, "Check box", wxDefaultPosition, wxDefaultSize, style); return false; @@ -110,7 +111,6 @@ void CheckBoxTestCase::Check() #ifdef wxHAS_3STATE_CHECKBOX void CheckBoxTestCase::ThirdState() { - wxDELETE(m_check); CreateCheckBox(wxCHK_3STATE); CPPUNIT_ASSERT_EQUAL(wxCHK_UNCHECKED, m_check->Get3StateValue()); @@ -128,7 +128,6 @@ void CheckBoxTestCase::ThirdState() void CheckBoxTestCase::ThirdStateUser() { - wxDELETE(m_check); CreateCheckBox(wxCHK_3STATE | wxCHK_ALLOW_3RD_STATE_FOR_USER); CPPUNIT_ASSERT_EQUAL(wxCHK_UNCHECKED, m_check->Get3StateValue()); @@ -147,14 +146,12 @@ void CheckBoxTestCase::ThirdStateUser() void CheckBoxTestCase::InvalidStyles() { // Check that using incompatible styles doesn't work. - wxDELETE( m_check ); WX_ASSERT_FAILS_WITH_ASSERT( CreateCheckBox(wxCHK_2STATE | wxCHK_3STATE) ); #if !wxDEBUG_LEVEL CPPUNIT_ASSERT( !m_check->Is3State() ); CPPUNIT_ASSERT( !m_check->Is3rdStateAllowedForUser() ); #endif - wxDELETE( m_check ); WX_ASSERT_FAILS_WITH_ASSERT( CreateCheckBox(wxCHK_2STATE | wxCHK_ALLOW_3RD_STATE_FOR_USER) ); #if !wxDEBUG_LEVEL @@ -163,7 +160,6 @@ void CheckBoxTestCase::InvalidStyles() #endif // wxCHK_ALLOW_3RD_STATE_FOR_USER without wxCHK_3STATE doesn't work. - wxDELETE( m_check ); WX_ASSERT_FAILS_WITH_ASSERT( CreateCheckBox(wxCHK_ALLOW_3RD_STATE_FOR_USER) ); } From ad68515d52747cdd33d25306b2126cbc20cc5e0e Mon Sep 17 00:00:00 2001 From: ali kettab Date: Sat, 25 Jul 2020 14:59:31 +0100 Subject: [PATCH 3/5] cleanup a wxTextCtrl leftover from SpinCtrlTest --- tests/controls/spinctrltest.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/controls/spinctrltest.cpp b/tests/controls/spinctrltest.cpp index e4c94e313e..bc1b994bf9 100644 --- a/tests/controls/spinctrltest.cpp +++ b/tests/controls/spinctrltest.cpp @@ -338,6 +338,8 @@ TEST_CASE_METHOD(SpinCtrlTestCase3, "SpinCtrl::SetValueInsideEventHandler", "[sp CHECK(m_spin->GetValue() == 32); } + + delete text; #endif // wxUSE_UIACTIONSIMULATOR } From b1c83920b5c353ba64aa26167f2e840994f4cce1 Mon Sep 17 00:00:00 2001 From: ali kettab Date: Sat, 25 Jul 2020 16:09:50 +0100 Subject: [PATCH 4/5] fix typo --- tests/controls/spinctrltest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/controls/spinctrltest.cpp b/tests/controls/spinctrltest.cpp index bc1b994bf9..23d8b613cf 100644 --- a/tests/controls/spinctrltest.cpp +++ b/tests/controls/spinctrltest.cpp @@ -273,7 +273,7 @@ TEST_CASE_METHOD(SpinCtrlTestCase2, "SpinCtrl::Value", "[spinctrl]") CHECK(updatedText.GetCount() == 0); } -TEST_CASE_METHOD(SpinCtrlTestCase2, "SpinCtrl::Base`", "[spinctrl]") +TEST_CASE_METHOD(SpinCtrlTestCase2, "SpinCtrl::Base", "[spinctrl]") { CHECK(m_spin->GetMin() == 0); CHECK(m_spin->GetMax() == 100); From 30e5ff87a46af0ef5615654fbccbdfeffbcbbb7a Mon Sep 17 00:00:00 2001 From: ali kettab Date: Sat, 25 Jul 2020 18:09:55 +0100 Subject: [PATCH 5/5] the assertion was mistakenly placed in the wrong place --- tests/controls/comboboxtest.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/controls/comboboxtest.cpp b/tests/controls/comboboxtest.cpp index 5f344060c1..d6fe21854c 100644 --- a/tests/controls/comboboxtest.cpp +++ b/tests/controls/comboboxtest.cpp @@ -150,8 +150,9 @@ void ComboBoxTestCase::PopDismiss() // Under wxGTK2, the event is sent only during idle time and not // immediately, so we need this yield to get it. wxYield(); - CPPUNIT_ASSERT_EQUAL(1, close.GetCount()); #endif // wxGTK2 + + CPPUNIT_ASSERT_EQUAL(1, close.GetCount()); #endif }