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

Use Catch in wxSpinCtrl unit tests

Browse Source 
Use Catch instead of CppUnit for unit tests of wxSpinCtrl.
This commit is contained in:
Artur Wieczorek
2020-07-12 15:31:02 +02:00
parent 776b28cba7
commit a4928c0fde
1 changed files with 128 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

251
tests/controls/spinctrltest.cpp
View File

@@ -23,107 +23,126 @@
#include "wx/spinctrl.h" #include "wx/spinctrl.h"
#include "wx/textctrl.h" #include "wx/textctrl.h"
class SpinCtrlTestCase : public CppUnit::TestCase class SpinCtrlTestCase1
{ {
public: public:
SpinCtrlTestCase() { } SpinCtrlTestCase1()
: m_spin(new wxSpinCtrl())
{
}
void setUp() wxOVERRIDE; ~SpinCtrlTestCase1()
void tearDown() wxOVERRIDE; {
delete m_spin;
private: }
CPPUNIT_TEST_SUITE( SpinCtrlTestCase );
CPPUNIT_TEST( Initial );
CPPUNIT_TEST( NoEventsInCtor );
WXUISIM_TEST( Arrows );
WXUISIM_TEST( Wrap );
CPPUNIT_TEST( Range );
CPPUNIT_TEST( Value );
WXUISIM_TEST( SetValueInsideEventHandler );
CPPUNIT_TEST_SUITE_END();
void Initial();
void NoEventsInCtor();
void Arrows();
void Wrap();
void Range();
void Value();
void SetValueInsideEventHandler();
// Helper event handler for SetValueInsideEventHandler() test.
void OnSpinSetValue(wxSpinEvent &e);
protected:
wxSpinCtrl* m_spin; wxSpinCtrl* m_spin;
wxDECLARE_NO_COPY_CLASS(SpinCtrlTestCase);
}; };
// register in the unnamed registry so that these tests are run by default class SpinCtrlTestCase2
CPPUNIT_TEST_SUITE_REGISTRATION( SpinCtrlTestCase );
// also include in its own registry so that these tests can be run alone
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( SpinCtrlTestCase, "SpinCtrlTestCase" );
void SpinCtrlTestCase::setUp()
{ {
m_spin = new wxSpinCtrl(wxTheApp->GetTopWindow()); public:
} SpinCtrlTestCase2()
: m_spin(new wxSpinCtrl(wxTheApp->GetTopWindow()))
{
}
void SpinCtrlTestCase::tearDown() ~SpinCtrlTestCase2()
{
delete m_spin;
}
protected:
wxSpinCtrl* m_spin;
};
class SpinCtrlTestCase3
{ {
wxDELETE(m_spin); public:
} SpinCtrlTestCase3()
: m_spin(new wxSpinCtrl(wxTheApp->GetTopWindow()))
{
m_spin->Bind(wxEVT_SPINCTRL, &SpinCtrlTestCase3::OnSpinSetValue, this);
}
void SpinCtrlTestCase::Initial() ~SpinCtrlTestCase3()
{
delete m_spin;
}
private:
void OnSpinSetValue(wxSpinEvent &e)
{
// Constrain the value to be in the 1..16 range or 32.
int newVal = e.GetValue();
if ( newVal == 31 )
m_spin->SetValue(16);
else if ( newVal > 16 )
m_spin->SetValue(32);
}
protected:
wxSpinCtrl* m_spin;
};
TEST_CASE_METHOD(SpinCtrlTestCase2, "SpinCtrl::Init", "[spinctrl]")
{ {
// Initial value is defined by "initial" argument which is 0 by default. // Initial value is defined by "initial" argument which is 0 by default.
CPPUNIT_ASSERT_EQUAL( 0, m_spin->GetValue() ); CHECK(m_spin->GetValue() == 0);
wxWindow* const parent = m_spin->GetParent();
// Recreate the control with another "initial" to check this.
delete m_spin;
m_spin = new wxSpinCtrl(parent, wxID_ANY, "",
wxDefaultPosition, wxDefaultSize, 0,
0, 100, 17);
CPPUNIT_ASSERT_EQUAL( 17, m_spin->GetValue() );
// Recreate the control with another "initial" outside of standard spin
// ctrl range.
delete m_spin;
m_spin = new wxSpinCtrl(parent, wxID_ANY, "",
wxDefaultPosition, wxDefaultSize, 0,
0, 200, 150);
CPPUNIT_ASSERT_EQUAL( 150, m_spin->GetValue() );
// But if the text string is specified, it takes precedence.
delete m_spin;
m_spin = new wxSpinCtrl(parent, wxID_ANY, "99",
wxDefaultPosition, wxDefaultSize, 0,
0, 100, 17);
CPPUNIT_ASSERT_EQUAL( 99, m_spin->GetValue() );
} }
void SpinCtrlTestCase::NoEventsInCtor() TEST_CASE_METHOD(SpinCtrlTestCase1, "SpinCtrl::Init2", "[spinctrl]")
{ {
// Verify that creating the control does not generate any events. This is m_spin->Create(wxTheApp->GetTopWindow(), wxID_ANY, "",
// unexpected and shouldn't happen.
wxWindow* const parent = m_spin->GetParent();
delete m_spin;
m_spin = new wxSpinCtrl;
EventCounter updatedSpin(m_spin, wxEVT_SPINCTRL);
EventCounter updatedText(m_spin, wxEVT_TEXT);
m_spin->Create(parent, wxID_ANY, "",
wxDefaultPosition, wxDefaultSize, 0, wxDefaultPosition, wxDefaultSize, 0,
0, 100, 17); 0, 100, 17);
CPPUNIT_ASSERT_EQUAL(0, updatedSpin.GetCount()); // Recreate the control with another "initial" to check this.
CPPUNIT_ASSERT_EQUAL(0, updatedText.GetCount()); CHECK(m_spin->GetValue() == 17);
} }
void SpinCtrlTestCase::Arrows() TEST_CASE_METHOD(SpinCtrlTestCase1, "SpinCtrl::Init3", "[spinctrl]")
{
m_spin->Create(wxTheApp->GetTopWindow(), wxID_ANY, "",
wxDefaultPosition, wxDefaultSize, 0,
0, 200, 150);
// Recreate the control with another "initial" outside of standard spin
// ctrl range.
CHECK(m_spin->GetValue() == 150);
}
TEST_CASE_METHOD(SpinCtrlTestCase1, "SpinCtrl::Init4", "[spinctrl]")
{
m_spin->Create(wxTheApp->GetTopWindow(), wxID_ANY, "99",
wxDefaultPosition, wxDefaultSize, 0,
0, 100, 17);
// Recreate the control with another "initial" outside of standard spin
// ctrl range.
// But if the text string is specified, it takes precedence.
CHECK(m_spin->GetValue() == 99);
}
TEST_CASE_METHOD(SpinCtrlTestCase1, "SpinCtrl::NoEventsInCtor", "[spinctrl]")
{
// Verify that creating the control does not generate any events. This is
// unexpected and shouldn't happen.
EventCounter updatedSpin(m_spin, wxEVT_SPINCTRL);
EventCounter updatedText(m_spin, wxEVT_TEXT);
m_spin->Create(wxTheApp->GetTopWindow(), wxID_ANY, "",
wxDefaultPosition, wxDefaultSize, 0,
0, 100, 17);
CHECK(updatedSpin.GetCount() == 0);
CHECK(updatedText.GetCount() == 0);
}
TEST_CASE_METHOD(SpinCtrlTestCase2, "SpinCtrl::Arrows", "[spinctrl]")
{ {
#if wxUSE_UIACTIONSIMULATOR #if wxUSE_UIACTIONSIMULATOR
EventCounter updated(m_spin, wxEVT_SPINCTRL); EventCounter updated(m_spin, wxEVT_SPINCTRL);
@@ -137,26 +156,25 @@ void SpinCtrlTestCase::Arrows()
wxYield(); wxYield();
CPPUNIT_ASSERT_EQUAL(1, updated.GetCount()); CHECK(updated.GetCount() == 1);
CPPUNIT_ASSERT_EQUAL(1, m_spin->GetValue()); CHECK(m_spin->GetValue() == 1);
updated.Clear(); updated.Clear();
sim.Char(WXK_DOWN); sim.Char(WXK_DOWN);
wxYield(); wxYield();
CPPUNIT_ASSERT_EQUAL(1, updated.GetCount()); CHECK(updated.GetCount() == 1);
CPPUNIT_ASSERT_EQUAL(0, m_spin->GetValue()); CHECK(m_spin->GetValue() == 0);
#endif #endif
} }
void SpinCtrlTestCase::Wrap() TEST_CASE_METHOD(SpinCtrlTestCase1, "SpinCtrl::Wrap", "[spinctrl]")
{ {
#if wxUSE_UIACTIONSIMULATOR #if wxUSE_UIACTIONSIMULATOR
wxDELETE(m_spin); m_spin->Create(wxTheApp->GetTopWindow(), wxID_ANY, "",
m_spin = new wxSpinCtrl(wxTheApp->GetTopWindow(), wxID_ANY, "", wxDefaultPosition, wxDefaultSize,
wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS | wxSP_WRAP);
wxSP_ARROW_KEYS | wxSP_WRAP);
wxUIActionSimulator sim; wxUIActionSimulator sim;
@@ -167,20 +185,20 @@ void SpinCtrlTestCase::Wrap()
wxYield(); wxYield();
CPPUNIT_ASSERT_EQUAL(100, m_spin->GetValue()); CHECK(m_spin->GetValue() == 100);
sim.Char(WXK_UP); sim.Char(WXK_UP);
wxYield(); wxYield();
CPPUNIT_ASSERT_EQUAL(0, m_spin->GetValue()); CHECK(m_spin->GetValue() == 0);
#endif #endif
} }
void SpinCtrlTestCase::Range() TEST_CASE_METHOD(SpinCtrlTestCase2, "SpinCtrl::Range", "[spinctrl]")
{ {
CPPUNIT_ASSERT_EQUAL(0, m_spin->GetMin()); CHECK(m_spin->GetMin() == 0);
CPPUNIT_ASSERT_EQUAL(100, m_spin->GetMax()); CHECK(m_spin->GetMax() == 100);
// Test that the value is adjusted to be inside the new valid range but // Test that the value is adjusted to be inside the new valid range but
// that this doesn't result in any events (as this is not something done by // that this doesn't result in any events (as this is not something done by
@@ -190,62 +208,49 @@ void SpinCtrlTestCase::Range()
EventCounter updatedText(m_spin, wxEVT_TEXT); EventCounter updatedText(m_spin, wxEVT_TEXT);
m_spin->SetRange(1, 10); m_spin->SetRange(1, 10);
CPPUNIT_ASSERT_EQUAL(1, m_spin->GetValue()); CHECK(m_spin->GetValue() == 1);
CPPUNIT_ASSERT_EQUAL(0, updatedSpin.GetCount()); CHECK(updatedSpin.GetCount() == 0);
CPPUNIT_ASSERT_EQUAL(0, updatedText.GetCount()); CHECK(updatedText.GetCount() == 0);
} }
//Test negative ranges //Test negative ranges
m_spin->SetRange(-10, 10); m_spin->SetRange(-10, 10);
CPPUNIT_ASSERT_EQUAL(-10, m_spin->GetMin()); CHECK(m_spin->GetMin() == -10);
CPPUNIT_ASSERT_EQUAL(10, m_spin->GetMax()); CHECK(m_spin->GetMax() == 10);
//Test backwards ranges //Test backwards ranges
m_spin->SetRange(75, 50); m_spin->SetRange(75, 50);
CPPUNIT_ASSERT_EQUAL(75, m_spin->GetMin()); CHECK(m_spin->GetMin() == 75);
CPPUNIT_ASSERT_EQUAL(50, m_spin->GetMax()); CHECK(m_spin->GetMax() == 50);
} }
void SpinCtrlTestCase::Value() TEST_CASE_METHOD(SpinCtrlTestCase2, "SpinCtrl::Value", "[spinctrl]")
{ {
EventCounter updatedSpin(m_spin, wxEVT_SPINCTRL); EventCounter updatedSpin(m_spin, wxEVT_SPINCTRL);
EventCounter updatedText(m_spin, wxEVT_TEXT); EventCounter updatedText(m_spin, wxEVT_TEXT);
CPPUNIT_ASSERT_EQUAL(0, m_spin->GetValue()); CHECK(m_spin->GetValue() == 0);
m_spin->SetValue(50); m_spin->SetValue(50);
CPPUNIT_ASSERT_EQUAL(50, m_spin->GetValue()); CHECK(m_spin->GetValue() == 50);
m_spin->SetValue(-10); m_spin->SetValue(-10);
CPPUNIT_ASSERT_EQUAL(0, m_spin->GetValue()); CHECK(m_spin->GetValue() == 0);
m_spin->SetValue(110); m_spin->SetValue(110);
CPPUNIT_ASSERT_EQUAL(100, m_spin->GetValue()); CHECK(m_spin->GetValue() == 100);
// Calling SetValue() shouldn't have generated any events. // Calling SetValue() shouldn't have generated any events.
CPPUNIT_ASSERT_EQUAL(0, updatedSpin.GetCount()); CHECK(updatedSpin.GetCount() == 0);
CPPUNIT_ASSERT_EQUAL(0, updatedText.GetCount()); CHECK(updatedText.GetCount() == 0);
} }
void SpinCtrlTestCase::OnSpinSetValue(wxSpinEvent &e) TEST_CASE_METHOD(SpinCtrlTestCase3, "SpinCtrl::SetValueInsideEventHandler", "[spinctrl]")
{
// Constrain the value to be in the 1..16 range or 32.
int newVal = e.GetValue();
if ( newVal == 31 )
m_spin->SetValue(16);
else if ( newVal > 16 )
m_spin->SetValue(32);
}
void SpinCtrlTestCase::SetValueInsideEventHandler()
{ {
#if wxUSE_UIACTIONSIMULATOR #if wxUSE_UIACTIONSIMULATOR
m_spin->Bind(wxEVT_SPINCTRL, &SpinCtrlTestCase::OnSpinSetValue, this);
// A dummy control with which we change the focus. // A dummy control with which we change the focus.
wxTextCtrl* text = new wxTextCtrl(wxTheApp->GetTopWindow(), wxID_ANY); wxTextCtrl* text = new wxTextCtrl(wxTheApp->GetTopWindow(), wxID_ANY);
text->Move(m_spin->GetSize().x, m_spin->GetSize().y * 3); text->Move(m_spin->GetSize().x, m_spin->GetSize().y * 3);
@@ -266,7 +271,7 @@ void SpinCtrlTestCase::SetValueInsideEventHandler()
text->SetFocus(); text->SetFocus();
wxYield(); wxYield();
CPPUNIT_ASSERT_EQUAL(32, m_spin->GetValue()); CHECK(m_spin->GetValue() == 32);
} }
#endif // wxUSE_UIACTIONSIMULATOR #endif // wxUSE_UIACTIONSIMULATOR
} }