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

Get rid of CppUnit compatibility macros in wxSearchCtrl unit test

Browse Source 
No real changes, just remove all the CppUnit machinery not needed any
longer and replace it with a simple test function.
This commit is contained in:
Vadim Zeitlin
2018-01-29 19:04:47 +01:00
parent 99dea2e2e0
commit 05ebeb6bac
1 changed files with 18 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
tests/controls/searchctrltest.cpp
View File

@@ -20,50 +20,33 @@
#include "wx/srchctrl.h"
class SearchCtrlTestCase : public CppUnit::TestCase
class SearchCtrlTestCase
{
public:
SearchCtrlTestCase() { }
SearchCtrlTestCase()
: m_search(new wxSearchCtrl(wxTheApp->GetTopWindow(), wxID_ANY))
{
}
virtual void setUp();
virtual void tearDown();
~SearchCtrlTestCase()
{
delete m_search;
}
private:
CPPUNIT_TEST_SUITE( SearchCtrlTestCase );
CPPUNIT_TEST( Focus );
CPPUNIT_TEST_SUITE_END();
void Focus();
wxSearchCtrl* m_search;
wxDECLARE_NO_COPY_CLASS(SearchCtrlTestCase);
protected:
wxSearchCtrl* const m_search;
};
// register in the unnamed registry so that these tests are run by default
CPPUNIT_TEST_SUITE_REGISTRATION( SearchCtrlTestCase );
#define SEARCH_CTRL_TEST_CASE(name, tags) \
TEST_CASE_METHOD(SearchCtrlTestCase, name, tags)
// also include in its own registry so that these tests can be run alone
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( SearchCtrlTestCase, "SearchCtrlTestCase" );
void SearchCtrlTestCase::setUp()
{
m_search = new wxSearchCtrl(wxTheApp->GetTopWindow(), wxID_ANY);
}
void SearchCtrlTestCase::tearDown()
{
delete m_search;
m_search = NULL;
}
void SearchCtrlTestCase::Focus()
{
// TODO OS X test only passes when run solo ...
// TODO OS X test only passes when run solo ...
#ifndef __WXOSX__
SEARCH_CTRL_TEST_CASE("wxSearchCtrl::Focus", "[wxSearchCtrl][focus]")
{
m_search->SetFocus();
CPPUNIT_ASSERT( m_search->HasFocus() );
#endif
CHECK( m_search->HasFocus() );
}
#endif // !__WXOSX__
#endif // wxUSE_SEARCHCTRL