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

Rewrite SetSizeTestCase to not use CppUnit macros neither

Browse Source 
Do the same thing as in the previous commit to another test.

No real changes.
This commit is contained in:
Vadim Zeitlin 2019-09-22 00:43:59 +02:00
parent 3a4538a18c
commit baca938ce3
1 changed files with 41 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
tests/window/setsize.cpp
View File

@ -21,97 +21,66 @@
#include "wx/window.h" #include "wx/window.h"
#endif // WX_PRECOMP #endif // WX_PRECOMP
#include "wx/scopedptr.h"
#include "asserthelper.h" #include "asserthelper.h"
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// test class // tests helpers
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class SetSizeTestCase : public CppUnit::TestCase namespace
{
// Helper class overriding DoGetBestSize() for testing purposes.
class MyWindow : public wxWindow
{ {
public: public:
SetSizeTestCase() { } MyWindow(wxWindow* parent)
: wxWindow(parent, wxID_ANY)
virtual void setUp() wxOVERRIDE;
virtual void tearDown() wxOVERRIDE;
private:
CPPUNIT_TEST_SUITE( SetSizeTestCase );
CPPUNIT_TEST( SetSize );
CPPUNIT_TEST( SetSizeLessThanMinSize );
CPPUNIT_TEST( BestSize );
CPPUNIT_TEST_SUITE_END();
void SetSize();
void SetSizeLessThanMinSize();
void BestSize();
// Helper class overriding DoGetBestSize() for testing purposes.
class MyWindow : public wxWindow
{ {
public: }
MyWindow(wxWindow* parent)
: wxWindow(parent, wxID_ANY)
{
}
protected: protected:
virtual wxSize DoGetBestSize() const wxOVERRIDE { return wxSize(50, 250); } virtual wxSize DoGetBestSize() const wxOVERRIDE { return wxSize(50, 250); }
};
wxWindow *m_win;
wxDECLARE_NO_COPY_CLASS(SetSizeTestCase);
}; };
// register in the unnamed registry so that these tests are run by default } // anonymous namespace
CPPUNIT_TEST_SUITE_REGISTRATION( SetSizeTestCase );
// also include in its own registry so that these tests can be run alone
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( SetSizeTestCase, "SetSizeTestCase" );
// ----------------------------------------------------------------------------
// test initialization
// ----------------------------------------------------------------------------
void SetSizeTestCase::setUp()
{
m_win = new MyWindow(wxTheApp->GetTopWindow());
}
void SetSizeTestCase::tearDown()
{
delete m_win;
m_win = NULL;
}
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// tests themselves // tests themselves
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
void SetSizeTestCase::SetSize() TEST_CASE("wxWindow::SetSize", "[window][size]")
{ {
const wxSize size(127, 35); wxScopedPtr<wxWindow> w(new MyWindow(wxTheApp->GetTopWindow()));
m_win->SetSize(size);
CPPUNIT_ASSERT_EQUAL( size, m_win->GetSize() ); SECTION("Simple")
{
const wxSize size(127, 35);
w->SetSize(size);
CHECK( size == w->GetSize() );
}
SECTION("With min size")
{
w->SetMinSize(wxSize(100, 100));
const wxSize size(200, 50);
w->SetSize(size);
CHECK( size == w->GetSize() );
}
} }
void SetSizeTestCase::SetSizeLessThanMinSize() TEST_CASE("wxWindow::GetBestSize", "[window][size][best-size]")
{ {
m_win->SetMinSize(wxSize(100, 100)); wxScopedPtr<wxWindow> w(new MyWindow(wxTheApp->GetTopWindow()));
const wxSize size(200, 50); CHECK( wxSize(50, 250) == w->GetBestSize() );
m_win->SetSize(size);
CPPUNIT_ASSERT_EQUAL( size, m_win->GetSize() ); w->SetMinSize(wxSize(100, 100));
} CHECK( wxSize(100, 250) == w->GetBestSize() );
void SetSizeTestCase::BestSize() w->SetMaxSize(wxSize(200, 200));
{ CHECK( wxSize(100, 200) == w->GetBestSize() );
CPPUNIT_ASSERT_EQUAL( wxSize(50, 250), m_win->GetBestSize() );
m_win->SetMinSize(wxSize(100, 100));
CPPUNIT_ASSERT_EQUAL( wxSize(100, 250), m_win->GetBestSize() );
m_win->SetMaxSize(wxSize(200, 200));
CPPUNIT_ASSERT_EQUAL( wxSize(100, 200), m_win->GetBestSize() );
} }